From 2bdcf3f0d00077c59dcc04d0232c7c5b1a278a59 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Tue, 25 Jul 2017 15:35:51 +0200 Subject: [PATCH] common,atmodem: rename & move at_util_call_compare_by_status to common.c at_util_call_compare_by_status is used by several modem drivers. --- drivers/atmodem/atutil.c | 11 ----------- drivers/atmodem/atutil.h | 2 +- drivers/atmodem/voicecall.c | 16 ++++++++-------- drivers/hfpmodem/voicecall.c | 20 ++++++++++---------- drivers/huaweimodem/voicecall.c | 4 ++-- drivers/ifxmodem/voicecall.c | 10 +++++----- src/common.c | 12 ++++++++++++ src/common.h | 1 + 8 files changed, 39 insertions(+), 37 deletions(-) diff --git a/drivers/atmodem/atutil.c b/drivers/atmodem/atutil.c index 1a48b606..fecae19e 100644 --- a/drivers/atmodem/atutil.c +++ b/drivers/atmodem/atutil.c @@ -68,17 +68,6 @@ void decode_at_error(struct ofono_error *error, const char *final) } } -gint at_util_call_compare_by_status(gconstpointer a, gconstpointer b) -{ - const struct ofono_call *call = a; - int status = GPOINTER_TO_INT(b); - - if (status != call->status) - return 1; - - return 0; -} - gint at_util_call_compare_by_phone_number(gconstpointer a, gconstpointer b) { const struct ofono_call *call = a; diff --git a/drivers/atmodem/atutil.h b/drivers/atmodem/atutil.h index 95e09900..4afd21c8 100644 --- a/drivers/atmodem/atutil.h +++ b/drivers/atmodem/atutil.h @@ -51,7 +51,7 @@ enum at_util_charset { typedef void (*at_util_sim_inserted_cb_t)(gboolean present, void *userdata); void decode_at_error(struct ofono_error *error, const char *final); -gint at_util_call_compare_by_status(gconstpointer a, gconstpointer b); +gint ofono_call_compare_by_status(gconstpointer a, gconstpointer b); gint at_util_call_compare_by_phone_number(gconstpointer a, gconstpointer b); gint at_util_call_compare_by_id(gconstpointer a, gconstpointer b); GSList *at_util_parse_clcc(GAtResult *result, unsigned int *mpty_ids); diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c index 6fee39bc..68cd694c 100644 --- a/drivers/atmodem/voicecall.c +++ b/drivers/atmodem/voicecall.c @@ -660,13 +660,13 @@ static void ring_notify(GAtResult *result, gpointer user_data) /* See comment in CRING */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_WAITING), - at_util_call_compare_by_status)) + ofono_call_compare_by_status)) return; /* RING can repeat, ignore if we already have an incoming call */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status)) + ofono_call_compare_by_status)) return; /* Generate an incoming call of unknown type */ @@ -698,13 +698,13 @@ static void cring_notify(GAtResult *result, gpointer user_data) */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_WAITING), - at_util_call_compare_by_status)) + ofono_call_compare_by_status)) return; /* CRING can repeat, ignore if we already have an incoming call */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status)) + ofono_call_compare_by_status)) return; g_at_result_iter_init(&iter, result); @@ -748,7 +748,7 @@ static void clip_notify(GAtResult *result, gpointer user_data) l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (l == NULL) { ofono_error("CLIP for unknown call"); return; @@ -810,7 +810,7 @@ static void cdip_notify(GAtResult *result, gpointer user_data) l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (l == NULL) { ofono_error("CDIP for unknown call"); return; @@ -859,7 +859,7 @@ static void cnap_notify(GAtResult *result, gpointer user_data) l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (l == NULL) { ofono_error("CNAP for unknown call"); return; @@ -913,7 +913,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data) /* Some modems resend CCWA, ignore it the second time around */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_WAITING), - at_util_call_compare_by_status)) + ofono_call_compare_by_status)) return; g_at_result_iter_init(&iter, result); diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c index 1a282903..839b422c 100644 --- a/drivers/hfpmodem/voicecall.c +++ b/drivers/hfpmodem/voicecall.c @@ -85,12 +85,12 @@ static GSList *find_dialing(GSList *calls) GSList *c; c = g_slist_find_custom(calls, GINT_TO_POINTER(CALL_STATUS_DIALING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (c == NULL) c = g_slist_find_custom(calls, GINT_TO_POINTER(CALL_STATUS_ALERTING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); return c; } @@ -720,7 +720,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data) /* CCWA can repeat, ignore if we already have an waiting call */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_WAITING), - at_util_call_compare_by_status)) + ofono_call_compare_by_status)) return; /* some phones may send extra CCWA after active call is ended @@ -729,7 +729,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data) */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status)) + ofono_call_compare_by_status)) return; @@ -772,7 +772,7 @@ static gboolean clip_timeout(gpointer user_data) l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (l == NULL) return FALSE; @@ -801,12 +801,12 @@ static void ring_notify(GAtResult *result, gpointer user_data) /* RING can repeat, ignore if we already have an incoming call */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status)) + ofono_call_compare_by_status)) return; waiting = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_WAITING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); /* If we started receiving RINGS but have a waiting call, most * likely all other calls were dropped and we just didn't get @@ -851,7 +851,7 @@ static void clip_notify(GAtResult *result, gpointer user_data) l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (l == NULL) { ofono_error("CLIP for unknown call"); @@ -967,7 +967,7 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc, waiting = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_WAITING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); /* This is a truly bizarre case not covered at all by the specification * (yes, they are complete idiots). Here we assume the other side is @@ -1046,7 +1046,7 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc, { GSList *o = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_DIALING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (o) { struct ofono_call *call = o->data; diff --git a/drivers/huaweimodem/voicecall.c b/drivers/huaweimodem/voicecall.c index 0887f652..9be8fb31 100644 --- a/drivers/huaweimodem/voicecall.c +++ b/drivers/huaweimodem/voicecall.c @@ -179,7 +179,7 @@ static void cring_notify(GAtResult *result, gpointer user_data) /* CRING can repeat, ignore if we already have an incoming call */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status)) + ofono_call_compare_by_status)) return; g_at_result_iter_init(&iter, result); @@ -218,7 +218,7 @@ static void clip_notify(GAtResult *result, gpointer user_data) l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (l == NULL) { ofono_error("CLIP for unknown call"); return; diff --git a/drivers/ifxmodem/voicecall.c b/drivers/ifxmodem/voicecall.c index 581a7906..60278d00 100644 --- a/drivers/ifxmodem/voicecall.c +++ b/drivers/ifxmodem/voicecall.c @@ -545,12 +545,12 @@ static void cring_notify(GAtResult *result, gpointer user_data) */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_WAITING), - at_util_call_compare_by_status)) + ofono_call_compare_by_status)) return; l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (l == NULL) { ofono_error("CRING received before XCALLSTAT!!!"); return; @@ -589,7 +589,7 @@ static void clip_notify(GAtResult *result, gpointer user_data) l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (l == NULL) { ofono_error("CLIP for unknown call"); return; @@ -649,7 +649,7 @@ static void cnap_notify(GAtResult *result, gpointer user_data) */ l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (l == NULL) { ofono_error("CNAP for unknown call"); return; @@ -695,7 +695,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data) l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_WAITING), - at_util_call_compare_by_status); + ofono_call_compare_by_status); if (l == NULL) { ofono_error("CCWA received before XCALLSTAT!!!"); return; diff --git a/src/common.c b/src/common.c index 77d28c33..e4b1b5f0 100644 --- a/src/common.c +++ b/src/common.c @@ -779,3 +779,15 @@ gint ofono_call_compare(gconstpointer a, gconstpointer b) return 0; } + +gint ofono_call_compare_by_status(gconstpointer a, gconstpointer b) +{ + const struct ofono_call *call = a; + int status = GPOINTER_TO_INT(b); + + if (status != call->status) + return 1; + + return 0; +} + diff --git a/src/common.h b/src/common.h index ba38d4e0..aacc72b0 100644 --- a/src/common.h +++ b/src/common.h @@ -187,3 +187,4 @@ gboolean is_valid_apn(const char *apn); const char *call_status_to_string(enum call_status status); gint ofono_call_compare(gconstpointer a, gconstpointer b); +gint ofono_call_compare_by_status(gconstpointer a, gconstpointer b);