hal-info: Branch 'master'

[Dan Williams]

 fdi/information/10freedesktop/10-modem.fdi |   48 ++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 11 deletions(-)

New commits:
commit 9bbb69d3ca39bff58435d8e9c6d405292d5b56d7
Author: Dan Williams <dcbw at redhat.com>
Date:   Wed Sep 24 10:50:34 2008 -0400

    Additional mobile broadband devices
    
    Three more Dell cards, an Ericsson card, and one from AXESSTEL.

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index a8cdc12..5ddadef 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -215,22 +215,24 @@
       <!-- Dell Wireless -->
       <match key="@info.parent:usb.vendor_id" int="0x413c">
         <!-- 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO,
-	     5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO,
-	     5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO,
-	     5720 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E725 CDMA/EV-DO,
-	  -->
-        <match key="@info.parent:usb.product_id" int_outof="0x8114;0x8117;0x8128;0x8133">
+             5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO,
+             2x 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO,
+             5720 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E725 CDMA/EV-DO,
+        -->
+        <match key="@info.parent:usb.product_id" int_outof="0x8114;0x8117;0x8128;0x8129;0x8133">
           <match key="@info.parent:usb.interface.number" int="0">
             <append key="info.capabilities" type="strlist">modem</append>
             <append key="modem.command_sets" type="strlist">IS-707-A</append>
           </match>
         </match>
-	<!-- 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G,
-	     505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G,
-	     5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G,
-	     HSDPA 5520,
-	  -->
-        <match key="@info.parent:usb.product_id" int_outof="0x8115;0x8116;0x8118;0x8136;0x8137">
+        <!-- 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G,
+             505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G,
+             5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G,
+             HSDPA 5520,
+             2x 5520 Voda I Mobile Broadband (3G HSDPA) Minicard,
+             5530 Mobile Broadband (3G HSPA) Mini-Card
+        -->
+        <match key="@info.parent:usb.product_id" int_outof="0x8115;0x8116;0x8118;0x8136;0x8137;0x8138;0x8147">
           <match key="@info.parent:usb.interface.number" int="0">
             <append key="info.capabilities" type="strlist">modem</append>
             <append key="modem.command_sets" type="strlist">GSM-07.07</append>
@@ -319,6 +321,30 @@
         </match>
       </match>
 
+      <!-- Ericsson -->
+      <match key="@info.parent:usb.vendor_id" int="0x0bdb">
+        <!-- Ericsson F3507g Mobile Broadband Minicard -->
+        <match key="@info.parent:usb.product_id" int="0x1900">
+          <match key="@info.parent:usb.interface.number" int="2">
+            <append key="info.capabilities" type="strlist">modem</append>
+            <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>
+
+      <!-- AXESSTEL modem -->
+      <match key="@info.parent:usb.vendor_id" int="0x1726">
+        <match key="@info.parent:usb.product_id" int="0x1000">
+          <match key="@info.parent:usb.interface.number" int="0">
+            <match key="serial.port" int="0">
+              <append key="info.capabilities" type="strlist">modem</append>
+              <append key="modem.command_sets" type="strlist">IS-707-A</append>
+            </match>
+          </match>
+        </match>
+      </match>
+
       <!-- Communication Device Class Abstract Control Model (CDC ACM) modems,
            typically provided by GSM/CDMA phones -->
       <match key="@info.parent:usb.interface.class" int="0x02">