sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

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.
This commit is contained in:
Alexander Couzens 2017-07-25 15:35:51 +02:00
parent 2d29d8215d
commit 2bdcf3f0d0
8 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/atmodem/atutil.c
View File

@ -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;

2
drivers/atmodem/atutil.h
View File

@ -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);

16
drivers/atmodem/voicecall.c
View File

@ -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);

20
drivers/hfpmodem/voicecall.c
View File

@ -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;

4
drivers/huaweimodem/voicecall.c
View File

@ -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;

10
drivers/ifxmodem/voicecall.c
View File

@ -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;

12
src/common.c
View File

@ -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;
}

1
src/common.h
View File

@ -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);