diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/atmodem/voicecall.c | 12 | ||||
-rw-r--r-- | drivers/calypsomodem/voicecall.c | 9 | ||||
-rw-r--r-- | drivers/hfpmodem/voicecall.c | 4 | ||||
-rw-r--r-- | drivers/huaweimodem/voicecall.c | 9 | ||||
-rw-r--r-- | drivers/ifxmodem/voicecall.c | 12 | ||||
-rw-r--r-- | drivers/isimodem/voicecall.c | 14 | ||||
-rw-r--r-- | drivers/stemodem/voicecall.c | 12 |
7 files changed, 10 insertions, 62 deletions
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c index 9e569990..10cac425 100644 --- a/drivers/atmodem/voicecall.c +++ b/drivers/atmodem/voicecall.c @@ -367,8 +367,8 @@ out: static void at_dial(struct ofono_voicecall *vc, const struct ofono_phone_number *ph, - enum ofono_clir_option clir, enum ofono_cug_option cug, - ofono_voicecall_cb_t cb, void *data) + enum ofono_clir_option clir, ofono_voicecall_cb_t cb, + void *data) { struct voicecall_data *vd = ofono_voicecall_get_data(vc); struct cb_data *cbd = cb_data_new(cb, data); @@ -395,14 +395,6 @@ static void at_dial(struct ofono_voicecall *vc, break; } - switch (cug) { - case OFONO_CUG_OPTION_INVOCATION: - strcat(buf, "G"); - break; - default: - break; - } - strcat(buf, ";"); if (g_at_chat_send(vd->chat, buf, atd_prefix, diff --git a/drivers/calypsomodem/voicecall.c b/drivers/calypsomodem/voicecall.c index 837ff694..204ed14c 100644 --- a/drivers/calypsomodem/voicecall.c +++ b/drivers/calypsomodem/voicecall.c @@ -80,7 +80,6 @@ error: static void calypso_dial(struct ofono_voicecall *vc, const struct ofono_phone_number *ph, enum ofono_clir_option clir, - enum ofono_cug_option cug, ofono_voicecall_cb_t cb, void *data) { char buf[256]; @@ -101,14 +100,6 @@ static void calypso_dial(struct ofono_voicecall *vc, break; } - switch (cug) { - case OFONO_CUG_OPTION_INVOCATION: - strcat(buf, "G"); - break; - default: - break; - } - strcat(buf, ";"); calypso_template(vc, buf, cb, data); diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c index d4d370e3..d12a5efb 100644 --- a/drivers/hfpmodem/voicecall.c +++ b/drivers/hfpmodem/voicecall.c @@ -355,8 +355,8 @@ out: static void hfp_dial(struct ofono_voicecall *vc, const struct ofono_phone_number *ph, - enum ofono_clir_option clir, enum ofono_cug_option cug, - ofono_voicecall_cb_t cb, void *data) + enum ofono_clir_option clir, ofono_voicecall_cb_t cb, + void *data) { struct voicecall_data *vd = ofono_voicecall_get_data(vc); struct cb_data *cbd = cb_data_new(cb, data); diff --git a/drivers/huaweimodem/voicecall.c b/drivers/huaweimodem/voicecall.c index 0c0aaa1e..aef2a116 100644 --- a/drivers/huaweimodem/voicecall.c +++ b/drivers/huaweimodem/voicecall.c @@ -115,7 +115,6 @@ error: static void huawei_dial(struct ofono_voicecall *vc, const struct ofono_phone_number *ph, enum ofono_clir_option clir, - enum ofono_cug_option cug, ofono_voicecall_cb_t cb, void *data) { char buf[256]; @@ -136,14 +135,6 @@ static void huawei_dial(struct ofono_voicecall *vc, break; } - switch (cug) { - case OFONO_CUG_OPTION_INVOCATION: - strcat(buf, "G"); - break; - default: - break; - } - strcat(buf, ";"); huawei_template(vc, buf, cb, data); diff --git a/drivers/ifxmodem/voicecall.c b/drivers/ifxmodem/voicecall.c index f6736247..fcd0c7e8 100644 --- a/drivers/ifxmodem/voicecall.c +++ b/drivers/ifxmodem/voicecall.c @@ -298,8 +298,8 @@ static void atd_cb(gboolean ok, GAtResult *result, gpointer user_data) static void ifx_dial(struct ofono_voicecall *vc, const struct ofono_phone_number *ph, - enum ofono_clir_option clir, enum ofono_cug_option cug, - ofono_voicecall_cb_t cb, void *data) + enum ofono_clir_option clir, ofono_voicecall_cb_t cb, + void *data) { struct voicecall_data *vd = ofono_voicecall_get_data(vc); struct cb_data *cbd = cb_data_new(cb, data); @@ -326,14 +326,6 @@ static void ifx_dial(struct ofono_voicecall *vc, break; } - switch (cug) { - case OFONO_CUG_OPTION_INVOCATION: - strcat(buf, "G"); - break; - default: - break; - } - strcat(buf, ";"); if (g_at_chat_send(vd->chat, buf, atd_prefix, diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c index 55f4c17e..6a1e582a 100644 --- a/drivers/isimodem/voicecall.c +++ b/drivers/isimodem/voicecall.c @@ -927,9 +927,8 @@ static struct isi_call_req_ctx *isi_call_dtmf_send_req(struct ofono_voicecall *o static void isi_dial(struct ofono_voicecall *ovc, const struct ofono_phone_number *restrict number, - enum ofono_clir_option clir, - enum ofono_cug_option cug, - ofono_voicecall_cb_t cb, void *data) + enum ofono_clir_option clir, ofono_voicecall_cb_t cb, + void *data) { unsigned char presentation = CALL_GSM_PRESENTATION_DEFAULT; @@ -945,15 +944,6 @@ static void isi_dial(struct ofono_voicecall *ovc, break; } - switch (cug) { - case OFONO_CUG_OPTION_DEFAULT: - break; - case OFONO_CUG_OPTION_INVOCATION: - /* Not implemented */ - CALLBACK_WITH_FAILURE(cb, data); - return; - } - isi_call_create_req(ovc, presentation, number->type, number->number, cb, data); } diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c index ad505ffc..5210483a 100644 --- a/drivers/stemodem/voicecall.c +++ b/drivers/stemodem/voicecall.c @@ -180,8 +180,8 @@ static void atd_cb(gboolean ok, GAtResult *result, gpointer user_data) static void ste_dial(struct ofono_voicecall *vc, const struct ofono_phone_number *ph, - enum ofono_clir_option clir, enum ofono_cug_option cug, - ofono_voicecall_cb_t cb, void *data) + enum ofono_clir_option clir, ofono_voicecall_cb_t cb, + void *data) { struct voicecall_data *vd = ofono_voicecall_get_data(vc); struct cb_data *cbd = cb_data_new(cb, data); @@ -208,14 +208,6 @@ static void ste_dial(struct ofono_voicecall *vc, break; } - switch (cug) { - case OFONO_CUG_OPTION_DEFAULT: - break; - case OFONO_CUG_OPTION_INVOCATION: - strcat(buf, "G"); - break; - } - strcat(buf, ";"); if (g_at_chat_send(vd->chat, buf, none_prefix, |