diff --git a/drivers/atmodem/atutil.c b/drivers/atmodem/atutil.c index 28a192a4..5a409b80 100644 --- a/drivers/atmodem/atutil.c +++ b/drivers/atmodem/atutil.c @@ -35,17 +35,6 @@ #include "atutil.h" #include "vendor.h" -void dump_response(const char *func, gboolean ok, GAtResult *result) -{ - GSList *l; - - ofono_debug("%s got result: %d", func, ok); - ofono_debug("Final response: %s", result->final_or_pdu); - - for (l = result->lines; l; l = l->next) - ofono_debug("Response line: %s", (char *) l->data); -} - void decode_at_error(struct ofono_error *error, const char *final) { if (!strcmp(final, "OK")) { diff --git a/drivers/atmodem/atutil.h b/drivers/atmodem/atutil.h index fc5b041d..9303ed4a 100644 --- a/drivers/atmodem/atutil.h +++ b/drivers/atmodem/atutil.h @@ -20,7 +20,6 @@ */ void decode_at_error(struct ofono_error *error, const char *final); -void dump_response(const char *func, gboolean ok, GAtResult *result); gint at_util_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); diff --git a/drivers/atmodem/call-barring.c b/drivers/atmodem/call-barring.c index 28476bbb..b1d29008 100644 --- a/drivers/atmodem/call-barring.c +++ b/drivers/atmodem/call-barring.c @@ -50,7 +50,6 @@ static void clck_query_cb(gboolean ok, GAtResult *result, gpointer user_data) GAtResultIter iter; int status_mask, status, class, line; - dump_response("clck_query_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); status_mask = 0; @@ -109,7 +108,6 @@ static void clck_set_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_call_barring_set_cb_t callback = cbd->cb; struct ofono_error error; - dump_response("clck_set_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); callback(&error, cbd->data); } @@ -153,7 +151,6 @@ static void cpwd_set_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_call_barring_set_cb_t callback = cbd->cb; struct ofono_error error; - dump_response("cpwd_set_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); callback(&error, cbd->data); } diff --git a/drivers/atmodem/call-forwarding.c b/drivers/atmodem/call-forwarding.c index b5979f65..72a01883 100644 --- a/drivers/atmodem/call-forwarding.c +++ b/drivers/atmodem/call-forwarding.c @@ -53,7 +53,6 @@ static void ccfc_query_cb(gboolean ok, GAtResult *result, gpointer user_data) int i; int maxlen; - dump_response("ccfc_query_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) @@ -156,7 +155,6 @@ static void ccfc_set_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_call_forwarding_set_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("ccfc_set_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); diff --git a/drivers/atmodem/call-meter.c b/drivers/atmodem/call-meter.c index 7c40f50c..0553d78c 100644 --- a/drivers/atmodem/call-meter.c +++ b/drivers/atmodem/call-meter.c @@ -56,7 +56,6 @@ static void caoc_cacm_camm_query_cb(gboolean ok, char *end; int meter; - dump_response("caoc_cacm_camm_query_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -89,8 +88,6 @@ static void cccm_notify(GAtResult *result, gpointer user_data) char *end; int meter; - dump_response("cccm_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CCCM:")) @@ -156,7 +153,6 @@ static void generic_set_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_call_meter_set_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("generic_set_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -242,7 +238,6 @@ static void cpuc_query_cb(gboolean ok, char currency_buf[64]; double ppuval; - dump_response("cpuc_query_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -317,8 +312,6 @@ static void ccwv_notify(GAtResult *result, gpointer user_data) struct ofono_call_meter *cm = user_data; GAtResultIter iter; - dump_response("ccwv_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CCWV")) return; diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c index 6c2c4aa4..2a3ec42e 100644 --- a/drivers/atmodem/call-settings.c +++ b/drivers/atmodem/call-settings.c @@ -55,7 +55,6 @@ static void ccwa_query_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_error error; GAtResultIter iter; - dump_response("ccwa_query_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) @@ -111,7 +110,6 @@ static void ccwa_set_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_call_settings_set_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("ccwa_set_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -149,7 +147,6 @@ static void clip_query_cb(gboolean ok, GAtResult *result, gpointer user_data) GAtResultIter iter; int status = -1; - dump_response("clip_query_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -201,7 +198,6 @@ static void colp_query_cb(gboolean ok, GAtResult *result, gpointer user_data) GAtResultIter iter; int status; - dump_response("colp_query_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -253,7 +249,6 @@ static void clir_query_cb(gboolean ok, GAtResult *result, gpointer user_data) GAtResultIter iter; int override = 0, network = 2; - dump_response("clir_query_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -302,7 +297,6 @@ static void clir_set_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_call_settings_set_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("clir_set_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); diff --git a/drivers/atmodem/cbs.c b/drivers/atmodem/cbs.c index 1cbd487e..0a5e99a5 100644 --- a/drivers/atmodem/cbs.c +++ b/drivers/atmodem/cbs.c @@ -56,8 +56,6 @@ static void at_cbm_notify(GAtResult *result, gpointer user_data) unsigned char pdu[88]; long hexpdulen; - dump_response("at_cbm_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CBM:")) @@ -99,7 +97,6 @@ static void at_cscb_set_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_cbs_set_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("cscb_set_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -185,8 +182,6 @@ static void at_cscb_support_cb(gboolean ok, GAtResult *result, gpointer user) GAtResultIter iter; char buf[256]; - dump_response("at_cscb_support_cb", ok, result); - if (!ok) goto error; diff --git a/drivers/atmodem/devinfo.c b/drivers/atmodem/devinfo.c index fa1c376e..e4b070b6 100644 --- a/drivers/atmodem/devinfo.c +++ b/drivers/atmodem/devinfo.c @@ -60,7 +60,6 @@ static void attr_cb(gboolean ok, GAtResult *result, gpointer user_data) int i; decode_at_error(&error, g_at_result_final_response(result)); - dump_response("attr_cb", ok, result); if (!ok) { cb(&error, NULL, cbd->data); diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c index 5a09e2aa..a89dcf79 100644 --- a/drivers/atmodem/gprs-context.c +++ b/drivers/atmodem/gprs-context.c @@ -58,7 +58,6 @@ static void at_cgact_down_cb(gboolean ok, GAtResult *result, gpointer user_data) if (ok) gcd->active_context = 0; - dump_response("cgact_down_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -70,7 +69,6 @@ static void at_cgact_up_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_gprs_context_up_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("cgact_up_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, NULL, 0, NULL, NULL, NULL, NULL, cbd->data); @@ -85,8 +83,6 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data) struct cb_data *ncbd; char buf[64]; - dump_response("cgdcont_cb", ok, result); - if (!ok) { struct ofono_error error; @@ -180,8 +176,6 @@ static void at_cgact_read_cb(gboolean ok, GAtResult *result, gint cid, state; GAtResultIter iter; - dump_response("cgact_read_cb", ok, result); - if (!ok) return; diff --git a/drivers/atmodem/gprs.c b/drivers/atmodem/gprs.c index a51fdef3..65b5176f 100644 --- a/drivers/atmodem/gprs.c +++ b/drivers/atmodem/gprs.c @@ -56,7 +56,6 @@ static void at_cgatt_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_gprs_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("cgatt_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -93,7 +92,6 @@ static void at_cgreg_cb(gboolean ok, GAtResult *result, gpointer user_data) int status, lac, ci, tech; struct gprs_data *gd = cbd->user; - dump_response("at_cgreg_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -139,8 +137,6 @@ static void cgreg_notify(GAtResult *result, gpointer user_data) int status, lac, ci, tech; struct gprs_data *gd = ofono_gprs_get_data(gprs); - dump_response("cgreg_notify", TRUE, result); - if (at_util_parse_reg_unsolicited(result, "+CGREG:", &status, &lac, &ci, &tech, gd->vendor) == FALSE) return; @@ -192,8 +188,6 @@ static void at_cgreg_test_cb(gboolean ok, GAtResult *result, int cgreg2 = 0; const char *cmd; - dump_response("cgreg_read_cb", ok, result); - if (!ok) goto error; diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c index d6651532..f79d8746 100644 --- a/drivers/atmodem/network-registration.c +++ b/drivers/atmodem/network-registration.c @@ -75,7 +75,6 @@ static void at_creg_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_error error; struct netreg_data *nd = cbd->user; - dump_response("at_creg_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -126,7 +125,6 @@ static void cops_cb(gboolean ok, GAtResult *result, gpointer user_data) const char *name; struct ofono_error error; - dump_response("cops_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok || nd->mcc[0] == '\0' || nd->mnc[0] == '\0') { @@ -189,8 +187,6 @@ static void cops_numeric_cb(gboolean ok, GAtResult *result, gpointer user_data) const char *str; int format; - dump_response("cops_numeric_cb", ok, result); - if (!ok) goto error; @@ -267,7 +263,6 @@ static void cops_list_cb(gboolean ok, GAtResult *result, gpointer user_data) int num = 0; struct ofono_error error; - dump_response("cops_list_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -386,7 +381,6 @@ static void register_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_netreg_register_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("register_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -475,8 +469,6 @@ static void csq_notify(GAtResult *result, gpointer user_data) int strength; GAtResultIter iter; - dump_response("csq_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CSQ:")) @@ -494,8 +486,6 @@ static void calypso_csq_notify(GAtResult *result, gpointer user_data) int strength; GAtResultIter iter; - dump_response("calypso_csq_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "%CSQ:")) @@ -513,8 +503,6 @@ static void option_osigq_notify(GAtResult *result, gpointer user_data) int strength; GAtResultIter iter; - dump_response("option_osigq_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "_OSIGQ:")) @@ -564,8 +552,6 @@ static void ste_ciev_notify(GAtResult *result, gpointer user_data) int strength, ind; GAtResultIter iter; - dump_response("ciev_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CIEV:")) @@ -591,7 +577,6 @@ static void ste_cind_cb(gboolean ok, GAtResult *result, gpointer user_data) GAtResultIter iter; struct ofono_error error; - dump_response("cind_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -640,7 +625,6 @@ static void csq_cb(gboolean ok, GAtResult *result, gpointer user_data) GAtResultIter iter; struct ofono_error error; - dump_response("csq_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -699,8 +683,6 @@ static void creg_notify(GAtResult *result, gpointer user_data) int status, lac, ci, tech; struct netreg_data *nd = ofono_netreg_get_data(netreg); - dump_response("creg_notify", TRUE, result); - if (at_util_parse_reg_unsolicited(result, "+CREG:", &status, &lac, &ci, &tech, nd->vendor) == FALSE) return; @@ -794,8 +776,6 @@ static void at_creg_test_cb(gboolean ok, GAtResult *result, gpointer user_data) int creg1 = 0; int creg2 = 0; - dump_response("creg_read_cb", ok, result); - if (!ok) goto error; diff --git a/drivers/atmodem/phonebook.c b/drivers/atmodem/phonebook.c index 52126f42..5e7a52b4 100644 --- a/drivers/atmodem/phonebook.c +++ b/drivers/atmodem/phonebook.c @@ -95,8 +95,6 @@ static void at_cpbr_notify(GAtResult *result, gpointer user_data) GAtResultIter iter; int current; - dump_response("at_cbpr_notify", 1, result); - if (pbd->supported & CHARSET_IRA) current = CHARSET_IRA; @@ -282,8 +280,6 @@ static void at_read_charset_cb(gboolean ok, GAtResult *result, const char *charset; char buf[32]; - dump_response("at_read_charset_cb", ok, result); - if (!ok) goto error; @@ -355,8 +351,6 @@ static void at_select_storage_cb(gboolean ok, GAtResult *result, struct ofono_phonebook *pb = cbd->user; struct pb_data *pbd = ofono_phonebook_get_data(pb); - dump_response("at_select_storage_cb", ok, result); - if (!ok) goto error; @@ -410,8 +404,6 @@ static void at_list_storages_cb(gboolean ok, GAtResult *result, GAtResultIter iter; const char *storage; - dump_response("at_list_storages_cb", ok, result); - if (!ok) goto error; @@ -452,8 +444,6 @@ static void at_list_charsets_cb(gboolean ok, GAtResult *result, GAtResultIter iter; const char *charset; - dump_response("at_list_charsets_cb", ok, result); - if (!ok) goto error; diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c index 5c3061e4..d8d656bc 100644 --- a/drivers/atmodem/sim.c +++ b/drivers/atmodem/sim.c @@ -60,7 +60,6 @@ static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data) int str; unsigned char access[3]; - dump_response("at_crsm_info_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -137,7 +136,6 @@ static void at_crsm_read_cb(gboolean ok, GAtResult *result, const guint8 *response; gint sw1, sw2, len; - dump_response("at_crsm_read_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -226,7 +224,6 @@ static void at_crsm_update_cb(gboolean ok, GAtResult *result, struct ofono_error error; gint sw1, sw2; - dump_response("at_crsm_update_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -364,7 +361,6 @@ static void at_cimi_cb(gboolean ok, GAtResult *result, gpointer user_data) const char *imsi; int i; - dump_response("at_cimi_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -437,7 +433,6 @@ static void at_cpin_cb(gboolean ok, GAtResult *result, gpointer user_data) int i; int len = sizeof(at_sim_name) / sizeof(*at_sim_name); - dump_response("at_cpin_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -499,7 +494,6 @@ static void at_lock_unlock_cb(gboolean ok, GAtResult *result, ofono_sim_lock_unlock_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("at_lock_unlock_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -653,7 +647,6 @@ static void at_lock_status_cb(gboolean ok, GAtResult *result, struct ofono_error error; int locked; - dump_response("at_lock_status_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -714,7 +707,6 @@ static void at_csim_envelope_cb(gboolean ok, GAtResult *result, const guint8 *response; gint rlen, len; - dump_response("at_csim_envelope_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c index 41394098..13f57231 100644 --- a/drivers/atmodem/sms.c +++ b/drivers/atmodem/sms.c @@ -91,7 +91,6 @@ static void at_csca_set_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_sms_sca_set_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("csca_set_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -130,7 +129,6 @@ static void at_csca_query_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_phone_number sca; const char *number; - dump_response("at_csca_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -196,7 +194,6 @@ static void at_cmgs_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_error error; int mr; - dump_response("at_cmgs_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) { @@ -289,8 +286,6 @@ static void at_cds_notify(GAtResult *result, gpointer user_data) const char *pdu; char buf[256]; - dump_response("at_cds_notify", TRUE, result); - if (!at_parse_pdu_common(result, "+CDS:", &pdu, &pdulen)) { ofono_error("Unable to parse CDS notification"); return; @@ -318,8 +313,6 @@ static void at_cmt_notify(GAtResult *result, gpointer user_data) unsigned char pdu[176]; char buf[256]; - dump_response("at_cmt_notify", TRUE, result); - if (!at_parse_pdu_common(result, "+CMT:", &hexpdu, &tpdu_len)) { ofono_error("Unable to parse CMT notification"); return; @@ -354,8 +347,6 @@ static void at_cmgr_notify(GAtResult *result, gpointer user_data) long pdu_len; int tpdu_len; - dump_response("at_cmgr_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CMGR:")) @@ -428,8 +419,6 @@ static void at_cmti_notify(GAtResult *result, gpointer user_data) GAtResultIter iter; int index; - dump_response("at_cmti_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CMTI:")) @@ -501,8 +490,6 @@ static void at_cmgl_notify(GAtResult *result, gpointer user_data) int status; char buf[16]; - dump_response("at_cmgl_notify", TRUE, result); - g_at_result_iter_init(&iter, result); while (g_at_result_iter_next(&iter, "+CMGL:")) { @@ -753,8 +740,6 @@ static void at_cnmi_query_cb(gboolean ok, GAtResult *result, gpointer user_data) gboolean supported = FALSE; char buf[128]; - dump_response("at_cnmi_query_cb", ok, result); - if (!ok) goto out; @@ -807,8 +792,6 @@ static void at_cpms_set_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_sms *sms = user_data; struct sms_data *data = ofono_sms_get_data(sms); - dump_response("at_cpms_set_cb", ok, result); - if (ok) return at_query_cnmi(sms); @@ -843,8 +826,6 @@ static void at_cmgf_set_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_sms *sms = user_data; struct sms_data *data = ofono_sms_get_data(sms); - dump_response("at_cmgf_set_cb", ok, result); - if (ok) { data->retries = 0; set_cpms(sms); @@ -878,8 +859,6 @@ static void at_cpms_query_cb(gboolean ok, GAtResult *result, struct sms_data *data = ofono_sms_get_data(sms); gboolean supported = FALSE; - dump_response("cpms_query_cb", ok, result); - if (ok) { int mem = 0; GAtResultIter iter; @@ -954,8 +933,6 @@ static void at_cmgf_query_cb(gboolean ok, GAtResult *result, struct sms_data *data = ofono_sms_get_data(sms); gboolean supported = FALSE; - dump_response("cmgf_query_cb", ok, result); - if (ok) { GAtResultIter iter; int mode; @@ -989,8 +966,6 @@ static void at_csms_status_cb(gboolean ok, GAtResult *result, struct sms_data *data = ofono_sms_get_data(sms); gboolean supported = FALSE; - dump_response("csms_status_cb", ok, result); - if (ok) { GAtResultIter iter; int service; @@ -1047,8 +1022,6 @@ static void at_csms_query_cb(gboolean ok, GAtResult *result, int status_min, status_max; char buf[128]; - dump_response("csms_query_cb", ok, result); - if (!ok) return at_sms_not_supported(sms); diff --git a/drivers/atmodem/ssn.c b/drivers/atmodem/ssn.c index edd3fe82..f219cdea 100644 --- a/drivers/atmodem/ssn.c +++ b/drivers/atmodem/ssn.c @@ -45,8 +45,6 @@ static void cssi_notify(GAtResult *result, gpointer user_data) GAtResultIter iter; int code1, index; - dump_response("cssi_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CSSI:")) @@ -73,8 +71,6 @@ static void cssu_notify(GAtResult *result, gpointer user_data) ph.number[0] = '\0'; ph.type = 129; - dump_response("cssu_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CSSU:")) diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c index 6a399100..555ce134 100644 --- a/drivers/atmodem/ussd.c +++ b/drivers/atmodem/ussd.c @@ -109,7 +109,6 @@ static void cusd_request_cb(gboolean ok, GAtResult *result, gpointer user_data) struct cusd_req *cbd = user_data; struct ofono_error error; - dump_response("cusd_request_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cbd->cb(&error, cbd->data); @@ -173,7 +172,6 @@ static void cusd_cancel_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_ussd_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("cusd_cancel_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -203,8 +201,6 @@ static void cusd_notify(GAtResult *result, gpointer user_data) { struct ofono_ussd *ussd = user_data; - dump_response("cusd_notify", TRUE, result); - cusd_parse(result, ussd); } diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c index 8e432534..fce9144d 100644 --- a/drivers/atmodem/voicecall.c +++ b/drivers/atmodem/voicecall.c @@ -128,8 +128,6 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_call *nc, *oc; gboolean poll_again = FALSE; - dump_response("clcc_poll_cb", ok, result); - if (!ok) { ofono_error("We are polling CLCC and received an error"); ofono_error("All bets are off for call management"); @@ -217,7 +215,6 @@ static void generic_cb(gboolean ok, GAtResult *result, gpointer user_data) struct voicecall_data *vd = ofono_voicecall_get_data(req->vc); struct ofono_error error; - dump_response("generic_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (ok && req->affected_types) { @@ -246,7 +243,6 @@ static void release_id_cb(gboolean ok, GAtResult *result, struct voicecall_data *vd = ofono_voicecall_get_data(req->vc); struct ofono_error error; - dump_response("release_id_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (ok) @@ -273,8 +269,6 @@ static void atd_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_call *call; GSList *l; - dump_response("atd_cb", ok, result); - decode_at_error(&error, g_at_result_final_response(result)); if (!ok) @@ -536,7 +530,6 @@ static void vts_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_voicecall_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("vts_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); } @@ -586,8 +579,6 @@ static void ring_notify(GAtResult *result, gpointer user_data) struct voicecall_data *vd = ofono_voicecall_get_data(vc); struct ofono_call *call; - dump_response("ring_notify", TRUE, result); - /* See comment in CRING */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(5), at_util_call_compare_by_status)) @@ -618,8 +609,6 @@ static void cring_notify(GAtResult *result, gpointer user_data) const char *line; int type; - dump_response("cring_notify", TRUE, result); - /* Handle the following situation: * Active Call + Waiting Call. Active Call is Released. The Waiting * call becomes Incoming and RING/CRING indications are signaled. @@ -675,8 +664,6 @@ static void clip_notify(GAtResult *result, gpointer user_data) GSList *l; struct ofono_call *call; - dump_response("clip_notify", TRUE, result); - l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(4), at_util_call_compare_by_status); @@ -740,8 +727,6 @@ static void ccwa_notify(GAtResult *result, gpointer user_data) int num_type, validity, cls; struct ofono_call *call; - dump_response("ccwa_notify", TRUE, result); - /* Some modems resend CCWA, ignore it the second time around */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(5), at_util_call_compare_by_status)) diff --git a/drivers/calypsomodem/voicecall.c b/drivers/calypsomodem/voicecall.c index 6381c7d7..ae49eb0d 100644 --- a/drivers/calypsomodem/voicecall.c +++ b/drivers/calypsomodem/voicecall.c @@ -52,7 +52,6 @@ static void calypso_generic_cb(gboolean ok, GAtResult *result, ofono_voicecall_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("calypso_generic_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -235,8 +234,6 @@ static void cpi_notify(GAtResult *result, gpointer user_data) int validity; struct ofono_call call; - dump_response("cpi_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "%CPI:")) diff --git a/drivers/hfpmodem/call-volume.c b/drivers/hfpmodem/call-volume.c index 99c35dbc..95065d25 100644 --- a/drivers/hfpmodem/call-volume.c +++ b/drivers/hfpmodem/call-volume.c @@ -59,7 +59,6 @@ static void cv_generic_set_cb(gboolean ok, GAtResult *result, ofono_call_volume_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("generic_set_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c index 28a851c3..1fa0eec0 100644 --- a/drivers/hfpmodem/voicecall.c +++ b/drivers/hfpmodem/voicecall.c @@ -207,8 +207,6 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data) unsigned int num_active = 0; unsigned int num_held = 0; - dump_response("clcc_poll_cb", ok, result); - if (!ok) return; @@ -300,7 +298,6 @@ static void generic_cb(gboolean ok, GAtResult *result, gpointer user_data) struct voicecall_data *vd = ofono_voicecall_get_data(req->vc); struct ofono_error error; - dump_response("generic_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (ok && req->affected_types) { @@ -330,8 +327,6 @@ static void atd_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_call *call; GSList *l; - dump_response("atd_cb", ok, result); - decode_at_error(&error, g_at_result_final_response(result)); if (!ok) @@ -497,7 +492,6 @@ static void release_id_cb(gboolean ok, GAtResult *result, struct voicecall_data *vd = ofono_voicecall_get_data(req->vc); struct ofono_error error; - dump_response("release_id_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (ok) @@ -642,8 +636,6 @@ static void ccwa_notify(GAtResult *result, gpointer user_data) int num_type, validity; struct ofono_call *call; - dump_response("ccwa_notify", TRUE, result); - /* CCWA can repeat, ignore if we already have an waiting call */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_WAITING), @@ -709,8 +701,6 @@ static void ring_notify(GAtResult *result, gpointer user_data) struct ofono_call *call; GSList *waiting; - dump_response("ring_notify", TRUE, result); - /* RING can repeat, ignore if we already have an incoming call */ if (g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), @@ -762,8 +752,6 @@ static void clip_notify(GAtResult *result, gpointer user_data) GSList *l; struct ofono_call *call; - dump_response("clip_notify", TRUE, result); - l = g_slist_find_custom(vd->calls, GINT_TO_POINTER(CALL_STATUS_INCOMING), at_util_call_compare_by_status); @@ -880,7 +868,6 @@ static void sync_dialing_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_call *oc; struct ofono_call *nc; - dump_response("sync_dialing_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (!ok) diff --git a/drivers/hsomodem/gprs-context.c b/drivers/hsomodem/gprs-context.c index bfe3e658..99de5498 100644 --- a/drivers/hsomodem/gprs-context.c +++ b/drivers/hsomodem/gprs-context.c @@ -122,8 +122,6 @@ static void hso_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data) struct cb_data *ncbd; char buf[64]; - dump_response("cgdcont_cb", ok, result); - if (!ok) { struct ofono_error error; diff --git a/drivers/mbmmodem/gprs-context.c b/drivers/mbmmodem/gprs-context.c index f13d1c32..cca50871 100644 --- a/drivers/mbmmodem/gprs-context.c +++ b/drivers/mbmmodem/gprs-context.c @@ -306,8 +306,6 @@ static void mbm_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data) struct cb_data *ncbd; char buf[64]; - dump_response("cgdcont_cb", ok, result); - if (!ok) { struct ofono_error error; diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c index 3c98d55d..2e54f9f9 100644 --- a/drivers/stemodem/gprs-context.c +++ b/drivers/stemodem/gprs-context.c @@ -239,8 +239,6 @@ static void ste_eppsd_down_cb(gboolean ok, GAtResult *result, struct conn_info *conn; GSList *l; - dump_response("ste_eppsd_down_cb", ok, result); - if (!ok) goto error; @@ -288,8 +286,6 @@ static void ste_eppsd_up_cb(gboolean ok, GAtResult *result, gpointer user_data) struct eppsd_response rsp; GMarkupParseContext *context = NULL; - dump_response("ste_eppsd_up_cb", ok, result); - l = g_slist_find_custom(g_caif_devices, GUINT_TO_POINTER(gcd->active_context), conn_compare_by_cid); @@ -370,8 +366,6 @@ static void ste_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data) struct conn_info *conn; GSList *l; - dump_response("cgdcont_cb", ok, result); - if (!ok) { struct ofono_error error; @@ -503,8 +497,6 @@ static void ste_cgact_read_cb(gboolean ok, GAtResult *result, gint cid, state; GAtResultIter iter; - dump_response("cgact_read_cb", ok, result); - if (!ok) return; @@ -538,8 +530,6 @@ static void cgev_notify(GAtResult *result, gpointer user_data) GAtResultIter iter; const char *event; - dump_response("cgev_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "+CGEV:")) diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c index 2d746cc3..a56709ae 100644 --- a/drivers/stemodem/voicecall.c +++ b/drivers/stemodem/voicecall.c @@ -134,7 +134,6 @@ static void ste_generic_cb(gboolean ok, GAtResult *result, gpointer user_data) struct voicecall_data *vd = ofono_voicecall_get_data(req->vc); struct ofono_error error; - dump_response("ste_generic_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (ok && req->affected_types) { @@ -159,7 +158,6 @@ static void release_id_cb(gboolean ok, GAtResult *result, struct voicecall_data *vd = ofono_voicecall_get_data(req->vc); struct ofono_error error; - dump_response("release_id_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); if (ok) @@ -174,8 +172,6 @@ static void atd_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_error error; ofono_voicecall_cb_t cb = cbd->cb; - dump_response("atd_cb", ok, result); - decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); @@ -372,7 +368,6 @@ static void vts_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_voicecall_cb_t cb = cbd->cb; struct ofono_error error; - dump_response("vts_cb", ok, result); decode_at_error(&error, g_at_result_final_response(result)); cb(&error, cbd->data); } @@ -427,8 +422,6 @@ static void ecav_notify(GAtResult *result, gpointer user_data) GSList *l; /* Parse ECAV */ - dump_response("ecav_notify", TRUE, result); - g_at_result_iter_init(&iter, result); if (!g_at_result_iter_next(&iter, "*ECAV:"))