hal-info: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Wed Jan 28 05:30:29 PST 2009
fdi/information/10freedesktop/10-camera-ptp.fdi | 2
fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi | 2
fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi | 2
fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi | 2
fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi | 2
fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi | 2
fdi/information/10freedesktop/10-scanner.fdi | 2
fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi | 2
fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi | 2
fdi/information/10freedesktop/10-usb-music-players.fdi | 4 -
fdi/information/10freedesktop/10-usb-pda.fdi | 32 +++++-----
11 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit e144c0831ba11233e0b64bca645e8f7a2513465c
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Jan 28 14:29:16 2009 +0100
replace append with addset for some info.capabilities entries
Replaced append with addset FDI-directive for some
info.capabilities entries to prevent getting a capability
added twice or more times.
diff --git a/fdi/information/10freedesktop/10-camera-ptp.fdi b/fdi/information/10freedesktop/10-camera-ptp.fdi
index 9890e3f..654c45b 100644
--- a/fdi/information/10freedesktop/10-camera-ptp.fdi
+++ b/fdi/information/10freedesktop/10-camera-ptp.fdi
@@ -7,7 +7,7 @@
<match key="usb.interface.subclass" int="0x01">
<match key="usb.interface.protocol" int="0x01">
<merge key="info.category" type="string">camera</merge>
- <append key="info.capabilities" type="strlist">camera</append>
+ <addset key="info.capabilities" type="strlist">camera</addset>
<merge key="camera.access_method" type="string">ptp</merge>
</match>
</match>
diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
index 21c3880..b60f21c 100644
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
@@ -18,7 +18,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/dell_bluetooth_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.category" type="string">killswitch</merge>
<merge key="info.product" type="string">Dell Bluetooth Switch</merge>
<merge key="killswitch.type" type="string">bluetooth</merge>
diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
index 26acf09..7228c44 100644
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
@@ -18,7 +18,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/dell_wlan_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.product" type="string">Dell WLAN Switch</merge>
<merge key="info.category" type="string">killswitch</merge>
<merge key="killswitch.type" type="string">wlan</merge>
diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
index 2d94a24..2d05273 100644
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
@@ -18,7 +18,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/dell_wwan_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.product" type="string">Dell WWAN Switch</merge>
<merge key="info.category" type="string">killswitch</merge>
<merge key="killswitch.type" type="string">wwan</merge>
diff --git a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
index c7aa553..2347998 100644
--- a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
+++ b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
@@ -15,7 +15,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/ipw_wlan_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.product" type="string">Intel PRO/Wireless WLAN Switch</merge>
<merge key="info.category" type="string">killswitch</merge>
<merge key="killswitch.type" type="string">wlan</merge>
diff --git a/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi b/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi
index 5e2ab51..b29ea7c 100644
--- a/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi
+++ b/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi
@@ -15,7 +15,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/iwl_wlan_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.product" type="string">Intel PRO/Wireless WLAN Switch</merge>
<merge key="info.category" type="string">killswitch</merge>
<merge key="killswitch.type" type="string">wlan</merge>
diff --git a/fdi/information/10freedesktop/10-scanner.fdi b/fdi/information/10freedesktop/10-scanner.fdi
index d329480..9a02857 100644
--- a/fdi/information/10freedesktop/10-scanner.fdi
+++ b/fdi/information/10freedesktop/10-scanner.fdi
@@ -6,7 +6,7 @@
<device>
<match key="info.category" string="scsi_generic">
<match key="@info.parent:scsi.type" string="scanner">
- <append key="info.capabilities" type="strlist">scanner</append>
+ <addset key="info.capabilities" type="strlist">scanner</addset>
</match>
</match>
</device>
diff --git a/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi b/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
index d833040..98b7432 100644
--- a/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
+++ b/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
@@ -17,7 +17,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/sonypic_bluetooth_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.category" type="string">killswitch</merge>
<merge key="info.product" type="string">Sony Bluetooth Switch</merge>
<merge key="killswitch.type" type="string">bluetooth</merge>
diff --git a/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi b/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
index 979da51..676dac2 100644
--- a/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
+++ b/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
@@ -12,7 +12,7 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/thinkpad_bluetooth_switch">
- <append key="info.capabilities" type="strlist">killswitch</append>
+ <addset key="info.capabilities" type="strlist">killswitch</addset>
<merge key="info.category" type="string">killswitch</merge>
<merge key="info.product" type="string">ThinkPad Bluetooth Switch</merge>
<merge key="killswitch.type" type="string">bluetooth</merge>
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index eedd196..29f8234 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -981,7 +981,7 @@
<match key="portable_audio_player.access_method.protocols" contains="storage">
<merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
</match>
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
<merge key="info.category" type="string">portable_audio_player</merge>
<!-- all player in the list above support this output format -->
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
@@ -993,7 +993,7 @@
<!-- Sony PSP (PlayStation Portable) -->
<match key="storage.vendor" prefix_ncase="sony">
<match key="storage.model" contains="PSP">
- <append key="info.capabilities" type="strlist">portable_audio_player</append>
+ <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
<!-- NOTE: for backward compatibility until key get removed finally -->
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
diff --git a/fdi/information/10freedesktop/10-usb-pda.fdi b/fdi/information/10freedesktop/10-usb-pda.fdi
index 1e9861e..f2bc1db 100644
--- a/fdi/information/10freedesktop/10-usb-pda.fdi
+++ b/fdi/information/10freedesktop/10-usb-pda.fdi
@@ -6,7 +6,7 @@
<match key="info.capabilities" contains="serial">
<!-- Pocket PC PDAs -->
<match key="@serial.originating_device:info.linux.driver" string="ipaq">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">pocketpc</merge>
<merge key="info.product" type="string">Pocket PC PDA</merge>
<merge key="pda.pocketpc.hotsync_interface" type="copy_property">serial.device</merge>
@@ -29,7 +29,7 @@
<!-- Sony Clie: 3.5, SJ-22 -->
<match key="@serial.originating_device:usb.product_id" int_outof="0x0038;0x0066">
<match key="serial.port" int="0">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
</match>
@@ -41,7 +41,7 @@
<!-- Visor -->
<match key="@serial.originating_device:usb.product_id" int="0x0100">
<match key="serial.port" int="1">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
</match>
@@ -53,7 +53,7 @@
<!-- Palm m130 -->
<match key="@serial.originating_device:usb.product_id" int="0x0050">
<match key="serial.port" int="0">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
</match>
@@ -61,7 +61,7 @@
<!-- Tungsten T5 -->
<match key="@serial.originating_device:usb.product_id" int="0x0061">
<match key="serial.port" int="1">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
</match>
@@ -71,12 +71,12 @@
<!-- All the other PalmOS PDAs as fallback -->
<match key="pda.platform" exists="false">
<match key="serial.port" int="0">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
</match>
<match key="serial.port" int="1">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
</match>
@@ -94,7 +94,7 @@
Sony S360, Sony NR70V/U, Sony NX, Sony NZ, Sony UX, Sony TJ
-->
<match key="usb_device.product_id" int_outof="0x000a;0x0038;0x0066;0x0095;0x009a;0x00da;0x00e9;0x0144;0x0169">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -104,7 +104,7 @@
<match key="usb_device.vendor_id" int="0x082d">
<!-- Visor/Treo 300, Treo, Treo 600 -->
<match key="usb_device.product_id" int_outof="0x0100;0x0200;0x0300">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -116,7 +116,7 @@
(Tungsten series, Zire 71), 3x(Zire 21, 31, 72, Z22, Tungsten E2, T3, TX, Treo 650, 680, LifeDrive),
2x Zire, m100, 2y unknown -->
<match key="usb_device.product_id" int_outof="0x0001;0x0002;0x0003;0x0010;0x0011;0x0020;0x0030;0x0031;0x0040;0x0050;0x0051;0x0052;0x0053;0x0060;0x0061;0x0062;0x0063;0x0070;0x0071;0x0080;0x0099;0x0100">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -126,7 +126,7 @@
<match key="usb_device.vendor_id" int="0x04e8">
<!-- i330 -->
<match key="usb_device.product_id" int="0x8001">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -136,7 +136,7 @@
<match key="usb_device.vendor_id" int="0x091e">
<!-- IQUE 3600 -->
<match key="usb_device.product_id" int="0x0004">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -146,7 +146,7 @@
<match key="usb_device.vendor_id" int="0x0c88">
<!-- 7135 Smartphone, 6035 Smartphone -->
<match key="usb_device.product_id" int_outof="0x0021;0xa226">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -156,7 +156,7 @@
<match key="usb_device.vendor_id" int="0x12ef">
<!-- Zodiac, Zodiac2 -->
<match key="usb_device.product_id" int="0x0100">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -166,7 +166,7 @@
<match key="usb_device.vendor_id" int="0x4766">
<!-- MEZ1000 -->
<match key="usb_device.product_id" int="0x0001">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
@@ -176,7 +176,7 @@
<match key="usb_device.vendor_id" int="0x081e">
<!-- Alphasmart Dana -->
<match key="usb_device.product_id" int="0xdf00">
- <append key="info.capabilities" type="strlist">pda</append>
+ <addset key="info.capabilities" type="strlist">pda</addset>
<merge key="pda.platform" type="string">palm</merge>
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
More information about the hal-commit
mailing list