--- Makefile.am | 3 +- include/gnss.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletions(-) create mode 100644 include/gnss.h diff --git a/Makefile.am b/Makefile.am index b0cbcd7..bff2374 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,8 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \ include/cdma-sms.h include/sim-auth.h \ include/gprs-provision.h include/emulator.h \ include/location-reporting.h \ - include/cdma-connman.h + include/cdma-connman.h \ + include/gnss.h nodist_pkginclude_HEADERS = include/version.h diff --git a/include/gnss.h b/include/gnss.h new file mode 100644 index 0000000..c8ff310 --- /dev/null +++ b/include/gnss.h @@ -0,0 +1,69 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2011 ST-Ericsson AB. + * + * 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 + * + */ + +#ifndef __OFONO_GNSS_H +#define __OFONO_GNSS_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <ofono/types.h> + +struct ofono_gnss; + +typedef void (*ofono_gnss_cb_t)(const struct ofono_error *error, void *data); + +struct ofono_gnss_driver { + const char *name; + int (*probe)(struct ofono_gnss *gnss, unsigned int vendor, void *data); + void (*remove)(struct ofono_gnss *gnss); + void (*send_element)(struct ofono_gnss *gnss, + const char *xml, + ofono_gnss_cb_t cb, void *data); + void (*set_position_reporting)(struct ofono_gnss *gnss, + ofono_bool_t enable, + ofono_gnss_cb_t cb, + void *data); +}; + +void ofono_gnss_notify_posr_request(struct ofono_gnss *gnss, const char *xml); +void ofono_gnss_notify_posr_reset(struct ofono_gnss *gnss); +int ofono_gnss_driver_register(const struct ofono_gnss_driver *d); +void ofono_gnss_driver_unregister(const struct ofono_gnss_driver *d); + +struct ofono_gnss *ofono_gnss_create(struct ofono_modem *modem, + unsigned int vendor, + const char *driver, void *data); + +void ofono_gnss_register(struct ofono_gnss *gnss); +void ofono_gnss_remove(struct ofono_gnss *gnss); + +void ofono_gnss_set_data(struct ofono_gnss *gnss, void *data); +void *ofono_gnss_get_data(struct ofono_gnss *gnss); + + +#ifdef __cplusplus +} +#endif + +#endif /* __OFONO_GNSS_H */ -- 1.7.0.4

--- Makefile.am | 3 +- src/gnss.c | 386 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/gnssagent.c | 158 +++++++++++++++++++++++ src/gnssagent.h | 43 ++++++ 4 files changed, 589 insertions(+), 1 deletions(-) create mode 100644 src/gnss.c create mode 100644 src/gnssagent.c create mode 100644 src/gnssagent.h diff --git a/Makefile.am b/Makefile.am index bff2374..8d127af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -385,7 +385,8 @@ src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) src/ofono.ver \ src/cdma-voicecall.c src/sim-auth.c \ src/message.h src/message.c src/gprs-provision.c \ src/emulator.c src/location-reporting.c \ - src/cdma-connman.c + src/cdma-connman.c src/gnss.c \ + src/gnssagent.c src/gnssagent.h src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl diff --git a/src/gnss.c b/src/gnss.c new file mode 100644 index 0000000..e0c17e6 --- /dev/null +++ b/src/gnss.c @@ -0,0 +1,386 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2011 ST-Ericsson AB. + * + * 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 <config.h> +#endif + +#define _GNU_SOURCE +#include <string.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> + +#include <glib.h> +#include <gdbus.h> +#include <errno.h> + +#include "ofono.h" + +#include "common.h" +#include "gnssagent.h" + +static GSList *g_drivers = NULL; + +struct ofono_gnss { + const struct ofono_gnss_driver *driver; + void *driver_data; + struct ofono_atom *atom; + DBusMessage *pending; + struct gnss_agent *posr_agent; + ofono_bool_t enabled; +}; + +static void gnss_unregister_agent_cb(const struct ofono_error *error, + void *data) +{ + DBusMessage *reply; + struct ofono_gnss *gnss = data; + + DBG(""); + + if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { + ofono_error("Disabling Location Reporting Failed"); + reply = __ofono_error_failed(gnss->pending); + __ofono_dbus_pending_reply(&gnss->pending, reply); + return; + } + + gnss->enabled = FALSE; + + if (gnss->posr_agent) + gnss_agent_free(gnss->posr_agent); + + if (gnss->posr_agent) { + ofono_error("Releasing agent failed"); + reply = __ofono_error_failed(gnss->pending); + __ofono_dbus_pending_reply(&gnss->pending, reply); + return; + } + + if (gnss->pending) { + reply = dbus_message_new_method_return(gnss->pending); + __ofono_dbus_pending_reply(&gnss->pending, reply); + } +} + +static void gnss_register_agent_cb(const struct ofono_error *error, + void *data) +{ + DBusMessage *reply; + struct ofono_gnss *gnss = data; + + DBG(""); + + if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { + ofono_error("Enabling Location Reporting Failed"); + reply = __ofono_error_failed(gnss->pending); + + if (gnss->posr_agent) + gnss_agent_free(gnss->posr_agent); + + __ofono_dbus_pending_reply(&gnss->pending, reply); + return; + } + + if (gnss->posr_agent) { + gnss->enabled = TRUE; + reply = dbus_message_new_method_return(gnss->pending); + __ofono_dbus_pending_reply(&gnss->pending, reply); + } else + gnss->driver->set_position_reporting(gnss, FALSE, + gnss_unregister_agent_cb, + gnss); +} + +static void gnss_agent_notify(gpointer user_data) +{ + struct ofono_gnss *gnss = user_data; + + if (gnss->enabled) + gnss->driver->set_position_reporting(gnss, FALSE, + gnss_unregister_agent_cb, + gnss); + + gnss->posr_agent = NULL; +} + +static DBusMessage *gnss_register_agent(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + struct ofono_gnss *gnss = data; + const char *agent_path; + + if (gnss->pending) + return __ofono_error_busy(msg); + + if (gnss->posr_agent) + return __ofono_error_busy(msg); + + if (dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, + &agent_path, DBUS_TYPE_INVALID) == FALSE) + return __ofono_error_invalid_args(msg); + + if (!__ofono_dbus_valid_object_path(agent_path)) + return __ofono_error_invalid_format(msg); + + gnss->posr_agent = gnss_agent_new(agent_path, + dbus_message_get_sender(msg), + FALSE); + + if (gnss->posr_agent == NULL) + return __ofono_error_failed(msg); + + gnss->enabled = FALSE; + + gnss_agent_set_removed_notify(gnss->posr_agent, + gnss_agent_notify, gnss); + + gnss->driver->set_position_reporting(gnss, TRUE, gnss_register_agent_cb, + gnss); + + gnss->pending = dbus_message_ref(msg); + + return NULL; +} + +static DBusMessage *gnss_unregister_agent(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + struct ofono_gnss *gnss = data; + const char *agent_path; + const char *agent_bus = dbus_message_get_sender(msg); + + if (gnss->pending) + return __ofono_error_busy(msg); + + if (dbus_message_get_args(msg, NULL, + DBUS_TYPE_OBJECT_PATH, &agent_path, + DBUS_TYPE_INVALID) == FALSE) + return __ofono_error_invalid_args(msg); + + if (gnss->posr_agent == NULL) + return __ofono_error_failed(msg); + + if (!gnss_agent_matches(gnss->posr_agent, agent_path, agent_bus)) + return __ofono_error_failed(msg); + + gnss->pending = dbus_message_ref(msg); + + gnss->driver->set_position_reporting(gnss, FALSE, + gnss_unregister_agent_cb, + gnss); + + return NULL; +} + +static void gnss_send_element_cb(const struct ofono_error *error, + void *data) +{ + DBusMessage *reply; + struct ofono_gnss *gnss = data; + + DBG(""); + + if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { + ofono_error("Sending Positioning Element failed"); + + reply = __ofono_error_failed(gnss->pending); + + goto out; + } + + reply = dbus_message_new_method_return(gnss->pending); + +out: + __ofono_dbus_pending_reply(&gnss->pending, reply); +} + +static DBusMessage *gnss_send_element(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + const char *caller = dbus_message_get_sender(msg); + struct ofono_gnss *gnss = data; + const char *xml; + + DBG(""); + + if (gnss->pending) + return __ofono_error_busy(msg); + + if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &xml, + DBUS_TYPE_INVALID)) + return __ofono_error_invalid_args(msg); + + if (!gnss_agent_sender_matches(gnss->posr_agent, caller)) + return __ofono_error_access_denied(msg); + + gnss->pending = dbus_message_ref(msg); + + gnss->driver->send_element(gnss, xml, gnss_send_element_cb, gnss); + + return NULL; +} + +static GDBusMethodTable gnss_methods[] = { + { "SendPositioningElement", "s", "", + gnss_send_element, G_DBUS_METHOD_FLAG_ASYNC }, + { "RegisterPositioningRequestAgent", "o", "", + gnss_register_agent, + G_DBUS_METHOD_FLAG_ASYNC }, + { "UnregisterPositioningRequestAgent", "o", "", + gnss_unregister_agent, + G_DBUS_METHOD_FLAG_ASYNC }, + { } +}; + +static void gnss_unregister(struct ofono_atom *atom) +{ + struct ofono_gnss *gnss = __ofono_atom_get_data(atom); + DBusConnection *conn = ofono_dbus_get_connection(); + struct ofono_modem *modem = __ofono_atom_get_modem(atom); + const char *path = __ofono_atom_get_path(atom); + + if (gnss->posr_agent) + gnss_agent_free(gnss->posr_agent); + + ofono_modem_remove_interface(modem, OFONO_GNSS_INTERFACE); + g_dbus_unregister_interface(conn, path, OFONO_GNSS_INTERFACE); +} + +static void gnss_remove(struct ofono_atom *atom) +{ + struct ofono_gnss *gnss = __ofono_atom_get_data(atom); + + DBG("atom: %p", atom); + + if (gnss == NULL) + return; + + if (gnss->driver && gnss->driver->remove) + gnss->driver->remove(gnss); + + g_free(gnss); +} + +void ofono_gnss_register(struct ofono_gnss *gnss) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + struct ofono_modem *modem = __ofono_atom_get_modem(gnss->atom); + const char *path = __ofono_atom_get_path(gnss->atom); + + if (!g_dbus_register_interface(conn, path, + OFONO_GNSS_INTERFACE, + gnss_methods, NULL, NULL, + gnss, NULL)) { + ofono_error("Could not create %s interface", + OFONO_GNSS_INTERFACE); + + return; + } + + ofono_modem_add_interface(modem, OFONO_GNSS_INTERFACE); + + __ofono_atom_register(gnss->atom, gnss_unregister); +} + +int ofono_gnss_driver_register(const struct ofono_gnss_driver *d) +{ + DBG("driver: %p, name: %s", d, d->name); + + if (d->probe == NULL) + return -EINVAL; + + g_drivers = g_slist_prepend(g_drivers, (void *) d); + + return 0; +} + +void ofono_gnss_driver_unregister(const struct ofono_gnss_driver *d) +{ + DBG("driver: %p, name: %s", d, d->name); + + g_drivers = g_slist_remove(g_drivers, (void *) d); +} + +struct ofono_gnss *ofono_gnss_create(struct ofono_modem *modem, + unsigned int vendor, + const char *driver, + void *data) +{ + struct ofono_gnss *gnss; + GSList *l; + + if (driver == NULL) + return NULL; + + gnss = g_try_new0(struct ofono_gnss, 1); + + if (gnss == NULL) + return NULL; + + gnss->enabled = FALSE; + gnss->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_GNSS, + gnss_remove, gnss); + + for (l = g_drivers; l; l = l->next) { + const struct ofono_gnss_driver *drv = l->data; + + if (g_strcmp0(drv->name, driver)) + continue; + + if (drv->probe(gnss, vendor, data) < 0) + continue; + + gnss->driver = drv; + break; + } + + return gnss; +} + +void ofono_gnss_notify_posr_request(struct ofono_gnss *gnss, const char *xml) +{ + if (gnss->posr_agent) + gnss_agent_receive_request(gnss->posr_agent, xml); +} + +void ofono_gnss_notify_posr_reset(struct ofono_gnss *gnss) +{ + if (gnss->posr_agent) + gnss_agent_receive_reset(gnss->posr_agent); +} + +void ofono_gnss_remove(struct ofono_gnss *gnss) +{ + __ofono_atom_free(gnss->atom); +} + +void ofono_gnss_set_data(struct ofono_gnss *gnss, void *data) +{ + gnss->driver_data = data; +} + +void *ofono_gnss_get_data(struct ofono_gnss *gnss) +{ + return gnss->driver_data; +} diff --git a/src/gnssagent.c b/src/gnssagent.c new file mode 100644 index 0000000..0db9856 --- /dev/null +++ b/src/gnssagent.c @@ -0,0 +1,158 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2011 ST-Ericsson AB. + * + * 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 <config.h> +#endif + +#define _GNU_SOURCE +#include <stdint.h> +#include <string.h> +#include <errno.h> + +#include <glib.h> +#include <gdbus.h> + +#include "ofono.h" +#include "gnssagent.h" + +struct gnss_agent { + char *path; + char *bus; + guint disconnect_watch; + ofono_bool_t remove_on_terminate; + ofono_destroy_func removed_cb; + void *removed_data; +}; + +void gnss_agent_receive_request(struct gnss_agent *agent, const char *xml) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + DBusMessage *message; + + message = dbus_message_new_method_call(agent->bus, agent->path, + OFONO_GNSS_POSR_AGENT_INTERFACE, + "Request"); + + dbus_message_append_args(message, + DBUS_TYPE_STRING, &xml, + DBUS_TYPE_INVALID); + + dbus_message_set_no_reply(message, TRUE); + + g_dbus_send_message(conn, message); +} + +static void gnss_agent_send_noreply(struct gnss_agent *agent, + const char *method) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + DBusMessage *message; + + message = dbus_message_new_method_call(agent->bus, agent->path, + OFONO_GNSS_POSR_AGENT_INTERFACE, + method); + + dbus_message_set_no_reply(message, TRUE); + + g_dbus_send_message(conn, message); +} + +static inline void gnss_agent_send_release(struct gnss_agent *agent) +{ + gnss_agent_send_noreply(agent, "Release"); +} + +void gnss_agent_receive_reset(struct gnss_agent *agent) +{ + gnss_agent_send_noreply(agent, "ResetAssistanceData"); +} + +ofono_bool_t gnss_agent_matches(struct gnss_agent *agent, + const char *path, const char *sender) +{ + return !g_strcmp0(agent->path, path) && !g_strcmp0(agent->bus, sender); +} + +ofono_bool_t gnss_agent_sender_matches(struct gnss_agent *agent, + const char *sender) +{ + return !g_strcmp0(agent->bus, sender); +} + +void gnss_agent_set_removed_notify(struct gnss_agent *agent, + ofono_destroy_func destroy, + void *user_data) +{ + agent->removed_cb = destroy; + agent->removed_data = user_data; +} + +void gnss_agent_free(struct gnss_agent *agent) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + + + if (agent->disconnect_watch) { + gnss_agent_send_release(agent); + g_dbus_remove_watch(conn, agent->disconnect_watch); + agent->disconnect_watch = 0; + } + + if (agent->removed_cb) + agent->removed_cb(agent->removed_data); + + g_free(agent->path); + g_free(agent->bus); + g_free(agent); +} + +static void gnss_agent_disconnect_cb(DBusConnection *conn, void *user_data) +{ + struct gnss_agent *agent = user_data; + + ofono_debug("Agent exited without calling Unregister"); + + agent->disconnect_watch = 0; + + gnss_agent_free(agent); +} + +struct gnss_agent *gnss_agent_new(const char *path, const char *sender, + ofono_bool_t remove_on_terminate) +{ + struct gnss_agent *agent = g_try_new0(struct gnss_agent, 1); + DBusConnection *conn = ofono_dbus_get_connection(); + + if (agent == NULL) + return NULL; + + agent->path = g_strdup(path); + agent->bus = g_strdup(sender); + agent->remove_on_terminate = remove_on_terminate; + + agent->disconnect_watch = g_dbus_add_disconnect_watch(conn, sender, + gnss_agent_disconnect_cb, + agent, NULL); + + return agent; +} diff --git a/src/gnssagent.h b/src/gnssagent.h new file mode 100644 index 0000000..b03645b --- /dev/null +++ b/src/gnssagent.h @@ -0,0 +1,43 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2011 ST-Ericsson AB. + * + * 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 + * + */ + +struct gnss_agent; + + +struct gnss_agent *gnss_agent_new(const char *path, const char *sender, + ofono_bool_t remove_on_terminate); + +void gnss_agent_free(struct gnss_agent *agent); + +void gnss_agent_receive_request(struct gnss_agent *agent, const char *xml); + +void gnss_agent_receive_reset(struct gnss_agent *agent); + +void gnss_agent_set_removed_notify(struct gnss_agent *agent, + ofono_destroy_func removed_cb, + void *user_data); + +ofono_bool_t gnss_agent_matches(struct gnss_agent *agent, + const char *path, const char *sender); + +ofono_bool_t gnss_agent_sender_matches(struct gnss_agent *agent, + const char *sender); -- 1.7.0.4

--- gatchat/gatsyntax.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/gatchat/gatsyntax.h b/gatchat/gatsyntax.h index afc0bd3..2580ec6 100644 --- a/gatchat/gatsyntax.h +++ b/gatchat/gatsyntax.h @@ -29,7 +29,8 @@ extern "C" { enum _GAtSyntaxExpectHint { G_AT_SYNTAX_EXPECT_PDU, G_AT_SYNTAX_EXPECT_MULTILINE, - G_AT_SYNTAX_EXPECT_PROMPT + G_AT_SYNTAX_EXPECT_PROMPT, + G_AT_SYNTAX_EXPECT_SHORT_PROMPT }; typedef enum _GAtSyntaxExpectHint GAtSyntaxExpectHint; -- 1.7.0.4

--- gatchat/gatsyntax.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/gatchat/gatsyntax.c b/gatchat/gatsyntax.c index 2fc70b8..469ffc3 100644 --- a/gatchat/gatsyntax.c +++ b/gatchat/gatsyntax.c @@ -44,6 +44,7 @@ enum GSMV1_STATE { GSMV1_STATE_PROMPT, GSMV1_STATE_ECHO, GSMV1_PPP_DATA, + GSMV1_STATE_SHORT_PROMPT, }; enum GSM_PERMISSIVE_STATE { @@ -53,6 +54,7 @@ enum GSM_PERMISSIVE_STATE { GSM_PERMISSIVE_STATE_GUESS_PDU, GSM_PERMISSIVE_STATE_PDU, GSM_PERMISSIVE_STATE_PROMPT, + GSM_PERMISSIVE_STATE_SHORT_PROMPT, }; static void gsmv1_hint(GAtSyntax *syntax, GAtSyntaxExpectHint hint) @@ -64,6 +66,9 @@ static void gsmv1_hint(GAtSyntax *syntax, GAtSyntaxExpectHint hint) case G_AT_SYNTAX_EXPECT_MULTILINE: syntax->state = GSMV1_STATE_GUESS_MULTILINE_RESPONSE; break; + case G_AT_SYNTAX_EXPECT_SHORT_PROMPT: + syntax->state = GSMV1_STATE_SHORT_PROMPT; + break; default: break; }; @@ -200,6 +205,16 @@ static GAtSyntaxResult gsmv1_feed(GAtSyntax *syntax, syntax->state = GSMV1_STATE_RESPONSE; return G_AT_SYNTAX_RESULT_UNSURE; + case GSMV1_STATE_SHORT_PROMPT: + if (byte == '\r') + break; + else if (byte == '\n') { + syntax->state = GSMV1_STATE_IDLE; + i += 1; + res = G_AT_SYNTAX_RESULT_PROMPT; + goto out; + } + case GSMV1_STATE_ECHO: /* This handles the case of echo of the PDU terminated * by CtrlZ character @@ -239,6 +254,8 @@ static void gsm_permissive_hint(GAtSyntax *syntax, GAtSyntaxExpectHint hint) { if (hint == G_AT_SYNTAX_EXPECT_PDU) syntax->state = GSM_PERMISSIVE_STATE_GUESS_PDU; + else if (hint == G_AT_SYNTAX_EXPECT_SHORT_PROMPT) + syntax->state = GSM_PERMISSIVE_STATE_SHORT_PROMPT; } static GAtSyntaxResult gsm_permissive_feed(GAtSyntax *syntax, @@ -303,6 +320,16 @@ static GAtSyntaxResult gsm_permissive_feed(GAtSyntax *syntax, syntax->state = GSM_PERMISSIVE_STATE_RESPONSE; return G_AT_SYNTAX_RESULT_UNSURE; + case GSM_PERMISSIVE_STATE_SHORT_PROMPT: + if (byte == '\r') + break; + else if (byte == '\n') { + syntax->state = GSM_PERMISSIVE_STATE_IDLE; + i += 1; + res = G_AT_SYNTAX_RESULT_PROMPT; + goto out; + } + default: break; }; -- 1.7.0.4

--- plugins/ste.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/ste.c b/plugins/ste.c index 36b3148..f7fe2b4 100644 --- a/plugins/ste.c +++ b/plugins/ste.c @@ -57,6 +57,7 @@ #include <ofono/gprs-context.h> #include <ofono/radio-settings.h> #include <ofono/stk.h> +#include <ofono/gnss.h> #include <drivers/atmodem/atutil.h> #include <drivers/atmodem/vendor.h> @@ -64,17 +65,18 @@ #include <drivers/stemodem/caif_socket.h> #include <drivers/stemodem/if_caif.h> -#define NUM_CHAT 5 +#define NUM_CHAT 6 #define AT_DEFAULT 0 #define AT_NET 1 #define AT_VOICE 2 #define AT_GPRS 3 #define AT_SIM 4 +#define AT_GNSS 5 #define MAX_PDP_CONTEXTS 4 static char *chat_prefixes[NUM_CHAT] = { "Default: ", "Net: ", "Voice: ", - "GPRS: ", "SIM: " }; + "GPRS: ", "SIM: ", "GNSS:" }; struct ste_data { GAtChat *chat[NUM_CHAT]; @@ -471,6 +473,8 @@ static void ste_post_online(struct ofono_modem *modem) ofono_call_barring_create(modem, 0, "atmodem", data->chat[AT_DEFAULT]); ofono_call_volume_create(modem, 0, "atmodem", data->chat[AT_DEFAULT]); ofono_cbs_create(modem, 0, "atmodem", data->chat[AT_DEFAULT]); + ofono_gnss_create(modem, OFONO_VENDOR_STE, "atmodem", + data->chat[AT_GNSS]); gprs = ofono_gprs_create(modem, OFONO_VENDOR_MBM, "atmodem", data->chat[AT_GPRS]); -- 1.7.0.4

--- Makefile.am | 3 +- test/test-gnss | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletions(-) create mode 100755 test/test-gnss diff --git a/Makefile.am b/Makefile.am index b5a3d6e..626a310 100644 --- a/Makefile.am +++ b/Makefile.am @@ -509,7 +509,8 @@ test_scripts = test/backtrace \ test/test-sms \ test/test-message-waiting \ test/cdma-connman-disable \ - test/cdma-connman-enable + test/cdma-connman-enable \ + test/test-gnss if TEST testdir = $(pkglibdir)/test diff --git a/test/test-gnss b/test/test-gnss new file mode 100755 index 0000000..d7d9027 --- /dev/null +++ b/test/test-gnss @@ -0,0 +1,91 @@ +#!/usr/bin/python + +import gobject +import sys +import os + +import dbus +import dbus.service +import dbus.mainloop.glib + +class PositioningAgent(dbus.service.Object): + @dbus.service.method("org.ofono.PositioningRequestAgent", + in_signature="", out_signature="") + def Release(self): + print "Release" + mainloop.quit() + + @dbus.service.method("org.ofono.PositioningRequestAgent", + in_signature="s", out_signature="") + def Request(self, xml): + print "positioning data: %s" % (xml) + + @dbus.service.method("org.ofono.PositioningRequestAgent", + in_signature="", out_signature="") + def ResetAssistanceData(self): + print "Reset Assistance Data request received" + +def print_menu(): + print "Select test case" + print "-----------------------------------------------------------" + print "[0] SendPositioningElement" + print "[1] RegisterPositioningRequestAgent" + print "[2] UnregisterPositioningRequestAgent" + print "[x] Exit" + print "-----------------------------------------------------------" + +def stdin_handler(fd, condition, positioning, path): + + in_key = os.read(fd.fileno(), 8).rstrip() + if in_key == '0': + xml = raw_input('type the element and press enter: ') + try: + positioning.SendPositioningElement(dbus.String(xml)) + print "ok" + except dbus.DBusException, e: + print "Unable to send positioning element" + + elif in_key == '1': + try: + positioning.RegisterPositioningRequestAgent("/test/posagent") + print "ok" + except dbus.DBusException, e: + print "Unable to register positioning agent" + + elif in_key == '2': + try: + positioning.UnregisterPositioningRequestAgent(path) + print "ok" + except dbus.DBusException, e: + print "Unable to unregister positioning agent" + elif in_key == 'x': + sys.exit(1) + + return True + +if __name__ == "__main__": + + if len(sys.argv) < 1: + sys.exit(1) + + dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) + bus = dbus.SystemBus() + manager = dbus.Interface(bus.get_object('org.ofono', '/'), + 'org.ofono.Manager') + + modems = manager.GetModems() + for path, properties in modems: + if "org.ofono.AssistedSatelliteNavigation" not in properties["Interfaces"]: + continue + + positioning = dbus.Interface(bus.get_object('org.ofono', path), + 'org.ofono.AssistedSatelliteNavigation') + + path = "/test/posagent" + agent = PositioningAgent(bus, path) + + print_menu() + + gobject.io_add_watch(sys.stdin, gobject.IO_IN, stdin_handler, positioning, path) + mainloop = gobject.MainLoop() + mainloop.run() -- 1.7.0.4