hal-info: Branch 'master' - 27 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Tue Apr 13 06:31:01 PDT 2010
fdi/information/10freedesktop/10-laptop-panel-hardware.fdi | 6
fdi/information/10freedesktop/10-modem.fdi | 26 +
fdi/information/10freedesktop/10-recall-battery-lenovo.fdi | 20 -
fdi/information/10freedesktop/10-usb-music-players.fdi | 189 ++++++++-----
fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi | 7
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 21 +
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 2
fdi/information/10freedesktop/30-keymap-hp.fdi | 32 +-
fdi/information/10freedesktop/30-keymap-misc.fdi | 2
fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi | 4
10 files changed, 219 insertions(+), 90 deletions(-)
New commits:
commit 81e47995cc6bb6fbc62303fc9cefdba0144ff5c3
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Apr 13 15:23:17 2010 +0200
add Archos 5 IMT as USB music player
Applied a fixed/slightly adopted version of a patch from
Kirk Bridger <kbridger at shaw.ca> to add Archos 5 IMT as
USB music player. (fd.o#21277)
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 49bf7c3..d2f0adf 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -760,7 +760,18 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
- </match>
+ <!-- Archos 5 IMT -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1332">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="strlist">Playlists/</append>
+ </match>
+ </match>
<!-- Q-be (Hyun Won, Inc.) -->
<match key="@storage.originating_device:usb.vendor_id" int="0x0f9c">
commit e68ce857cd6a5a630060b3aad4b10a3555b18d21
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Apr 12 17:22:32 2010 +0200
cleanup 10-usb-music-players.fdi, sort by vendor ID's
Cleaned up 10-usb-music-players.fdi. Sort entries by
vendor ID's.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 3a3d352..49bf7c3 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -576,6 +576,17 @@
</match>
</match>
+ <!-- TrekStor -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x0738">
+ <!-- i.Beat cebrax fx 1GB -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1738">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
+ </match>
+
<!-- Olympus -->
<match key="@storage.originating_device:usb.vendor_id" int="0x07b4">
<!-- DS-2 voice recorder -->
@@ -585,6 +596,43 @@
</match>
</match>
+ <!-- Palm -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x0830">
+ <!-- Palm Pre -->
+ <match key="@storage.originating_device:usb.product_id" int="0x8004">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ </match>
+ </match>
+
+ <!-- High Tech Computer Corp. -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0xbb4">
+ <!-- Android Phone, HTC Diamond -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0xc01;0xc02;0xc13">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-midi</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ </match>
+ <!-- Windows Mobile PPC HTC Touch HD -->
+ <match key="@storage.originating_device:usb.product_id" int="0xc25">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">My Music/</append>
+ </match>
+ </match>
+
<!-- Peak Digital Audio Player -->
<match key="@storage.originating_device:usb.vendor_id" int="0xd7d">
<match key="@storage.originating_device:usb.product_id" int="0x1651">
@@ -606,6 +654,14 @@
</match>
</match>
+ <!-- ISCI, hama, no-name -->
+ <match key="@storage.physical_device:usb.vendor_id" int="0xdda">
+ <!-- IC1110 V1.0A, hama DMP-100 -->
+ <match key="@storage.physical_device:usb.product_id" int="0x302">
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ </match>
+ </match>
+
<!-- Cowon -->
<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
<!-- iAUDIO M3 -->
@@ -1007,17 +1063,6 @@
</match>
</match>
- <!-- TrekStor -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x0738">
- <!-- i.Beat cebrax fx 1GB -->
- <match key="@storage.originating_device:usb.product_id" int="0x1738">
- <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
- </match>
- </match>
-
<!-- Amazon -->
<match key="@storage.originating_device:usb.vendor_id" int="0x1949">
<!-- Amazon Kindle -->
@@ -1027,6 +1072,25 @@
</match>
</match>
+ <!-- Insignia -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x19ff">
+ <!-- Insignia NS-8V24 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x0308">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.output_formats" type="strlist">video/mpeg4</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">music/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">video/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">record/</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="string">playlists/%File</append>
+ </match>
+ </match>
+
<!-- Motorola -->
<match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
<!-- Motorola iTunes enabled phone -->
@@ -1121,70 +1185,6 @@
</match>
</match>
- <!-- High Tech Computer Corp. -->
- <match key="@storage.originating_device:usb.vendor_id" int="0xbb4">
- <!-- Android Phone, HTC Diamond -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0xc01;0xc02;0xc13">
- <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-midi</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
- <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
- <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
- </match>
- <!-- Windows Mobile PPC HTC Touch HD -->
- <match key="@storage.originating_device:usb.product_id" int="0xc25">
- <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
- <append key="portable_audio_player.audio_folders" type="strlist">My Music/</append>
- </match>
- </match>
-
- <!-- ISCI, hama, no-name -->
- <match key="@storage.physical_device:usb.vendor_id" int="0xdda">
- <!-- IC1110 V1.0A, hama DMP-100 -->
- <match key="@storage.physical_device:usb.product_id" int="0x302">
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- </match>
- </match>
-
- <!-- Insignia -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x19ff">
- <!-- Insignia NS-8V24 -->
- <match key="@storage.originating_device:usb.product_id" int="0x0308">
- <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
- <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
- <append key="portable_audio_player.output_formats" type="strlist">video/mpeg4</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.audio_folders" type="strlist">music/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">video/</append>
- <append key="portable_audio_player.audio_folders" type="strlist">record/</append>
- <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
- <append key="portable_audio_player.playlist_path" type="string">playlists/%File</append>
- </match>
- </match>
-
- <!-- Palm -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x0830">
- <!-- Palm Pre -->
- <match key="@storage.originating_device:usb.product_id" int="0x8004">
- <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
- <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
- <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
- </match>
- </match>
-
</match>
</match>
commit 8f14b076bef29daa1764f0e5e72094cd495e45fa
Author: Bertrand Lorentz <bertrand.lorentz at gmail.com>
Date: Thu Aug 27 19:29:24 2009 +0200
add Samsung Galaxy as a USB music player
It's an Android phone, so keys are copied from the HTC Android G1.
Extracted from http://bugzilla.gnome.org/show_bug.cgi?id=589029
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index f0b62ae..3a3d352 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -364,6 +364,19 @@
<append key="portable_audio_player.audio_folders" type="strlist">Recorded Files/Voice/</append>
<append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
</match>
+ <!-- Samsung Galaxy, Android Phone -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x6601;0x6603">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-midi</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ </match>
</match>
<!-- Sony -->
commit 1c664e48226d1db80eeb04570ea3b2fbbadc3740
Author: Bertrand Lorentz <bertrand.lorentz at gmail.com>
Date: Thu Aug 27 19:53:21 2009 +0200
add Palm Pre as a USB music player
Extracted from http://bugzilla.gnome.org/show_bug.cgi?id=585112
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 77368d9..f0b62ae 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -1159,6 +1159,19 @@
</match>
</match>
+ <!-- Palm -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x0830">
+ <!-- Palm Pre -->
+ <match key="@storage.originating_device:usb.product_id" int="0x8004">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ </match>
+ </match>
+
</match>
</match>
commit d927d173cc0dc1a83ae71aa8661704d0dd77c131
Author: Holger Macht <hmacht at suse.de>
Date: Fri Apr 9 15:12:21 2010 +0200
workaround for HP ProBook 5310 BIOS issue
Workaround HP ProBook 5310 BIOS issue by marking the scan code
generated by FN-F7 as reserved (bnc#568988)
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index fe60671..88a4690 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -75,13 +75,18 @@
<append key="input.keymap.data" type="strlist">e003:email</append> <!-- envelope button -->
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5310">
+ <append key="input.keymap.data" type="strlist">e021:reserved</append>
+ </match>
+
<match key="/org/freedesktop/Hal/devices/computer:system.board.vendor" string="Quanta">
<!-- HP Pavillion dv6315ea with empty system.hardware.* keys fd.o#19936 -->
<match key="/org/freedesktop/Hal/devices/computer:system.board.product" string="30B7">
<match key="/org/freedesktop/Hal/devices/computer:system.board.version" string="65.2B">
+ <remove key="input.keymap.data" type="strlist">e008:presentation</remove>
<append key="input.keymap.data" type="strlist">e008:media</append> <!-- FIXME: quick play -->
</match>
- </match>
+ </match>
</match>
</match>
commit 29bfe617802827d19f4bf3e4e26bcef9554dddca
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Apr 9 14:41:12 2010 +0200
added some more HP models to get brightness keys working
Added some more HP models to get brightness keys working:
- EliteBook 8440w
- EliteBook 8740w
- EliteBook 8540p
They need laptop_panel.brightness_in_hardware=false
diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 07fe031..1b79e1e 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -37,7 +37,7 @@
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="Hewlett-Packard">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4310s;4410s;4411s;4415s;4416s;4510s;4515s;4710s;Compaq 5X5;Compaq 515;Compaq 516;Compaq 615;HP Mini 5102">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4310s;4410s;4411s;4415s;4416s;4510s;4515s;4710s;Compaq 5X5;Compaq 515;Compaq 516;Compaq 615;HP Mini 5102;EliteBook 8440w;EliteBook 8740w;EliteBook 8540p">
<merge key="laptop_panel.brightness_in_hardware" type="bool">false</merge>
</match>
</match>
commit 520be8d8fac0845c3c4bad084516f5a4a73cb799
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Apr 9 12:46:20 2010 +0200
Updated some keys and brightness handling for some HP notebooks
Updated some keys and brightness handling for some HP notebooks
with a patch from the following authors: Timo Hönig <thoenig at suse.de>,
Dirk Müller <dmueller at suse.de> and Holger Macht <hmacht at suse.de>.
(from: bnc#568988, bnc#546539, bnc#491802, bnc#531435, bnc#474079,
bnc#479262, bnc#474065, bnc#471966, bnc#471978)
diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 58d17b4..07fe031 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -36,6 +36,12 @@
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="Hewlett-Packard">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4310s;4410s;4411s;4415s;4416s;4510s;4515s;4710s;Compaq 5X5;Compaq 515;Compaq 516;Compaq 615;HP Mini 5102">
+ <merge key="laptop_panel.brightness_in_hardware" type="bool">false</merge>
+ </match>
+ </match>
+
<match key="linux.sysfs_path" suffix="/backlight/thinkpad_screen">
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index c230a2a..fe60671 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -22,23 +22,6 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
<!-- We're so sorry... -->
- <match key="/org/freedesktop/Hal/devices/computer:system.firmware.release_date" contains_outof="2009;2010;2011;2012;2013;2014;2015">
- <!-- [make code:kernel define lower case (linux/input.h)] comment: description according to HP spec -->
- <append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- presentation mode -->
- <append key="input.keymap.data" type="strlist">e012:brightnessdown</append> <!-- brightness down -->
- <append key="input.keymap.data" type="strlist">e017:brightnessup</append> <!-- brightness up -->
- <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- volume mute -->
- <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- volume down -->
- <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- volume up -->
- <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- sleep -->
- <append key="input.keymap.data" type="strlist">e06b:computer</append> <!-- browser button (cf. bnc#550670 comment 17) -->
- <append key="input.keymap.data" type="strlist">e06c:mail</append> <!-- envelope button (cf. bnc#550670 comment 17) -->
- <append key="input.keymap.data" type="strlist">e06e:switchvideomode</append> <!-- LCD/CRT -->
- <append key="input.keymap.data" type="strlist">e075:info</append> <!-- info center -->
- <append key="input.keymap.data" type="strlist">e078:wlan</append> <!-- wireless toggle -->
- </match>
-
- <!-- We're so sorry... -->
<match key="/org/freedesktop/Hal/devices/computer:system.firmware.release_date" contains_outof="2009;2010;2011;2012;2013;2014;2015">
<!-- [make code:kernel define lower case (linux/input.h)] comment: description according to HP spec -->
<append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- presentation mode -->
@@ -87,6 +70,11 @@
<append key="input.keymap.data" type="strlist">e059:f23</append> <!-- touchpad on -->
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4310s;4410s;4411s;4415s;4416s;4510s;4515s;4710s;6730s;Compaq 5X5;Compaq 515;Compaq 516;Compaq 615;Compaq 6530b;HP Mini 5102">
+ <!-- HP Compaq 4310s, 4410s, 4415s, 4416s, 4510s, 4515s, 4710s, 6730s, Compaq 5X5, Compaq 515, Compaq 516, Compaq 615, Compaq 6530b, HP Mini 5102 -->
+ <append key="input.keymap.data" type="strlist">e003:email</append> <!-- envelope button -->
+ </match>
+
<match key="/org/freedesktop/Hal/devices/computer:system.board.vendor" string="Quanta">
<!-- HP Pavillion dv6315ea with empty system.hardware.* keys fd.o#19936 -->
<match key="/org/freedesktop/Hal/devices/computer:system.board.product" string="30B7">
commit 0351b551fd26891e23e39147a9040a9aa3ddc448
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Apr 9 12:40:50 2010 +0200
added adopted version of a SUSE patch to support HP keymaps
Added adopted version of a SUSE patch to support HP keymaps from
thoenig at suse.de and hmacht at suse.de. (see bnc#550670, bnc#552532
and bnc#577998)
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index c49cc47..c230a2a 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -20,6 +20,23 @@
<append key="input.keymap.data" type="strlist">e057:wlan</append> <!-- Wlan -->
<append key="input.keymap.data" type="strlist">e06e:switchvideomode</append> <!-- FnF4 (video switch LCD/CRT) -->
<append key="info.capabilities" type="strlist">input.keymap</append>
+
+ <!-- We're so sorry... -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.firmware.release_date" contains_outof="2009;2010;2011;2012;2013;2014;2015">
+ <!-- [make code:kernel define lower case (linux/input.h)] comment: description according to HP spec -->
+ <append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- presentation mode -->
+ <append key="input.keymap.data" type="strlist">e012:brightnessdown</append> <!-- brightness down -->
+ <append key="input.keymap.data" type="strlist">e017:brightnessup</append> <!-- brightness up -->
+ <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- volume mute -->
+ <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- volume down -->
+ <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- volume up -->
+ <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- sleep -->
+ <append key="input.keymap.data" type="strlist">e06b:computer</append> <!-- browser button (cf. bnc#550670 comment 17) -->
+ <append key="input.keymap.data" type="strlist">e06c:mail</append> <!-- envelope button (cf. bnc#550670 comment 17) -->
+ <append key="input.keymap.data" type="strlist">e06e:switchvideomode</append> <!-- LCD/CRT -->
+ <append key="input.keymap.data" type="strlist">e075:info</append> <!-- info center -->
+ <append key="input.keymap.data" type="strlist">e078:wlan</append> <!-- wireless toggle -->
+ </match>
<!-- We're so sorry... -->
<match key="/org/freedesktop/Hal/devices/computer:system.firmware.release_date" contains_outof="2009;2010;2011;2012;2013;2014;2015">
commit 4bb2e4b6f0d8796a12483f50dc46618a1b6b50b2
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Feb 25 14:09:54 2009 -0800
Add Quallcom 3G modem information.
It only has 1 port, so no need to specific the specific one.
(bnc#479726)
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 621632f..bc9cfdd 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -454,6 +454,14 @@
</match>
</match>
+ <!-- Qualcomm 3G modem -->
+ <match key="@info.parent:usb.vendor_id" int="0x05c6">
+ <match key="@info.parent:usb.product_id" int="0x9212">
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
+
<!-- *****************************************************
PCMCIA cards
***************************************************** -->
commit 1a5e433e77e8d707c5f3d6f1038b7071f8979ef6
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Apr 12 15:14:16 2010 +0200
fix modem detection for a Sierra Wireless AirCard 875U
Fixed modem detection for a Sierra Wireless AirCard 875U.
This device need to use the device with serial.port=2 as
modem. (bnc#480964)
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 6305e09..621632f 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -235,8 +235,8 @@
</match>
</match>
</match>
- <!-- 2x MC8755,MC8765,MC8775 & AC 875U,MC8775,AirCard 875,MC8780,MC8781, AirCard MC8790, AirCard 880,AirCard 881,AirCard 880 E,AirCard 881 E, Aircard 880 U, AirCard 881 U, Aircard 885 E, Aircard 885 E, C885, 0x6890, 0x6891, 0x6892 -->
- <match key="@info.parent:usb.product_id" int_outof="0x6802;0x6804;0x6803;0x6812;0x6813;0x6820;0x6832;0x6833;0x683c;0x6850;0x6851;0x6852;0x6853;0x6855;0x6856;0x6859;0x685a;0x6880;0x6890;0x6891;0x6892">
+ <!-- 2x MC8755,MC8765,MC8775 ,MC8775,AirCard 875,MC8780,MC8781, AirCard MC8790, AirCard 880,AirCard 881,AirCard 880 E,AirCard 881 E, Aircard 880 U, AirCard 881 U, Aircard 885 E, Aircard 885 E, C885, 0x6890, 0x6891, 0x6892 -->
+ <match key="@info.parent:usb.product_id" int_outof="0x6802;0x6804;0x6803;0x6813;0x6820;0x6832;0x6833;0x683c;0x6850;0x6851;0x6852;0x6853;0x6855;0x6856;0x6859;0x685a;0x6880;0x6890;0x6891;0x6892">
<match key="@info.parent:usb.interface.number" int="0">
<match key="serial.port" int="0">
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
@@ -244,6 +244,16 @@
</match>
</match>
</match>
+ <!-- AirCard 875U -->
+ <match key="@info.parent:usb.product_id" int="0x6812">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <match key="serial.port" int="2">
+ <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>
+
<!-- Compass USB modem -->
<match key="@info.parent:usb.product_id" int="0x6880">
<match key="@info.parent:usb.interface.number" int="4">
commit 960040965743ca698b88b57f1cdbb7337cbc6208
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Apr 9 12:32:56 2010 +0200
added adopted version of a SUSE patch to support HP keymaps
Added adopted version of a SUSE patch to support HP keymaps from
thoenig at suse.de and hmacht at suse.de. (see bnc#550670, bnc#552532
and bnc#577998)
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 3bc4eb1..c49cc47 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -13,14 +13,28 @@
<append key="input.keymap.data" type="strlist">e00b:camera</append> <!-- camera -->
<append key="input.keymap.data" type="strlist">e00c:media</append> <!-- music -->
<append key="input.keymap.data" type="strlist">e00e:dvd</append> <!-- dvd -->
+ <append key="input.keymap.data" type="strlist">e012:brightnessdown</append> <!-- FnF7 (FnF9 on 6730b) (brightness down) -->
+ <append key="input.keymap.data" type="strlist">e017:brightnessup</append> <!-- FnF8 (FnF10 on 6730b) (brightness up) -->
<append key="input.keymap.data" type="strlist">e031:help</append> <!-- FnF1 (help) -->
<append key="input.keymap.data" type="strlist">e033:f23</append> <!-- FIXME: Auto brightness -->
<append key="input.keymap.data" type="strlist">e057:wlan</append> <!-- Wlan -->
- <append key="input.keymap.data" type="strlist">e012:brightnessdown</append> <!-- FnF7 (FnF9 on 6730b) (brightness down) -->
- <append key="input.keymap.data" type="strlist">e017:brightnessup</append> <!-- FnF8 (FnF10 on 6730b) (brightness up) -->
- <append key="input.keymap.data" type="strlist">e06e:switchvideomode</append> <!-- FnF4 (video switch) -->
+ <append key="input.keymap.data" type="strlist">e06e:switchvideomode</append> <!-- FnF4 (video switch LCD/CRT) -->
<append key="info.capabilities" type="strlist">input.keymap</append>
+ <!-- We're so sorry... -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.firmware.release_date" contains_outof="2009;2010;2011;2012;2013;2014;2015">
+ <!-- [make code:kernel define lower case (linux/input.h)] comment: description according to HP spec -->
+ <append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- presentation mode -->
+ <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- volume mute -->
+ <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- volume down -->
+ <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- volume up -->
+ <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- sleep -->
+ <append key="input.keymap.data" type="strlist">e06b:computer</append> <!-- browser button (cf. bnc#550670 comment 17) -->
+ <append key="input.keymap.data" type="strlist">e06c:mail</append> <!-- envelope button (cf. bnc#550670 comment 17) -->
+ <append key="input.keymap.data" type="strlist">e075:info</append> <!-- info center -->
+ <append key="input.keymap.data" type="strlist">e078:wlan</append> <!-- wireless toggle -->
+ </match>
+
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Tablet">
<append key="input.keymap.data" type="strlist">e002:prog2</append> <!-- Funny Key -->
<append key="input.keymap.data" type="strlist">e003:prog1</append> <!-- Q -->
commit 69fda730b4dc78a4379b6517a2916e02b8d5e62a
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Apr 6 11:07:20 2010 +0200
added quirk for a HP nx9420
Added quirk for a HP nx9420 (bnc#450525)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 73ce4a9..e097966 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -317,6 +317,12 @@
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
+ <!-- HP NX9420 RH450EA -->
+ <match key="system.firmware.version" prefix="68YAF">
+ <match key="system.hardware.product" string="">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ </match>
</match>
commit cb138ab9c9435474fa35a789dbab10b9f15e96f8
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Mar 8 15:28:10 2010 +0100
add ZTE-MF626 as modem
Added ZTE-MF626 as modem. fd.o#24165
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 1f3ac50..6305e09 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -357,7 +357,7 @@
</match>
</match>
<!-- ZTE MF628 HSDPA USB dongle -->
- <match key="@info.parent:usb.product_id" int="0x0015">
+ <match key="@info.parent:usb.product_id" int_outof="0x0015;0×0031">
<match key="@info.parent:usb.interface.number" int="3">
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
commit 7e219564dd805ce50c5f1a88168ea06c2eede5a0
Author: Marin Glibić <zhilla2 at gmail.com>
Date: Mon Mar 8 15:12:40 2010 +0100
fixed suspend for HP nc8430
Fixed suspend for HP nc8430 by adding needed quirk. fd.o#26288
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 37a4a99..73ce4a9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -311,6 +311,13 @@
</match>
</match>
+ <!-- This is Compaq nc8430, at least with F.16 BIOS. Blank system.hardware.product! -->
+ <match key="system.firmware.version" prefix="68YVD">
+ <match key="system.hardware.product" string="">
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ </match>
+
</match>
<!-- HP Media Center PC m7330n w/ ATI RS480 [Radeon Xpress 200G Series] -->
commit de64b639e457f6d36c50f38a6d7494e3c25983d6
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Mar 8 15:06:40 2010 +0100
fix missuage of int_outof
Fixed (once again) missuage of int_outof.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index c19f53e..77368d9 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -596,7 +596,7 @@
<!-- Cowon -->
<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
<!-- iAUDIO M3 -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x500">
+ <match key="@storage.originating_device:usb.product_id" int="0x500">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
@@ -712,7 +712,7 @@
<append key="portable_audio_player.audio_folders" type="strlist">blackberry/videos/</append>
</match>
<!-- Blackberry 8000 (Curve) -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x6">
+ <match key="@storage.originating_device:usb.product_id" int="0x6">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
@@ -720,7 +720,7 @@
<append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
</match>
<!-- Blackberry 9000 (Bold) -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x8004">
+ <match key="@storage.originating_device:usb.product_id" int="0x8004">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
@@ -1054,7 +1054,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- T30 UMS firmware v1.7 , S10 UMS firmware v1.05 -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x1023">
+ <match key="@storage.originating_device:usb.product_id" int="0x1023">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
commit b53e7b0e6a48b7fad5bc1cdabb7b150b9f5a34a3
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Mar 8 15:02:34 2010 +0100
fix fd.o#25867: remove ';;'
Fixed fd.o#25867: remove ';;' and replace with ';'
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index ee4eb3f..3022821 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -5,7 +5,7 @@
<match key="system.hardware.product" string="VGN-FS115Z">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B;VGN-B100B;;VGN-B1VP">
+ <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B;VGN-B100B;VGN-B1VP">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N;VGN-FS920;VGN-C240E;PCG-FX601;VGN-SR11M">
commit d7e2b5662abc65d9ef3c302aecaff68ea554a558
Author: Martin Pley <martin at pley.de>
Date: Mon Feb 22 16:57:48 2010 +0100
enable sd-card-reader of huawei's e160 umts-stick
Enable sd-card-reader of huawei's e160 umts-stick by
set info.ignore only for the cdrom device. (bnc#487593).
diff --git a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
index 429cf97..e5e8054 100644
--- a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
+++ b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
@@ -40,7 +40,9 @@
<!-- Ignore the Huawei E220 USB HSDPA modem -->
<match key="@storage.originating_device:usb.vendor_id" int="0x12d1">
<match key="@storage.originating_device:usb.product_id" int="0x1003">
- <merge key="info.ignore" type="bool">true</merge>
+ <match key="@info.parent:scsi.type" string="cdrom">
+ <merge key="info.ignore" type="bool">true</merge>
+ </match>
</match>
</match>
commit 67662f7e8bd22b13c793555e0e3ab27cda59540e
Merge: b23c7b4... e621b51...
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Feb 22 16:55:45 2010 +0100
Merge branch 'master' of ssh://dkukawka@git.freedesktop.org/git/hal-info
commit b23c7b4b203436aa89b6e6207023056024b1f741
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Sat Aug 15 16:20:07 2009 +0200
add new (none safety) battery recall from Lenovo
Added new (none safety) battery recall from Lenovo:
- http://download.lenovo.com/lenovo/content/batt/082009/LandingPage.html
- Issue: "ThinkPad battery has low capacity or shows an “Irreparable
damage†or “Battery cannot be charged†error message – ThinkPad
T60/T61/R60/R61/X60/X61. "
- Note: This issue is not a safety recall and does not pose a safety hazard.
diff --git a/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi b/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
index 6b57561..207511c 100644
--- a/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
+++ b/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
@@ -10,18 +10,24 @@
* GNOME Power Manager no longer reads these values.
-->
- <match key="battery.vendor" string="SANYO">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="LENOVO">
- <match key="battery.model" string="92P1131">
- <merge key="info.is_recalled" type="bool">true</merge>
+ <match key="battery.vendor" string="SANYO">
+ <match key="battery.model" string="92P1131">
+ <merge key="info.is_recalled" type="bool">true</merge>
+ <merge key="info.recall.website_url" type="string">http://www.lenovo.com/batteryprogram</merge>
+ <merge key="info.recall.vendor" type="string">LENOVO</merge>
+ </match>
</match>
- <!-- only matching on specific model and vendor SANYO -->
- <match key="info.is_recalled" bool="true">
+ <!-- battery.vendor unknown -->
+ <!-- ThinkPad battery has low capacity or shows an “Irreparable damage†or “Battery cannot be charged†error
+ message – ThinkPad T60/T61/R60/R61/X60/X61. Note: This issue is not a safety recall and does not pose a safety hazard. -->
+ <match key="battery.model" string_outof="42T4546;42T4566;92P1141;42T4550;42T4567;42T4568;92P1169;92P1173;93P5028;93P5030">
+ <merge key="info.is_recalled" type="bool">true</merge>
+ <merge key="info.recall.website_url" type="string">http://download.lenovo.com/lenovo/content/batt/082009/LandingPage.html</merge>
<merge key="info.recall.vendor" type="string">LENOVO</merge>
- <merge key="info.recall.website_url" type="string">http://www.lenovo.com/batteryprogram</merge>
</match>
-
</match>
</device>
commit 1fba2e4bd374035fc884edc9c929a04d48bbf6a6
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Aug 14 16:16:48 2009 +0200
add another version of a SonyEricsson K800i as music player
Added an adapted version of a patch from fd.o#11835, contributed
by Per Thomas Jahr <perja at ifi.uio.no>, to add another version of
a SonyEricsson K800i as USB music player.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index b92192f..cc26e83 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -736,9 +736,10 @@
<!-- K800i mobile phone -->
<!-- media files go in mp3/$ARTIST/$ALBUM/$TRACKNAME -->
- <match key="@storage.originating_device:usb.product_id" int="0xd039">
+ <match key="@storage.originating_device:usb.product_id" int_outof="0xd039;0xe039">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
@@ -748,6 +749,7 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-amr</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
</match>
<!-- W950i mobile phone -->
commit 5e5f77541882849e9db3dd3517e2fc0100cc7706
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Aug 14 16:12:32 2009 +0200
fixed missusage of contains_outof
Fixed missusage of contains_outof, use it only to match
out of multiple cases.
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index c32e360..1f3ac50 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -531,7 +531,7 @@
<remove key="info.capabilities" type="strlist">net.80203</remove>
</match>
</match>
- <match key="info.parent" contains_outof="bdb_1904">
+ <match key="info.parent" contains="bdb_1904">
<match key="info.parent" suffix="_if6">
<remove key="info.capabilities" type="strlist">net.80203</remove>
</match>
commit cc0fb7c3d23779f17e2cf1da069c80abf614396e
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Aug 14 16:05:58 2009 +0200
s/playlist_formats/playlist_format/
Fix invalid keyname as pointed out in fd.o#23251:
- s/playlist_formats/playlist_format/
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index eaeb9f9..b92192f 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -232,7 +232,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
<append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
- <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_path" type="string">PLAYLISTS/%File</append>
</match>
</match>
@@ -324,7 +324,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.audio_folders" type="strlist">MUSIC</append>
<append key="portable_audio_player.audio_folders" type="strlist">RECORD</append>
- <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_path" type="string">PLAYLISTS/%File</append>
</match>
<!-- Samsung YP-S5 -->
@@ -427,7 +427,7 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.audio_folders" type="strlist">/</append>
- <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
<match key="storage.lun" int="1">
<merge key="storage.drive_type" type="string">sd_mmc</merge>
@@ -1104,7 +1104,7 @@
<append key="portable_audio_player.audio_folders" type="strlist">music/</append>
<append key="portable_audio_player.audio_folders" type="strlist">video/</append>
<append key="portable_audio_player.audio_folders" type="strlist">record/</append>
- <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_path" type="string">playlists/%File</append>
</match>
</match>
commit 66ec51afb8329bce7b0bb87785a886fb803e8f29
Author: Wander Boessenkool <wboessen at redhat.com>
Date: Fri Aug 7 11:05:02 2009 +0200
add suspend quirk for a Acer Aspire One 751
Added suspend quirk for a Acer Aspire One 751 (with weird poulsbo
graphics when using the psb driver for Xorg).
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 91ad85c..561b413 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -161,6 +161,13 @@
</match>
</match>
+ <!-- Aspire One 751 -->
+ <match key="system.hardware.product" string="AO751h">
+ <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
+
<!-- Aspire One 110 -->
<match key="system.hardware.product" prefix_outof="AOA110;AOA150">
<merge key="power_management.quirk.none" type="bool">true</merge>
commit d38397e62bce037acb788760f6befca7039a6614
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Aug 7 10:55:55 2009 +0200
add keymap for a Samsung NC20
Added keymap for a Samsung NC20 as reported on HAL ML by
Dirk Thierbach <dthierbach at gmx.de>.
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index c4e527e..2b5e45a 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -134,7 +134,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="NC10;SP55S;SQ45S70S;SX60P;SX30S;SX22S;R59P/R60P/R61P;Q210;Q310;X05;P560;R560">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="NC10;NC20;SP55S;SQ45S70S;SX60P;SX30S;SX22S;R59P/R60P/R61P;Q210;Q310;X05;P560;R560">
<append key="input.keymap.data" type="strlist">e002:switchvideomode</append> <!-- Fn+F4 CRT/LCD (high keycode: "displaytoggle") -->
<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 -->
commit 3f330d4b42f5c6b70c6b2e53af597cc494d13be2
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Aug 7 10:29:19 2009 +0200
add a ALi MP3 Player
Added a ALi MP3 Player (0402:5667) as reported in fd.o#23097.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 27501e6..eaeb9f9 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -33,6 +33,14 @@
</match>
</match>
+ <!-- ALi Corporation -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x0402">
+ <!-- ALi MP3 Player -->
+ <match key="@storage.originating_device:usb.product_id" int="0x5667">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ </match>
+ </match>
+
<!-- Creative -->
<match key="@storage.originating_device:usb.vendor_id" int="0x41e">
<!-- MuVo V100 -->
commit cf5e5999b5f3ba7f860de845a19e7f48879e6a1d
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Aug 7 10:23:47 2009 +0200
updated HP suspend quirks with s2ram whitelist entries from -r1.135
Updated HP suspend quirks with s2ram whitelist entries from -r1.135.
Added new:
- HP xw4550 Workstation
- HP xw6600 Workstation
- HP xw8600 Workstation
- HP xw9400 Workstation
tested by HP https://bugzilla.novell.com/show_bug.cgi?id=436284
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 40fc620..37a4a99 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -151,7 +151,7 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
</match>
- <match key="system.hardware.product" contains_outof="HP Compaq dc5800 Small Form Factor;HP d330 uT; nw9440;nw8440">
+ <match key="system.hardware.product" contains_outof="HP Compaq dc5800 Small Form Factor;HP d330 uT; nw9440;nw8440;HP xw4550 Workstation;HP xw6600 Workstation;HP xw8600 Workstation;HP xw9400 Workstation">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
commit cdf5c86913e6138856032ffbe758ab44e5ff6126
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Aug 7 10:20:44 2009 +0200
updated HP suspend quirks with s2ram whitelist entries from -r1.136
Updated HP suspend quirks with s2ram whitelist entries from -r1.136.
Added new:
- HP Compaq nx6315
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 4a3016c..40fc620 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -133,6 +133,12 @@
</match>
</match>
</match>
+ <match key="system.hardware.product" contains="Compaq nx6315">
+ <match key="system.hardware.version" prefix="68MOU">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ </match>
<match key="system.hardware.product" contains="nx 7010">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<match key="system.hardware.product" contains="DU394T#">
More information about the hal-commit
mailing list