diff options
| author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2010-05-27 19:12:46 +0300 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-05-27 13:41:51 -0500 |
| commit | 654c0ef73bd1de0925b3abb3e4561436b2081633 (patch) | |
| tree | 0c7aa0dd7f507d3267b53353c5ffabb8ab5f1190 /drivers/isimodem/isimodem.c | |
| parent | a97a97147d8523cd54be8cd6ddbf16e321b2b133 (diff) | |
| download | ofono-654c0ef73bd1de0925b3abb3e4561436b2081633.tar.bz2 | |
Eliminated bool, true and false from isimodem.
Diffstat (limited to 'drivers/isimodem/isimodem.c')
| -rw-r--r-- | drivers/isimodem/isimodem.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index 9a5e87e0..05ebfe23 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -96,8 +96,9 @@ static void set_power_by_mtc_state(struct isi_data *isi, int state) } } -static void mtc_state_ind_cb(GIsiClient *client, const void *restrict data, - size_t len, uint16_t object, void *opaque) +static void mtc_state_ind_cb(GIsiClient *client, + const void *restrict data, size_t len, + uint16_t object, void *opaque) { const unsigned char *msg = data; struct isi_data *isi = opaque; @@ -120,8 +121,9 @@ static void mtc_state_ind_cb(GIsiClient *client, const void *restrict data, } } -static bool mtc_poll_query_cb(GIsiClient *client, const void *restrict data, - size_t len, uint16_t object, void *opaque) +static gboolean mtc_poll_query_cb(GIsiClient *client, + const void *restrict data, size_t len, + uint16_t object, void *opaque) { const unsigned char *msg = data; struct isi_data *isi = opaque; @@ -132,7 +134,7 @@ static bool mtc_poll_query_cb(GIsiClient *client, const void *restrict data, }; if (isi->linkstate != PN_LINK_UP) - return true; + return TRUE; isi->interval *= 2; if (isi->interval >= 20) @@ -142,11 +144,11 @@ static bool mtc_poll_query_cb(GIsiClient *client, const void *restrict data, isi->interval, mtc_poll_query_cb, opaque); - return true; + return TRUE; } if (len < 3 || msg[0] != MTC_STATE_QUERY_RESP) - return false; + return FALSE; g_isi_subscribe(client, MTC_STATE_INFO_IND, mtc_state_ind_cb, opaque); @@ -157,22 +159,23 @@ static bool mtc_poll_query_cb(GIsiClient *client, const void *restrict data, set_power_by_mtc_state(isi, msg[1]); - return true; + return TRUE; } -static bool mtc_query_cb(GIsiClient *client, const void *restrict data, - size_t len, uint16_t object, void *opaque) +static gboolean mtc_query_cb(GIsiClient *client, + const void *restrict data, size_t len, + uint16_t object, void *opaque) { const unsigned char *msg = data; struct isi_data *isi = opaque; if (!msg) { DBG("ISI client error: %d", g_isi_client_error(client)); - return true; + return TRUE; } if (len < 3 || msg[0] != MTC_STATE_QUERY_RESP) - return false; + return FALSE; DBG("current modem state: %s (0x%02X)", mtc_modem_state_name(msg[1]), msg[1]); @@ -181,10 +184,10 @@ static bool mtc_query_cb(GIsiClient *client, const void *restrict data, set_power_by_mtc_state(isi, msg[1]); - return true; + return TRUE; } -static void reachable_cb(GIsiClient *client, bool alive, uint16_t object, +static void reachable_cb(GIsiClient *client, gboolean alive, uint16_t object, void *opaque) { struct isi_data *isi = opaque; |