hal-info: Branch 'master' - 3 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Thu Apr 22 07:18:00 PDT 2010
fdi/information/10freedesktop/10-laptop-panel-hardware.fdi | 11 ++++++++--
fdi/information/10freedesktop/10-usb-music-players.fdi | 14 +++++++++++++
fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi | 10 +++++++++
3 files changed, 33 insertions(+), 2 deletions(-)
New commits:
commit 00b3f8968080eb269f205d188a7fe418ddd056dd
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Apr 20 16:01:47 2010 +0200
add a generic match for HP machines to fix brightness handling
Added a generic match for HP machines to fix brightness handling by
setting laptop_panel.brightness_in_hardware=false on all HP laptops
with a bios release date >= 2009. (bnc#587057)
diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 1b79e1e..6685ceb 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -37,8 +37,15 @@
</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;EliteBook 8440w;EliteBook 8740w;EliteBook 8540p">
- <merge key="laptop_panel.brightness_in_hardware" type="bool">false</merge>
+ <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+ <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 key="laptop_panel.brightness_in_hardware" bool="true">
+ <match key="/org/freedesktop/Hal/devices/computer:system.firmware.release_date" contains_outof="2009;2010;2011;2012;2013;2014;2015">
+ <merge key="laptop_panel.brightness_in_hardware" type="bool">false</merge>
+ </match>
+ </match>
</match>
</match>
commit 69e87afc26ef6377956efdb500819b047f28c460
Author: Hans de Goede <j.w.r.degoede at hhs.nl>
Date: Thu Apr 22 16:04:40 2010 +0200
ignore cdrom device on Appotech ax203 v3.3.x based picture frames
Don't probe the cdrom device on Appotech ax203 v3.3.x based picture
frames, as it does not like being probed. (fd.o#27239)
diff --git a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
index e5e8054..81b68d7 100644
--- a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
+++ b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
@@ -26,6 +26,7 @@
</match>
</match>
</match>
+
<!-- some usb sticks don't like polling -->
<match key="@storage.originating_device:usb.vendor_id" int="0x054c">
<match key="@storage.originating_device:usb.product_id" int="0x008b">
@@ -37,6 +38,7 @@
<merge key="storage.media_check_enabled" type="bool">false</merge>
</match>
</match>
+
<!-- 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">
@@ -46,6 +48,14 @@
</match>
</match>
+ <!-- Don't probe the cdrom device on Appotech ax203 v3.3.x based picture
+ frames, as it does not like being probed -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x1908">
+ <match key="@storage.originating_device:usb.product_id" int="0x1315">
+ <merge key="info.ignore" type="bool">true</merge>
+ </match>
+ </match>
+
<!-- Ignore the system partition on the Samsung YP S5 music player; the
first one is the interesting one with the music, etc. LP #332913 -->
<match key="@info.parent:storage.vendor" contains="Samsung">
commit 0475aa2bc952f0791f3b18248534df099ad4d1ae
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Apr 16 12:12:08 2010 +0200
add a Cowon iAudio S9 as USB music player
Added an adopted patch from James Ogley <riggwelter at opensuse.org> to
add a Cowon iAudio S9 as USB music player. (bnc#552488)
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index d2f0adf..9b908d5 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -737,6 +737,20 @@
<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 S9 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x900">
+ <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/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.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDINGS/FM RADIO/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDINGS/LINE-IN/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDINGS/MIC/</append>
+ </match>
</match>
<!-- Archos -->
More information about the hal-commit
mailing list