From 9b60a5a76f13eff7a165e4d593f24ad25f2d32fe Mon Sep 17 00:00:00 2001 From: Suresh Kumar N Date: Thu, 10 Apr 2014 16:04:04 +0530 Subject: [PATCH 1/1] Updated as per tcore_at_prepare_and_send_request() API change Change-Id: I2ce7db43f211cba398ed6e071c04a160c55ba613 --- src/desc-imc.c | 4 +- src/imc_call.c | 34 ++------ src/imc_gps.c | 5 +- src/imc_modem.c | 33 ++------ src/imc_network.c | 49 ++++-------- src/imc_phonebook.c | 24 ++---- src/imc_ps.c | 29 ++----- src/imc_sap.c | 36 +++------ src/imc_sat.c | 16 +--- src/imc_sim.c | 220 ++++++++++++++++++++++++---------------------------- src/imc_sms.c | 85 ++++++-------------- src/imc_ss.c | 138 ++++++++++++-------------------- 12 files changed, 236 insertions(+), 437 deletions(-) diff --git a/src/desc-imc.c b/src/desc-imc.c index 960706f..f639fc9 100644 --- a/src/desc-imc.c +++ b/src/desc-imc.c @@ -78,11 +78,9 @@ static void __send_request(CoreObject *co, const gchar *at_cmd, { (void)tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, resp_cb, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); } static void __on_response_subscribe_bootup_notification(TcorePending *p, diff --git a/src/imc_call.c b/src/imc_call.c index 142ede3..918bc09 100644 --- a/src/imc_call.c +++ b/src/imc_call.c @@ -518,12 +518,9 @@ static TelReturn __send_call_request(CoreObject *co, TcoreObjectResponseCallback ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_call_default, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, func_name); /* Free resources */ @@ -563,11 +560,9 @@ static TelReturn __call_list_get(CoreObject *co, gboolean flag) ret = tcore_at_prepare_and_send_request(co, "AT+CLCC","+CLCC", TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_imc_call_list_get, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get current call list"); return ret; @@ -985,12 +980,9 @@ static void on_response_imc_call_set_volume_info(TcorePending *p, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+XDRV", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_call_set_volume_info, resp_cb_data, - on_send_imc_request, NULL, - (guint)0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "imc_call_set_volume_info"); g_free(at_cmd); @@ -1062,12 +1054,9 @@ static void on_response_imc_call_set_sound_path(TcorePending *p, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+XDRV", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_call_set_sound_path, resp_cb_data, - on_send_imc_request, NULL, - (guint)0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "imc_call_set_sound_path"); g_free(at_cmd); @@ -1627,12 +1616,9 @@ static TelReturn imc_call_set_volume_info(CoreObject *co, const TelCallVolumeInf ret = tcore_at_prepare_and_send_request(co, at_cmd, "+XDRV", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_call_set_volume_info, resp_cb_data, - on_send_imc_request, NULL, - (guint)0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "imc_call_set_volume_info"); g_free(at_cmd); @@ -1718,12 +1704,9 @@ static TelReturn imc_call_set_sound_path(CoreObject *co, const TelCallSoundPathI ret = tcore_at_prepare_and_send_request(co, at_cmd, "+XDRV", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_call_set_sound_path, resp_cb_data, - on_send_imc_request, NULL, - (guint)0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, NULL, "imc_call_set_sound_path"); g_free(at_cmd); @@ -1771,12 +1754,9 @@ static TelReturn imc_call_set_mute(CoreObject *co, gboolean mute, TcoreObjectRes ret = tcore_at_prepare_and_send_request(co, at_cmd, "+XDRV", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_call_set_mute, resp_cb_data, - on_send_imc_request, NULL, - (guint)0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "imc_call_set_mute"); g_free(at_cmd); diff --git a/src/imc_gps.c b/src/imc_gps.c index c567a7c..750b015 100644 --- a/src/imc_gps.c +++ b/src/imc_gps.c @@ -2035,12 +2035,9 @@ static TelReturn imc_gps_confirm_measure_pos (CoreObject *co, const TelGpsDataIn ret = tcore_at_prepare_and_send_request(co, cmd_str, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_gps_confirm_measure_pos, resp_cb_data, - on_send_imc_request, NULL, - (guint)0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Confirm Measure Position"); g_free(cmd_str); diff --git a/src/imc_modem.c b/src/imc_modem.c index c636972..6ae002f 100644 --- a/src/imc_modem.c +++ b/src/imc_modem.c @@ -150,12 +150,9 @@ static void __imc_modem_unsuspend_nvm_updates(CoreObject *co) ret = tcore_at_prepare_and_send_request(co, cmd_str, "+XDRV:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_modem_unsuspend_nvm_updates, NULL, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, NULL, "Unsuspend Nvm Updates"); g_free(cmd_str); @@ -185,12 +182,9 @@ static void __imc_modem_send_nvm_update_ack(CoreObject *co) ret = tcore_at_prepare_and_send_request(co, cmd_str, "+XDRV:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_modem_send_nvm_update_ack, NULL, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, NULL, "Nvm Update Ack"); g_free(cmd_str); @@ -220,12 +214,9 @@ static void __imc_modem_send_nvm_update_request_ack(CoreObject *co) ret = tcore_at_prepare_and_send_request(co, cmd_str, "+XDRV:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_modem_send_nvm_update_request_ack, NULL, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, NULL, "Nvm Update Request Ack"); g_free(cmd_str); @@ -596,11 +587,9 @@ static TelReturn imc_modem_set_power_status(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_modem_set_power_status, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Power Status"); /* Free resources */ @@ -656,11 +645,9 @@ static TelReturn imc_modem_set_flight_mode(CoreObject *co, gboolean enable, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_modem_set_flight_mode, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Flight mode"); /* Free resources */ @@ -714,7 +701,7 @@ static TelReturn imc_modem_get_version(CoreObject *co, { dbg("entry"); -/* Current modem does not support this operation */ + /* Current modem does not support this operation */ #if 0 ImcRespCbData *resp_cb_data; TelReturn ret; @@ -770,11 +757,9 @@ static TelReturn imc_modem_get_imei(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+CGSN", NULL, TCORE_AT_COMMAND_TYPE_NUMERIC, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_modem_get_imei, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get IMEI"); return ret; @@ -909,11 +894,9 @@ void imc_modem_register_nvm(CoreObject *co) ret = tcore_at_prepare_and_send_request(co, cmd_str, "+XDRV:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_modem_register_nvm, NULL, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); if (ret != TEL_RETURN_SUCCESS) { err("Failed to process request - [Register NVM]"); } diff --git a/src/imc_network.c b/src/imc_network.c index 2a15ec9..5913879 100644 --- a/src/imc_network.c +++ b/src/imc_network.c @@ -135,11 +135,9 @@ static void __imc_network_register_to_network(CoreObject *co) ret = tcore_at_prepare_and_send_request(co, "AT+COPS=0", NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_imc_network_registration, NULL, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); dbg("Sending Network Registration request: [%s]", (ret == TEL_RETURN_SUCCESS ? "SUCCESS" : "FAIL")); } @@ -332,11 +330,9 @@ static TelReturn __imc_network_fetch_nw_name(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+XCOPS=0;+XCOPS=5;+XCOPS=6", "+XCOPS", TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_imc_network_fetch_nw_name, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Fetch Network name"); return ret; @@ -1533,13 +1529,11 @@ static TelReturn imc_network_select_automatic(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+COPS=0", NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_network_default, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Automatic network selection"); + return ret; } @@ -1607,13 +1601,11 @@ static TelReturn imc_network_select_manual(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_network_default, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Manual network selection"); + /* Free resources*/ g_free(at_cmd); return ret; @@ -1653,13 +1645,11 @@ static TelReturn imc_network_get_selection_mode(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+COPS?", "+COPS", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_network_get_selection_mode, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get selection mode"); + return ret; } @@ -1731,13 +1721,11 @@ static TelReturn imc_network_set_preferred_plmn(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_network_default, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set preferred plmn"); + g_free(at_cmd); return ret; } @@ -1769,13 +1757,11 @@ static TelReturn imc_network_get_preferred_plmn(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+CPOL=,2;+CPOL?", "+CPOL", //to make sure is numeric type in reponse. TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_network_get_preferred_plmn, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get preferred plmn"); + return ret; } @@ -1840,12 +1826,11 @@ static TelReturn imc_network_set_mode(CoreObject *co, TelNetworkMode mode, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL , TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_network_default, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set network mode"); + g_free(at_cmd); return ret; } @@ -1889,13 +1874,11 @@ static TelReturn imc_network_get_mode(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+XRAT?", "+XRAT", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_network_get_mode, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get network mode"); + return ret; } diff --git a/src/imc_phonebook.c b/src/imc_phonebook.c index c5d2c93..20b653e 100644 --- a/src/imc_phonebook.c +++ b/src/imc_phonebook.c @@ -279,11 +279,9 @@ static void __imc_phonebook_get_used_index(CoreObject *co, TelPbType pb_type, gu ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CPBR", TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_phonebook_get_used_index, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Used Index"); /* Free resources */ @@ -386,11 +384,9 @@ static void __imc_phonebook_get_support_list(CoreObject *co) ret = tcore_at_prepare_and_send_request(co, "AT+CPBS=?", "+CPBS", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_phonebook_get_support_list, NULL, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, NULL, "Get Support List"); } @@ -828,11 +824,9 @@ static TelReturn imc_phonebook_get_info(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CPB", TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_phonebook_get_info, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Info"); /* Free resources */ @@ -905,11 +899,9 @@ static TelReturn imc_phonebook_read_record(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CPBR", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_phonebook_read_record, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Read Record"); /* Free resources */ @@ -973,11 +965,9 @@ static TelReturn imc_phonebook_update_record(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_phonebook_update_record, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Update Record"); /* Free resources */ @@ -1030,11 +1020,9 @@ static TelReturn imc_phonebook_delete_record(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_phonebook_delete_record, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Delete Record"); /* Free resources */ diff --git a/src/imc_ps.c b/src/imc_ps.c index c9afd16..f602bc8 100644 --- a/src/imc_ps.c +++ b/src/imc_ps.c @@ -312,13 +312,10 @@ static void __imc_ps_send_get_dns_cmd(CoreObject *co_ps, CoreObject *ps_context) ret = tcore_at_prepare_and_send_request(co_ps, "AT+XDNS?", "+XDNS", TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_imc_ps_send_get_dns_cmd, ps_context, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); if (ret != TEL_RETURN_SUCCESS){ TcorePsCallState curr_call_status; err("Failed to prepare and send AT request"); @@ -410,13 +407,10 @@ static void __imc_ps_get_pdp_address(CoreObject *co_ps, CoreObject *ps_context) ret = tcore_at_prepare_and_send_request(co_ps, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_imc_ps_get_pdp_address, ps_context, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); if (ret != TEL_RETURN_SUCCESS){ err("Failed to prepare and send AT request"); /* Deactivate PDP context */ @@ -481,13 +475,10 @@ static TelReturn __imc_ps_send_xdns_enable_cmd(CoreObject *co_ps, CoreObject *ps ret = tcore_at_prepare_and_send_request(co_ps, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_imc_ps_send_xdns_enable_cmd, ps_context, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); if (ret != TEL_RETURN_SUCCESS){ TcorePsCallState curr_call_status; @@ -640,13 +631,10 @@ static TelReturn imc_ps_activate_context(CoreObject *co_ps, CoreObject *ps_conte ret = tcore_at_prepare_and_send_request(co_ps, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_ps_activate_context, ps_context, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); if (ret != TEL_RETURN_SUCCESS){ TcorePsCallState curr_call_status; curr_call_status = private_info->ps_call_status; @@ -700,13 +688,10 @@ static TelReturn imc_ps_deactivate_context(CoreObject *co_ps, CoreObject *ps_con ret = tcore_at_prepare_and_send_request(co_ps, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_ps_deactivate_context, ps_context, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); if (ret != TEL_RETURN_SUCCESS){ TcorePsCallState curr_call_status; curr_call_status = private_info->ps_call_status; @@ -826,12 +811,10 @@ static TelReturn imc_ps_define_context(CoreObject *co_ps, CoreObject *ps_context ret = tcore_at_prepare_and_send_request(co_ps, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_ps_define_context, ps_context, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); tcore_free(pdp_type_str); tcore_free(at_cmd); diff --git a/src/imc_sap.c b/src/imc_sap.c index f6667ea..b0653dc 100644 --- a/src/imc_sap.c +++ b/src/imc_sap.c @@ -440,13 +440,11 @@ static TelReturn imc_sap_req_connect(CoreObject *co, unsigned int max_msg_size, ret = tcore_at_prepare_and_send_request(co, "AT+XBCON=0,0,0", NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sap_req_connect, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "imc_sap_req_connect"); + return ret; } @@ -476,13 +474,11 @@ static TelReturn imc_sap_req_disconnect(CoreObject *co, TcoreObjectResponseCallb ret = tcore_at_prepare_and_send_request(co, "AT+XBDISC", NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sap_req_disconnect, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "imc_sap_req_disconnect"); + return ret; } @@ -524,13 +520,11 @@ static TelReturn imc_sap_get_atr(CoreObject *co, TcoreObjectResponseCallback cb, ret = tcore_at_prepare_and_send_request(co, "AT+XBATR", "+XBATR:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sap_get_atr, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "imc_sap_get_atr"); + return ret; } @@ -578,13 +572,11 @@ static TelReturn imc_sap_req_transfer_apdu(CoreObject *co, const TelSapApdu *apd ret = tcore_at_prepare_and_send_request(co, at_cmd, "+XBAPDU:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sap_req_transfer_apdu, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "imc_sap_req_transfer_apdu"); + g_free(at_cmd); return ret; } @@ -653,13 +645,11 @@ static TelReturn imc_sap_req_power_operation(CoreObject *co, TelSapPowerMode pow ret = tcore_at_prepare_and_send_request(co, at_cmd, "+XBPWR:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sap_req_power_operation, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "imc_sap_req_power_operation"); + g_free(at_cmd); return ret; } @@ -709,13 +699,11 @@ static TelReturn imc_sap_get_cardreader_status(CoreObject *co, TcoreObjectRespon ret = tcore_at_prepare_and_send_request(co, "AT+XBCRDSTAT", "+XBCRDSTAT:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sap_get_cardreader_status, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "imc_sap_get_cardreader_status"); + return ret; } diff --git a/src/imc_sat.c b/src/imc_sat.c index 8c002f1..155bad2 100644 --- a/src/imc_sat.c +++ b/src/imc_sat.c @@ -72,11 +72,9 @@ static TcoreHookReturn on_hook_imc_sim_status(TcorePlugin *plugin, tcore_at_prepare_and_send_request(co, "AT+CFUN=6", NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_enable_sat, NULL, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); } return TCORE_HOOK_RETURN_CONTINUE; @@ -509,11 +507,9 @@ static TelReturn imc_sat_send_envelope(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sat_send_envelop_cmd, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Send Envelop Command"); /* Free resources */ @@ -590,11 +586,9 @@ static TelReturn imc_sat_send_terminal_response(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sat_send_terminal_response, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Send Terminal Response"); /* Free resources */ @@ -638,11 +632,9 @@ static TelReturn imc_sat_send_user_confirmation(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sat_send_user_confirmation, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Send User Confirmation"); /* Free resources */ diff --git a/src/imc_sim.c b/src/imc_sim.c index 17455d6..955818c 100644 --- a/src/imc_sim.c +++ b/src/imc_sim.c @@ -460,11 +460,9 @@ gboolean __imc_sim_get_sim_type(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+XUICC?", "+XUICC:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_imc_sim_get_sim_type, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get SIM Type"); return ret; @@ -668,11 +666,9 @@ static gboolean __imc_sim_get_sim_status(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+XSIMSTATE?", "+XSIMSTATE:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_imc_sim_get_sim_status, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get SIM Status"); return TRUE; @@ -1902,12 +1898,12 @@ static TelReturn __imc_sim_update_file(CoreObject *co, cmd_str = g_strdup_printf("AT+CRSM=%d,%d,%d,%d,%d,\"%s\"", cmd, ef, p1, p2, p3, encoded_data); - ret = tcore_at_prepare_and_send_request(co, cmd_str, "+CRSM:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, - __on_response_imc_sim_update_file, resp_cb_data, - on_send_imc_request, NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, "+CRSM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_imc_sim_update_file, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Update SIM File"); tcore_free(encoded_data); @@ -1943,12 +1939,12 @@ static void __imc_sim_read_record(CoreObject *co, ImcRespCbData *resp_cb_data) at_cmd = g_strdup_printf("AT+CRSM=%d, %d, %d, %d, %d", IMC_SIM_ACCESS_READ_RECORD, file_meta->file_id, p1, p2, p3); - ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CRSM:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, - __on_response_imc_sim_read_data, resp_cb_data, - on_send_imc_request, NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + at_cmd, "+CRSM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_imc_sim_read_data, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get File Record"); dbg("ret:[%d]", ret); @@ -1985,12 +1981,12 @@ static void __imc_sim_read_binary(CoreObject *co, ImcRespCbData *resp_cb_data) at_cmd = g_strdup_printf("AT+CRSM=%d, %d, %d, %d, %d", IMC_SIM_ACCESS_READ_BINARY, file_meta->file_id, p1, p2, p3); - ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CRSM:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, - __on_response_imc_sim_read_data, resp_cb_data, - on_send_imc_request, NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + at_cmd, "+CRSM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_imc_sim_read_data, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get File Data"); dbg("ret:[%d]", ret); @@ -2012,12 +2008,11 @@ static TelReturn __imc_sim_get_response(CoreObject *co, ImcRespCbData *resp_cb_d IMC_SIM_ACCESS_GET_RESPONSE, file_meta->file_id); ret = tcore_at_prepare_and_send_request(co, - at_cmd, "+CRSM:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, - __on_response_imc_sim_get_response, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + at_cmd, "+CRSM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_imc_sim_get_response, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get File Info"); g_free(at_cmd); @@ -2238,16 +2233,14 @@ static TelReturn __imc_sim_get_retry_count(CoreObject *co, } cmd_str = g_strdup_printf("AT+XPINCNT=%d", lock_type); - ret = tcore_at_prepare_and_send_request(co, cmd_str, NULL, - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - __on_response_imc_sim_get_retry_count, - resp_cb_data, - on_send_imc_request, - NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, NULL, + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_imc_sim_get_retry_count, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Retry Count"); + g_free(cmd_str); return ret; } @@ -3497,13 +3490,14 @@ static TelReturn imc_sim_req_authentication (CoreObject *co, resp_cb_data = imc_create_resp_cb_data(cb, cb_data, (void *)&request->auth_type, sizeof(TelSimAuthenticationType)); - ret = tcore_at_prepare_and_send_request(co, cmd_str, "+XAUTH:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, - on_response_imc_sim_req_authentication, resp_cb_data, - on_send_imc_request, NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, "+XAUTH:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_imc_sim_req_authentication, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Sim request authentication"); + EXIT: g_free(cmd_str); tcore_free(convert_rand); @@ -3558,16 +3552,14 @@ static TelReturn imc_sim_verify_pins(CoreObject *co, const TelSimSecPinPw *reque resp_cb_data = imc_create_resp_cb_data(cb, cb_data, &sec_op, sizeof(sec_op)); - ret = tcore_at_prepare_and_send_request(co, cmd_str, NULL, - TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_sim_verify_pins, - resp_cb_data, - on_send_imc_request, - NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_imc_sim_verify_pins, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Sim Verify Pins"); + g_free(cmd_str); return ret; } @@ -3598,16 +3590,14 @@ static TelReturn imc_sim_verify_puks(CoreObject *co, const TelSimSecPukPw *reque resp_cb_data = imc_create_resp_cb_data(cb, cb_data, &sec_op, sizeof(sec_op)); - ret = tcore_at_prepare_and_send_request(co, cmd_str, NULL, - TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_sim_verify_puks, - resp_cb_data, - on_send_imc_request, - NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_imc_sim_verify_puks, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Sim Verify Puks"); + g_free(cmd_str); return ret; } @@ -3661,16 +3651,14 @@ static TelReturn imc_sim_change_pins(CoreObject *co, const TelSimSecChangePinPw resp_cb_data = imc_create_resp_cb_data(cb, cb_data, &sec_op, sizeof(sec_op)); - ret = tcore_at_prepare_and_send_request(co, cmd_str, NULL, - TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_sim_change_pins, - resp_cb_data, - on_send_imc_request, - NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_imc_sim_change_pins, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Sim Change Pins"); + g_free(cmd_str); return ret; } @@ -3726,16 +3714,14 @@ static TelReturn imc_sim_disable_facility(CoreObject *co, const TelSimFacilityPw resp_cb_data = imc_create_resp_cb_data(cb, cb_data, &sec_op, sizeof(sec_op)); - ret = tcore_at_prepare_and_send_request(co, cmd_str, "+CLCK:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_sim_disable_facility, - resp_cb_data, - on_send_imc_request, - NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, "+CLCK:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_imc_sim_disable_facility, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Sim Disable Facility"); + g_free(cmd_str); return ret; } @@ -3763,16 +3749,14 @@ static TelReturn imc_sim_enable_facility(CoreObject *co, const TelSimFacilityPw resp_cb_data = imc_create_resp_cb_data(cb, cb_data, &sec_op, sizeof(sec_op)); - ret = tcore_at_prepare_and_send_request(co, cmd_str, "+CLCK:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_sim_enable_facility, - resp_cb_data, - on_send_imc_request, - NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, "+CLCK:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_imc_sim_enable_facility, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Sim Disable Facility"); + g_free(cmd_str); return ret; } @@ -3799,16 +3783,14 @@ static TelReturn imc_sim_get_facility(CoreObject *co, TelSimLockType lock_type, resp_cb_data = imc_create_resp_cb_data(cb, cb_data, &sec_op, sizeof(sec_op)); - ret = tcore_at_prepare_and_send_request(co, cmd_str, "+CLCK:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_sim_get_facility, - resp_cb_data, - on_send_imc_request, - NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, "+CLCK:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_imc_sim_get_facility, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Sim Get Facility"); + g_free(cmd_str); return ret; } @@ -3860,16 +3842,14 @@ static TelReturn imc_sim_get_lock_info(CoreObject *co, TelSimLockType lock_type, cmd_str = g_strdup_printf("AT+XPINCNT=%d", lockType); - ret = tcore_at_prepare_and_send_request(co, cmd_str, "+XPINCNT:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_sim_get_lock_info, - resp_cb_data, - on_send_imc_request, - NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, "+XPINCNT:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_imc_sim_get_lock_info, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Sim Get Lock Info"); + g_free(cmd_str); return ret; } @@ -3890,12 +3870,12 @@ static TelReturn imc_sim_req_apdu (CoreObject *co, const TelSimApdu *request, Tc cmd_str = g_strdup_printf("AT+CSIM=%d,\"%s\"", strlen((const char *)apdu), apdu); - ret = tcore_at_prepare_and_send_request(co, cmd_str, "+CSIM:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, - on_response_imc_sim_req_apdu, resp_cb_data, - on_send_imc_request, NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, "+CSIM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_imc_sim_req_apdu, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Sim Request APDU"); g_free(cmd_str); @@ -3917,12 +3897,12 @@ static TelReturn imc_sim_req_atr (CoreObject *co, TcoreObjectResponseCallback cb cmd_str = g_strdup_printf("AT+XGATR"); - ret = tcore_at_prepare_and_send_request(co, cmd_str, "+XGATR:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, - on_response_imc_sim_req_atr, resp_cb_data, - on_send_imc_request, NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + cmd_str, "+XGATR:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_imc_sim_req_atr, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Sim Request ATR"); g_free(cmd_str); diff --git a/src/imc_sms.c b/src/imc_sms.c index 83678bb..f7f968d 100644 --- a/src/imc_sms.c +++ b/src/imc_sms.c @@ -446,11 +446,9 @@ static gboolean on_notification_imc_sms_class2_incoming_msg(CoreObject *co, cons ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CMGR:", TCORE_AT_COMMAND_TYPE_PDU, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_class2_sms_incom_msg, NULL, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); if (ret != TEL_RETURN_SUCCESS) { err("Failed to Read Class2 Incomming Message"); } @@ -911,11 +909,9 @@ static void on_response_imc_sms_get_sms_count(TcorePending *p, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CMGL", TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_get_msg_indices, getcnt_resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); /* free the consumed token */ tcore_at_tok_free(tokens); @@ -1357,11 +1353,9 @@ static void _response_get_efsms_data(TcorePending *p, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CRSM:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_set_message_status, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Message Status-Updating status in Record"); @@ -1594,11 +1588,9 @@ static TelReturn imc_sms_send_sms(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+CMMS=1", "+CMMS:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_send_more_msg, NULL, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, NULL, "More Msgs to Send"); } @@ -1609,11 +1601,9 @@ static TelReturn imc_sms_send_sms(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CMGS:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_send_sms, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Send SMS"); /* Free resources */ @@ -1699,11 +1689,9 @@ static TelReturn imc_sms_write_sms_in_sim(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CMGW:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_write_sms_in_sim, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Write SMS in SIM"); /* Free resources */ @@ -1746,11 +1734,9 @@ static TelReturn imc_sms_read_sms_in_sim(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CMGR:", TCORE_AT_COMMAND_TYPE_PDU, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_read_sms_in_sim, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Read SMS in SIM"); /* Free resources */ @@ -1799,11 +1785,9 @@ static TelReturn imc_sms_delete_sms_in_sim(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CMGD:", TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_delete_sms_in_sim, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Delete SMS in SIM"); /* Free resources */ @@ -1849,11 +1833,9 @@ static TelReturn imc_sms_get_msg_count_in_sim(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CPMS", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_get_sms_count, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get SMS Count"); /* Free resources */ @@ -1900,11 +1882,9 @@ static TelReturn imc_sms_get_msg_count_in_sim(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_set_sca, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set SCA"); /* Free resources */ @@ -1945,13 +1925,11 @@ static TelReturn imc_sms_get_msg_count_in_sim(CoreObject *co, /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, "+CSCA", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_sms_get_sca, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + at_cmd, "+CSCA", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_imc_sms_get_sca, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get SCA"); /* Free resources */ @@ -2031,11 +2009,9 @@ static TelReturn imc_sms_set_cb_config(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_set_cb_config, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Cb Config"); /* Free resources */ @@ -2076,11 +2052,9 @@ static TelReturn imc_sms_set_cb_config(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_get_cb_config, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Cb Config"); /* Free resources */ @@ -2153,11 +2127,9 @@ static TelReturn imc_sms_set_memory_status(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_set_memory_status, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Memory Status"); /* Free resources */ @@ -2202,11 +2174,9 @@ static TelReturn imc_sms_set_message_status(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CRSM:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, _response_get_efsms_data, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Message Status"); /* Free resources */ @@ -2276,14 +2246,11 @@ static TelReturn imc_sms_get_sms_params(CoreObject *co, /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, "+CRSM", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_sms_get_sms_params, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, "+CRSM", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_imc_sms_get_sms_params, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get SMS Parameters"); /* Free resources */ @@ -2358,11 +2325,9 @@ static TelReturn imc_sms_set_sms_params(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, at_cmd, "+CRSM", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_imc_sms_set_sms_params, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set SMS Parameters"); /* Free resources */ diff --git a/src/imc_ss.c b/src/imc_ss.c index ac5b876..cb81804 100644 --- a/src/imc_ss.c +++ b/src/imc_ss.c @@ -1127,14 +1127,11 @@ static TelReturn imc_ss_set_barring(CoreObject *co, const TelSsBarringInfo *barr /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, NULL, - TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_ss_set_barring, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_imc_ss_set_barring, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Barring"); g_free(at_cmd); @@ -1170,18 +1167,14 @@ static TelReturn imc_ss_get_barring_status(CoreObject *co, const TelSsBarringGet /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, "+CLCK", - TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_ss_get_barring_status, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, "+CLCK", + TCORE_AT_COMMAND_TYPE_MULTILINE, + NULL, + on_response_imc_ss_get_barring_status, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Barring Status"); g_free(at_cmd); - return ret; } @@ -1227,18 +1220,14 @@ static TelReturn imc_ss_change_barring_password(CoreObject *co, const TelSsBarri /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, NULL, - TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_ss_change_barring_password, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_imc_ss_change_barring_password, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Change Barring Password"); g_free(at_cmd); - return ret; } @@ -1338,14 +1327,11 @@ static TelReturn imc_ss_set_forwarding(CoreObject *co, const TelSsForwardInfo *f /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, NULL, - TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_ss_set_forwarding, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_imc_ss_set_forwarding, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Forwarding"); g_free(tmp_cmd); @@ -1379,18 +1365,14 @@ static TelReturn imc_ss_get_forwarding_status(CoreObject *co, const TelSsForward /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, "+CCFC", - TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_ss_get_forwarding_status, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, "+CCFC", + TCORE_AT_COMMAND_TYPE_MULTILINE, + NULL, + on_response_imc_ss_get_forwarding_status, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Forwarding Status"); g_free(at_cmd); - return ret; } @@ -1449,18 +1431,14 @@ static TelReturn imc_ss_set_waiting(CoreObject *co, const TelSsWaitingInfo *wait /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, NULL, - TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_ss_set_waiting, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_imc_ss_set_waiting, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Waiting"); g_free(at_cmd); - return ret; } @@ -1482,18 +1460,14 @@ static TelReturn imc_ss_get_waiting_status(CoreObject *co, TelSsClass ss_class, /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, "+CCWA", - TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_ss_get_waiting_status, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, "+CCWA", + TCORE_AT_COMMAND_TYPE_MULTILINE, + NULL, + on_response_imc_ss_get_waiting_status, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Waiting Status"); g_free(at_cmd); - return ret; } @@ -1556,18 +1530,14 @@ static TelReturn imc_ss_set_cli(CoreObject *co, const TelSsCliInfo *cli_info, /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, NULL, - TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_ss_set_cli, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_imc_ss_set_cli, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Cli"); g_free(at_cmd); - return ret; } @@ -1612,18 +1582,14 @@ static TelReturn imc_ss_get_cli_status(CoreObject *co, TelSsCliType cli_type, /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, cmd_prefix, - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_ss_get_cli_status, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, cmd_prefix, + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_imc_ss_get_cli_status, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Cli Status"); g_free(at_cmd); - return ret; } @@ -1676,18 +1642,14 @@ static TelReturn imc_ss_send_ussd_request(CoreObject *co, const TelSsUssdInfo *u /* Send Request to modem */ ret = tcore_at_prepare_and_send_request(co, - at_cmd, NULL, - TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - on_response_imc_ss_send_ussd_request, resp_cb_data, - on_send_imc_request, NULL, - 0, NULL, NULL); - + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_imc_ss_send_ussd_request, resp_cb_data, + on_send_imc_request, NULL); IMC_CHECK_REQUEST_RET(ret, resp_cb_data, "Send Ussd Request"); g_free(at_cmd); - return ret; } -- 2.7.4