hal-info: Branch 'master' - 3 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Tue Nov 18 08:36:26 PST 2008
fdi/information/10freedesktop/10-modem.fdi | 304 ++++++++++++++---------------
1 file changed, 152 insertions(+), 152 deletions(-)
New commits:
commit 5b109b7bd63feff45b912625ba29bc702f623503
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Nov 18 17:35:52 2008 +0100
removed some V.250 command set entries
Removed some V.250 command set entries on USB devices since they
get already added by a generic rule.
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index d84f830..8a22422 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -35,7 +35,6 @@
<match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x72">
<match key="@info.parent:usb.interface.class" int="0x02">
<match key="@info.parent:usb.interface.subclass" int="0x02">
- <append key="modem.command_sets" type="strlist">V.250</append>
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
</match>
@@ -301,7 +300,6 @@
<match key="@info.parent:usb.product_id" int_outof="0x6402;0x4902">
<match key="@info.parent:usb.interface.class" int="0x02">
<match key="@info.parent:usb.interface.subclass" int="0x02">
- <append key="modem.command_sets" type="strlist">V.250</append>
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
</match>
commit 301462a8a62b5894c580c1b83597e3fac5e1970e
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Nov 18 17:35:21 2008 +0100
cleand up modem entries, merged some entries
Cleaned up modem entries, merged some entries with the same vendor.
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 315eb7f..d84f830 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -139,7 +139,6 @@
</match>
</match>
-
<!-- LG -->
<match key="@info.parent:usb.vendor_id" int="0x1004">
<!-- U990 -->
@@ -149,7 +148,6 @@
</match>
</match>
-
<!-- Pantech -->
<match key="@info.parent:usb.vendor_id" int="0x106c">
<!-- PC5740, PC5750, UM150 EVDO rev A card, UM175 EVDO rev A -->
@@ -259,14 +257,8 @@
</match>
<match key="@info.parent:usb.vendor_id" int="0x19d2">
- <!-- Qualcomm: Telstra/NextG CDMA -->
- <match key="@info.parent:usb.product_id" int="0x0001">
- <match key="@info.parent:usb.interface.number" int="0">
- <append key="modem.command_sets" type="strlist">IS-707-A</append>
- </match>
- </match>
- <!-- ZTE CDMA Tech -->
- <match key="@info.parent:usb.product_id" int="0xfffe">
+ <!-- Qualcomm: Telstra/NextG CDMA , ZTE CDMA Tech -->
+ <match key="@info.parent:usb.product_id" int_outof="0x0001;0xfffe">
<match key="@info.parent:usb.interface.number" int="0">
<append key="modem.command_sets" type="strlist">IS-707-A</append>
</match>
@@ -298,8 +290,8 @@
</match>
<match key="@info.parent:usb.vendor_id" int="0x22b8">
- <!-- BUSlink UM-864GW USB GPRS Modem (Model SCWi275u) -->
- <match key="@info.parent:usb.product_id" int="0x3802">
+ <!-- BUSlink UM-864GW USB GPRS Modem (Model SCWi275u), Motorola G24 USB GPRS Modem -->
+ <match key="@info.parent:usb.product_id" int_outof="0x3802;0x4902">
<match key="@info.parent:usb.interface.number" int="0">
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
@@ -315,13 +307,6 @@
</match>
</match>
</match>
- <!-- Motorola G24 USB GPRS Modem -->
- <match key="@info.parent:usb.product_id" int="0x4902">
- <match key="@info.parent:usb.interface.number" 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>
<!-- Dell Wireless -->
commit 295884f6abe8e84553c0a50172d70abce9a81d34
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Nov 18 17:34:10 2008 +0100
sorted modem entries
Reorganised existing modem entries. Put the USB, PCMCIA and PCI
entries together in sections and sorted them after the vendor IDs.
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index e7e1ba2..315eb7f 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -4,6 +4,18 @@
<device>
<match key="info.category" string="serial">
+<!-- *****************************************************
+ USB devices
+ ***************************************************** -->
+
+ <!-- Communication Device Class Abstract Control Model (CDC ACM) modems,
+ typically provided by GSM/CDMA phones -->
+ <match key="@info.parent:usb.interface.class" int="0x02">
+ <match key="@info.parent:usb.interface.subclass" int="0x02">
+ <append key="modem.command_sets" type="strlist">V.250</append>
+ </match>
+ </match>
+
<!-- Vendor: HP -->
<match key="@info.parent:usb.vendor_id" int="0x03f0">
<!-- HP HS2300 (Sierra Wireless MC8775) -->
@@ -17,6 +29,20 @@
</match>
</match>
+ <!-- Nokia -->
+ <match key="@info.parent:usb.vendor_id" int="0x421">
+ <!-- 6300/3109c/6120 Classic/E71/E70/N95-3/E90/N70/E61/N95-2/N96/N82 -->
+ <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x72">
+ <match key="@info.parent:usb.interface.class" int="0x02">
+ <match key="@info.parent:usb.interface.subclass" int="0x02">
+ <append key="modem.command_sets" type="strlist">V.250</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>
+ </match>
+
<!-- Samsung SGH-A707 (AT&T Sync) -->
<match key="@info.parent:usb.vendor_id" int="0x04e8">
<match key="@info.parent:usb.product_id" int="0x6601">
@@ -27,6 +53,16 @@
</match>
</match>
+ <!-- NEC -->
+ <match key="@info.parent:usb.vendor_id" int="0xaae">
+ <!-- emobile -->
+ <match key="@info.parent:usb.product_id" int="0x1c">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+
<!-- Option -->
<match key="@info.parent:usb.vendor_id" int="0x0af0">
<!-- Colt,Ricola,Ricola Light,Ricola Quad,Ricola Quad Light,Ricola Ndis,Ricola Ndis Light, Ricola Ndis Quad,Ricola Ndis Quad Light,
@@ -50,6 +86,17 @@
</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="4">
+ <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>
+
<!-- Kyocera -->
<match key="@info.parent:usb.vendor_id" int="0x0c88">
<!-- KPC680,KPC650/Passport, -->
@@ -82,6 +129,37 @@
</match>
</match>
+ <!-- Sony Ericsson K750i -->
+ <match key="@info.parent:usb.vendor_id" int="0x0fce">
+ <match key="@info.parent:usb.product_id" int="0xd016">
+ <match key="@info.parent:usb.interface.number" int="1">
+ <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>
+
+
+ <!-- LG -->
+ <match key="@info.parent:usb.vendor_id" int="0x1004">
+ <!-- U990 -->
+ <match key="@info.parent:usb.product_id" int="0x6000">
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
+
+
+ <!-- Pantech -->
+ <match key="@info.parent:usb.vendor_id" int="0x106c">
+ <!-- PC5740, PC5750, UM150 EVDO rev A card, UM175 EVDO rev A -->
+ <match key="@info.parent:usb.product_id" int_outof="0x3701;0x3702;0x3711;0x3714">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+
<!-- Sierra Wireless -->
<match key="@info.parent:usb.vendor_id" int="0x1199">
<!-- EM5625,2x MC5720,2x MC5725,AirCard 595,AirCard 597E,USB Dongle 595U,AirCard 580, Compass 597 -->
@@ -127,35 +205,6 @@
</match>
</match>
- <match key="@info.parent:usb.vendor_id" int="0x19d2">
- <!-- Qualcomm: Telstra/NextG CDMA -->
- <match key="@info.parent:usb.product_id" int="0x0001">
- <match key="@info.parent:usb.interface.number" int="0">
- <append key="modem.command_sets" type="strlist">IS-707-A</append>
- </match>
- </match>
- <!-- ZTE CDMA Tech -->
- <match key="@info.parent:usb.product_id" int="0xfffe">
- <match key="@info.parent:usb.interface.number" int="0">
- <append key="modem.command_sets" type="strlist">IS-707-A</append>
- </match>
- </match>
- <!-- ZTE MF628 HSDPA USB dongle -->
- <match key="@info.parent:usb.product_id" int="0x0015">
- <match key="@info.parent:usb.interface.number" int="3">
- <append key="modem.command_sets" type="strlist">GSM-07.07</append>
- <append key="modem.command_sets" type="strlist">GSM-07.05</append>
- </match>
- </match>
- <!-- ONDA MF632 HSDPA USB dongle -->
- <match key="@info.parent:usb.product_id" int="0x002">
- <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>
-
<!-- Novatel -->
<match key="@info.parent:usb.vendor_id" int="0x1410">
<!-- Merlin XS620/S640,S620,EX720,S720,EV620 CDMA/EV-DO,ES620/Merlin ES720/Ovation U720,ES620 SM Bus,U727 -->
@@ -183,14 +232,59 @@
</match>
</match>
- <!-- Pantech -->
- <match key="@info.parent:usb.vendor_id" int="0x106c">
- <!-- PC5740, PC5750, UM150 EVDO rev A card, UM175 EVDO rev A -->
- <match key="@info.parent:usb.product_id" int_outof="0x3701;0x3702;0x3711;0x3714">
+ <!-- CMOTECH -->
+ <match key="@info.parent:usb.vendor_id" int="0x16d8">
+ <!-- C-motech CNU-550, CNU-680 (USB, EV-DO) -->
+ <match key="@info.parent:usb.product_id" int_outof="0x5543;0x680a">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ <match key="@info.parent:usb.product_id" int="0x6280">
+ <match key="@info.parent:usb.interface.number" int="1">
+ <append key="modem.command_sets" type="strlist">IS-707-A</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="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+ </match>
+
+ <match key="@info.parent:usb.vendor_id" int="0x19d2">
+ <!-- Qualcomm: Telstra/NextG CDMA -->
+ <match key="@info.parent:usb.product_id" int="0x0001">
<match key="@info.parent:usb.interface.number" int="0">
<append key="modem.command_sets" type="strlist">IS-707-A</append>
</match>
</match>
+ <!-- ZTE CDMA Tech -->
+ <match key="@info.parent:usb.product_id" int="0xfffe">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ <!-- ZTE MF628 HSDPA USB dongle -->
+ <match key="@info.parent:usb.product_id" int="0x0015">
+ <match key="@info.parent:usb.interface.number" int="3">
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
+ <!-- ONDA MF632 HSDPA USB dongle -->
+ <match key="@info.parent:usb.product_id" int="0x002">
+ <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>
<!-- Bandrich C100 1/2 -->
@@ -257,6 +351,21 @@
</match>
</match>
+<!-- *****************************************************
+ PCMCIA cards
+ ***************************************************** -->
+
+ <!-- Hayes Accura V.92 Modem PC Card -->
+ <match key="@info.parent:pcmcia.card_id" int="0">
+ <match key="@info.parent:pcmcia.manf_id" int="19">
+ <match key="@info.parent:pcmcia.prod_id1" string="Hayes">
+ <match key="@info.parent:pcmcia.prod_id2" string="V92 PC Card">
+ <append key="modem.command_sets" type="strlist">V.250</append>
+ </match>
+ </match>
+ </match>
+ </match>
+
<!-- Sierra Wireless 850/860 -->
<match key="@info.parent:pcmcia.card_id" int="1808">
<match key="@info.parent:pcmcia.manf_id" int="402">
@@ -267,6 +376,17 @@
</match>
</match>
+ <!-- Best Data 56Kbps(Cirrus) Fax Modem PC Card (56SPC) -->
+ <match key="@info.parent:pcmcia.card_id" int="0x88">
+ <match key="@info.parent:pcmcia.manf_id" int="0x14e">
+ <match key="@info.parent:pcmcia.prod_id1" string="PCMCIA V92 FAX Modem CARD">
+ <match key="@info.parent:pcmcia.prod_id2" string="FM56C-NFS">
+ <append key="modem.command_sets" type="strlist">V.250</append>
+ </match>
+ </match>
+ </match>
+ </match>
+
<!-- T-Mobile IPWireless 4G (IPWireless 3G Data Modem) -->
<match key="@info.parent:pcmcia.card_id" int="0x200">
<match key="@info.parent:pcmcia.manf_id" int="0x2f2">
@@ -281,27 +401,9 @@
</match>
</match>
- <!-- Hayes Accura V.92 Modem PC Card -->
- <match key="@info.parent:pcmcia.card_id" int="0">
- <match key="@info.parent:pcmcia.manf_id" int="19">
- <match key="@info.parent:pcmcia.prod_id1" string="Hayes">
- <match key="@info.parent:pcmcia.prod_id2" string="V92 PC Card">
- <append key="modem.command_sets" type="strlist">V.250</append>
- </match>
- </match>
- </match>
- </match>
-
- <!-- Best Data 56Kbps(Cirrus) Fax Modem PC Card (56SPC) -->
- <match key="@info.parent:pcmcia.card_id" int="0x88">
- <match key="@info.parent:pcmcia.manf_id" int="0x14e">
- <match key="@info.parent:pcmcia.prod_id1" string="PCMCIA V92 FAX Modem CARD">
- <match key="@info.parent:pcmcia.prod_id2" string="FM56C-NFS">
- <append key="modem.command_sets" type="strlist">V.250</append>
- </match>
- </match>
- </match>
- </match>
+<!-- *****************************************************
+ PCI devices
+ ***************************************************** -->
<!-- Option Fusion+ UMTS HSDPA card -->
<match key="info.category" string="serial">
@@ -315,94 +417,9 @@
</match>
</match>
- <!-- CMOTECH -->
- <match key="@info.parent:usb.vendor_id" int="0x16d8">
- <!-- C-motech CNU-550, CNU-680 (USB, EV-DO) -->
- <match key="@info.parent:usb.product_id" int_outof="0x5543;0x680a">
- <match key="@info.parent:usb.interface.number" int="0">
- <append key="modem.command_sets" type="strlist">IS-707-A</append>
- </match>
- </match>
- <match key="@info.parent:usb.product_id" int="0x6280">
- <match key="@info.parent:usb.interface.number" int="1">
- <append key="modem.command_sets" type="strlist">IS-707-A</append>
- </match>
- </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="4">
- <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="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">
- <match key="@info.parent:usb.interface.subclass" int="0x02">
- <append key="modem.command_sets" type="strlist">V.250</append>
- </match>
- </match>
-
- <!-- Nokia -->
- <match key="@info.parent:usb.vendor_id" int="0x421">
- <!-- 6300/3109c/6120 Classic/E71/E70/N95-3/E90/N70/E61/N95-2/N96/N82 -->
- <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x72">
- <match key="@info.parent:usb.interface.class" int="0x02">
- <match key="@info.parent:usb.interface.subclass" int="0x02">
- <append key="modem.command_sets" type="strlist">V.250</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>
- </match>
-
- <!-- LG -->
- <match key="@info.parent:usb.vendor_id" int="0x1004">
- <!-- U990 -->
- <match key="@info.parent:usb.product_id" int="0x6000">
- <append key="modem.command_sets" type="strlist">GSM-07.07</append>
- <append key="modem.command_sets" type="strlist">GSM-07.05</append>
- </match>
- </match>
-
- <!-- NEC -->
- <match key="@info.parent:usb.vendor_id" int="0xaae">
- <!-- emobile -->
- <match key="@info.parent:usb.product_id" int="0x1c">
- <match key="@info.parent:usb.interface.number" int="0">
- <append key="modem.command_sets" type="strlist">IS-707-A</append>
- </match>
- </match>
- </match>
-
- <!-- Sony Ericsson K750i -->
- <match key="@info.parent:usb.vendor_id" int="0x0fce">
- <match key="@info.parent:usb.product_id" int="0xd016">
- <match key="@info.parent:usb.interface.number" int="1">
- <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>
-
+<!-- *****************************************************
+ generic keys
+ ***************************************************** -->
<!-- set common properties for all above matched modem devices -->
<match key="modem.command_sets" exists="true">
More information about the hal-commit
mailing list