hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi |    2 +-
 fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi               |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 23a07faa0adb22d67afbe30c9e396498d5962d2a
Author: Fredrik Roubert <roubert at df.lth.se>
Date:   Sun May 18 01:39:46 2008 +0200

    add suspend quirk for Sony Vaio VGN-N320E
    
    It seems like my Sony Vaio VGN-N320E laptop has identical key
    definitions to the VGN-FS790B, VGN-TZ11, VGN-TZ16 and VGN-SZ71WN_C
    models already listed.

diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index e94ee96..7257e52 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -17,7 +17,7 @@
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
 
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FS790B;VGN-TZ11;VGN-TZ16;VGN-SZ71WN_C">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FS790B;VGN-TZ11;VGN-TZ16;VGN-SZ71WN_C;VGN-N320E">
           <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
           <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
           <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
commit d36464c0a5555d32b38ed91e52f7d342f8f2283a
Author: Sam Morris <sam at robots.org.uk>
Date:   Sun May 18 01:37:43 2008 +0200

    blacklist CD drive of the Huawei E220 USB HSDPA modem
    
    The Huawei E220 is a USB HSPDA/GPRS modem. It appears to the
    computer as a USB CD drive, on which are drivers for Windows
    systems. Of course, we need no such drivers, so the CD drive
    is useless and annoying as it is mounted by GNOME whenever a
    user logs in.

diff --git a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
index 19b2bfc..18db728 100644
--- a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
+++ b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
@@ -29,6 +29,12 @@
          <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">
+         <merge key="info.ignore" type="bool">true</merge>
+       </match>
+     </match>
    </match>
   </device>
 </deviceinfo>