hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-modem.fdi |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 113cbe13dfb3935eeafec66ebbd813b358f7178b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Dec 5 14:18:07 2008 +0100

    fixed 0x0af0:0x7011 modem for hso and option driver
    
    Fixed Option USB modem 0x0af0:0x7011 to work with the hso and the
    option linux kernel driver. Both drivers use different ports for
    the same card.

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 5a4b410..e798c1e 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -96,9 +96,19 @@
         </match>
 
         <match key="@info.parent:usb.product_id" int_outof="0x7011">
-          <match key="@info.parent:usb.interface.number" int="2">
-            <append key="modem.command_sets" type="strlist">GSM-07.07</append>
-            <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+	  <match key="@serial.originating_device:info.linux.driver" string="hso">
+	    <match key="@info.parent:usb.interface.number" int="0">
+	      <match key="serial.port" int="0">
+                <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+                <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+              </match>
+            </match>
+          </match>
+	  <match key="@serial.originating_device:info.linux.driver" string="option">
+            <match key="@info.parent:usb.interface.number" int="2">
+              <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+              <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+            </match>
           </match>
         </match>