hal-info: Branch 'master' - 6 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Tue Nov 18 03:21:49 PST 2008
fdi/information/10freedesktop/10-modem.fdi | 16 ++++++++++++++--
fdi/information/10freedesktop/10-usb-music-players.fdi | 7 +++++--
fdi/information/10freedesktop/30-keymap-misc.fdi | 3 ++-
3 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit 98f64375617a50ffeb6a004a27d75eb87027dfb9
Author: Bastien Nocera <hadess at hadess.net>
Date: Tue Nov 18 12:19:40 2008 +0100
correct PSP music player entry
Corrected PSP music player entry:
- Default folder depth is 0, as putting the files in a sub-directory,
actually puts them in separate playlists.
- Add mention of WMA and MP4 support (WMA requires to be enabled in
the preferences on the system, but if a user has WMAs, he's more
than likely going to enable the option, saving transcoding)
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 2783385..fc7d93b 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -942,9 +942,12 @@
<!-- NOTE: for backward compatibility until key get removed finally -->
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
<append key="portable_audio_player.audio_folders" type="strlist">PSP/MUSIC/</append>
+ <merge key="portable_audio_player.folder_depth" type="int">0</merge>
<merge key="storage.drive_type" type="string">memory_stick</merge>
</match>
</match>
commit 72f0ed662b15c53acf519dc17d0e4d0ee89721e5
Author: Bastien Nocera <hadess at hadess.net>
Date: Tue Nov 18 12:17:32 2008 +0100
detect PSP 3000 as a music player
Also detect the new PSP-3000 in storage mode. Vendor name is SONY
(not Sony), and the product name is "PSP" MS (yes, that's with the
quotes in the HAL output).
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 75cdcaa..2783385 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -936,8 +936,8 @@
<match key="info.category" string="storage">
<!-- Sony PSP (PlayStation Portable) -->
- <match key="storage.vendor" string="Sony">
- <match key="storage.model" string="PSP">
+ <match key="storage.vendor" prefix_ncase="SONY">
+ <match key="storage.model" contains="PSP">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
<!-- NOTE: for backward compatibility until key get removed finally -->
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
commit 322f2a0b74258f3d8ce67f5f0695ead7403ff585
Author: Dorian Scholz <DorianScholz at gmx.de>
Date: Tue Nov 18 12:13:45 2008 +0100
add keymap for Samsung X60p
Added keymap for Samsung X60p.
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index a3f18d2..36d6b96 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -94,7 +94,7 @@
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix_ncase="samsung">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="SP55S;SQ45S70S">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="SP55S;SQ45S70S;SX60P">
<append key="input.keymap.data" type="strlist">e002:displaytoggle</append> <!-- Fn+F4 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e003:battery</append> <!-- Fn+F2 battery icon -->
<append key="input.keymap.data" type="strlist">e004:prog1</append> <!-- Fn+F5 backlight on/off -->
@@ -103,6 +103,7 @@
<append key="input.keymap.data" type="strlist">e009:brightnessdown</append> <!-- Fn-Down Brightness down -->
<append key="input.keymap.data" type="strlist">e031:prog2</append> <!-- Fn+F7 run Samsung Magic Doctor (keypressed event is generated twice) -->
<append key="input.keymap.data" type="strlist">e033:prog3</append> <!-- Fn+F8 switch power mode (battery/dynamic/performance) -->
+ <append key="input.keymap.data" type="strlist">e034:wlan</append> <!-- Fn+F9 Turn On/Off Wireless (X60P) -->
<append key="input.keymap.data" type="strlist">0074:prog1</append> <!-- User key -->
<append key="input.keymap.data" type="strlist">0075:www</append> <!-- WWW key -->
<append key="input.keymap.data" type="strlist">e077:f22</append> <!-- Fn+F10 Touchpad on -->
commit 054fbba7dfd7013ccf53ab5b9e171821a7ccc996
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Tue Nov 18 12:07:39 2008 +0100
add ZTE CDMA Tech USB modem
Added ZTE CDMA Tech USB modem.
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 39a4490..560a9c2 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -134,6 +134,12 @@
<append key="modem.command_sets" type="strlist">IS-707-A</append>
</match>
</match>
+ <!-- ZTE CDMA Tech -->
+ <match key="@info.parent:usb.product_id" int="0xfffe">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
<!-- ZTE MF628 HSDPA USB dongle -->
<match key="@info.parent:usb.product_id" int="0x0015">
<match key="@info.parent:usb.interface.number" int="3">
commit ad2152d07c35057b0b9074bcd81cf436f9e6a23d
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Tue Nov 18 12:07:15 2008 +0100
add Motorola G24 USB GPRS Modem (GSM)
Added Motorola G24 USB GPRS Modem (GSM).
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 5e8059d..39a4490 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -215,6 +215,13 @@
</match>
</match>
</match>
+ <!-- Motorola G24 USB GPRS Modem -->
+ <match key="@info.parent:usb.product_id" int="0x4902">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
</match>
<!-- Dell Wireless -->
commit 6854dd610c2a56b8d78e2a7acc77c4e0908198d6
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Tue Nov 18 12:06:46 2008 +0100
fix modem.command_sets string for Telstra/NextG CDMA modem
Fix modem.command_sets string for Telstra/NextG CDMA modem.
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 9d110db..5e8059d 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -131,8 +131,7 @@
<!-- Qualcomm: Telstra/NextG CDMA -->
<match key="@info.parent:usb.product_id" int="0x0001">
<match key="@info.parent:usb.interface.number" int="0">
- <append key="modem.command_sets" type="strlist">GSM-07.07</append>
- <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
</match>
</match>
<!-- ZTE MF628 HSDPA USB dongle -->
More information about the hal-commit
mailing list