[PATCH] set capabilities and modem command sets for HSO modems

[Colin Watson]

Option N.V. mobile broadband modems have a number of interfaces. This
patch sets appropriate capabilities and modem command sets for them
based on the hsotype sysfs attribute. With this, the corresponding patch
to HAL to set info.hsotype, and a kernel patch to stop usb-storage
binding to the ZeroCD interface
(https://lists.one-eyed-alien.net/pipermail/usb-storage/2009-January/004499.html),
the modem works out of the box with NetworkManager.

This is loosely based on a similar FDI file supplied by Option in their
hso-udev package, but is integrated with the existing modem rules, and
omits some net.80203 -> net.wwan changes which Alexander Sack tells me
are not needed by NetworkManager (and it certainly appears to work
without those).

Signed-off-by: Colin Watson <cjwatson at canonical.com>
---
 fdi/information/10freedesktop/10-modem.fdi |   30 ++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 03aae4f..8fdeb56 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -112,6 +112,36 @@
           </match>
         </match>
 
+        <match key="info.hsotype" string="Control">
+          <merge key="info.category" type="string">wwan</merge>
+          <append key="info.capabilities" type="strlist">serial</append>
+          <append key="info.capabilities" type="strlist">wwan</append>
+          <remove key="modem.command_sets"></remove>
+        </match>
+        <match key="info.hsotype" contains="Application">
+          <merge key="info.category" type="string">wwan</merge>
+          <append key="info.capabilities" type="strlist">serial</append>
+          <append key="info.capabilities" type="strlist">wwan</append>
+          <remove key="modem.command_sets"></remove>
+        </match>
+        <match key="info.hsotype" contains="Diagnostic">
+          <merge key="info.category" type="string">debug</merge>
+          <append key="info.capabilities" type="strlist">serial</append>
+          <append key="info.capabilities" type="strlist">debug</append>
+          <remove key="modem.command_sets"></remove>
+        </match>
+        <match key="info.hsotype" string="Modem">
+          <append key="info.capabilities" type="strlist">serial</append>
+          <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 key="info.hsotype" contains="GPS">
+          <merge key="info.category" type="string">GPS</merge>
+          <append key="info.capabilities" type="strlist">serial</append>
+          <append key="info.capabilities" type="strlist">GPS</append>
+          <remove key="modem.command_sets"></remove>
+        </match>
       </match>
 
       <!-- HTC Apache SPV C500 Smart Phone (Verizon XV6700) -->
-- 
1.6.0.4


--XSfi1pJWPNAvuBPy--