diff --git a/Makefile.am b/Makefile.am index 568a00bc..9bc321cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,6 +114,9 @@ builtin_sources += plugins/g1.c builtin_modules += mbm builtin_sources += plugins/mbm.c +builtin_modules += hso +builtin_sources += plugins/hso.c + builtin_modules += huawei builtin_sources += plugins/huawei.c diff --git a/plugins/hso.c b/plugins/hso.c new file mode 100644 index 00000000..09d6d707 --- /dev/null +++ b/plugins/hso.c @@ -0,0 +1,178 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2009 Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include +#include + +#define OFONO_API_SUBJECT_TO_CHANGE +#include +#include +#include +#include +#include +#include + +struct hso_data { + GAtChat *chat; +}; + +static int hso_probe(struct ofono_modem *modem) +{ + struct hso_data *data; + + DBG("%p", modem); + + data = g_try_new0(struct hso_data, 1); + if (!data) + return -ENOMEM; + + ofono_modem_set_data(modem, data); + + return 0; +} + +static void hso_remove(struct ofono_modem *modem) +{ + struct hso_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_modem_set_data(modem, NULL); + + g_free(data); +} + +static void hso_debug(const char *str, void *user_data) +{ + ofono_info("%s", str); +} + +static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + + DBG(""); + + if (ok) + ofono_modem_set_powered(modem, TRUE); +} + +static int hso_enable(struct ofono_modem *modem) +{ + struct hso_data *data = ofono_modem_get_data(modem); + GAtSyntax *syntax; + const char *device; + + DBG("%p", modem); + + device = ofono_modem_get_string(modem, "ModemDevice"); + if (!device) { + device = ofono_modem_get_string(modem, "Device"); + if (!device) + return -EINVAL; + } + + syntax = g_at_syntax_new_gsmv1(); + data->chat = g_at_chat_new_from_tty(device, syntax); + g_at_syntax_unref(syntax); + + if (!data->chat) + return -EIO; + + if (getenv("OFONO_AT_DEBUG")) + g_at_chat_set_debug(data->chat, hso_debug, NULL); + + g_at_chat_send(data->chat, "AT+CFUN=1", NULL, + cfun_enable, modem, NULL); + + return 0; +} + +static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + + DBG(""); + + if (ok) + ofono_modem_set_powered(modem, FALSE); +} + +static int hso_disable(struct ofono_modem *modem) +{ + struct hso_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + if (!data->chat) + return 0; + + g_at_chat_send(data->chat, "AT+CFUN=0", NULL, + cfun_disable, modem, NULL); + + g_at_chat_shutdown(data->chat); + + g_at_chat_unref(data->chat); + data->chat = NULL; + + return 0; +} + +static void hso_populate(struct ofono_modem *modem) +{ + struct hso_data *data = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_devinfo_create(modem, 0, "atmodem", data->chat); + ofono_netreg_create(modem, 0, "atmodem", data->chat); + ofono_sms_create(modem, 0, "atmodem", data->chat); +} + +static struct ofono_modem_driver hso_driver = { + .name = "hso", + .probe = hso_probe, + .remove = hso_remove, + .enable = hso_enable, + .disable = hso_disable, + .populate = hso_populate, +}; + +static int hso_init(void) +{ + return ofono_modem_driver_register(&hso_driver); +} + +static void hso_exit(void) +{ + ofono_modem_driver_unregister(&hso_driver); +} + +OFONO_PLUGIN_DEFINE(hso, "Option HSO modem driver", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, hso_init, hso_exit) diff --git a/plugins/ofono.rules b/plugins/ofono.rules index bed61f0e..8de3e0f9 100644 --- a/plugins/ofono.rules +++ b/plugins/ofono.rules @@ -10,6 +10,9 @@ ATTRS{idVendor}=="12d1", ENV{OFONO_DRIVER}="huawei" # Novatel Wireless ATTRS{idVendor}=="1410", ENV{OFONO_DRIVER}="novatel" +# Option Globetrotter +ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6971", ENV{OFONO_DRIVER}="hso" + # Ericsson F3507g ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1900", ENV{OFONO_DRIVER}="mbm" ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1902", ENV{OFONO_DRIVER}="mbm" diff --git a/plugins/udev.c b/plugins/udev.c index 87775f14..c8ec1a1f 100644 --- a/plugins/udev.c +++ b/plugins/udev.c @@ -86,10 +86,10 @@ static const char *get_driver(struct udev_device *udev_device) return driver; } -#define MBM_MODEM_DEVICE "ModemDevice" -#define MBM_DATA_DEVICE "DataDevice" -#define MBM_GPS_DEVICE "GPSDevice" -#define MBM_NETWORK_INTERFACE "NetworkInterface" +#define MODEM_DEVICE "ModemDevice" +#define DATA_DEVICE "DataDevice" +#define GPS_DEVICE "GPSDevice" +#define NETWORK_INTERFACE "NetworkInterface" static void add_mbm(struct ofono_modem *modem, struct udev_device *udev_device) @@ -109,25 +109,61 @@ static void add_mbm(struct ofono_modem *modem, if (g_str_has_suffix(description, "Minicard Modem") == TRUE) { devnode = udev_device_get_devnode(udev_device); - ofono_modem_set_string(modem, MBM_MODEM_DEVICE, devnode); + ofono_modem_set_string(modem, MODEM_DEVICE, devnode); } else if (g_str_has_suffix(description, "Minicard Data Modem") == TRUE) { devnode = udev_device_get_devnode(udev_device); - ofono_modem_set_string(modem, MBM_DATA_DEVICE, devnode); + ofono_modem_set_string(modem, DATA_DEVICE, devnode); } else if (g_str_has_suffix(description, "Minicard GPS Port") == TRUE) { devnode = udev_device_get_devnode(udev_device); - ofono_modem_set_string(modem, MBM_GPS_DEVICE, devnode); + ofono_modem_set_string(modem, GPS_DEVICE, devnode); } else if (g_str_has_suffix(description, "Minicard Network Adapter") == TRUE) { devnode = udev_device_get_property_value(udev_device, "INTERFACE"); - ofono_modem_set_string(modem, MBM_NETWORK_INTERFACE, devnode); + ofono_modem_set_string(modem, NETWORK_INTERFACE, devnode); } else return; - device = ofono_modem_get_string(modem, MBM_MODEM_DEVICE); - network = ofono_modem_get_string(modem, MBM_NETWORK_INTERFACE); + device = ofono_modem_get_string(modem, MODEM_DEVICE); + network = ofono_modem_get_string(modem, NETWORK_INTERFACE); + + if (device != NULL && network != NULL) { + ofono_modem_set_integer(modem, "Registered", 1); + ofono_modem_register(modem); + } +} + +static void add_hso(struct ofono_modem *modem, + struct udev_device *udev_device) +{ + const char *subsystem, *type, *devnode; + const char *device, *network; + int registered; + + subsystem = udev_device_get_subsystem(udev_device); + if (subsystem == NULL) + return; + + registered = ofono_modem_get_integer(modem, "Registered"); + if (registered != 0) + return; + + type = udev_device_get_sysattr_value(udev_device, "hsotype"); + + if (type != NULL && g_str_has_suffix(type, "Control") == TRUE) { + devnode = udev_device_get_devnode(udev_device); + ofono_modem_set_string(modem, MODEM_DEVICE, devnode); + } else if (g_str_equal(subsystem, "net") == TRUE) { + devnode = udev_device_get_property_value(udev_device, + "INTERFACE"); + ofono_modem_set_string(modem, NETWORK_INTERFACE, devnode); + } else + return; + + device = ofono_modem_get_string(modem, MODEM_DEVICE); + network = ofono_modem_get_string(modem, NETWORK_INTERFACE); if (device != NULL && network != NULL) { ofono_modem_set_integer(modem, "Registered", 1); @@ -209,6 +245,8 @@ static void add_modem(struct udev_device *udev_device) if (g_strcmp0(driver, "mbm") == 0) add_mbm(modem, udev_device); + else if (g_strcmp0(driver, "hso") == 0) + add_hso(modem, udev_device); else if (g_strcmp0(driver, "huawei") == 0) add_huawei(modem, udev_device); else if (g_strcmp0(driver, "novatel") == 0)