hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-obex.fdi |   26 ++++++++++++++++++++++++++
 fdi/information/10freedesktop/Makefile.am     |    3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit 370d778d8eb79529b874212ca504824f808f4dc0
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Oct 20 15:38:34 2008 +0200

    added 10-usb-obex.fdi to identify obex devices
    
    Added 10-usb-obex.fdi to identify obex devices. Adopted (to final
    spec of the obex namespace) version of a patch from Alex Kanavin
    <ak at sensi.org>, contributed via HAL ML.

diff --git a/fdi/information/10freedesktop/10-usb-obex.fdi b/fdi/information/10freedesktop/10-usb-obex.fdi
new file mode 100644
index 0000000..66e3017
--- /dev/null
+++ b/fdi/information/10freedesktop/10-usb-obex.fdi
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.subsystem" string="usb">
+      <match key="usb.interface.class" int="0x02">
+        <match key="usb.interface.subclass" int="0x0b">
+          <merge key="info.category" type="string">obex</merge>
+          <append key="info.capabilities" type="strlist">obex</append>
+          <match key="usb.interface.description" contains_ncase="pc suite">
+            <merge key="obex.type" type="string">pcsuite</merge>
+          </match>  
+          <match key="usb.interface.description" contains_ncase="syncml">
+            <merge key="obex.type" type="string">syncml</merge>
+          </match>
+          <match key="usb.interface.description" contains_ncase="syncml-sync">
+            <merge key="obex.type" type="string">syncml-sync</merge>
+          </match>
+          <match key="usb.interface.description" contains_ncase="syncml-dm">
+            <merge key="obex.type" type="string">syncml-dm</merge>
+          </match>
+        </match>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 790cd92..458be4b 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -10,7 +10,8 @@ dist_fdi_DATA = 10-usb-card-readers.fdi		\
 		10-laptop-panel-hardware.fdi	\
 		10-cd-dvd-burner.fdi		\
 		10-battery.fdi			\
-		10-modem.fdi
+		10-modem.fdi			\
+		10-usb-obex.fdi
 
 if BUILD_KILLSWITCH_DELL_WLAN
 dist_fdi_DATA += 10-dell-rfkill-switch-wlan.fdi