diff options
Diffstat (limited to 'audio')
-rw-r--r-- | audio/headset.c | 8 | ||||
-rw-r--r-- | audio/telephony-dummy.c | 4 | ||||
-rw-r--r-- | audio/telephony-maemo.c | 4 | ||||
-rw-r--r-- | audio/telephony.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/audio/headset.c b/audio/headset.c index a5701018..8a578aaf 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -1009,7 +1009,7 @@ int telephony_call_hold_rsp(void *telephony_device, cme_error_t err) return telephony_generic_rsp(telephony_device, err); } -int telephony_disable_nr_and_ec_rsp(void *telephony_device, cme_error_t err) +int telephony_nr_and_ec_rsp(void *telephony_device, cme_error_t err) { struct audio_device *device = telephony_device; struct headset *hs = device->headset; @@ -1050,7 +1050,7 @@ static int operator_selection(struct audio_device *device, const char *buf) return 0; } -static int disable_nr_and_ec(struct audio_device *device, const char *buf) +static int nr_and_ec(struct audio_device *device, const char *buf) { struct headset *hs = device->headset; @@ -1062,7 +1062,7 @@ static int disable_nr_and_ec(struct audio_device *device, const char *buf) else hs->nrec_req = TRUE; - telephony_disable_nr_and_ec_req(device, hs->nrec_req); + telephony_nr_and_ec_req(device, hs->nrec_req); return 0; } @@ -1086,7 +1086,7 @@ static struct event event_callbacks[] = { { "AT+CMEE", extended_errors }, { "AT+CCWA", call_waiting_notify }, { "AT+COPS", operator_selection }, - { "AT+NREC", disable_nr_and_ec }, + { "AT+NREC", nr_and_ec }, { 0 } }; diff --git a/audio/telephony-dummy.c b/audio/telephony-dummy.c index 9c13e91d..c1eee1d3 100644 --- a/audio/telephony-dummy.c +++ b/audio/telephony-dummy.c @@ -197,12 +197,12 @@ void telephony_call_hold_req(void *telephony_device, const char *cmd) telephony_call_hold_rsp(telephony_device, CME_ERROR_NONE); } -void telephony_disable_nr_and_ec_req(void *telephony_device, gboolean enable) +void telephony_nr_and_ec_req(void *telephony_device, gboolean enable) { debug("telephony-dummy: got %s NR and EC request", enable ? "enable" : "disable"); - telephony_disable_nr_and_ec_rsp(telephony_device, CME_ERROR_NONE); + telephony_nr_and_ec_rsp(telephony_device, CME_ERROR_NONE); } /* D-Bus method handlers */ diff --git a/audio/telephony-maemo.c b/audio/telephony-maemo.c index 997e4652..6388f56f 100644 --- a/audio/telephony-maemo.c +++ b/audio/telephony-maemo.c @@ -760,11 +760,11 @@ void telephony_call_hold_req(void *telephony_device, const char *cmd) telephony_call_hold_rsp(telephony_device, CME_ERROR_NONE); } -void telephony_disable_nr_and_ec_req(void *telephony_device, gboolean enable) +void telephony_nr_and_ec_req(void *telephony_device, gboolean enable) { debug("telephony-maemo: got %s NR and EC request", enable ? "enable" : "disable"); - telephony_disable_nr_and_ec_rsp(telephony_device, CME_ERROR_NONE); + telephony_nr_and_ec_rsp(telephony_device, CME_ERROR_NONE); } static void handle_incoming_call(DBusMessage *msg) diff --git a/audio/telephony.h b/audio/telephony.h index 084b1571..1c93b46f 100644 --- a/audio/telephony.h +++ b/audio/telephony.h @@ -153,7 +153,7 @@ void telephony_subscriber_number_req(void *telephony_device); void telephony_list_current_calls_req(void *telephony_device); void telephony_operator_selection_req(void *telephony_device); void telephony_call_hold_req(void *telephony_device, const char *cmd); -void telephony_disable_nr_and_ec_req(void *telephony_device, gboolean enable); +void telephony_nr_and_ec_req(void *telephony_device, gboolean enable); /* AG responses to HF requests. These are implemented by headset.c */ int telephony_event_reporting_rsp(void *telephony_device, cme_error_t err); @@ -167,7 +167,7 @@ int telephony_subscriber_number_rsp(void *telephony_device, cme_error_t err); int telephony_list_current_calls_rsp(void *telephony_device, cme_error_t err); int telephony_operator_selection_rsp(void *telephony_device, cme_error_t err); int telephony_call_hold_rsp(void *telephony_device, cme_error_t err); -int telephony_disable_nr_and_ec_rsp(void *telephony_device, cme_error_t err); +int telephony_nr_and_ec_rsp(void *telephony_device, cme_error_t err); /* Event indications by AG. These are implemented by headset.c */ int telephony_event_ind(int index); |