diff options
author | Denis Kenzior <denkenz@gmail.com> | 2010-08-18 21:09:03 -0500 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2010-08-18 21:09:03 -0500 |
commit | 999a754ef7041834d8452ffa4f123f9e84070179 (patch) | |
tree | 177b17a68b4b70a84e5d2172b2a59aebac79684e /src | |
parent | 89f37c9010492f5919f5029338ddfb5972f8b383 (diff) | |
download | ofono-999a754ef7041834d8452ffa4f123f9e84070179.tar.bz2 |
netreg: Move more stuff around
Diffstat (limited to 'src')
-rw-r--r-- | src/network.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/network.c b/src/network.c index 2b10e549..beca63d7 100644 --- a/src/network.c +++ b/src/network.c @@ -85,10 +85,6 @@ struct ofono_netreg { struct ofono_atom *atom; }; -static void registration_status_callback(const struct ofono_error *error, - int status, int lac, int ci, int tech, - void *data); - struct network_operator_data { char name[OFONO_MAX_OPERATOR_NAME_LENGTH + 1]; char mcc[OFONO_MAX_MCC_LENGTH + 1]; @@ -178,6 +174,20 @@ static void set_registration_mode(struct ofono_netreg *netreg, int mode) "Mode", DBUS_TYPE_STRING, &strmode); } +static void registration_status_callback(const struct ofono_error *error, + int status, int lac, int ci, int tech, + void *data) +{ + struct ofono_netreg *netreg = data; + + if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { + DBG("Error during registration status query"); + return; + } + + ofono_netreg_status_notify(netreg, status, lac, ci, tech); +} + static void register_callback(const struct ofono_error *error, void *data) { struct ofono_netreg *netreg = data; @@ -1328,20 +1338,6 @@ void ofono_netreg_time_notify(struct ofono_netreg *netreg, __ofono_nettime_info_received(modem, info); } -static void registration_status_callback(const struct ofono_error *error, - int status, int lac, int ci, int tech, - void *data) -{ - struct ofono_netreg *netreg = data; - - if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { - DBG("Error during registration status query"); - return; - } - - ofono_netreg_status_notify(netreg, status, lac, ci, tech); -} - static void signal_strength_callback(const struct ofono_error *error, int strength, void *data) { |