hal: Branch 'master'
Kay Sievers
kay at kemper.freedesktop.org
Wed Feb 7 12:04:49 PST 2007
fdi/information/10freedesktop/10-camera-ptp.fdi | 2
fdi/information/10freedesktop/10-usb-card-readers.fdi | 20 -
fdi/information/10freedesktop/10-usb-music-players.fdi | 194 ++++++++---------
fdi/information/10freedesktop/10-usb-pda.fdi | 26 +-
fdi/information/10freedesktop/10-usbcsr-mice.fdi | 2
5 files changed, 122 insertions(+), 122 deletions(-)
New commits:
diff-tree 3de31d4b45dcdf63ebda2fefe603264875e32b59 (from 10b1970f8da25a97131e48004ee520eab2675369)
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed Feb 7 21:04:57 2007 +0100
rename "bus" and "physical" properties to something more abstract
Renames:
info.bus -> info.subsystem
*.physical_device -> *.originating_device
diff --git a/fdi/information/10freedesktop/10-camera-ptp.fdi b/fdi/information/10freedesktop/10-camera-ptp.fdi
index 9879725..9890e3f 100644
--- a/fdi/information/10freedesktop/10-camera-ptp.fdi
+++ b/fdi/information/10freedesktop/10-camera-ptp.fdi
@@ -2,7 +2,7 @@
<deviceinfo version="0.2">
<device>
- <match key="info.bus" string="usb">
+ <match key="info.subsystem" string="usb">
<match key="usb.interface.class" int="0x06">
<match key="usb.interface.subclass" int="0x01">
<match key="usb.interface.protocol" int="0x01">
diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 5802445..aa4e00c 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -92,32 +92,32 @@
</match>
<!-- Lexar CF Reader -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x05dc">
- <match key="@storage.physical_device:usb.product_id" int="0x0002">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x05dc">
+ <match key="@storage.originating_device:usb.product_id" int="0x0002">
<merge key="storage.drive_type" type="string">compact_flash</merge>
</match>
</match>
<!-- SanDisk ImageMate II CF Reader -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x0781">
- <match key="@storage.physical_device:usb.product_id" int="0x0002">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x0781">
+ <match key="@storage.originating_device:usb.product_id" int="0x0002">
<merge key="storage.drive_type" type="string">compact_flash</merge>
</match>
</match>
<!-- Sony Ericsson Handys with Memory Stick (Duo) -->
- <match key="@storage.physical_device:usb.vendor_id" int="0xfce">
+ <match key="@storage.originating_device:usb.vendor_id" int="0xfce">
<!-- K750i -->
- <match key="@storage.physical_device:usb.product_id" int="0xd016">
+ <match key="@storage.originating_device:usb.product_id" int="0xd016">
<merge key="storage.drive_type" type="string">memory_stick</merge>
- <merge key="info.vendor" type="copy_property">@storage.physical_device:usb.vendor</merge>
- <merge key="storage.vendor" type="copy_property">@storage.physical_device:usb.vendor</merge>
+ <merge key="info.vendor" type="copy_property">@storage.originating_device:usb.vendor</merge>
+ <merge key="storage.vendor" type="copy_property">@storage.originating_device:usb.vendor</merge>
</match>
<!-- General match-->
<match key="storage.model" contains="Memory Stick">
<merge key="storage.drive_type" type="string">memory_stick</merge>
- <merge key="info.vendor" type="copy_property">@storage.physical_device:usb.vendor</merge>
- <merge key="storage.vendor" type="copy_property">@storage.physical_device:usb.vendor</merge>
+ <merge key="info.vendor" type="copy_property">@storage.originating_device:usb.vendor</merge>
+ <merge key="storage.vendor" type="copy_property">@storage.originating_device:usb.vendor</merge>
</match>
</match>
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index af7210c..2240c41 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -33,11 +33,11 @@
<!-- USB Mass Storage devices that are music players -->
- <match key="@storage.physical_device:info.bus" string="usb">
+ <match key="@storage.originating_device:info.subsystem" string="usb">
<!-- Creative -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x41e">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x41e">
<!-- MuVo NX -->
- <match key="@storage.physical_device:usb.product_id" int="0x4115">
+ <match key="@storage.originating_device:usb.product_id" int="0x4115">
<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>
@@ -49,7 +49,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- MuVo2 -->
- <match key="@storage.physical_device:usb.product_id" int="0x4116">
+ <match key="@storage.originating_device:usb.product_id" int="0x4116">
<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>
@@ -61,7 +61,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- Creative MuVo TX -->
- <match key="@storage.physical_device:usb.product_id" int="0x4117">
+ <match key="@storage.originating_device:usb.product_id" int="0x4117">
<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>
@@ -72,7 +72,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- Zen Micro -->
- <match key="@storage.physical_device:usb.product_id" int="0x411e">
+ <match key="@storage.originating_device:usb.product_id" int="0x411e">
<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>
@@ -84,7 +84,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- Zen Nano -->
- <match key="@storage.physical_device:usb.product_id" int="0x412c">
+ <match key="@storage.originating_device:usb.product_id" int="0x412c">
<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>
@@ -93,7 +93,7 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
</match>
<!-- NOMAD Jukebox Zen Xtra -->
- <match key="@storage.physical_device:usb.product_id" int="0x4128">
+ <match key="@storage.originating_device:usb.product_id" int="0x4128">
<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>
@@ -105,7 +105,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- MuVo V200 -->
- <match key="@storage.physical_device:usb.product_id" int="0x4129">
+ <match key="@storage.originating_device:usb.product_id" int="0x4129">
<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>
@@ -116,7 +116,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- MuVo N200 (MuVo Micro) -->
- <match key="@storage.physical_device:usb.product_id" int="0x412b">
+ <match key="@storage.originating_device:usb.product_id" int="0x412b">
<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>
@@ -128,7 +128,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- Zen Micro -->
- <match key="@storage.physical_device:usb.product_id" int="0x4130">
+ <match key="@storage.originating_device:usb.product_id" int="0x4130">
<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>
@@ -142,9 +142,9 @@
</match>
<!-- SONICblue -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x045a">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x045a">
<!-- Rio Forge -->
- <match key="@storage.physical_device:usb.product_id" int="0x5042">
+ <match key="@storage.originating_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>
@@ -159,7 +159,7 @@
</match>
</match>
<!-- Rio Karma -->
- <match key="@storage.physical_device:usb.product_id" int="0x5210">
+ <match key="@storage.originating_device:usb.product_id" int="0x5210">
<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>
@@ -171,7 +171,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- Rio Carbon -->
- <match key="@storage.physical_device:usb.product_id" int="0x5224">
+ <match key="@storage.originating_device:usb.product_id" int="0x5224">
<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>
@@ -184,9 +184,9 @@
</match>
<!--Panasonic -->
- <match key="@storage.physical_deviceusb.vendor_id" int="0x4da">
+ <match key="@storage.originating_deviceusb.vendor_id" int="0x4da">
<!--Panasonic SV-MP31V-->
- <match key="@storage.physical_deviceusb.product_id" int="0x3701">
+ <match key="@storage.originating_deviceusb.product_id" int="0x3701">
<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>
@@ -200,9 +200,9 @@
</match>
<!-- Samsung -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x04e8">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x04e8">
<!-- Samsung Yepp YP-35 -->
- <match key="@storage.physical_device:usb.product_id" int="0x5010">
+ <match key="@storage.originating_device:usb.product_id" int="0x5010">
<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>
@@ -214,7 +214,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- Samsung Yepp YP-ST5 -->
- <match key="@storage.physical_device:usb.product_id" int="0x5021">
+ <match key="@storage.originating_device:usb.product_id" int="0x5021">
<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>
@@ -226,7 +226,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- YP-F1 -->
- <match key="@storage.physical_device:usb.product_id" int="0x502b">
+ <match key="@storage.originating_device:usb.product_id" int="0x502b">
<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>
@@ -238,7 +238,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- Samsung YP-U1 -->
- <match key="@storage.physical_device:usb.product_id" int="0x503b">
+ <match key="@storage.originating_device:usb.product_id" int="0x503b">
<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>
@@ -252,7 +252,7 @@
<append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
</match>
<!-- Samsung YP-Z5 -->
- <match key="@storage.physical_device:usb.product_id" int="0x5041">
+ <match key="@storage.originating_device:usb.product_id" int="0x5041">
<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>
@@ -269,7 +269,7 @@
<append key="portable_audio_player.playlist_path" type="strlist">Playlists/</append>
</match>
<!-- Samsung YP-U2Z -->
- <match key="@storage.physical_device:usb.product_id" int="0x5050">
+ <match key="@storage.originating_device:usb.product_id" int="0x5050">
<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>
@@ -284,9 +284,9 @@
</match>
<!-- Sony -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x54c">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x54c">
<!-- Sony Network Walkman -->
- <match key="@storage.physical_device:usb.product_id" int="0x1fb">
+ <match key="@storage.originating_device:usb.product_id" int="0x1fb">
<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>
@@ -299,8 +299,8 @@
</match>
<!-- Jetflash MP3 Player, AKA NAPA LCD-HD, AKA Medion, AKA Tevion -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x066f">
- <match key="@storage.physical_device:usb.product_id" int="0x8000">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x066f">
+ <match key="@storage.originating_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>
@@ -311,7 +311,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- EXATEL i-BEAD100 Player -->
- <match key="@storage.physical_device:usb.product_id" int="0x8008">
+ <match key="@storage.originating_device:usb.product_id" int="0x8008">
<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>
@@ -322,7 +322,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- Traxdata Digital Audio Player -->
- <match key="@storage.physical_device:usb.product_id" int="0x8038">
+ <match key="@storage.originating_device:usb.product_id" int="0x8038">
<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>
@@ -336,7 +336,7 @@
</match>
</match>
<!-- TrekStor i.Beat 115 -->
- <match key="@storage.physical_device:usb.product_id" int="0x829c">
+ <match key="@storage.originating_device:usb.product_id" int="0x829c">
<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>
@@ -347,7 +347,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- Medion MD41512 / Tevion 41512 -->
- <match key="@storage.physical_device:usb.product_id" int="0x8206">
+ <match key="@storage.originating_device:usb.product_id" int="0x8206">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
<merge key="portable_audio_player.type" type="string">generic</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
@@ -357,7 +357,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
<!-- Jens of Sweeden (JoS) MP-120 -->
- <match key="@storage.physical_device:usb.product_id" int="0x82d4">
+ <match key="@storage.originating_device:usb.product_id" int="0x82d4">
<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>
@@ -371,9 +371,9 @@
</match>
<!-- RCA -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x69b">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x69b">
<!-- Lyra RD2212 -->
- <match key="@storage.physical_device:usb.product_id" int="0x718">
+ <match key="@storage.originating_device:usb.product_id" int="0x718">
<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>
@@ -388,9 +388,9 @@
</match>
<!-- SanDisk -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x781">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x781">
<!-- Sansa e130 -->
- <match key="@storage.physical_device:usb.product_id" int="0x7301">
+ <match key="@storage.originating_device:usb.product_id" int="0x7301">
<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>
@@ -405,8 +405,8 @@
</match>
<!-- Peak Digital Audio Player -->
- <match key="@storage.physical_device:usb.vendor_id" int="0xd7d">
- <match key="@storage.physical_device:usb.product_id" int="0x1651">
+ <match key="@storage.originating_device:usb.vendor_id" int="0xd7d">
+ <match key="@storage.originating_device:usb.product_id" int="0x1651">
<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>
@@ -422,9 +422,9 @@
</match>
<!-- Cowon -->
- <match key="@storage.physical_device:usb.vendor_id" int="0xe21">
+ <match key="@storage.originating_device:usb.vendor_id" int="0xe21">
<!-- iAudio M3 -->
- <match key="@storage.physical_device:usb.product_id" int="0x500">
+ <match key="@storage.originating_device:usb.product_id" int="0x500">
<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>
@@ -441,7 +441,7 @@
<append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
</match>
<!-- iAudio X5 -->
- <match key="@storage.physical_device:usb.product_id" int="0x510">
+ <match key="@storage.originating_device:usb.product_id" int="0x510">
<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>
@@ -458,7 +458,7 @@
<append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
</match>
<!-- iAudio M5 -->
- <match key="@storage.physical_device:usb.product_id" int="0x520">
+ <match key="@storage.originating_device:usb.product_id" int="0x520">
<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>
@@ -475,7 +475,7 @@
<append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
</match>
<!-- iAudio G3 -->
- <match key="@storage.physical_device:usb.product_id" int="0x601">
+ <match key="@storage.originating_device:usb.product_id" int="0x601">
<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>
@@ -490,7 +490,7 @@
<append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
</match>
<!-- iAudio 5 -->
- <match key="@storage.physical_device:usb.product_id" int="0x602">
+ <match key="@storage.originating_device:usb.product_id" int="0x602">
<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>
@@ -505,7 +505,7 @@
<append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
</match>
<!-- iAudio G2 -->
- <match key="@storage.physical_device:usb.product_id" int="0x604">
+ <match key="@storage.originating_device:usb.product_id" int="0x604">
<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>
@@ -520,7 +520,7 @@
<append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
</match>
<!-- iAudio U3 -->
- <match key="@storage.physical_device:usb.product_id" int="0x700">
+ <match key="@storage.originating_device:usb.product_id" int="0x700">
<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>
@@ -545,9 +545,9 @@
</match>
<!-- Archos -->
- <match key="@storage.physical_device:usb.vendor_id" int="0xe79">
+ <match key="@storage.originating_device:usb.vendor_id" int="0xe79">
<!-- Archos GMini 400 -->
- <match key="@storage.physical_device:usb.product_id" int="0x1109">
+ <match key="@storage.originating_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>
@@ -562,7 +562,7 @@
<append key="portable_audio_player.playlist_path" type="strlist">Playlist/</append>
</match>
<!-- Archos XS 100 -->
- <match key="@storage.physical_device:usb.product_id" int="0x1205">
+ <match key="@storage.originating_device:usb.product_id" int="0x1205">
<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>
@@ -575,9 +575,9 @@
</match>
<!-- Sony Ericsson -->
- <match key="@storage.physical_device:usb.vendor_id" int="0xfce">
+ <match key="@storage.originating_device:usb.vendor_id" int="0xfce">
<!-- K750i mobile phone -->
- <match key="@storage.physical_device:usb.product_id" int="0xd016">
+ <match key="@storage.originating_device:usb.product_id" int="0xd016">
<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>
@@ -589,7 +589,7 @@
<!-- W800 Walkman Phone -->
<!-- media files go in mp3/$ARTIST/$ALBUM/$TRACKNAME -->
- <match key="@storage.physical_device:usb.product_id" int="0xd028">
+ <match key="@storage.originating_device:usb.product_id" int="0xd028">
<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>
@@ -601,9 +601,9 @@
</match>
</match>
- <match key="@storage.physical_device:usb.vendor_id" int="0x1006">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x1006">
<!-- iGP 100 -->
- <match key="@storage.physical_device:usb.product_id" int="0x2001">
+ <match key="@storage.originating_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>
@@ -614,7 +614,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- iHP-100,115 -->
- <match key="@storage.physical_device:usb.product_id" int="0x3001">
+ <match key="@storage.originating_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>
@@ -626,7 +626,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- HP-120,140 -->
- <match key="@storage.physical_device:usb.product_id" int="0x3002">
+ <match key="@storage.originating_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>
@@ -638,7 +638,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- H320, H340 -->
- <match key="@storage.physical_device:usb.product_id" int="0x3003">
+ <match key="@storage.originating_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>
@@ -652,9 +652,9 @@
</match>
<!-- TouchStone/WaveX -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x10c7">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x10c7">
<!-- TS-300 -->
- <match key="@storage.physical_device:usb.product_id" int="0xc000">
+ <match key="@storage.originating_device:usb.product_id" int="0xc000">
<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>
@@ -666,9 +666,9 @@
</match>
<!-- Foston -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x10d6">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x10d6">
<!-- Foston 256MB -->
- <match key="@storage.physical_device:usb.product_id" int="0x1100">
+ <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>
@@ -682,9 +682,9 @@
</match>
<!-- Jens of Sweden -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x1332">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x1332">
<!-- MP-130 -->
- <match key="@storage.physical_device:usb.product_id" int="0x1325">
+ <match key="@storage.originating_device:usb.product_id" int="0x1325">
<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>
@@ -699,9 +699,9 @@
</match>
<!-- MSI -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x1462">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x1462">
<!-- MegaStick-1 Flash Stick -->
- <match key="@storage.physical_device:usb.product_id" int="0x5512">
+ <match key="@storage.originating_device:usb.product_id" int="0x5512">
<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>
@@ -713,9 +713,9 @@
</match>
<!-- Motorola -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x22b8">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
<!-- ROKR e2 Memory Card mode -->
- <match key="@storage.physical_device:usb.product_id" int="0x608d">
+ <match key="@storage.originating_device:usb.product_id" int="0x608d">
<merge key="storage.model" type="string">ROKR e2</merge>
<merge key="storage.vendor" type="string">Motorola</merge>
<append key="info.capabilities" type="strlist">portable_audio_player</append>
@@ -730,9 +730,9 @@
</match>
<!-- iRiver -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x4102">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x4102">
<!-- T30 UMS -->
- <match key="@storage.physical_device:usb.product_id" int="0x1018">
+ <match key="@storage.originating_device:usb.product_id" int="0x1018">
<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>
@@ -744,7 +744,7 @@
<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.physical_device:usb.product_id" int="0x1101">
+ <match key="@storage.originating_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>
@@ -755,7 +755,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- iFP 300 UMS (supports application/ogg only after firmware upgrade)-->
- <match key="@storage.physical_device:usb.product_id" int="0x1103">
+ <match key="@storage.originating_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>
@@ -766,7 +766,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- iFP 500 UMS (supports application/ogg only after firmware upgrade)-->
- <match key="@storage.physical_device:usb.product_id" int="0x1105">
+ <match key="@storage.originating_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>
@@ -777,7 +777,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- iFP 700 UMS-->
- <match key="@storage.physical_device:usb.product_id" int="0x1107">
+ <match key="@storage.originating_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>
@@ -789,7 +789,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- iFP 800 UMS-->
- <match key="@storage.physical_device:usb.product_id" int="0x1108">
+ <match key="@storage.originating_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>
@@ -801,7 +801,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- iFP 900 UMS-->
- <match key="@storage.physical_device:usb.product_id" int="0x1109">
+ <match key="@storage.originating_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>
@@ -813,7 +813,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- iFP 1000 UMS-->
- <match key="@storage.physical_device:usb.product_id" int="0x1110">
+ <match key="@storage.originating_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>
@@ -825,7 +825,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- N10 UMS-->
- <match key="@storage.physical_device:usb.product_id" int="0x1111">
+ <match key="@storage.originating_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>
@@ -836,7 +836,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- H10 20GB UMS-->
- <match key="@storage.physical_device:usb.product_id" int="0x2001">
+ <match key="@storage.originating_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>
@@ -848,7 +848,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
<!-- H10 5GB UMS-->
- <match key="@storage.physical_device:usb.product_id" int="0x2002">
+ <match key="@storage.originating_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>
@@ -864,9 +864,9 @@
</match>
<!-- Philips -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x471">
+ <match key="@storage.originating_device:usb.vendor_id" int="0x471">
<!-- Philips GoGear SA1330 -->
- <match key="@storage.physical_device:usb.product_id" int="0x165">
+ <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>
@@ -880,8 +880,8 @@
</match>
<!-- Motorola iTunes enabled phone -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x22b8">
- <match key="@storage.physical_device:usb.product_id" int="0x4810">
+ <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>
@@ -894,8 +894,8 @@
</match>
<!-- Sandisk Corp. Sansa m250 (maybe others as well) -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x0781">
- <match key="@storage.physical_device:usb.product_id" int="0x7401">
+ <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>
@@ -909,8 +909,8 @@
</match>
<!-- TrekStor i.Beat jump MP3 Player -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x066f">
- <match key="@storage.physical_device:usb.product_id" int="0x835d">
+ <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>
@@ -923,8 +923,8 @@
</match>
<!-- Nexia NX58XX (including Super*Talent MegaScreen) -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x1718">
- <match key="@storage.physical_device:usb.product_id" int="0x1013">
+ <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>
@@ -939,8 +939,8 @@
</match>
<!-- Feiya Technology Corp Memory Bar -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x090c">
- <match key="@storage.physical_device:usb.product_id" int="0x1000">
+ <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>
@@ -953,8 +953,8 @@
</match>
<!-- MPMan MP-Ki 128 Player -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x10d6">
- <match key="@storage.physical_device:usb.product_id" int="0x1100">
+ <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>
@@ -968,8 +968,8 @@
</match>
<!-- Sandisk Corp. Sansa e270 (maybe others as well) -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x0781">
- <match key="@storage.physical_device:usb.product_id" int="0x7421">
+ <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>
@@ -986,7 +986,7 @@
<!-- USB devices that are music players but uses a user-space library -->
- <match key="info.bus" string="usb">
+ <match key="info.subsystem" string="usb">
<!-- Archos -->
<match key="usb.vendor_id" int="0xe79">
<!-- GMini 120 -->
diff --git a/fdi/information/10freedesktop/10-usb-pda.fdi b/fdi/information/10freedesktop/10-usb-pda.fdi
index 1133f5e..5de823a 100644
--- a/fdi/information/10freedesktop/10-usb-pda.fdi
+++ b/fdi/information/10freedesktop/10-usb-pda.fdi
@@ -5,7 +5,7 @@
<!-- Pocket PC PDAs -->
<device>
<match key="info.capabilities" contains="serial">
- <match key="@serial.physical_device:info.linux.driver" string="ipaq">
+ <match key="@serial.originating_device:info.linux.driver" string="ipaq">
<append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">pocketpc</merge>
<merge key="info.product" type="string">Pocket PC PDA</merge>
@@ -26,10 +26,10 @@
-->
<device>
<match key="info.capabilities" contains="serial">
- <match key="@serial.physical_device:info.linux.driver" string="visor">
- <match key="@serial.physical_device:usb.vendor_id" int="0x054c">
+ <match key="@serial.originating_device:info.linux.driver" string="visor">
+ <match key="@serial.originating_device:usb.vendor_id" int="0x054c">
<!-- Sony Clie 3.5 -->
- <match key="@serial.physical_device:usb.product_id" int="0x0038">
+ <match key="@serial.originating_device:usb.product_id" int="0x0038">
<match key="serial.port" int="0">
<append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
@@ -37,7 +37,7 @@
</match>
</match>
<!-- Sony Clie SJ-22 -->
- <match key="@serial.physical_device:usb.product_id" int="0x0066">
+ <match key="@serial.originating_device:usb.product_id" int="0x0066">
<match key="serial.port" int="0">
<append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
@@ -52,10 +52,10 @@
<!-- Handspring -->
<device>
<match key="info.capabilities" contains="serial">
- <match key="@serial.physical_device:info.linux.driver" string="visor">
- <match key="@serial.physical_device:usb.vendor_id" int="0x082d">
+ <match key="@serial.originating_device:info.linux.driver" string="visor">
+ <match key="@serial.originating_device:usb.vendor_id" int="0x082d">
<!-- Visor -->
- <match key="@serial.physical_device:usb.product_id" int="0x0100">
+ <match key="@serial.originating_device:usb.product_id" int="0x0100">
<match key="serial.port" int="1">
<append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
@@ -70,10 +70,10 @@
<!-- Known Palm PDAs from Palm, Inc. -->
<device>
<match key="info.capabilities" contains="serial">
- <match key="@serial.physical_device:info.linux.driver" string="visor">
- <match key="@serial.physical_device:usb.vendor_id" int="0x0830">
+ <match key="@serial.originating_device:info.linux.driver" string="visor">
+ <match key="@serial.originating_device:usb.vendor_id" int="0x0830">
<!-- Palm m130 -->
- <match key="@serial.physical_device:usb.product_id" int="0x0050">
+ <match key="@serial.originating_device:usb.product_id" int="0x0050">
<match key="serial.port" int="0">
<append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
@@ -81,7 +81,7 @@
</match>
</match>
<!-- Tungsten T5 -->
- <match key="@serial.physical_device:usb.product_id" int="0x0061">
+ <match key="@serial.originating_device:usb.product_id" int="0x0061">
<match key="serial.port" int="1">
<append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
@@ -96,7 +96,7 @@
<!-- All the other PalmOS PDAs as fallback -->
<device>
<match key="info.capabilities" contains="serial">
- <match key="@serial.physical_device:info.linux.driver" string="visor">
+ <match key="@serial.originating_device:info.linux.driver" string="visor">
<match key="pda.platform" exists="false">
<match key="serial.port" int="0">
<append key="info.capabilities" type="strlist">pda</append>
diff --git a/fdi/information/10freedesktop/10-usbcsr-mice.fdi b/fdi/information/10freedesktop/10-usbcsr-mice.fdi
index 8d66605..ae0f25e 100644
--- a/fdi/information/10freedesktop/10-usbcsr-mice.fdi
+++ b/fdi/information/10freedesktop/10-usbcsr-mice.fdi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
<device>
- <match key="info.bus" string="usb_device">
+ <match key="info.subsystem" string="usb_device">
<match key="usb_device.vendor_id" int="0x046d"> <!-- Logitech, Inc. -->
<!-- Receiver for MX1000 Laser -->
More information about the hal-commit
mailing list