12:21 a.m.
Hi All,
The following four patches add core support for fast dormancy.
I have tested the changes with a backend for isimodem. However,
the isimodem implementation has triggered some fairly extensive
revectoring of gisi. The final isimodem patches will be submitted
once the gisi changes are complete.
Br,
MikaL
--
[PATCH 1/4] radio settings: allow for more than one property
[PATCH 2/4] radio settings: add FastDormancy property
[PATCH 3/4] radio settings: document FastDormancy property
[PATCH 4/4] test: add scripts to enable and disable fast dormancy
Makefile.am | 4 +-
doc/radio-settings-api.txt | 22 ++++++
include/radio-settings.h | 12 +++
src/call-settings.c | 2 +-
src/common.c | 2 +-
src/radio-settings.c | 160 ++++++++++++++++++++++++++++++++++++--------
test/disable-fast-dormancy | 20 ++++++
test/enable-fast-dormancy | 20 ++++++
8 files changed, 210 insertions(+), 32 deletions(-)
12:21 a.m.
New subject: [PATCH 1/4] radio settings: allow for more than one property
Restructure code to allow other properties besides
TechnologyPreference to be returned.
---
src/radio-settings.c | 60 +++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/radio-settings.c b/src/radio-settings.c
index f70d870..7cdd411 100644
--- a/src/radio-settings.c
+++ b/src/radio-settings.c
@@ -77,15 +77,16 @@ static int string_to_radio_access_mode(const char *mode)
return -1;
}
-static DBusMessage *radio_get_properties_reply(DBusMessage *msg,
- struct ofono_radio_settings *rs)
+static void radio_rat_mode_query_callback(const struct ofono_error *error,
+ enum ofono_radio_access_mode mode,
+ void *data);
+
+static DBusMessage *radio_get_properties_reply(DBusMessage *msg, struct
ofono_radio_settings *rs)
{
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter dict;
- const char *mode = radio_access_mode_to_string(rs->mode);
-
reply = dbus_message_new_method_return(msg);
if (!reply)
return NULL;
@@ -96,8 +97,17 @@ static DBusMessage *radio_get_properties_reply(DBusMessage *msg,
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
- ofono_dbus_dict_append(&dict, "TechnologyPreference", DBUS_TYPE_STRING,
- &mode);
+ if (rs->flags & RADIO_SETTINGS_MODE_CACHED) {
+ const char *mode = radio_access_mode_to_string(rs->mode);
+ ofono_dbus_dict_append(&dict, "TechnologyPreference",
+ DBUS_TYPE_STRING, &mode);
+ } else if (rs->driver->query_rat_mode) {
+ rs->pending = dbus_message_ref(msg);
+ rs->driver->query_rat_mode(rs,
+ radio_rat_mode_query_callback, rs);
+ dbus_message_unref(reply);
+ return NULL;
+ }
dbus_message_iter_close_container(&iter, &dict);
@@ -107,23 +117,21 @@ static DBusMessage *radio_get_properties_reply(DBusMessage *msg,
static void radio_set_rat_mode(struct ofono_radio_settings *rs,
enum ofono_radio_access_mode mode)
{
- DBusConnection *conn = ofono_dbus_get_connection();
- const char *path;
- const char *str_mode;
+ if ((rs->flags & RADIO_SETTINGS_MODE_CACHED) &&
+ rs->mode != (int)mode) {
- if (rs->mode == (int)mode)
- return;
+ DBusConnection *conn = ofono_dbus_get_connection();
+ const char *path = __ofono_atom_get_path(rs->atom);
+ const char *str_mode = radio_access_mode_to_string(rs->mode);
+
+ ofono_dbus_signal_property_changed(conn, path,
+ OFONO_RADIO_SETTINGS_INTERFACE,
+ "TechnologyPreference",
+ DBUS_TYPE_STRING, &str_mode);
+ }
rs->mode = mode;
rs->flags |= RADIO_SETTINGS_MODE_CACHED;
-
- path = __ofono_atom_get_path(rs->atom);
- str_mode = radio_access_mode_to_string(rs->mode);
-
- ofono_dbus_signal_property_changed(conn, path,
- OFONO_RADIO_SETTINGS_INTERFACE,
- "TechnologyPreference", DBUS_TYPE_STRING,
- &str_mode);
}
static void radio_mode_set_callback(const struct ofono_error *error, void *data)
@@ -162,7 +170,8 @@ static void radio_rat_mode_query_callback(const struct ofono_error
*error,
radio_set_rat_mode(rs, mode);
reply = radio_get_properties_reply(rs->pending, rs);
- __ofono_dbus_pending_reply(&rs->pending, reply);
+ if (reply)
+ __ofono_dbus_pending_reply(&rs->pending, reply);
}
static DBusMessage *radio_get_properties(DBusConnection *conn, DBusMessage *msg,
@@ -170,19 +179,10 @@ static DBusMessage *radio_get_properties(DBusConnection *conn,
DBusMessage *msg,
{
struct ofono_radio_settings *rs = data;
- if (rs->flags & RADIO_SETTINGS_MODE_CACHED)
- return radio_get_properties_reply(msg, rs);
-
- if (!rs->driver->query_rat_mode)
- return __ofono_error_not_implemented(msg);
-
if (rs->pending)
return __ofono_error_busy(msg);
- rs->pending = dbus_message_ref(msg);
- rs->driver->query_rat_mode(rs, radio_rat_mode_query_callback, rs);
-
- return NULL;
+ return radio_get_properties_reply(msg, rs);
}
static DBusMessage *radio_set_property(DBusConnection *conn, DBusMessage *msg,
--
1.7.0.4
12:21 a.m.
New subject: [PATCH 2/4] radio settings: add FastDormancy property
---
include/radio-settings.h | 12 +++++
src/radio-settings.c | 104 +++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 115 insertions(+), 1 deletions(-)
diff --git a/include/radio-settings.h b/include/radio-settings.h
index d41ec0b..7152355 100644
--- a/include/radio-settings.h
+++ b/include/radio-settings.h
@@ -42,6 +42,11 @@ typedef void (*ofono_radio_settings_rat_mode_set_cb_t)(const struct
ofono_error
typedef void (*ofono_radio_settings_rat_mode_query_cb_t)(const struct ofono_error
*error,
enum ofono_radio_access_mode mode,
void *data);
+typedef void (*ofono_radio_settings_fast_dormancy_set_cb_t)(const struct ofono_error
*error,
+ void *data);
+typedef void (*ofono_radio_settings_fast_dormancy_query_cb_t)(const struct ofono_error
*error,
+ ofono_bool_t enable,
+ void *data);
struct ofono_radio_settings_driver {
const char *name;
@@ -55,6 +60,13 @@ struct ofono_radio_settings_driver {
enum ofono_radio_access_mode mode,
ofono_radio_settings_rat_mode_set_cb_t cb,
void *data);
+ void (*query_fast_dormancy)(struct ofono_radio_settings *rs,
+ ofono_radio_settings_fast_dormancy_query_cb_t cb,
+ void *data);
+ void (*set_fast_dormancy)(struct ofono_radio_settings *rs,
+ ofono_bool_t enable,
+ ofono_radio_settings_fast_dormancy_set_cb_t,
+ void *data);
};
int ofono_radio_settings_driver_register(const struct ofono_radio_settings_driver *d);
diff --git a/src/radio-settings.c b/src/radio-settings.c
index 7cdd411..113bc3d 100644
--- a/src/radio-settings.c
+++ b/src/radio-settings.c
@@ -33,7 +33,9 @@
#include "ofono.h"
#include "common.h"
-#define RADIO_SETTINGS_MODE_CACHED 0x1
+#define RADIO_SETTINGS_MODE_CACHED 0x01
+#define FAST_DORMANCY_SETTING_CACHED 0x02
+
static GSList *g_drivers = NULL;
@@ -42,6 +44,8 @@ struct ofono_radio_settings {
int flags;
int mode;
int pending_mode;
+ ofono_bool_t fast_dormancy_current;
+ ofono_bool_t fast_dormancy_target;
const struct ofono_radio_settings_driver *driver;
void *driver_data;
struct ofono_atom *atom;
@@ -80,6 +84,9 @@ static int string_to_radio_access_mode(const char *mode)
static void radio_rat_mode_query_callback(const struct ofono_error *error,
enum ofono_radio_access_mode mode,
void *data);
+static void fast_dormancy_query_callback(const struct ofono_error *error,
+ ofono_bool_t enable,
+ void *data);
static DBusMessage *radio_get_properties_reply(DBusMessage *msg, struct
ofono_radio_settings *rs)
{
@@ -109,6 +116,17 @@ static DBusMessage *radio_get_properties_reply(DBusMessage *msg,
struct ofono_ra
return NULL;
}
+ if (rs->flags & FAST_DORMANCY_SETTING_CACHED) {
+ dbus_bool_t value = rs->fast_dormancy_current;
+ ofono_dbus_dict_append(&dict, "FastDormancy",
+ DBUS_TYPE_BOOLEAN, &value);
+ } else if (rs->driver->query_fast_dormancy) {
+ rs->driver->query_fast_dormancy(rs,
+ fast_dormancy_query_callback, rs);
+ dbus_message_unref(reply);
+ return NULL;
+ }
+
dbus_message_iter_close_container(&iter, &dict);
return reply;
@@ -174,6 +192,67 @@ static void radio_rat_mode_query_callback(const struct ofono_error
*error,
__ofono_dbus_pending_reply(&rs->pending, reply);
}
+static void set_fast_dormancy(struct ofono_radio_settings *rs,
+ ofono_bool_t enable)
+{
+ if ((rs->flags & FAST_DORMANCY_SETTING_CACHED) &&
+ rs->fast_dormancy_current != enable) {
+
+ DBusConnection *conn = ofono_dbus_get_connection();
+ const char *path = __ofono_atom_get_path(rs->atom);
+ dbus_bool_t value = enable;
+
+ ofono_dbus_signal_property_changed(conn, path,
+ OFONO_RADIO_SETTINGS_INTERFACE,
+ "FastDormancy",
+ DBUS_TYPE_BOOLEAN, &value);
+ }
+
+ rs->fast_dormancy_current = enable;
+ rs->flags |= FAST_DORMANCY_SETTING_CACHED;
+}
+
+static void fast_dormancy_set_callback(const struct ofono_error *error,
+ void *data)
+{
+ struct ofono_radio_settings *rs = data;
+ DBusMessage *reply;
+
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+ DBG("Error setting fast dormancy");
+ rs->fast_dormancy_target = rs->fast_dormancy_current;
+ reply = __ofono_error_failed(rs->pending);
+ __ofono_dbus_pending_reply(&rs->pending, reply);
+ return;
+ }
+
+ reply = dbus_message_new_method_return(rs->pending);
+ __ofono_dbus_pending_reply(&rs->pending, reply);
+
+ set_fast_dormancy(rs, rs->fast_dormancy_target);
+}
+
+static void fast_dormancy_query_callback(const struct ofono_error *error,
+ ofono_bool_t enable,
+ void *data)
+{
+ struct ofono_radio_settings *rs = data;
+ DBusMessage *reply;
+
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+ DBG("Error during fast dormancy query");
+ reply = __ofono_error_failed(rs->pending);
+ __ofono_dbus_pending_reply(&rs->pending, reply);
+ return;
+ }
+
+ set_fast_dormancy(rs, enable);
+
+ reply = radio_get_properties_reply(rs->pending, rs);
+ if (reply)
+ __ofono_dbus_pending_reply(&rs->pending, reply);
+}
+
static DBusMessage *radio_get_properties(DBusConnection *conn, DBusMessage *msg,
void *data)
{
@@ -235,6 +314,29 @@ static DBusMessage *radio_set_property(DBusConnection *conn,
DBusMessage *msg,
rs->driver->set_rat_mode(rs, mode, radio_mode_set_callback, rs);
return NULL;
+ } else if (g_strcmp0(property, "FastDormancy") == 0) {
+ dbus_bool_t value;
+ ofono_bool_t target;
+
+ if (!rs->driver->set_fast_dormancy)
+ return __ofono_error_not_implemented(msg);
+
+ if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_BOOLEAN)
+ return __ofono_error_invalid_args(msg);
+
+ dbus_message_iter_get_basic(&var, &value);
+ target = value;
+
+ if (rs->fast_dormancy_target == target)
+ return dbus_message_new_method_return(msg);
+
+ rs->pending = dbus_message_ref(msg);
+ rs->fast_dormancy_target = target;
+
+ rs->driver->set_fast_dormancy(rs, target,
+ fast_dormancy_set_callback, rs);
+
+ return NULL;
}
return __ofono_error_invalid_args(msg);
--
1.7.0.4
12:21 a.m.
New subject: [PATCH 3/4] radio settings: document FastDormancy property
---
doc/radio-settings-api.txt | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/doc/radio-settings-api.txt b/doc/radio-settings-api.txt
index 3372abd..f1b91ad 100644
--- a/doc/radio-settings-api.txt
+++ b/doc/radio-settings-api.txt
@@ -41,3 +41,25 @@ Properties string TechnologyPreference [read-write]
"gsm" Only GSM used for radio access.
"umts" Only UMTS used for radio access.
"lte" Only LTE used for radio acccess.
+
+ boolean FastDormancy [read-write, optional]
+
+ This property will enable or disable fast
+ dormancy. Fast dormancy refers to UE initiated
+ release of radio resources quickly after a
+ burst of data transfer has ended. Normally,
+ radio resources are released by the network
+ after a timeout configured by the network
+ operator. Fast dormancy allows the modem to
+ release radio resources more quickly.
+ Typically, fast dormancy would be enabled if
+ no data transfer is predicted to occur in the
+ near future, for instance, when the end user
+ is not actively using the device. This is a
+ major power-saving feature for mobile devices,
+ but can be ignored for USB sticks or PCI
+ devices.
+
+ If the modem does not support such a feature
+ the property should never be exposed to the
+ user.
--
1.7.0.4
12:21 a.m.
New subject: [PATCH 4/4] test: add scripts to enable and disable fast dormancy
---
Makefile.am | 4 +++-
test/disable-fast-dormancy | 20 ++++++++++++++++++++
test/enable-fast-dormancy | 20 ++++++++++++++++++++
3 files changed, 43 insertions(+), 1 deletions(-)
create mode 100755 test/disable-fast-dormancy
create mode 100755 test/enable-fast-dormancy
diff --git a/Makefile.am b/Makefile.am
index 6c56459..7a56cb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -407,7 +407,9 @@ test_scripts = test/backtrace \
test/lock-pin \
test/unlock-pin \
test/enable-gprs \
- test/disable-gprs
+ test/disable-gprs \
+ test/enable-fast-dormancy \
+ test/disable-fast-dormancy
if TEST
testdir = $(pkglibdir)/test
diff --git a/test/disable-fast-dormancy b/test/disable-fast-dormancy
new file mode 100755
index 0000000..ec326aa
--- /dev/null
+++ b/test/disable-fast-dormancy
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+
+import dbus
+import sys
+
+bus = dbus.SystemBus()
+
+if len(sys.argv) == 2:
+ path = sys.argv[1]
+else:
+ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+ 'org.ofono.Manager')
+ modems = manager.GetModems()
+ path = modems[0][0]
+
+print "Disabling fast dormancy on modem %s..." % path
+cm = dbus.Interface(bus.get_object('org.ofono', path),
+ 'org.ofono.RadioSettings')
+
+cm.SetProperty("FastDormancy", dbus.Boolean(0))
diff --git a/test/enable-fast-dormancy b/test/enable-fast-dormancy
new file mode 100755
index 0000000..93ec1d5
--- /dev/null
+++ b/test/enable-fast-dormancy
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+
+import dbus
+import sys
+
+bus = dbus.SystemBus()
+
+if len(sys.argv) == 2:
+ path = sys.argv[1]
+else:
+ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+ 'org.ofono.Manager')
+ modems = manager.GetModems()
+ path = modems[0][0]
+
+print "Enabling fast dormancy on modem %s..." % path
+cm = dbus.Interface(bus.get_object('org.ofono', path),
+ 'org.ofono.RadioSettings')
+
+cm.SetProperty("FastDormancy", dbus.Boolean(1))
--
1.7.0.4
4364
days inactive
4364
days old
4 comments
1 participants
participants (1)
-
Mika Liljeberg