udev: Add support for Sierra device detection

diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index d1d18b2..04e58ff 100644 (file)
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -10,6 +10,9 @@ SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="?*", ATTRS{bInterfaceClass}=="ff",
 # Qualcomm Gobi 2000 (Lenovo)
 ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9205", ENV{OFONO_IFACE_NUM}=="02", ENV{OFONO_GOBI_TYPE}="modem"
 
+# Sierra Wireless HSPA Modem
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="6880", ENV{OFONO_IFACE_NUM}=="03", ENV{OFONO_SIERRA_TYPE}="modem"
+
 ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0031", ENV{OFONO_IFACE_NUM}=="03", ENV{OFONO_ZTE_TYPE}="modem"
 ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0031", ENV{OFONO_IFACE_NUM}=="01", ENV{OFONO_ZTE_TYPE}="aux"
 
@@ -360,6 +363,11 @@ ENV{DEVTYPE}!="usb_device", GOTO="ofono_end"
 # Novatel Wireless
 ATTRS{idVendor}=="1410", ENV{OFONO_DRIVER}="novatel"
 
+# Sierra Wireless
+ATTRS{idVendor}=="1199", ENV{OFONO_DRIVER}="sierra"
+
+ATTRS{idVendor}=="1199", ATTRS{serial}=="1234567890ABCDEF", ENV{ID_SERIAL_SHORT}=""
+
 # HUAWEI Technology
 ATTRS{idVendor}=="12d1", ENV{OFONO_DRIVER}="huawei"
 

diff --git a/plugins/udev.c b/plugins/udev.c
index e502669..2ee8828 100644 (file)
--- a/plugins/udev.c
+++ b/plugins/udev.c
@@ -359,6 +359,38 @@ static void add_huawei(struct ofono_modem *modem,
                ofono_modem_register(modem);
 }
 
+static void add_sierra(struct ofono_modem *modem,
+                                       struct udev_device *udev_device)
+{
+       struct udev_list_entry *entry;
+       const char *devnode;
+       gboolean found = FALSE;
+
+       DBG("modem %p", modem);
+
+       entry = udev_device_get_properties_list_entry(udev_device);
+       while (entry) {
+               const char *name = udev_list_entry_get_name(entry);
+               const char *value = udev_list_entry_get_value(entry);
+
+               if (g_str_equal(name, "OFONO_SIERRA_TYPE") == TRUE &&
+                                       g_str_equal(value, "modem") == TRUE) {
+                       found = TRUE;
+                       break;
+               }
+
+               entry = udev_list_entry_get_next(entry);
+       }
+
+       if (found == FALSE)
+               return;
+
+       devnode = udev_device_get_devnode(udev_device);
+       ofono_modem_set_string(modem, "Device", devnode);
+
+       ofono_modem_register(modem);
+}
+
 static void add_novatel(struct ofono_modem *modem,
                                        struct udev_device *udev_device)
 {
@@ -583,6 +615,8 @@ done:
                add_zte(modem, udev_device);
        else if (g_strcmp0(driver, "huawei") == 0)
                add_huawei(modem, udev_device);
+       else if (g_strcmp0(driver, "sierra") == 0)
+               add_sierra(modem, udev_device);
        else if (g_strcmp0(driver, "novatel") == 0)
                add_novatel(modem, udev_device);
        else if (g_strcmp0(driver, "nokia") == 0)