hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    2 +-
 fdi/information/10freedesktop/30-keymap-misc.fdi       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3bfc2b0dc29b9655c2c6352e07d881c2d8eaf28b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri May 22 19:50:48 2009 +0200

    fix usage of int_outof
    
    Fixed usage of int_outof: use it only if there are multiple entries
    to check for.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 7ffabca..357663e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -666,7 +666,7 @@
 	  </match>
 
 	  <!-- W302i -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0xe0c8">
+	  <match key="@storage.originating_device:usb.product_id" int="0xe0c8">
 	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
commit 0e6811e3b298e701a526896fd3486e930044ea37
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri May 22 19:48:07 2009 +0200

    Revert "30-keymap-misc.fdi: Consistent vendor check"
    
    This reverts commit 1e1c296fe58b52b8100c515651be3381d63cc8fa.
    
    Reverted commit. Please check first if the affected machines really
    work with system.hardware.vendor instead of system.chassis.manufacturer.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 6c8f4ac..bdfa4b6 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -72,7 +72,7 @@
         </match>
       </match>
 
-      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="MICRO-STAR">
+      <match key="/org/freedesktop/Hal/devices/computer:system.chassis.manufacturer" prefix="MICRO-STAR">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string_outof="0031;0131">
           <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9   Sound On/Off -->
           <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7   Volume down -->