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

voicecall: remove ofono_cug_option

This commit is contained in:
Jeevaka Badrappan 2011-01-26 14:17:52 -08:00 committed by Denis Kenzior
parent 0be9e23a90
commit 12c3cf6969
10 changed files with 14 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/atmodem/voicecall.c
View File

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

9
drivers/calypsomodem/voicecall.c
View File

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

4
drivers/hfpmodem/voicecall.c
View File

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

9
drivers/huaweimodem/voicecall.c
View File

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

12
drivers/ifxmodem/voicecall.c
View File

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

14
drivers/isimodem/voicecall.c
View File

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

12
drivers/stemodem/voicecall.c
View File

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

6
include/types.h
View File

@ -49,12 +49,6 @@ enum ofono_clir_option {
OFONO_CLIR_OPTION_SUPPRESSION
};
/* 27.007 Section 6.2 */
enum ofono_cug_option {
OFONO_CUG_OPTION_DEFAULT = 0,
OFONO_CUG_OPTION_INVOCATION = 1,
};
enum ofono_error_type {
OFONO_ERROR_TYPE_NO_ERROR = 0,
OFONO_ERROR_TYPE_CME,

4
include/voicecall.h
View File

@ -63,8 +63,8 @@ struct ofono_voicecall_driver {
*/
void (*dial)(struct ofono_voicecall *vc,
const struct ofono_phone_number *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);
/* Answers an incoming call, this usually corresponds to ATA */
void (*answer)(struct ofono_voicecall *vc,
ofono_voicecall_cb_t cb, void *data);

5
src/voicecall.c
View File

@ -1327,8 +1327,7 @@ static DBusMessage *manager_dial(DBusConnection *conn,
string_to_phone_number(number, &ph);
vc->driver->dial(vc, &ph, clir, OFONO_CUG_OPTION_DEFAULT,
manager_dial_callback, vc);
vc->driver->dial(vc, &ph, clir, manager_dial_callback, vc);
return NULL;
}
@ -2463,7 +2462,7 @@ static void dial_request_cb(const struct ofono_error *error, void *data)
static void dial_request(struct ofono_voicecall *vc)
{
vc->driver->dial(vc, &vc->dial_req->ph, OFONO_CLIR_OPTION_DEFAULT,
OFONO_CUG_OPTION_DEFAULT, dial_request_cb, vc);
dial_request_cb, vc);
}
static void dial_req_disconnect_cb(const struct ofono_error *error, void *data)