From 64e2b33465242b6e0bc6c9dee3e9812abe7c008c Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Mon, 26 Sep 2011 14:26:55 -0300 Subject: [PATCH] sap: Add basic sap plugin --- Makefile.am | 3 + plugins/bluetooth.c | 1 - plugins/bluetooth.h | 12 ++ plugins/hfp_hf.c | 2 - plugins/sap.c | 277 ++++++++++++++++++++++++++++++++++++++++++++ plugins/telit.c | 10 ++ 6 files changed, 302 insertions(+), 3 deletions(-) create mode 100644 plugins/sap.c diff --git a/Makefile.am b/Makefile.am index 71962ea6..8771cb2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -369,6 +369,9 @@ builtin_sources += plugins/hfp_ag.c plugins/bluetooth.h builtin_modules += dun_gw builtin_sources += plugins/dun_gw.c plugins/bluetooth.h +builtin_modules += sap +builtin_sources += plugins/sap.c plugins/bluetooth.h + builtin_modules += connman builtin_sources += plugins/connman.c diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c index a286dd48..274d25b3 100644 --- a/plugins/bluetooth.c +++ b/plugins/bluetooth.c @@ -33,7 +33,6 @@ #include #define OFONO_API_SUBJECT_TO_CHANGE -#include #include #include diff --git a/plugins/bluetooth.h b/plugins/bluetooth.h index 4056f0a2..b21ab643 100644 --- a/plugins/bluetooth.h +++ b/plugins/bluetooth.h @@ -19,6 +19,9 @@ * */ +#include +#include + #define BLUEZ_SERVICE "org.bluez" #define BLUEZ_MANAGER_INTERFACE BLUEZ_SERVICE ".Manager" #define BLUEZ_ADAPTER_INTERFACE BLUEZ_SERVICE ".Adapter" @@ -30,6 +33,7 @@ #define DUN_GW_UUID "00001103-0000-1000-8000-00805f9b34fb" #define HFP_AG_UUID "0000111f-0000-1000-8000-00805f9b34fb" #define HFP_HS_UUID "0000111e-0000-1000-8000-00805f9b34fb" +#define SAP_UUID "0000112d-0000-1000-8000-00805f9b34fb" struct bluetooth_profile { const char *name; @@ -39,6 +43,10 @@ struct bluetooth_profile { void (*set_alias)(const char *device, const char *); }; +struct bluetooth_sap_driver { + const char *name; +}; + struct server; typedef void (*ConnectFunc)(GIOChannel *io, GError *err, gpointer user_data); @@ -60,3 +68,7 @@ int bluetooth_send_with_reply(const char *path, const char *interface, void *user_data, DBusFreeFunction free_func, int timeout, int type, ...); void bluetooth_parse_properties(DBusMessage *reply, const char *property, ...); + +int bluetooth_sap_client_register(struct bluetooth_sap_driver *sap, + struct ofono_modem *modem); +void bluetooth_sap_client_unregister(struct ofono_modem *modem); diff --git a/plugins/hfp_hf.c b/plugins/hfp_hf.c index 0c6ed83c..d5f26c03 100644 --- a/plugins/hfp_hf.c +++ b/plugins/hfp_hf.c @@ -45,8 +45,6 @@ #include -#include - #include "bluetooth.h" #define BLUEZ_GATEWAY_INTERFACE BLUEZ_SERVICE ".HandsfreeGateway" diff --git a/plugins/sap.c b/plugins/sap.c new file mode 100644 index 00000000..52fb2fb6 --- /dev/null +++ b/plugins/sap.c @@ -0,0 +1,277 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2010-2011 ProFUSION embedded systems + * + * 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 +#include +#include +#include + +#define OFONO_API_SUBJECT_TO_CHANGE +#include +#include +#include + +#include "bluetooth.h" + +#ifndef DBUS_TYPE_UNIX_FD +#define DBUS_TYPE_UNIX_FD -1 +#endif + +static DBusConnection *connection; +static GHashTable *modem_hash = NULL; +static struct ofono_modem *sap_hw_modem = NULL; +static struct bluetooth_sap_driver *sap_hw_driver = NULL; + +struct sap_data { + char *server_path; + struct ofono_modem *hw_modem; + struct bluetooth_sap_driver *sap_driver; +}; + +int bluetooth_sap_client_register(struct bluetooth_sap_driver *sap, + struct ofono_modem *modem) +{ + if (sap_hw_modem != NULL) + return -EPERM; + + sap_hw_modem = modem; + sap_hw_driver = sap; + + return 0; +} + +static void sap_remove_modem(struct ofono_modem *modem) +{ + struct sap_data *data = ofono_modem_get_data(modem); + + g_free(data->server_path); + g_free(data); + + ofono_modem_set_data(modem, NULL); + + ofono_modem_remove(modem); +} + +void bluetooth_sap_client_unregister(struct ofono_modem *modem) +{ + GHashTableIter iter; + gpointer key, value; + + if (sap_hw_modem == NULL) + return; + + g_hash_table_iter_init(&iter, modem_hash); + + while (g_hash_table_iter_next(&iter, &key, &value)) { + + g_hash_table_iter_remove(&iter); + + sap_remove_modem(value); + } + + sap_hw_modem = NULL; + sap_hw_driver = NULL; +} + +static int sap_probe(struct ofono_modem *modem) +{ + DBG("%p", modem); + + return 0; +} + +static void sap_remove(struct ofono_modem *modem) +{ + DBG("%p", modem); +} + +/* power up hardware */ +static int sap_enable(struct ofono_modem *modem) +{ + DBG("%p", modem); + + return 0; +} + +static int sap_disable(struct ofono_modem *modem) +{ + DBG("%p", modem); + + return 0; +} + +static void sap_pre_sim(struct ofono_modem *modem) +{ + DBG("%p", modem); +} + +static void sap_post_sim(struct ofono_modem *modem) +{ + DBG("%p", modem); +} + +static int bluetooth_sap_probe(const char *device, const char *dev_addr, + const char *adapter_addr, const char *alias) +{ + struct ofono_modem *modem; + struct sap_data *data; + char buf[256]; + + if(sap_hw_modem == NULL) + return -ENODEV; + + /* We already have this device in our hash, ignore */ + if (g_hash_table_lookup(modem_hash, device) != NULL) + return -EALREADY; + + ofono_info("Using device: %s, devaddr: %s, adapter: %s", + device, dev_addr, adapter_addr); + + strcpy(buf, "sap/"); + bluetooth_create_path(dev_addr, adapter_addr, buf + 4, + sizeof(buf) - 4); + + modem = ofono_modem_create(buf, "sap"); + if (modem == NULL) + return -ENOMEM; + + data = g_try_new0(struct sap_data, 1); + if (data == NULL) + goto free; + + data->server_path = g_strdup(device); + if (data->server_path == NULL) + goto free; + + ofono_modem_set_data(modem, data); + ofono_modem_set_name(modem, alias); + ofono_modem_register(modem); + + g_hash_table_insert(modem_hash, g_strdup(device), modem); + + return 0; + +free: + g_free(data); + ofono_modem_remove(modem); + + return -ENOMEM; +} + +static void bluetooth_sap_remove(const char *prefix) +{ + GHashTableIter iter; + gpointer key, value; + + DBG("%s", prefix); + + if (modem_hash == NULL || prefix == NULL) + return; + + g_hash_table_iter_init(&iter, modem_hash); + + while (g_hash_table_iter_next(&iter, &key, &value)) { + + if (g_str_has_prefix((char *)key, prefix) == FALSE) + continue; + + g_hash_table_iter_remove(&iter); + + sap_remove_modem(value); + } +} + +static void bluetooth_sap_set_alias(const char *device, const char *alias) +{ + struct ofono_modem *modem; + + if (device == NULL || alias == NULL) + return; + + modem = g_hash_table_lookup(modem_hash, device); + if (modem == NULL) + return; + + ofono_modem_set_name(modem, alias); +} + +static struct ofono_modem_driver sap_driver = { + .name = "sap", + .probe = sap_probe, + .remove = sap_remove, + .enable = sap_enable, + .disable = sap_disable, + .pre_sim = sap_pre_sim, + .post_sim = sap_post_sim, +}; + +static struct bluetooth_profile sap = { + .name = "sap", + .probe = bluetooth_sap_probe, + .remove = bluetooth_sap_remove, + .set_alias = bluetooth_sap_set_alias, +}; + +static int sap_init(void) +{ + int err; + + if (DBUS_TYPE_UNIX_FD < 0) + return -EBADF; + + connection = ofono_dbus_get_connection(); + + err = ofono_modem_driver_register(&sap_driver); + if (err < 0) + return err; + + err = bluetooth_register_uuid(SAP_UUID, &sap); + if (err < 0) { + ofono_modem_driver_unregister(&sap_driver); + return err; + } + + modem_hash = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, NULL); + + return 0; +} + +static void sap_exit(void) +{ + DBG(""); + + bluetooth_unregister_uuid(SAP_UUID); + ofono_modem_driver_unregister(&sap_driver); + g_hash_table_destroy(modem_hash); + modem_hash = NULL; +} + +OFONO_PLUGIN_DEFINE(sap, "Sim Access Profile Plugins", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, sap_init, sap_exit) diff --git a/plugins/telit.c b/plugins/telit.c index 9c8eb0d3..18cf0c40 100644 --- a/plugins/telit.c +++ b/plugins/telit.c @@ -54,6 +54,8 @@ #include #include +#include "bluetooth.h" + static const char *none_prefix[] = { NULL }; static const char *qss_prefix[] = { "#QSS:", NULL }; @@ -63,6 +65,10 @@ struct telit_data { guint sim_inserted_source; }; +static struct bluetooth_sap_driver sap_driver = { + .name = "telit", +}; + static void telit_debug(const char *str, void *user_data) { const char *prefix = user_data; @@ -82,6 +88,8 @@ static int telit_probe(struct ofono_modem *modem) ofono_modem_set_data(modem, data); + bluetooth_sap_client_register(&sap_driver, modem); + return 0; } @@ -91,6 +99,8 @@ static void telit_remove(struct ofono_modem *modem) DBG("%p", modem); + bluetooth_sap_client_unregister(modem); + ofono_modem_set_data(modem, NULL); if (data->sim_inserted_source > 0)