diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2011-08-11 10:28:48 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2011-08-11 10:28:48 -0700 |
| commit | f5c4be81606e829115bef1fb219d85a5034a34ad (patch) | |
| tree | 2ae862bcc4f165b41d6f58fc12622a2d53c9286e /plugins | |
| parent | ea8e97bdc85451b70f9e72c4233975a5ccf8e935 (diff) | |
| download | ofono-f5c4be81606e829115bef1fb219d85a5034a34ad.tar.bz2 | |
udev: Add support for automatic ISI USB modem detection
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ofono.rules | 3 | ||||
| -rw-r--r-- | plugins/udev.c | 2 | ||||
| -rw-r--r-- | plugins/udevng.c | 35 |
3 files changed, 35 insertions, 5 deletions
diff --git a/plugins/ofono.rules b/plugins/ofono.rules index c4ed1639..2b181096 100644 --- a/plugins/ofono.rules +++ b/plugins/ofono.rules @@ -17,9 +17,6 @@ SUBSYSTEM!="net", GOTO="ofono_isi_end" ATTRS{type}!="820", GOTO="ofono_isi_end" KERNELS=="gadget", GOTO="ofono_isi_end" -# Generic USB / PC Suite mode -SUBSYSTEMS=="usb", ENV{OFONO_DRIVER}="isiusb", ENV{OFONO_ISI_ADDRESS}="16" - # Nokia N900 modem SUBSYSTEMS=="hsi", ENV{OFONO_DRIVER}="n900", ENV{OFONO_ISI_ADDRESS}="108" diff --git a/plugins/udev.c b/plugins/udev.c index 84b2a818..86600374 100644 --- a/plugins/udev.c +++ b/plugins/udev.c @@ -336,8 +336,6 @@ done: if (g_strcmp0(driver, "ifx") == 0) add_ifx(modem, udev_device); - else if (g_strcmp0(driver, "isiusb") == 0) - add_isi(modem, udev_device); else if (g_strcmp0(driver, "u8500") == 0) add_isi(modem, udev_device); else if (g_strcmp0(driver, "n900") == 0) diff --git a/plugins/udevng.c b/plugins/udevng.c index 0a831595..5b1e142f 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -55,6 +55,39 @@ struct device_info { char *sysattr; }; +static gboolean setup_isi(struct modem_info *modem) +{ + const char *node = NULL; + int addr = 0; + 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 %s", info->devnode, info->interface, + info->number, info->label, info->sysattr); + + if (g_strcmp0(info->sysattr, "820") == 0) { + if (g_strcmp0(info->interface, "2/254/0") == 0) + addr = 16; + + node = info->devnode; + } + } + + if (node == NULL) + return FALSE; + + DBG("interface=%s address=%d", node, addr); + + ofono_modem_set_string(modem->modem, "Interface", node); + ofono_modem_set_integer(modem->modem, "Address", addr); + + return TRUE; +} + static gboolean setup_mbm(struct modem_info *modem) { const char *mdm = NULL, *app = NULL, *network = NULL, *gps = NULL; @@ -497,6 +530,7 @@ static struct { gboolean (*setup)(struct modem_info *modem); const char *sysattr; } driver_list[] = { + { "isiusb", setup_isi, "type" }, { "mbm", setup_mbm, "device/interface" }, { "hso", setup_hso, "hsotype" }, { "gobi", setup_gobi, }, @@ -672,6 +706,7 @@ static struct { const char *vid; const char *pid; } vendor_list[] = { + { "isiusb", "cdc_phonet" }, { "mbm", "cdc_acm", "0bdb" }, { "mbm" "cdc_ether", "0bdb" }, { "mbm", "cdc_acm", "0fce" }, |