hal: Branch 'origin' - 6 commits
David Zeuthen
david at kemper.freedesktop.org
Wed Feb 21 09:38:03 PST 2007
fdi/information/10freedesktop/10-usb-music-players.fdi | 276 +++++++++--------
1 files changed, 152 insertions(+), 124 deletions(-)
New commits:
diff-tree defc0819bb691d3adad05b1b61df080e4db0f726 (from 7d31690fb77e55dc62d2209b35c659e93650814a)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Feb 21 17:54:27 2007 +0100
amend entries for SE W800i and Motorola V360
Applied slightly adopted parts of a patch from Adam Williamson
<awilliamson at mandriva.com> to amend the entries for the SE W800i and
Motorola V360 with folder and name information (fd.o bug #8510).
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 216ff4b..35a7d45 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -730,6 +730,8 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">MP3/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">MSSEMC/Media files/audio/</append>
</match>
</match>
@@ -864,14 +866,18 @@
<match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
<!-- Motorola iTunes enabled phone -->
<match key="@storage.originating_device:usb.product_id" int="0x4810">
+ <merge key="storage.model" type="string">V360</merge>
+ <merge key="storage.vendor" type="string">Motorola</merge>
<append key="info.capabilities" type="strlist">portable_audio_player</append>
<merge key="info.category" type="string">portable_audio_player</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
<merge key="portable_audio_player.type" type="string">ipod</merge>
<merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
- <merge key="storage.requires_eject" type="bool">true</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">mobile/audio/</append>
+ <merge key="storage.requires_eject" type="bool">true</merge>
</match>
<!-- ROKR e2 Memory Card mode -->
<match key="@storage.originating_device:usb.product_id" int="0x608d">
diff-tree 7d31690fb77e55dc62d2209b35c659e93650814a (from e02d63eb700f798f913f2af59fb5cb0e0b428464)
Author: Jakub Steiner <jimmac at novell.com>
Date: Wed Feb 21 17:27:18 2007 +0100
specify location for mp3s on a PSP in the FDI file
Fixed FDI file to get music copied to a location where the Playstation
Portable (PSP) finds it.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index ab40d2e..216ff4b 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -27,6 +27,7 @@
<merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">PSP/MUSIC/</append>
<merge key="storage.drive_type" type="string">memory_stick</merge>
</match>
</match>
diff-tree e02d63eb700f798f913f2af59fb5cb0e0b428464 (from eaceb3f57e8869deb3ab4b74da79e64782854194)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Feb 21 17:22:13 2007 +0100
cleaned up USB music players
Cleaned up the USB music player fdi-file part for storage devices. Removed
double entries and merged different player under the correct vendor to
reduce double checks. Sorted vendor sections by USB vendor ID.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 3aa4e59..ab40d2e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -183,6 +183,22 @@
</match>
</match>
+ <!-- Philips -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x471">
+ <!-- Philips GoGear SA1330 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x165">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</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/x-wav</append>
+ </match>
+ </match>
+
<!--Panasonic -->
<match key="@storage.originating_deviceusb.vendor_id" int="0x4da">
<!--Panasonic SV-MP31V-->
@@ -450,8 +466,45 @@
<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>
+ <!-- Sansa m250 (maybe others as well) -->
+ <match key="@storage.originating_device:usb.product_id" int="0x7401">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+ </match>
+ <!-- Sansa e270 (maybe others as well) -->
+ <match key="@storage.originating_device:usb.product_id" int="0x7421">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+ </match>
</match>
+ <!-- Feiya Technology Corp Memory Bar -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x090c">
+ <match key="@storage.originating_device:usb.product_id" int="0x1000">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ </match>
+ </match>
+
<!-- Peak Digital Audio Player -->
<match key="@storage.originating_device:usb.vendor_id" int="0xd7d">
<match key="@storage.originating_device:usb.product_id" int="0x1651">
@@ -743,14 +796,15 @@
</match>
</match>
- <!-- Foston -->
+ <!-- Foston, MPMan -->
<match key="@storage.originating_device:usb.vendor_id" int="0x10d6">
- <!-- Foston 256MB -->
+ <!-- Foston 256MB / MPMan MP-Ki 128 Player -->
<match key="@storage.originating_device:usb.product_id" int="0x1100">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
<merge key="info.category" type="string">portable_audio_player</merge>
<merge key="portable_audio_player.type" type="string">generic</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.folder_depth" type="int">0</merge>
<merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
@@ -790,8 +844,34 @@
</match>
</match>
+ <!-- Nexia NX58XX (including Super*Talent MegaScreen) -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x1718">
+ <match key="@storage.originating_device:usb.product_id" int="0x1013">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+ </match>
+ </match>
+
<!-- Motorola -->
<match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
+ <!-- Motorola iTunes enabled phone -->
+ <match key="@storage.originating_device:usb.product_id" int="0x4810">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.type" type="string">ipod</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
<!-- ROKR e2 Memory Card mode -->
<match key="@storage.originating_device:usb.product_id" int="0x608d">
<merge key="storage.model" type="string">ROKR e2</merge>
@@ -949,115 +1029,9 @@
<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>
-
</match>
- </match>
- <!-- Philips -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x471">
- <!-- Philips GoGear SA1330 -->
- <match key="@storage.originating_device:usb.product_id" int="0x165">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</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/x-wav</append>
- </match>
</match>
-
- <!-- Motorola iTunes enabled phone -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
- <match key="@storage.originating_device:usb.product_id" int="0x4810">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.type" type="string">ipod</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
- <merge key="storage.requires_eject" type="bool">true</merge>
- </match>
- </match>
-
- <!-- Sandisk Corp. Sansa m250 (maybe others as well) -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x0781">
- <match key="@storage.originating_device:usb.product_id" int="0x7401">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
- </match>
- </match>
-
- <!-- Nexia NX58XX (including Super*Talent MegaScreen) -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x1718">
- <match key="@storage.originating_device:usb.product_id" int="0x1013">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
-
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
- </match>
- </match>
-
- <!-- Feiya Technology Corp Memory Bar -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x090c">
- <match key="@storage.originating_device:usb.product_id" int="0x1000">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
-
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
- </match>
- </match>
-
- <!-- MPMan MP-Ki 128 Player -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x10d6">
- <match key="@storage.originating_device:usb.product_id" int="0x1100">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.folder_depth" type="int">0</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</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>
- </match>
- </match>
-
- <!-- Sandisk Corp. Sansa e270 (maybe others as well) -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x0781">
- <match key="@storage.originating_device:usb.product_id" int="0x7421">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
- </match>
- </match>
-
</match>
<!-- USB devices that are music players but uses a user-space library -->
diff-tree eaceb3f57e8869deb3ab4b74da79e64782854194 (from 2f989a01fc0529861bca7bba3a742dd00f2ad796)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Feb 21 16:57:11 2007 +0100
added RCA Lyra RD1072 and a Transcend T.SONIC USB mp3 player, cleanup
Applied slightly adopted patch from Javier Aravena <phrodo.00 at gmail.com>
to support RCA Lyra RD1072 and a Transcend T.SONIC USB mp3 player
(fd.o bug #8523).
Move a player to correct vendor to avoid multiple vendor matches/sections.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index ff81940..3aa4e59 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -369,6 +369,17 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
+ <!--Transcend (T.Sonic ??? White) -->
+ <match key="@storage.originating_device:usb.product_id" int="0x821f">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
<!-- Jens of Sweeden (JoS) MP-120 -->
<match key="@storage.originating_device:usb.product_id" int="0x82d4">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
@@ -381,10 +392,34 @@
<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>
+ <!-- TrekStor i.Beat jump MP3 Player -->
+ <match key="@storage.originating_device:usb.product_id" int="0x835d">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
</match>
<!-- RCA -->
<match key="@storage.originating_device:usb.vendor_id" int="0x69b">
+ <!-- Lyra RD1072-->
+ <match key="@storage.originating_device:usb.product_id" int="0x713">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</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/audible</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>
+ </match>
<!-- Lyra RD2212 -->
<match key="@storage.originating_device:usb.product_id" int="0x718">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
@@ -963,20 +998,6 @@
</match>
</match>
- <!-- TrekStor i.Beat jump MP3 Player -->
- <match key="@storage.originating_device:usb.vendor_id" int="0x066f">
- <match key="@storage.originating_device:usb.product_id" int="0x835d">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
- <merge key="info.category" type="string">portable_audio_player</merge>
- <merge key="portable_audio_player.type" type="string">generic</merge>
- <merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
- </match>
- </match>
-
<!-- Nexia NX58XX (including Super*Talent MegaScreen) -->
<match key="@storage.originating_device:usb.vendor_id" int="0x1718">
<match key="@storage.originating_device:usb.product_id" int="0x1013">
diff-tree 2f989a01fc0529861bca7bba3a742dd00f2ad796 (from e8fe5376cb79e428a6c13695b44b5c315486bb5a)
Author: Dan Williams <dcbw at redhat.com>
Date: Wed Feb 21 16:28:10 2007 +0100
added support for Sidekick 3 USB musicplayer devices
Applied slightly adopted patch from Dan Williams <dcbw at redhat.com> to
support Sidekick 3 USB musicplayer devices (fd.o bug #8752).
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 3a129e9..ff81940 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -434,6 +434,20 @@
</match>
</match>
+ <!-- Danger Research -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x0da0">
+ <!-- Hiptop/Sidekick 3 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1001">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ </match>
+ </match>
+
<!-- Cowon -->
<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
<!-- iAudio M3 -->
diff-tree e8fe5376cb79e428a6c13695b44b5c315486bb5a (from 061ea78e3575f71eb42d63f9b8f7e0b02f3d23ed)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Feb 21 16:16:49 2007 +0100
added iRiver T10 UMS USB music player and fixed keys
Added slightly adopted patch from Jon Lund Steffensen <jonlst at gmail.com>
to add the iRiver T10 UMS USB music player (fd.o bug #8959).
Fixed some keys from last commits (s/physical_device/originating_device/).
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 6b66287..3a129e9 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -226,7 +226,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- Samsung YP-MT6V -->
- <match key="@storage.physical_device:usb.product_id" int="0x5026">
+ <match key="@storage.originating_device:usb.product_id" int="0x5026">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
<merge key="info.category" type="string">portable_audio_player</merge>
<merge key="portable_audio_player.type" type="string">generic</merge>
@@ -488,7 +488,7 @@
<append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
</match>
<!-- iAudio U2 -->
- <match key="@storage.physical_device:usb.product_id" int="0x600">
+ <match key="@storage.originating_device:usb.product_id" int="0x600">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
<merge key="info.category" type="string">portable_audio_player</merge>
<merge key="portable_audio_player.type" type="string">generic</merge>
@@ -772,6 +772,18 @@
<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>
+ <!-- T10 UMS -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1020">
+ <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+ <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>
+ </match>
<!-- iFP 100 UMS (supports application/ogg only after firmware upgrade)-->
<match key="@storage.originating_device:usb.product_id" int="0x1101">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
More information about the hal-commit
mailing list