summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2010-08-18 21:07:50 -0500
committerDenis Kenzior <denkenz@gmail.com>2010-08-18 21:07:50 -0500
commit89f37c9010492f5919f5029338ddfb5972f8b383 (patch)
tree88036f88ccd2ad449fb6c3419c6e5585ad6b451c
parent0225a8ea10a42abed8bfa4d4cac4f3a5c030cc64 (diff)
downloadofono-89f37c9010492f5919f5029338ddfb5972f8b383.tar.bz2
netreg: Move stuff around to avoid forward decl
-rw-r--r--src/network.c29
1 files changed, 13 insertions, 16 deletions
diff --git a/src/network.c b/src/network.c
index 021f4d93..2b10e549 100644
--- a/src/network.c
+++ b/src/network.c
@@ -85,9 +85,6 @@ struct ofono_netreg {
struct ofono_atom *atom;
};
-static void signal_strength_callback(const struct ofono_error *error,
- int strength, void *data);
-
static void registration_status_callback(const struct ofono_error *error,
int status, int lac, int ci, int tech,
void *data);
@@ -1345,6 +1342,19 @@ static void registration_status_callback(const struct ofono_error *error,
ofono_netreg_status_notify(netreg, status, lac, ci, tech);
}
+static void signal_strength_callback(const struct ofono_error *error,
+ int strength, void *data)
+{
+ struct ofono_netreg *netreg = data;
+
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+ DBG("Error during signal strength query");
+ return;
+ }
+
+ ofono_netreg_strength_notify(netreg, strength);
+}
+
static void init_registration_status(const struct ofono_error *error,
int status, int lac, int ci, int tech,
void *data)
@@ -1405,19 +1415,6 @@ void ofono_netreg_strength_notify(struct ofono_netreg *netreg, int strength)
}
}
-static void signal_strength_callback(const struct ofono_error *error,
- int strength, void *data)
-{
- struct ofono_netreg *netreg = data;
-
- if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
- DBG("Error during signal strength query");
- return;
- }
-
- ofono_netreg_strength_notify(netreg, strength);
-}
-
static void sim_opl_read_cb(int ok, int length, int record,
const unsigned char *data,
int record_length, void *userdata)