From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============6186305274990177781==" MIME-Version: 1.0 From: Kalle Valo Subject: [PATCH v5 2/3] Move report_signal_strength to atutil Date: Thu, 20 May 2010 13:53:21 +0300 Message-ID: <20100520105321.20968.95696.stgit@potku.valot.fi> In-Reply-To: <20100520105215.20968.59029.stgit@potku.valot.fi> List-Id: To: ofono@ofono.org --===============6186305274990177781== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable The function is needed in two different places, better to move it to atutil.h. --- drivers/atmodem/atutil.h | 12 ++++++++++++ drivers/atmodem/network-registration.c | 22 ++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/drivers/atmodem/atutil.h b/drivers/atmodem/atutil.h index 9303ed4..265a5ad 100644 --- a/drivers/atmodem/atutil.h +++ b/drivers/atmodem/atutil.h @@ -55,6 +55,18 @@ static inline struct cb_data *cb_data_new(void *cb, void= *data) return ret; } = +static inline int at_util_convert_signal_strength(int strength) +{ + int result; + + if (strength =3D=3D 99) + result =3D -1; + else + result =3D (strength * 100) / 31; + + return result; +} + #define DECLARE_FAILURE(e) \ struct ofono_error e; \ e.type =3D OFONO_ERROR_TYPE_FAILURE; \ diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/netwo= rk-registration.c index f7aafbe..f137d94 100644 --- a/drivers/atmodem/network-registration.c +++ b/drivers/atmodem/network-registration.c @@ -463,19 +463,6 @@ error: CALLBACK_WITH_FAILURE(cb, data); } = -static inline void report_signal_strength(struct ofono_netreg *netreg, - int strength) -{ - DBG("csq_notify: %d", strength); - - if (strength =3D=3D 99) - strength =3D -1; - else - strength =3D (strength * 100) / 31; - - ofono_netreg_strength_notify(netreg, strength); -} - static void csq_notify(GAtResult *result, gpointer user_data) { struct ofono_netreg *netreg =3D user_data; @@ -490,7 +477,8 @@ static void csq_notify(GAtResult *result, gpointer user= _data) if (!g_at_result_iter_next_number(&iter, &strength)) return; = - report_signal_strength(netreg, strength); + ofono_netreg_strength_notify(netreg, + at_util_convert_signal_strength(strength)); } = static void calypso_csq_notify(GAtResult *result, gpointer user_data) @@ -507,7 +495,8 @@ static void calypso_csq_notify(GAtResult *result, gpoin= ter user_data) if (!g_at_result_iter_next_number(&iter, &strength)) return; = - report_signal_strength(netreg, strength); + ofono_netreg_strength_notify(netreg, + at_util_convert_signal_strength(strength)); } = static void option_osigq_notify(GAtResult *result, gpointer user_data) @@ -524,7 +513,8 @@ static void option_osigq_notify(GAtResult *result, gpoi= nter user_data) if (!g_at_result_iter_next_number(&iter, &strength)) return; = - report_signal_strength(netreg, strength); + ofono_netreg_strength_notify(netreg, + at_util_convert_signal_strength(strength)); } = static void option_owcti_notify(GAtResult *result, gpointer user_data) --===============6186305274990177781==--