hal: Branch 'origin' - 5 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Thu May 31 07:30:33 PDT 2007
fdi/information/10freedesktop/10-laptop-panel-hardware.fdi | 3
fdi/information/10freedesktop/10-usb-card-readers.fdi | 4
fdi/information/10freedesktop/10-usb-music-players.fdi | 125 +++++--------
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 4
4 files changed, 60 insertions(+), 76 deletions(-)
New commits:
diff-tree 44ddbb607a12a59039b6255e83a14fdd02444b55 (from 4d8b0bde1fef59c99ff6b58d00d7167b27fc2a08)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed May 30 11:36:48 2007 +0200
fixed USB card reader entries from commit ae31fad7
Fixed USB card reader entry from commit ae31fad7 to not use deprecated
physical_device* properties.
diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index b0fb54c..44b07f8 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -92,8 +92,8 @@
</match>
<!-- Noname multi-card Reader -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x05e3">
- <match key="@storage.physical_device:usb.product_id" int="0x0760">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x05e3">
+ <match key="@storage.originating_device:usb.product_id" int="0x0760">
<match key="storage.lun" int="0">
<merge key="storage.drive_type" type="string">compact_flash</merge>
</match>
diff-tree 4d8b0bde1fef59c99ff6b58d00d7167b27fc2a08 (from 7287d133a326d7c2c33567da36a015358d82e8a2)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed May 30 11:29:44 2007 +0200
fixed USB music player entries
fixed several music player entries:
- don't use deprecated physical_device*
- cleanup Sansa m230 entrie to respect current structure of the file
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 346eb6b..2fd141e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -128,11 +128,11 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
</match>
<!-- Nokia E60 -->
- <match key="@storage.physical_device:usb.product_id" int="0x0434">
+ <match key="@storage.originating_device:usb.product_id" int="0x0434">
<merge key="storage.requires_eject" type="bool">true</merge>
</match>
<!-- Nokia E70 -->
- <match key="@storage.physical_device:usb.product_id" int="0x0433">
+ <match key="@storage.originating_device:usb.product_id" int="0x0433">
<merge key="storage.requires_eject" type="bool">true</merge>
</match>
</match>
@@ -396,13 +396,9 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
</match>
<!-- Sandisk Corp. Sansa m230 (maybe others as well) -->
- <match key="@storage.physical_device:usb.product_id" int="0x7431">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
+ <match key="@storage.originating_device:usb.product_id" int="0x7431">
<merge key="portable_audio_player.type" type="string">generic</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</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/mpeg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
diff-tree 7287d133a326d7c2c33567da36a015358d82e8a2 (from f02be8c9a0fdd37050dad7756f4457f70be60a50)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed May 30 11:23:39 2007 +0200
fix USB music player from commit 52407a01
Fixed bugs from commit 52407a01:
- use originating_device instead of deprecated physical_device
- moved added entries to current structure of the FDI-file (avoid adding
several properties two times)
- moved the W810i/W300i (SonyEricsson) and the iAudio F2 (Cowon)
entries to the related manufacturer sections of the file.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index d74ec24..346eb6b 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -17,6 +17,17 @@
<!-- USB Mass Storage devices that are music players -->
<match key="@storage.originating_device:info.subsystem" string="usb">
+ <!-- Transcend -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x402">
+ <!-- Transcend T.Sonic 520 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x5661">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <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>
+
<!-- Creative -->
<match key="@storage.originating_device:usb.vendor_id" int="0x41e">
<!-- MuVo NX -->
@@ -554,6 +565,21 @@
<append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
<append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
</match>
+ <!-- iAudio F2 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x730">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <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/flac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <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">VOICE</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_path" type="string">PLAYLIST/%File</append>
+ </match>
</match>
<!-- Archos -->
@@ -579,40 +605,17 @@
<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>
- <!-- iAudio F2 -->
- <match key="@storage.physical_device:usb.product_id" int="0x730">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
+ <!-- Archos A404 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1300">
<merge key="portable_audio_player.type" type="string">generic</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <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/flac</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
- <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">VOICE</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_path" type="string">PLAYLIST/%File</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>
+ <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">Playlist/</append>
</match>
- <!-- Archos A404 -->
- <match key="@storage.physical_device:usb.product_id" int="0x1300">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <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>
- <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">Playlist/</append>
- </match>
</match>
<!-- Sony Ericsson -->
@@ -650,6 +653,21 @@
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
</match>
+
+ <!-- Sony Ericsson W810i -->
+ <match key="@storage.originating_device:usb.product_id" int="0xe042">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
+
+ <!-- Sony Ericsson W300i -->
+ <match key="@storage.originating_device:usb.product_id" int="0xe053">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
+
</match>
<match key="@storage.originating_device:usb.vendor_id" int="0x1006">
@@ -708,28 +726,6 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
-
- <!-- Sony Ericsson W810i) -->
- <match key="@storage.physical_device:usb.product_id" int="0xe042">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
- </match>
-
- <!-- Sony Ericsson W300i -->
- <match key="@storage.physical_device:usb.product_id" int="0xe053">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
- </match>
</match>
@@ -904,21 +900,6 @@
</match>
</match>
-
- <!-- Transcend -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x402">
- <!-- Transcend T.Sonic 520 -->
- <match key="@storage.physical_device:usb.product_id" int="0x5661">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</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>
</match>
<!-- USB devices that are music players but uses a user-space library -->
diff-tree f02be8c9a0fdd37050dad7756f4457f70be60a50 (from 68d56bdac68684faa078f1c18095b2b71b8e0109)
Author: Valent Turkovic <valent.turkovic at gmail.com>
Date: Tue May 29 17:26:37 2007 +0100
Add resume quirk for hp nx7300
I got my laptop to suspend/resume with Fedora 7 live CD with kernel
2.6.21-1.3163.fc7 and here is the quirk submission.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 5355f6c..a064fb9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -54,6 +54,10 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains="nx7300">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
</match>
</device>
</deviceinfo>
diff-tree 68d56bdac68684faa078f1c18095b2b71b8e0109 (from 2a8453efcb35630edd780d220cb25e464ee008b6)
Author: Richard Hughes <richard at hughsie.com>
Date: Fri May 25 16:55:45 2007 +0100
do not try to set the brightness on a LENOVO 3000 n100
My lenovo can get the brightness state using the lenovo_acpi kernel module -
except the brightness is done in hardware and so we really don't want to try
to set it.
Add the laptop_panel.brightness_in_hardware key for this model.
diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 8c72bcc..9bf76c7 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -25,6 +25,9 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="ThinkPad X60s">
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="3000 N100">
+ <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+ </match>
</match>
</match>
</device>
More information about the hal-commit
mailing list