Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Unified Diff: src/device.c

Issue 6294001: Added support for GSM in the modemmgr plugin. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/flimflam.git@master
Patch Set: Add a string mapping for NETWORK_TECHNOLOGY_GSM Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/connman.h ('k') | src/service.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/device.c
diff --git a/src/device.c b/src/device.c
index f5a25439e5d1b32ba243c7649e31834971060a83..755d341142366c256e879b44a48cb26494c6e4ec 100644
--- a/src/device.c
+++ b/src/device.c
@@ -80,7 +80,6 @@ struct connman_device {
char *firmware_revision;
char *hardware_revision;
guint prl_version;
- GTimeVal modem_update_time;
} cellular;
struct connman_device_driver *driver;
@@ -223,11 +222,6 @@ enum connman_service_type __connman_device_get_service_type(
return CONNMAN_SERVICE_TYPE_UNKNOWN;
}
-void __connman_device_set_modem_update_time(struct connman_device *device)
-{
- g_get_current_time(&device->cellular.modem_update_time);
-}
-
struct connman_ipconfig *connman_device_add_ipconfig(
struct connman_device *device, enum connman_ipconfig_type type)
{
@@ -420,17 +414,6 @@ static void append_ipconfig(DBusMessageIter *dict, void *arg)
__connman_ipconfig_foreach(device, append_ipconfig_path, dict);
}
-/*
- * Determine whether a GTimeVal represents a valid time.
- * There actually are no invalid values, but we know that
- * a time of [0, 0] should never occur in the context in which
- * we are using GTimeVals.
- */
-static connman_bool_t __is_valid_time(GTimeVal *timeval)
-{
- return timeval->tv_sec != 0 || timeval->tv_usec != 0;
-}
-
static DBusMessage *get_properties(DBusConnection *conn, DBusMessage *msg,
void *data)
{
@@ -543,16 +526,6 @@ static DBusMessage *get_properties(DBusConnection *conn, DBusMessage *msg,
&dict, "Cellular.HardwareRevision",
DBUS_TYPE_STRING,
&device->cellular.hardware_revision);
- if (__is_valid_time(&device->cellular.modem_update_time)) {
- str = g_time_val_to_iso8601(&device->cellular.modem_update_time);
- if (str != NULL) {
- connman_dbus_dict_append_variant(
- &dict,
- "Cellular.LastDeviceUpdate",
- DBUS_TYPE_STRING,
- &str);
- }
- }
connman_dbus_dict_append_variant(
&dict, "Cellular.PRLVersion",
DBUS_TYPE_UINT16,
@@ -2292,19 +2265,6 @@ static int device_load(struct connman_device *device)
device_load_ipconfigs(device, nconfigs, configs);
g_strfreev(configs);
g_clear_error(&error);
-
- if (device->type == CONNMAN_DEVICE_TYPE_CELLULAR) {
- gchar *str;
- str = g_key_file_get_string(keyfile,
- identifier,
- "Cellular.LastDeviceUpdate", NULL);
- if (str != NULL) {
- g_time_val_from_iso8601(
- str,
- &device->cellular.modem_update_time);
- g_free(str);
- }
- }
done:
g_free(identifier);
@@ -2363,20 +2323,6 @@ static int device_save(struct connman_device *device)
paths, npaths);
for (i = 0; i < npaths; i++)
g_free((gpointer)paths[i]);
-
- if (device->type == CONNMAN_DEVICE_TYPE_CELLULAR) {
- if (__is_valid_time(&device->cellular.modem_update_time)) {
- gchar *str;
- str = g_time_val_to_iso8601(&device->cellular.modem_update_time);
- if (str != NULL) {
- g_key_file_set_string(
- keyfile,
- identifier,
- "Cellular.LastDeviceUpdate",
- str);
- }
- }
- }
done:
g_free(identifier);
« no previous file with comments | « src/connman.h ('k') | src/service.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698