hal: Branch 'master' - 7 commits

Danny Kukawka dkukawka at kemper.freedesktop.org
Mon Mar 3 06:20:11 PST 2008


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

New commits:
commit f3912125dd6c91f542a0d7e7d15fae9255e04dbe
Author: Fernando Muñoz <munozferna at gmail.com>
Date:   Mon Mar 3 15:19:41 2008 +0100

    added Lyra TH1501 music player
    
    Added Lyra TH1501 music player. Contributed via
    https://bugs.launchpad.net/bugs/157904.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index e683b03..fe2a4e6 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -350,8 +350,8 @@
 
 	<!-- RCA -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x69b">
-	  <!-- Lyra RD1072, RD2212, MC2021C -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x713;0x718;0x767">
+	  <!-- Lyra RD1072, RD2212, MC2021C, TH1501 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x713;0x718;0x756;0x767">
 	    <merge key="portable_audio_player.type" type="string">generic</merge>
 	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
commit aa6ce4cda407b9038dcf4c711274d517b8e92045
Author: Alexey Fisher <bug-track at fisher-privat.net>
Date:   Mon Mar 3 15:16:01 2008 +0100

    added suspend quirks for Asus P5LD2
    
    In https://launchpad.net/bugs/191737, a user reported that the Asus
    P5LD2 needs the s3_bios and s3_mode quirks to resume properly.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 97b4e38..4d0f2de 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -8,7 +8,7 @@
       <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ;V6V">
+      <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ;V6V;P5LD2">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
commit 760853ff04f3391192f3ab5cb25c0f80a211c3b1
Author: Martin Pitt <martin at piware.de>
Date:   Mon Mar 3 15:08:23 2008 +0100

    fixed suspend quirks for Asus V6V
    
    In https://launchpad.net/bugs/191737, a user reported that the Asus
    V6V additionally needs the s3_bios quirk to resume properly.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index e8f55ec..97b4e38 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -5,10 +5,10 @@
       <match key="system.hardware.product" prefix="U5F ">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne;V6V">
+      <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ">
+      <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ;V6V">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
commit 03fc5c76634651f35ff9e93ff778efa04678fffc
Author: Martin Pitt <martin at piware.de>
Date:   Mon Mar 3 15:01:51 2008 +0100

    added Samsung Yepp YP-K3 music player
    
    Added Samsung Yepp YP-K3 music player. Contributed via
    https://bugs.launchpad.net/bugs/120413.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 7bfef55..e683b03 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -247,6 +247,14 @@
 	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
 	  </match>	
+	  <!-- Samsung Yepp YP-K3 (Firmware_4.06KR)-->
+	  <match key="@storage.originating_device:usb.product_id" int="0x5080">
+	    <merge key="portable_audio_player.type" type="string">generic</merge>
+	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
+	    <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.audio_folders" type="strlist">Music/</append>
+	  </match>
 	  <!-- Meizu M6 MiniPlayer -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x5a0f">
 	    <merge key="portable_audio_player.type" type="string">generic</merge>
commit f590a9e262dbfc1dab207e1acbbfe5ad06eb9b5f
Author: Alexander Jones <alex at weej.com>
Date:   Mon Mar 3 14:56:45 2008 +0100

    added Nokia 5300 to USB mp3 musicplayer
    
    Added Nokia 5300 to USB mp3 musicplayer list. Patch contributed via
    https://bugs.launchpad.net/bugs/103831

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index afb9063..7bfef55 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -85,6 +85,13 @@
           <match key="@storage.originating_device:usb.product_id" int_outof="0x0433;0x0434">
             <merge key="storage.requires_eject" type="bool">true</merge>
           </match>
+          <!-- Nokia 5300 -->
+          <match key="@storage.originating_device:usb.product_id" int="0x4b9">
+            <merge key="storage.model" type="string">5300</merge>
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+          </match>
         </match>
 
         <!-- MPIO HD300 Player -->
commit 0ea0f0cf520d6024ee5fd629de60f03f4c65d956
Author: Mark Edgington <medgingto at yahoo.com>
Date:   Mon Mar 3 14:48:55 2008 +0100

    added Olympus DS-2 voice recorder to USB mp3 player
    
    Added Olympus DS-2 voice recorderto USB mp3 players. Patch contributed in
    https://bugs.launchpad.net/bugs/94924.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 36aae1f..afb9063 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -605,6 +605,16 @@
           </match>
         </match>
  
+        <!-- Olympus -->
+        <match key="@storage.originating_device:usb.vendor_id" int="0x07b4">
+          <!-- DS-2 voice recorder -->
+          <match key="@storage.originating_device:usb.product_id" int="0x020e">
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+          </match>
+        </match>
+
 	<match key="@storage.originating_device:usb.vendor_id" int="0x1006">
           <!-- iGP 100 -->
           <match key="@storage.originating_device:usb.product_id" int="0x2001">
commit 12bdf69a181a84fb9ffacbb4bc7a57e26b828680
Author: Daniel Tschinder <dane.tschi at gmx.at>
Date:   Mon Mar 3 14:40:22 2008 +0100

    added keymap for Acer Aspire 5600
    
    Added keymap for Acer Aspire 5600.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 3f6a6da..e9ee8d9 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">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1410;1640;1680;1690;3050;3680;5050;5570;5580;5600">
             <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 -->


More information about the hal-commit mailing list