From 44fc02854b842c8ed23e0afed68f54fb0251fb11 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Thu, 29 Oct 2009 13:03:06 +0100
Subject: MSI WIND U100 handle brightness keys in hardware

Thanks to Felix Geyer! (No email address provided)

https://launchpad.net/bugs/415023
---
 fdi/information/10freedesktop/10-laptop-panel-hardware.fdi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index ef35a18..58d17b4 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -30,6 +30,12 @@
         </match>
       </match>
 
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix_ncase="micro-star">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="U100;U-100">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
+      </match>
+
       <match key="linux.sysfs_path" suffix="/backlight/thinkpad_screen">
         <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
       </match>
-- 
cgit v1.2.3


From 9585da336c7bcdf6f3e35694de8c3a362aedee2d Mon Sep 17 00:00:00 2001
From: "M. Vefa Bicakci" <bicave@superonline.com>
Date: Thu, 5 Nov 2009 11:16:55 +0100
Subject: suspend quirk for Sony VGN-B1VP

system.hardware.primary_video.product = 13698  (0x3582)  (int)
system.hardware.primary_video.vendor = 32902  (0x8086)  (int)
system.hardware.product = 'VGN-B1VP(GB)'  (string)
system.hardware.serial = 'XXXXXXXX-XXXXXXX'  (string)
system.hardware.uuid = 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX'  (string)
system.hardware.vendor = 'Sony Corporation'  (string)
system.hardware.version = 'J000L04A'  (string)
---
 fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 7e876a2..ee4eb3f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -5,7 +5,7 @@
       <match key="system.hardware.product" string="VGN-FS115Z">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B;VGN-B100B">
+      <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B;VGN-B100B;;VGN-B1VP">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N;VGN-FS920;VGN-C240E;PCG-FX601;VGN-SR11M">
-- 
cgit v1.2.3


From 90b11004734735b0e2b611c0c64d4fbf026ce1db Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Fri, 13 Nov 2009 16:16:13 +0100
Subject: Flatten product ID tests (temporary)

This re-applies commit a24984bac808382951ed2fe3ee6a6700bf7e3839 to flatten
product ID tests, now including the recently added Blackberry devices and iPod
change.

This is necessary for a clean conversion to media-player-info.

This will be reverted again after adding some more players and updating m-p-i
(unless Danny agrees to keeping it.)
---
 .../10freedesktop/10-usb-music-players.fdi         | 168 +++++++++++++--------
 1 file changed, 108 insertions(+), 60 deletions(-)

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 27501e6..dd0d88e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -13,10 +13,15 @@
           <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
           <append key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append>
           <merge key="storage.requires_eject" type="bool">true</merge>
-          <!-- iPods with video -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x1261;0x1262">
-            <append key="portable_audio_player.output_formats" type="strlist">video/mp4</append>
-          </match>
+        </match>
+        <!-- iPods with video -->
+        <match key="@storage.originating_device:usb.product_id" int_outof="0x1261;0x1262">
+          <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+          <addset key="portable_audio_player.access_method.protocols" type="strlist">ipod</addset>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append>
+          <append key="portable_audio_player.output_formats" type="strlist">video/mp4</append>
         </match>
       </match>
 
@@ -264,19 +269,25 @@
 	    <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>
-          <!-- Samsung YP-J70, YP-T7F -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x5032;0x503d">
+          <!-- Samsung YP-T7F -->
+          <match key="@storage.originating_device:usb.product_id" int="0x503d">
             <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>
             <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>
             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+          </match>
 	    <!-- Samsung YP-J70 -->
-            <match key="@storage.originating_device:usb.product_id" int="0x5032">
-              <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
-              <merge key="storage.requires_eject" type="bool">true</merge>
-            </match>
+          <match key="@storage.originating_device:usb.product_id" int="0x5032">
+            <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>
+            <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>
+            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
+            <merge key="storage.requires_eject" type="bool">true</merge>
           </match>
           <!-- Samsung YP-Z5 -->
           <match key="@storage.originating_device:usb.product_id" int="0x5041">
@@ -576,8 +587,8 @@
 
 	<!-- Cowon -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
-	  <!-- iAUDIO M3, X5, M5, U3 , F2, 7-->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x700;0x710;0x730;0x750">
+	  <!-- iAUDIO M3 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500">
 	    <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>
@@ -586,45 +597,68 @@
 	    <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.playlist_path" type="string">PLAYLIST/%File</append>
-	    <!-- iAUDIO X5, M5, F2, 7 -->
-	    <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
-	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	      <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
-	      <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
-	    </match>
-	    <!-- iAUDIO U3 -->
-	    <match key="@storage.originating_device:usb.product_id" int="0x700">
-	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
-	      <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>
 	  </match>
-	  <!-- iAUDIO G3, 5, G2 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604;0x760">
+	  <!-- iAUDIO X5, M5, F2, 7 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
 	    <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.playlist_path" type="string">PLAYLIST/%File</append>
-	    <!-- iAUDIO G2 -->
-	    <match key="@storage.originating_device:usb.product_id" int="0x760">
-	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	      <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
-              <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
-	    </match>
-	    <!-- iAUDIO U2 -->
-	    <match key="@storage.originating_device:usb.product_id" int="0x600">
-	      <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/x-wav</append>
-	      <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
-	      <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>
+	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+	  </match>
+	  <!-- iAUDIO U3 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x700">
+	    <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.playlist_path" type="string">PLAYLIST/%File</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+	    <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 G3, 5 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604">
+	    <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/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.playlist_path" type="string">PLAYLIST/%File</append>
+	  </match>
+	  <!-- iAUDIO G2 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x760">
+	    <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/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.playlist_path" type="string">PLAYLIST/%File</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+	  </match>
+	  <!-- iAUDIO U2 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x600">
+	    <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/x-wav</append>
+	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+	    <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>
 	</match>
 
@@ -661,21 +695,29 @@
 
         <!-- RIM -->
         <match key="@storage.originating_device:usb.vendor_id" int="0x0fca">
-          <!-- Blackberry 8100 (Pearl), 8000 (Curve), 9000 (Bold) -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x4;0x6;0x8004">
+          <!-- Blackberry 8100 (Pearl) -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x4">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <match key="@storage.originating_device:usb.product_id" int_outof="0x6;0x8004">
-              <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
-              <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
-            </match>
-	    <match key="@storage.originating_device:usb.product_id" int="0x4">
-              <append key="portable_audio_player.audio_folders" type="strlist">blackberry/music/</append>
-              <append key="portable_audio_player.audio_folders" type="strlist">blackberry/videos/</append>
-            </match>
+            <append key="portable_audio_player.audio_folders" type="strlist">blackberry/music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">blackberry/videos/</append>
           </match>
-	  <match key="@storage.originating_device:usb.product_id" int="0x8004">
+          <!-- Blackberry 8000 (Curve) -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x6">
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
+          </match>
+          <!-- Blackberry 9000 (Bold) -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x8004">
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
             <append key="portable_audio_player.audio_folders" type="strlist">home/user/music/</append>
             <append key="portable_audio_player.audio_folders" type="strlist">home/user/videos/</append>
           </match>
@@ -1002,18 +1044,24 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
 	  <!-- T30 UMS firmware v1.7 , S10 UMS firmware v1.05 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1019;0x1023">
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1023">
             <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>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
 	    <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
-	    <!-- S10 UMS firmware v1.05 folder -->
-	    <match key="@storage.originating_device:usb.product_id" int="0x1023">
-              <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
-              <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
-            </match>
+          </match>
+	  <!-- S10 UMS firmware v1.05 folder -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x1023">
+            <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>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
+	    <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
           </match>
           <!-- iFP 100 UMS, 300 UMS, 500 UMS (supports application/ogg only after firmware upgrade),
                N10 UMS
-- 
cgit v1.2.3


From b54ecfca3ca95dab5b716fad00f4bbd05582c52a Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Mon, 30 Nov 2009 23:38:57 +0100
Subject: Revert "Flatten product ID tests (temporary)"

This reverts commit 90b11004734735b0e2b611c0c64d4fbf026ce1db, until we finally
settle the argument as to whether to keep this permanently (for continuing
ability to convert to media-player-info).
---
 .../10freedesktop/10-usb-music-players.fdi         | 168 ++++++++-------------
 1 file changed, 60 insertions(+), 108 deletions(-)

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index dd0d88e..27501e6 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -13,15 +13,10 @@
           <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
           <append key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append>
           <merge key="storage.requires_eject" type="bool">true</merge>
-        </match>
-        <!-- iPods with video -->
-        <match key="@storage.originating_device:usb.product_id" int_outof="0x1261;0x1262">
-          <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-          <addset key="portable_audio_player.access_method.protocols" type="strlist">ipod</addset>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append>
-          <append key="portable_audio_player.output_formats" type="strlist">video/mp4</append>
+          <!-- iPods with video -->
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x1261;0x1262">
+            <append key="portable_audio_player.output_formats" type="strlist">video/mp4</append>
+          </match>
         </match>
       </match>
 
@@ -269,25 +264,19 @@
 	    <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>
-          <!-- Samsung YP-T7F -->
-          <match key="@storage.originating_device:usb.product_id" int="0x503d">
+          <!-- Samsung YP-J70, YP-T7F -->
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x5032;0x503d">
             <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>
             <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>
             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
-          </match>
 	    <!-- Samsung YP-J70 -->
-          <match key="@storage.originating_device:usb.product_id" int="0x5032">
-            <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>
-            <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>
-            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
-            <merge key="storage.requires_eject" type="bool">true</merge>
+            <match key="@storage.originating_device:usb.product_id" int="0x5032">
+              <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
+              <merge key="storage.requires_eject" type="bool">true</merge>
+            </match>
           </match>
           <!-- Samsung YP-Z5 -->
           <match key="@storage.originating_device:usb.product_id" int="0x5041">
@@ -587,8 +576,8 @@
 
 	<!-- Cowon -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
-	  <!-- iAUDIO M3 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500">
+	  <!-- iAUDIO M3, X5, M5, U3 , F2, 7-->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x700;0x710;0x730;0x750">
 	    <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>
@@ -597,47 +586,21 @@
 	    <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.playlist_path" type="string">PLAYLIST/%File</append>
+	    <!-- iAUDIO X5, M5, F2, 7 -->
+	    <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
+	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+	    </match>
+	    <!-- iAUDIO U3 -->
+	    <match key="@storage.originating_device:usb.product_id" int="0x700">
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+	      <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>
 	  </match>
-	  <!-- iAUDIO X5, M5, F2, 7 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
-	    <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.playlist_path" type="string">PLAYLIST/%File</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
-	  </match>
-	  <!-- iAUDIO U3 -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x700">
-	    <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.playlist_path" type="string">PLAYLIST/%File</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
-	    <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 G3, 5 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604">
-	    <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/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.playlist_path" type="string">PLAYLIST/%File</append>
-	  </match>
-	  <!-- iAUDIO G2 -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x760">
+	  <!-- iAUDIO G3, 5, G2 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604;0x760">
 	    <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>
@@ -645,20 +608,23 @@
 	    <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.playlist_path" type="string">PLAYLIST/%File</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
-	  </match>
-	  <!-- iAUDIO U2 -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x600">
-	    <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/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
+	    <!-- iAUDIO G2 -->
+	    <match key="@storage.originating_device:usb.product_id" int="0x760">
+	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+              <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+	    </match>
+	    <!-- iAUDIO U2 -->
+	    <match key="@storage.originating_device:usb.product_id" int="0x600">
+	      <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/x-wav</append>
+	      <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+	      <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>
 	  </match>
 	</match>
 
@@ -695,29 +661,21 @@
 
         <!-- RIM -->
         <match key="@storage.originating_device:usb.vendor_id" int="0x0fca">
-          <!-- Blackberry 8100 (Pearl) -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x4">
-            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">blackberry/music/</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">blackberry/videos/</append>
-          </match>
-          <!-- Blackberry 8000 (Curve) -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x6">
+          <!-- Blackberry 8100 (Pearl), 8000 (Curve), 9000 (Bold) -->
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x4;0x6;0x8004">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
+	    <match key="@storage.originating_device:usb.product_id" int_outof="0x6;0x8004">
+              <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
+              <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
+            </match>
+	    <match key="@storage.originating_device:usb.product_id" int="0x4">
+              <append key="portable_audio_player.audio_folders" type="strlist">blackberry/music/</append>
+              <append key="portable_audio_player.audio_folders" type="strlist">blackberry/videos/</append>
+            </match>
           </match>
-          <!-- Blackberry 9000 (Bold) -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x8004">
-            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
+	  <match key="@storage.originating_device:usb.product_id" int="0x8004">
             <append key="portable_audio_player.audio_folders" type="strlist">home/user/music/</append>
             <append key="portable_audio_player.audio_folders" type="strlist">home/user/videos/</append>
           </match>
@@ -1044,24 +1002,18 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
 	  <!-- T30 UMS firmware v1.7 , S10 UMS firmware v1.05 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1023">
-            <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>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
-	    <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
-          </match>
-	  <!-- S10 UMS firmware v1.05 folder -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x1023">
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1019;0x1023">
             <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>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
 	    <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
+	    <!-- S10 UMS firmware v1.05 folder -->
+	    <match key="@storage.originating_device:usb.product_id" int="0x1023">
+              <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+              <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
+            </match>
           </match>
           <!-- iFP 100 UMS, 300 UMS, 500 UMS (supports application/ogg only after firmware upgrade),
                N10 UMS
-- 
cgit v1.2.3


From 9e19940afaec9edf9eca230a39c68c915b4930f3 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Mon, 30 Nov 2009 23:43:23 +0100
Subject: Released hal-info 20091130

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 5d7445c..a41965d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20090716
+20091130
-- 
cgit v1.2.3


From 144401bdfaa8a61e13ad6d3c71fad04c0d7ba5d8 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Mon, 7 Dec 2009 14:29:28 +0100
Subject: Flatten product ID tests again

This only needs to be reverted before doing a new official snapshot release.
During development it's more convenient to keep it flat.
---
 .../10freedesktop/10-usb-music-players.fdi         | 168 +++++++++++++--------
 1 file changed, 108 insertions(+), 60 deletions(-)

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 27501e6..dd0d88e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -13,10 +13,15 @@
           <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
           <append key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append>
           <merge key="storage.requires_eject" type="bool">true</merge>
-          <!-- iPods with video -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x1261;0x1262">
-            <append key="portable_audio_player.output_formats" type="strlist">video/mp4</append>
-          </match>
+        </match>
+        <!-- iPods with video -->
+        <match key="@storage.originating_device:usb.product_id" int_outof="0x1261;0x1262">
+          <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+          <addset key="portable_audio_player.access_method.protocols" type="strlist">ipod</addset>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append>
+          <append key="portable_audio_player.output_formats" type="strlist">video/mp4</append>
         </match>
       </match>
 
@@ -264,19 +269,25 @@
 	    <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>
-          <!-- Samsung YP-J70, YP-T7F -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x5032;0x503d">
+          <!-- Samsung YP-T7F -->
+          <match key="@storage.originating_device:usb.product_id" int="0x503d">
             <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>
             <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>
             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+          </match>
 	    <!-- Samsung YP-J70 -->
-            <match key="@storage.originating_device:usb.product_id" int="0x5032">
-              <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
-              <merge key="storage.requires_eject" type="bool">true</merge>
-            </match>
+          <match key="@storage.originating_device:usb.product_id" int="0x5032">
+            <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>
+            <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>
+            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
+            <merge key="storage.requires_eject" type="bool">true</merge>
           </match>
           <!-- Samsung YP-Z5 -->
           <match key="@storage.originating_device:usb.product_id" int="0x5041">
@@ -576,8 +587,8 @@
 
 	<!-- Cowon -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
-	  <!-- iAUDIO M3, X5, M5, U3 , F2, 7-->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x700;0x710;0x730;0x750">
+	  <!-- iAUDIO M3 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500">
 	    <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>
@@ -586,45 +597,68 @@
 	    <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.playlist_path" type="string">PLAYLIST/%File</append>
-	    <!-- iAUDIO X5, M5, F2, 7 -->
-	    <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
-	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	      <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
-	      <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
-	    </match>
-	    <!-- iAUDIO U3 -->
-	    <match key="@storage.originating_device:usb.product_id" int="0x700">
-	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
-	      <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>
 	  </match>
-	  <!-- iAUDIO G3, 5, G2 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604;0x760">
+	  <!-- iAUDIO X5, M5, F2, 7 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
 	    <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.playlist_path" type="string">PLAYLIST/%File</append>
-	    <!-- iAUDIO G2 -->
-	    <match key="@storage.originating_device:usb.product_id" int="0x760">
-	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	      <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
-              <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
-	    </match>
-	    <!-- iAUDIO U2 -->
-	    <match key="@storage.originating_device:usb.product_id" int="0x600">
-	      <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/x-wav</append>
-	      <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
-	      <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>
+	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+	  </match>
+	  <!-- iAUDIO U3 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x700">
+	    <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.playlist_path" type="string">PLAYLIST/%File</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+	    <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 G3, 5 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604">
+	    <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/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.playlist_path" type="string">PLAYLIST/%File</append>
+	  </match>
+	  <!-- iAUDIO G2 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x760">
+	    <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/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.playlist_path" type="string">PLAYLIST/%File</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+	  </match>
+	  <!-- iAUDIO U2 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x600">
+	    <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/x-wav</append>
+	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+	    <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>
 	</match>
 
@@ -661,21 +695,29 @@
 
         <!-- RIM -->
         <match key="@storage.originating_device:usb.vendor_id" int="0x0fca">
-          <!-- Blackberry 8100 (Pearl), 8000 (Curve), 9000 (Bold) -->
-          <match key="@storage.originating_device:usb.product_id" int_outof="0x4;0x6;0x8004">
+          <!-- Blackberry 8100 (Pearl) -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x4">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <match key="@storage.originating_device:usb.product_id" int_outof="0x6;0x8004">
-              <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
-              <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
-            </match>
-	    <match key="@storage.originating_device:usb.product_id" int="0x4">
-              <append key="portable_audio_player.audio_folders" type="strlist">blackberry/music/</append>
-              <append key="portable_audio_player.audio_folders" type="strlist">blackberry/videos/</append>
-            </match>
+            <append key="portable_audio_player.audio_folders" type="strlist">blackberry/music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">blackberry/videos/</append>
           </match>
-	  <match key="@storage.originating_device:usb.product_id" int="0x8004">
+          <!-- Blackberry 8000 (Curve) -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x6">
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
+          </match>
+          <!-- Blackberry 9000 (Bold) -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x8004">
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
             <append key="portable_audio_player.audio_folders" type="strlist">home/user/music/</append>
             <append key="portable_audio_player.audio_folders" type="strlist">home/user/videos/</append>
           </match>
@@ -1002,18 +1044,24 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
 	  <!-- T30 UMS firmware v1.7 , S10 UMS firmware v1.05 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1019;0x1023">
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1023">
             <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>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
 	    <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
-	    <!-- S10 UMS firmware v1.05 folder -->
-	    <match key="@storage.originating_device:usb.product_id" int="0x1023">
-              <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
-              <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
-            </match>
+          </match>
+	  <!-- S10 UMS firmware v1.05 folder -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x1023">
+            <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>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
+	    <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
           </match>
           <!-- iFP 100 UMS, 300 UMS, 500 UMS (supports application/ogg only after firmware upgrade),
                N10 UMS
-- 
cgit v1.2.3


From 16e1c1921e089a4b53940b6b265fc72446d28254 Mon Sep 17 00:00:00 2001
From: Keng-Yu Lin <keng-yu.lin@canonical.com>
Date: Wed, 16 Sep 2009 15:08:05 +0800
Subject: Add hotkey quirk for Acer Aspire One (AO531h/AO751h)

To prevent the brightness adjustment OSD from showing when disabling the bluetooth.

Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
---
 fdi/information/10freedesktop/30-keymap-acer.fdi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index a2cf8d8..4511bff 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -61,6 +61,10 @@
           <append key="input.keymap.data" type="strlist">e012:prog2</append> 
           <append key="input.keymap.data" type="strlist">e059:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="AO751h;AO531h">
+          <remove key="input.keymap.data" type="strlist">e059:brightnessup</remove>
+          <append key="input.keymap.data" type="strlist">e059:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+        </match>
       </match>
     </match>
   </device>
-- 
cgit v1.2.3


From 1a3c7c28d028c0952404d6d45b58138849c09ff1 Mon Sep 17 00:00:00 2001
From: Ozan Çağlayan <ozan@pardus.org.tr>
Date: Wed, 23 Dec 2009 10:13:26 +0200
Subject: Add keymap quirks for LG X110

The patch adds keyboard quirks for LG X110 (An MSI Wind clone) which has
the following DMI informations:

system.hardware.primary_video.product = 10158  (0x27ae)  (int)
system.hardware.primary_video.vendor = 32902  (0x8086)  (int)
system.hardware.product = 'X110-L.A7M3F3'  (string)
system.hardware.serial = '812MSVJ025279'  (string)
system.hardware.uuid = '00000000-0000-0000-0000-002185569235' (string)
system.hardware.vendor = 'LG Electronics'  (string)
system.hardware.version = 'Ver.001'  (string)

Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
---
 fdi/information/10freedesktop/30-keymap-misc.fdi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index c4e527e..39d71ed 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -103,6 +103,22 @@
         </match>
       </match>
 
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LG">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="X110">
+          <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-Left   Volume down -->
+          <append key="input.keymap.data" type="strlist">e02f:search</append> <!-- Fn-F3   Search -->
+          <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-Right   Volume up -->
+          <append key="input.keymap.data" type="strlist">e031:battery</append> <!-- Fn-F10   Info -->
+          <append key="input.keymap.data" type="strlist">e033:suspend</append> <!-- Fn-F12   Hibernate -->
+          <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F4   Sleep -->
+          <append key="input.keymap.data" type="strlist">e064:f22</append> <!-- Fn-F5   Touchpad disable -->
+          <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- Fn-F6   satellite dish1 -->
+          <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-Down   Brightness down -->
+          <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-Up   Brightness up -->
+        </match>
+      </match>
+
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="MEDIONNB">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="A555">
           <append key="input.keymap.data" type="strlist">63:www</append> <!-- N button -->
-- 
cgit v1.2.3


From e621b51da9f57c820c3f3dadbd0262b112329a9a Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Mon, 28 Dec 2009 10:58:28 +0000
Subject: Add keymap for OLPC XO

This supports both XO-1 and XO-1.5.
The equivalent keymap has already been added to udev, but we'd also
like to support platforms which have not caught up with recent udev
developments.

Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
---
 fdi/information/10freedesktop/30-keymap-olpc.fdi | 93 ++++++++++++++++++++++++
 fdi/information/10freedesktop/Makefile.am        |  3 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 fdi/information/10freedesktop/30-keymap-olpc.fdi

diff --git a/fdi/information/10freedesktop/30-keymap-olpc.fdi b/fdi/information/10freedesktop/30-keymap-olpc.fdi
new file mode 100644
index 0000000..3912e66
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-olpc.fdi
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+  <device>
+
+    <match key="@input.originating_device:info.linux.driver" string="atkbd">
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="OLPC">
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="XO">
+        <append key="input.keymap.data" type="strlist">59:fn</append>
+        <append key="input.keymap.data" type="strlist">e001:fn_esc</append>
+
+        <append key="input.keymap.data" type="strlist">e079:camera</append>
+        <!-- FN-CAMERA is 'Mic', KEY_SOUND is as close as I see. -->
+        <append key="input.keymap.data" type="strlist">e078:sound</append>
+
+        <append key="input.keymap.data" type="strlist">e03b:fn_f1</append>
+        <append key="input.keymap.data" type="strlist">e03c:fn_f2</append>
+        <append key="input.keymap.data" type="strlist">e03d:fn_f3</append>
+        <append key="input.keymap.data" type="strlist">e03e:fn_f4</append>
+        <append key="input.keymap.data" type="strlist">e03f:fn_f5</append>
+        <append key="input.keymap.data" type="strlist">e040:fn_f6</append>
+        <append key="input.keymap.data" type="strlist">e041:fn_f7</append>
+        <append key="input.keymap.data" type="strlist">e042:fn_f8</append>
+        <append key="input.keymap.data" type="strlist">e043:fn_f9</append>
+        <append key="input.keymap.data" type="strlist">e044:fn_f10</append>
+        <append key="input.keymap.data" type="strlist">e057:fn_f11</append>
+        <append key="input.keymap.data" type="strlist">e058:fn_f12</append>
+
+        <!-- Using KEY_F13-KEY_F21 for the .5 F keys right now. -->
+        <append key="input.keymap.data" type="strlist">e077:f13</append>
+        <append key="input.keymap.data" type="strlist">e076:f14</append>
+        <append key="input.keymap.data" type="strlist">e075:f15</append>
+        <append key="input.keymap.data" type="strlist">e074:f16</append>
+        <append key="input.keymap.data" type="strlist">e073:f17</append>
+        <append key="input.keymap.data" type="strlist">e072:f18</append>
+        <append key="input.keymap.data" type="strlist">e071:f19</append>
+        <append key="input.keymap.data" type="strlist">e070:f20</append>
+        <append key="input.keymap.data" type="strlist">e06f:f21</append>
+
+        <append key="input.keymap.data" type="strlist">e06e:chat</append>
+        <!-- FIXME: FN-CHAT, just mapping to KEY_CHAT right now -->
+        <append key="input.keymap.data" type="strlist">e064:chat</append>
+
+        <!-- Frame and Fn-frame , which is listed as 'Win App', try -->
+        <append key="input.keymap.data" type="strlist">e05d:menu</append>
+        <append key="input.keymap.data" type="strlist">e05a:prog1</append>
+
+        <!-- The FN of some keys is other keys -->
+        <append key="input.keymap.data" type="strlist">e053:delete</append>
+        <append key="input.keymap.data" type="strlist">e052:insert</append>
+        <append key="input.keymap.data" type="strlist">e049:pageup</append>
+        <append key="input.keymap.data" type="strlist">e051:pagedown</append>
+        <append key="input.keymap.data" type="strlist">e047:home</append>
+        <append key="input.keymap.data" type="strlist">e04f:end</append>
+
+        <!-- FIXME: These should be the language key. Don't ask what they
+             are doing as KEY_HP. It will make your brain hurt. -->
+        <append key="input.keymap.data" type="strlist">73:hp</append>
+        <append key="input.keymap.data" type="strlist">7e:hp</append>
+
+        <!-- L/R grab -->
+        <append key="input.keymap.data" type="strlist">e05b:leftmeta</append>
+        <append key="input.keymap.data" type="strlist">e05c:rightmeta</append>
+        <!-- FIXME: right grab seems to be releasing on a different scancode -->
+        <append key="input.keymap.data" type="strlist">85:rightmeta</append>
+
+        <!-- Fn-space toggles the backlight.
+             At least in a dream I had last night. -->
+        <append key="input.keymap.data" type="strlist">e056:kbdillumtoggle</append>
+
+        <!-- Set the game keys to map to up/down/left/right for now -->
+        <append key="input.keymap.data" type="strlist">65:kp8</append>
+        <append key="input.keymap.data" type="strlist">66:kp2</append>
+        <append key="input.keymap.data" type="strlist">67:kp4</append>
+        <append key="input.keymap.data" type="strlist">68:kp6</append>
+
+        <!-- set the other game keys to map to pgup/pgdn/home/end -->
+        <append key="input.keymap.data" type="strlist">e065:kp9</append>
+        <append key="input.keymap.data" type="strlist">e066:kp3</append>
+        <append key="input.keymap.data" type="strlist">e067:kp7</append>
+        <append key="input.keymap.data" type="strlist">e068:kp1</append>
+
+        <append key="input.keymap.data" type="strlist">69:switchvideomode</append>
+
+        <append key="info.capabilities" type="strlist">input.keymap</append>
+
+      </match>
+      </match>
+
+    </match>
+  </device>
+</deviceinfo>
+
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 3332609..e2f428c 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -86,7 +86,8 @@ dist_fdi_DATA +=					\
 		30-keymap-compaq.fdi			\
 		30-keymap-lenovo.fdi			\
 		30-keymap-dell.fdi			\
-		30-keymap-acer.fdi 			
+		30-keymap-acer.fdi 			\
+		30-keymap-olpc.fdi
 endif
 
 check:
-- 
cgit v1.2.3