hal/fdi/information/10freedesktop 10-usb-music-players.fdi,1.5,1.6
Danny Kukawka
dkukawka at freedesktop.org
Wed Aug 31 11:58:22 PDT 2005
Update of /cvs/hal/hal/fdi/information/10freedesktop
In directory gabe:/tmp/cvs-serv12186/fdi/information/10freedesktop
Modified Files:
10-usb-music-players.fdi
Log Message:
2005-08-31 Danny Kukawka <danny.kukawka at web.de>
* fdi/information/10freedesktop/10-usb-music-players.fdi:
Removed merge of not useful key info.category=portable_audio_player.
This merge breakes the storage policy and prevent mount of USB storage
players. See bug: https://bugzilla.novell.com/show_bug.cgi?id=113966
Index: 10-usb-music-players.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-music-players.fdi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 10-usb-music-players.fdi 18 Aug 2005 22:15:10 -0000 1.5
+++ 10-usb-music-players.fdi 31 Aug 2005 18:58:20 -0000 1.6
@@ -8,7 +8,6 @@
<match key="storage.vendor" contains="Apple">
<match key="storage.model" contains="iPod">
<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>
@@ -25,7 +24,6 @@
<match key="@storage.physical_device:usb.vendor_id" int="0x066f">
<match key="@storage.physical_device:usb.product_id" int="0x8000">
<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>
@@ -39,7 +37,6 @@
<match key="@storage.physical_device:usb.vendor_id" int="0x045a">
<match key="@storage.physical_device:usb.product_id" int="0x5042">
<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>
@@ -57,7 +54,6 @@
<!-- iFP 100 UMS (supports application/ogg only after firmware upgrade)-->
<match key="@storage.physical_device:usb.product_id" int="0x1101">
<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>
@@ -68,7 +64,6 @@
<!-- iFP 300 UMS (supports application/ogg only after firmware upgrade)-->
<match key="@storage.physical_device:usb.product_id" int="0x1103">
<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>
@@ -79,7 +74,6 @@
<!-- iFP 500 UMS (supports application/ogg only after firmware upgrade)-->
<match key="@storage.physical_device:usb.product_id" int="0x1105">
<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>
@@ -90,7 +84,6 @@
<!-- iFP 700 UMS-->
<match key="@storage.physical_device:usb.product_id" int="0x1107">
<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>
@@ -102,7 +95,6 @@
<!-- iFP 800 UMS-->
<match key="@storage.physical_device:usb.product_id" int="0x1108">
<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>
@@ -114,7 +106,6 @@
<!-- iFP 900 UMS-->
<match key="@storage.physical_device:usb.product_id" int="0x1109">
<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>
@@ -126,7 +117,6 @@
<!-- iFP 1000 UMS-->
<match key="@storage.physical_device:usb.product_id" int="0x1110">
<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>
@@ -138,7 +128,6 @@
<!-- N10 UMS-->
<match key="@storage.physical_device:usb.product_id" int="0x1111">
<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>
@@ -150,7 +139,6 @@
<!-- H10 20GB UMS-->
<match key="@storage.physical_device:usb.product_id" int="0x2001">
<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>
@@ -162,7 +150,6 @@
<!-- H10 5GB UMS-->
<match key="@storage.physical_device:usb.product_id" int="0x2002">
<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>
@@ -176,7 +163,6 @@
<!-- iGP 100 -->
<match key="@storage.physical_device:usb.product_id" int="0x2001">
<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>
@@ -187,7 +173,6 @@
<!-- iHP-100,115 -->
<match key="@storage.physical_device:usb.product_id" int="0x3001">
<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>
@@ -199,7 +184,6 @@
<!-- HP-120,140 -->
<match key="@storage.physical_device:usb.product_id" int="0x3002">
<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>
@@ -211,7 +195,6 @@
<!-- H320, H340 -->
<match key="@storage.physical_device:usb.product_id" int="0x3003">
<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>
@@ -231,7 +214,6 @@
<!-- iFP 100 IMM (supports application/ogg only after firmware upgrade)-->
<match key="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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -241,7 +223,6 @@
<!-- iFP 300 IMM (supports application/ogg only after firmware upgrade)-->
<match key="usb.product_id" int="0x1003">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -251,7 +232,6 @@
<!-- iFP 500 IMM (supports application/ogg only after firmware upgrade)-->
<match key="usb.product_id" int="0x1005">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -261,7 +241,6 @@
<!-- iFP 700 IMM-->
<match key="usb.product_id" int="0x1007">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -272,7 +251,6 @@
<!-- iFP 800 IMM-->
<match key="usb.product_id" int="0x1008">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -283,7 +261,6 @@
<!-- iFP 900 IMM-->
<match key="usb.product_id" int="0x1009">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -294,7 +271,6 @@
<!-- iFP 1000 IMM-->
<match key="usb.product_id" int="0x1010">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -305,7 +281,6 @@
<!-- N10 IMM-->
<match key="usb.product_id" int="0x1011">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -316,7 +291,6 @@
<!-- H10 20GB MTP-->
<match key="usb.product_id" int="0x2101">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -327,7 +301,6 @@
<!-- H10 5GB MTP-->
<match key="usb.product_id" int="0x2102">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -338,7 +311,6 @@
<!-- H10 5,6GB MTP-->
<match key="usb.product_id" int="0x2105">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -351,7 +323,6 @@
<!-- iDP 100 UMS-->
<match key="usb.product_id" int="0x0001">
<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">user</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
More information about the hal-commit
mailing list