From ca6233486372d3a0b060872708433a78e036c16b Mon Sep 17 00:00:00 2001 From: Bertrand Aygon Date: Wed, 6 Jul 2011 19:25:59 +0200 Subject: [PATCH] udev: Add udev rules for SpeedUp modems --- plugins/ofono.rules | 9 +++++++++ plugins/udev.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/plugins/ofono.rules b/plugins/ofono.rules index 2829ea2..1fcdddb 100644 --- a/plugins/ofono.rules +++ b/plugins/ofono.rules @@ -358,6 +358,10 @@ ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="00", E ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="02", ENV{OFONO_TELIT_TYPE}="GPS" ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1004", ENV{OFONO_IFACE_NUM}=="03", ENV{OFONO_TELIT_TYPE}="Data" +# SpeedUp 9800 +ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800", ENV{OFONO_IFACE_NUM}=="01", ENV{OFONO_SPEEDUP_TYPE}="modem" +ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800", ENV{OFONO_IFACE_NUM}=="02", ENV{OFONO_SPEEDUP_TYPE}="aux" + LABEL="ofono_tty_end" # ISI/Phonet drivers @@ -398,6 +402,11 @@ ATTRS{idVendor}=="19d2", ENV{OFONO_DRIVER}="zte" ATTRS{idVendor}=="19d2", ATTRS{serial}=="1234567890ABCDEF", ENV{ID_SERIAL_SHORT}="" +# SpeedUp +ATTRS{idVendor}=="1c9e", ENV{OFONO_DRIVER}="speedup" + +ATTRS{idVendor}=="1c9e", ATTRS{serial}=="1234567890ABCDEF", ENV{ID_SERIAL_SHORT}="" + # Option Globetrotter ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6911", ENV{OFONO_DRIVER}="hso" ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6971", ENV{OFONO_DRIVER}="hso" diff --git a/plugins/udev.c b/plugins/udev.c index 4faf63e..a28bea7 100644 --- a/plugins/udev.c +++ b/plugins/udev.c @@ -639,6 +639,58 @@ static void add_telit(struct ofono_modem *modem, } } +static void add_speedup(struct ofono_modem *modem, + struct udev_device *udev_device) +{ + struct udev_list_entry *entry; + const char *devnode, *type; + + int ppp, aux; + + DBG("modem %p", modem); + + ppp = ofono_modem_get_integer(modem, "ModemRegistered"); + aux = ofono_modem_get_integer(modem, "AuxRegistered"); + + if (ppp && aux) + return; + + entry = udev_device_get_properties_list_entry(udev_device); + while (entry) { + const char *name = udev_list_entry_get_name(entry); + type = udev_list_entry_get_value(entry); + + if (g_str_equal(name, "OFONO_SPEEDUP_TYPE") != TRUE) { + entry = udev_list_entry_get_next(entry); + continue; + } + + if (g_str_equal(type, "modem") == TRUE) { + if (ppp != 0) + return; + + devnode = udev_device_get_devnode(udev_device); + ofono_modem_set_string(modem, "Modem", devnode); + ppp = 1; + ofono_modem_set_integer(modem, "ModemRegistered", ppp); + } else if (g_str_equal(type, "aux") == TRUE) { + if (aux != 0) + return; + + devnode = udev_device_get_devnode(udev_device); + ofono_modem_set_string(modem, "Aux", devnode); + + aux = 1; + ofono_modem_set_integer(modem, "AuxRegistered", aux); + } + + break; + } + + if (ppp && aux) + ofono_modem_register(modem); +} + static void add_modem(struct udev_device *udev_device) { struct ofono_modem *modem; @@ -739,6 +791,8 @@ done: add_nokiacdma(modem, udev_device); else if (g_strcmp0(driver, "linktop") == 0) add_linktop(modem, udev_device); + else if (g_strcmp0(driver, "speedup") == 0) + add_speedup(modem, udev_device); } static gboolean devpath_remove(gpointer key, gpointer value, gpointer user_data) -- 2.7.4