2:14 a.m.
---
drivers/atmodem/gprs.c | 18 +++++++++---------
drivers/isimodem/gprs.c | 6 +++---
include/gprs.h | 4 ++--
src/gprs.c | 31 ++++++++++++++++++++++++++++---
4 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/drivers/atmodem/gprs.c b/drivers/atmodem/gprs.c
index 94247ec..2f8e691 100644
--- a/drivers/atmodem/gprs.c
+++ b/drivers/atmodem/gprs.c
@@ -89,23 +89,23 @@ static void at_cgreg_cb(gboolean ok, GAtResult *result, gpointer
user_data)
struct cb_data *cbd = user_data;
ofono_gprs_status_cb_t cb = cbd->cb;
struct ofono_error error;
- int status;
+ int status, tech;
struct gprs_data *gd = cbd->user;
decode_at_error(&error, g_at_result_final_response(result));
if (!ok) {
- cb(&error, -1, cbd->data);
+ cb(&error, -1, -1, cbd->data);
return;
}
if (at_util_parse_reg(result, "+CGREG:", NULL, &status,
- NULL, NULL, NULL, gd->vendor) == FALSE) {
- CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+ NULL, NULL, &tech, gd->vendor) == FALSE) {
+ CALLBACK_WITH_FAILURE(cb, -1, -1, cbd->data);
return;
}
- cb(&error, status, cbd->data);
+ cb(&error, status, tech, cbd->data);
}
static void at_gprs_registration_status(struct ofono_gprs *gprs,
@@ -138,20 +138,20 @@ static void at_gprs_registration_status(struct ofono_gprs *gprs,
error:
g_free(cbd);
- CALLBACK_WITH_FAILURE(cb, -1, data);
+ CALLBACK_WITH_FAILURE(cb, -1, -1, data);
}
static void cgreg_notify(GAtResult *result, gpointer user_data)
{
struct ofono_gprs *gprs = user_data;
- int status;
+ int status, tech;
struct gprs_data *gd = ofono_gprs_get_data(gprs);
if (at_util_parse_reg_unsolicited(result, "+CGREG:", &status,
- NULL, NULL, NULL, gd->vendor) == FALSE)
+ NULL, NULL, &tech, gd->vendor) == FALSE)
return;
- ofono_gprs_status_notify(gprs, status);
+ ofono_gprs_status_notify(gprs, status, tech);
}
static void cgev_notify(GAtResult *result, gpointer user_data)
diff --git a/drivers/isimodem/gprs.c b/drivers/isimodem/gprs.c
index 9cbe4f3..0512bd8 100644
--- a/drivers/isimodem/gprs.c
+++ b/drivers/isimodem/gprs.c
@@ -335,12 +335,12 @@ static gboolean status_resp_cb(GIsiClient *client,
suspend_notify(gprs, msg[11], msg[12]);
- CALLBACK_WITH_SUCCESS(cb, status, cbd->data);
+ CALLBACK_WITH_SUCCESS(cb, status, -1, cbd->data);
return TRUE;
error:
- CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+ CALLBACK_WITH_FAILURE(cb, -1, -1, cbd->data);
return TRUE;
}
@@ -364,7 +364,7 @@ static void isi_gprs_attached_status(struct ofono_gprs *gprs,
return;
error:
- CALLBACK_WITH_FAILURE(cb, -1, data);
+ CALLBACK_WITH_FAILURE(cb, -1, -1, data);
g_free(cbd);
}
diff --git a/include/gprs.h b/include/gprs.h
index ad7925c..1c1d116 100644
--- a/include/gprs.h
+++ b/include/gprs.h
@@ -32,7 +32,7 @@ struct ofono_gprs;
struct ofono_gprs_context;
typedef void (*ofono_gprs_status_cb_t)(const struct ofono_error *error,
- int status, void *data);
+ int status, int tech, void *data);
typedef void (*ofono_gprs_cb_t)(const struct ofono_error *error, void *data);
@@ -55,7 +55,7 @@ enum gprs_suspend_cause {
GPRS_SUSPENDED_UNKNOWN_CAUSE,
};
-void ofono_gprs_status_notify(struct ofono_gprs *gprs, int status);
+void ofono_gprs_status_notify(struct ofono_gprs *gprs, int status, int tech);
void ofono_gprs_detached_notify(struct ofono_gprs *gprs);
void ofono_gprs_suspend_notify(struct ofono_gprs *gprs, int cause);
void ofono_gprs_resume_notify(struct ofono_gprs *gprs);
diff --git a/src/gprs.c b/src/gprs.c
index 7e42a99..3b0733e 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -67,6 +67,7 @@ struct ofono_gprs {
ofono_bool_t suspended;
int status;
int flags;
+ int tech;
guint suspend_timeout;
struct idmap *pid_map;
unsigned int last_context_id;
@@ -1326,8 +1327,25 @@ static void gprs_attached_update(struct ofono_gprs *gprs)
"Attached", DBUS_TYPE_BOOLEAN, &value);
}
+static void gprs_tech_update(struct ofono_gprs *gprs, int tech)
+{
+ DBusConnection *conn = ofono_dbus_get_connection();
+ const char *path, *value;
+
+ if (tech == gprs->tech)
+ return;
+
+ gprs->tech = tech;
+
+ path = __ofono_atom_get_path(gprs->atom);
+ value = registration_tech_to_string(tech);
+ ofono_dbus_signal_property_changed(conn, path,
+ OFONO_CONNECTION_MANAGER_INTERFACE,
+ "Technology", DBUS_TYPE_STRING, &value);
+}
+
static void registration_status_cb(const struct ofono_error *error,
- int status, void *data)
+ int status, int tech, void *data)
{
struct ofono_gprs *gprs = data;
@@ -1335,7 +1353,7 @@ static void registration_status_cb(const struct ofono_error *error,
error->type, status);
if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
- ofono_gprs_status_notify(gprs, status);
+ ofono_gprs_status_notify(gprs, status, tech);
if (gprs->flags & GPRS_FLAG_RECHECK) {
gprs->flags &= ~GPRS_FLAG_RECHECK;
@@ -1439,6 +1457,11 @@ static DBusMessage *gprs_get_properties(DBusConnection *conn,
ofono_dbus_dict_append(&dict, "Powered", DBUS_TYPE_BOOLEAN, &value);
if (gprs->attached) {
+ const char *tech = registration_tech_to_string(gprs->tech);
+
+ ofono_dbus_dict_append(&dict, "Technology",
+ DBUS_TYPE_STRING, &tech);
+
value = gprs->suspended;
ofono_dbus_dict_append(&dict, "Suspended",
DBUS_TYPE_BOOLEAN, &value);
@@ -1911,7 +1934,7 @@ void ofono_gprs_detached_notify(struct ofono_gprs *gprs)
*/
}
-void ofono_gprs_status_notify(struct ofono_gprs *gprs, int status)
+void ofono_gprs_status_notify(struct ofono_gprs *gprs, int status, int tech)
{
DBG("%s status %d", __ofono_atom_get_path(gprs->atom), status);
@@ -1933,6 +1956,7 @@ void ofono_gprs_status_notify(struct ofono_gprs *gprs, int status)
gprs->driver_attached = TRUE;
gprs_attached_update(gprs);
+ gprs_tech_update(gprs, tech);
return;
@@ -2235,6 +2259,7 @@ struct ofono_gprs *ofono_gprs_create(struct ofono_modem *modem,
}
gprs->status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
+ gprs->tech = -1;
gprs->netreg_status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
gprs->pid_map = idmap_new(MAX_CONTEXTS);
--
1.7.1