hal-info: Branch 'master' - 4 commits

[Danny Kukawka]

 fdi/information/10freedesktop/10-modem.fdi               |   10 ++++++++++
 fdi/information/10freedesktop/10-usb-music-players.fdi   |    4 ++--
 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi |    3 +++
 fdi/information/10freedesktop/30-keymap-acer.fdi         |    2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 20445a6f442f092a38a30b606b4be209c24faa86
Author: Constantin Bergemann <cbergemann at gmxpro.de>
Date:   Wed Apr 23 15:43:28 2008 +0200

    add keymap for Acer Travelmate 8100
    
    Added keymap for an Acer Travelmate 8100.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index b937c68..c0a4e57 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -52,7 +52,7 @@
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
           <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1410;1640;1680;1690;3050;3680;5050;5570;5580;5600">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1410;1640;1680;1690;3050;3680;5050;5570;5580;5600;8100">
             <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
             <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
             <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
commit 38d27cb0202ac544e9aa940187e190ffff0f19d5
Author: Stepan Zastupov <redchrom at redchrom.info>
Date:   Wed Apr 23 15:27:35 2008 +0200

    add suspend quirk for BenQ Joybook R42
    
    Added suspend quirk for BenQ Joybook R42.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index bd62122..905aa4b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -77,6 +77,9 @@
 
   <device>
     <match key="system.hardware.vendor" prefix="BenQ">
+      <match key="system.hardware.product" string="Joybook R42">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" string_outof="Joybook R22;Joybook R23;JoyBook 7000">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
commit 38bba5d6238be21699ae27078703ab4d0a2a9f2b
Author: Chuck Anderson <cra at wpi.edu>
Date:   Wed Apr 23 15:24:43 2008 +0200

    add one more usb id for iRiver T10 1G
    
    Added one more usb id for iRiver T10 1G.
    
    > Please apply this patch to 10-modem.fdi to enable the use of the HTC
    > Apache (Verizon XV6700) Smart Phone as a CDMA modem.  You must first
    > start the "WModem.exe" application on the phone to enable the device
    > to appear as a modem to the USB host.  This will allow NetworkManager
    > 0.7.0 to automatically detect the phone as a modem when plugged in.

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 9e4731d..616edb7 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -19,6 +19,16 @@
         </match>
       </match>
 
+      <!-- HTC Apache SPV C500 Smart Phone (Verizon XV6700) -->
+      <match key="@info.parent:usb.vendor_id" int="0x0bb4">
+        <match key="@info.parent:usb.product_id" int="0x00cf">
+          <match key="@info.parent:usb.interface.number" int="0">
+            <append key="info.capabilities" type="strlist">modem</append>
+            <append key="modem.command_sets" type="strlist">IS-707-A</append>
+          </match>
+        </match>
+      </match>
+
       <!-- Kyocera -->
       <match key="@info.parent:usb.vendor_id" int="0x0c88">
         <!-- KPC680,KPC650/Passport, -->
commit 21304b1d5504054b7247650cb8054c30f9ec6ba1
Author: Alexey Rempel <bug-track at fisher-privat.net>
Date:   Wed Apr 23 15:23:46 2008 +0200

    add one more usb id for iRiver T10 1G
    
    Added one more usb id for iRiver T10 1G.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 8b87182..6dc9163 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -776,8 +776,8 @@
 
 	<!-- iRiver -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x4102">
-	  <!-- T20 UMS, T30 UMS, T10 UMS,iFP 700/800/900/1000 UMS, H10 20GB/50GB UMS -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x1014;0x1018;0x1020;0x1107;0x1108;0x1109;0x1110;0x2001;0x2002">
+	  <!-- T10 1G, T20 UMS, T30 UMS, T10 UMS,iFP 700/800/900/1000 UMS, H10 20GB/50GB UMS -->
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x1013;0x1014;0x1018;0x1020;0x1107;0x1108;0x1109;0x1110;0x2001;0x2002">
             <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>