diff options
| -rw-r--r-- | plugins/ofono.rules | 3 | ||||
| -rw-r--r-- | plugins/udev.c | 30 | ||||
| -rw-r--r-- | plugins/udevng.c | 34 |
3 files changed, 34 insertions, 33 deletions
diff --git a/plugins/ofono.rules b/plugins/ofono.rules index 77125c22..30a1b7e8 100644 --- a/plugins/ofono.rules +++ b/plugins/ofono.rules @@ -25,7 +25,4 @@ ATTRS{serial}=="1234567890ABCDEF", ENV{ID_SERIAL_SHORT}="" ATTRS{idVendor}=="0421", ATTRS{idProduct}=="023e", ENV{OFONO_DRIVER}="nokiacdma" ATTRS{idVendor}=="0421", ATTRS{idProduct}=="00b6", ENV{OFONO_DRIVER}="nokiacdma" -# Teracom (Linktop/LW27x) 3G Data Card -ATTRS{idVendor}=="230d", ATTRS{idProduct}=="0001", ENV{OFONO_DRIVER}="linktop" - LABEL="ofono_end" diff --git a/plugins/udev.c b/plugins/udev.c index 0b7ae957..72dd78b1 100644 --- a/plugins/udev.c +++ b/plugins/udev.c @@ -193,34 +193,6 @@ static void add_nokiacdma(struct ofono_modem *modem, ofono_modem_register(modem); } -static void add_linktop(struct ofono_modem *modem, - struct udev_device *udev_device) -{ - const char *devnode, *intfnum; - int registered; - - DBG("modem %p", modem); - - registered = ofono_modem_get_integer(modem, "Registered"); - if (registered != 0) - return; - - intfnum = get_property(udev_device, "ID_USB_INTERFACE_NUM"); - - DBG("intfnum %s", intfnum); - - if (g_strcmp0(intfnum, "01") == 0) { - devnode = udev_device_get_devnode(udev_device); - ofono_modem_set_string(modem, "Aux", devnode); - } else if (g_strcmp0(intfnum, "03") == 0) { - devnode = udev_device_get_devnode(udev_device); - ofono_modem_set_string(modem, "Modem", devnode); - - ofono_modem_set_integer(modem, "Registered", 1); - ofono_modem_register(modem); - } -} - static void add_modem(struct udev_device *udev_device) { struct ofono_modem *modem; @@ -299,8 +271,6 @@ done: add_tc65(modem, udev_device); else if (g_strcmp0(driver, "nokiacdma") == 0) add_nokiacdma(modem, udev_device); - else if (g_strcmp0(driver, "linktop") == 0) - add_linktop(modem, udev_device); } static gboolean devpath_remove(gpointer key, gpointer value, gpointer user_data) diff --git a/plugins/udevng.c b/plugins/udevng.c index 808f3e99..78682ffa 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -331,6 +331,38 @@ static gboolean setup_speedup(struct modem_info *modem) return TRUE; } +static gboolean setup_linktop(struct modem_info *modem) +{ + const char *aux = NULL, *mdm = NULL; + GSList *list; + + DBG("%s", modem->syspath); + + for (list = modem->devices; list; list = list->next) { + struct device_info *info = list->data; + + DBG("%s %s %s %s", info->devnode, info->interface, + info->number, info->label); + + if (g_strcmp0(info->interface, "2/2/1") == 0) { + if (g_strcmp0(info->number, "01") == 0) + aux = info->devnode; + else if (g_strcmp0(info->number, "03") == 0) + mdm = info->devnode; + } + } + + if (aux == NULL || mdm == NULL) + return FALSE; + + DBG("aux=%s modem=%s", aux, mdm); + + ofono_modem_set_string(modem->modem, "Aux", aux); + ofono_modem_set_string(modem->modem, "Modem", mdm); + + return TRUE; +} + static gboolean setup_alcatel(struct modem_info *modem) { const char *aux = NULL, *mdm = NULL; @@ -584,6 +616,7 @@ static struct { { "huaweicdma", setup_huawei }, { "speedupcdma",setup_speedup }, { "speedup", setup_speedup }, + { "linktop", setup_linktop }, { "alcatel", setup_alcatel }, { "novatel", setup_novatel }, { "nokia", setup_nokia }, @@ -753,6 +786,7 @@ static struct { const char *pid; } vendor_list[] = { { "isiusb", "cdc_phonet" }, + { "linktop", "cdc_acm", "230d" }, { "mbm", "cdc_acm", "0bdb" }, { "mbm" "cdc_ether", "0bdb" }, { "mbm", "cdc_acm", "0fce" }, |