hal: Branch 'origin' - 3 commits

[Richard Hughes]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    9 +++++++++
 fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi  |   10 +++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
diff-tree 4e6f2c6c565374ad22cc9e0ba1d44479d020a86b (from 10333cf444c0f57257b693c3a433b5dcb11a860e)
Author: Steven Walter <stevenrwalter at gmail.com>
Date:   Tue Oct 10 18:26:55 2006 +0100

    Add match for Creative Zen Nano USB music player

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 5194982..5860ac8 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -83,6 +83,15 @@
 	    <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>
+	  <!-- Zen Nano -->
+          <match key="@storage.physical_device:usb.product_id" int="0x412c">
+	    <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>
+          </match>
 	  <!-- NOMAD Jukebox Zen Xtra -->
 	  <match key="@storage.physical_device:usb.product_id" int="0x4128">
 	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
diff-tree 10333cf444c0f57257b693c3a433b5dcb11a860e (from 28444f5ef1c23ca5bbeaad17ddcbc84e4c42f33b)
Author: Tomasz Torcz <zdzichu at irc.-nie.spam-.pl>
Date:   Tue Oct 10 18:22:09 2006 +0100

    Add ThinkPad T60 to the list of laptops needing laptop_panel.brightness_in_hardware
    
    I got confirmation that this is needed for Thinkpad T60 also. See
    comments at https://launchpad.net/distros/ubuntu/+source/hal/+bug/61184

diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
index f27201d..cb25a66 100644
--- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
@@ -22,7 +22,7 @@
        but the hardware also synthesizes keypresses when the brightness is
        changed. This gives power manager software problems as the brightness
        can get into a feedback state so the panel flashes uncontrollably.
-       This is a hardware "feature" seen on IBM x31 and Lenovo z61t laptops. -->
+       This is a hardware "feature" seen on some IBM and Lenovo laptops. -->
   <device>
     <match key="info.category" string="laptop_panel">
       <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="IBM">
@@ -34,6 +34,9 @@
         <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad Z31t">
           <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad T60">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
       </match>
     </match>
   </device>
diff-tree 28444f5ef1c23ca5bbeaad17ddcbc84e4c42f33b (from dbffafacbf7b9143d82547b9eabe61d1a5b8fffc)
Author: Tomasz Torcz <zdzichu at irc.-nie.spam-.pl>
Date:   Tue Oct 10 18:18:48 2006 +0100

    Add Z31t to the list of laptops needing laptop_panel.brightness_in_hardware
    
    Tomasz Torcz wrote:
    I have TP z61t, and I had to add: laptop_panel.brightness_in_hardware
    to 10-laptop-panel-mgmt-policy.fdi

diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
index 65f3199..f27201d 100644
--- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
@@ -22,7 +22,7 @@
        but the hardware also synthesizes keypresses when the brightness is
        changed. This gives power manager software problems as the brightness
        can get into a feedback state so the panel flashes uncontrollably.
-       This is a hardware "feature" seen on IBM x31 laptops. -->
+       This is a hardware "feature" seen on IBM x31 and Lenovo z61t laptops. -->
   <device>
     <match key="info.category" string="laptop_panel">
       <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="IBM">
@@ -30,6 +30,11 @@
           <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
         </match>
       </match>
+      <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="LENOVO">
+        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad Z31t">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
+      </match>
     </match>
   </device>