From: Suresh Kumar N Date: Thu, 10 Apr 2014 10:41:20 +0000 (+0530) Subject: Updated as per tcore_at_prepare_and_send_request() API change X-Git-Tag: submit/tizen/20140417.095515~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c17d489d70e6c6ad57581a1acab79e56e2525025;p=platform%2Fcore%2Ftelephony%2Ftel-plugin-atmodem.git Updated as per tcore_at_prepare_and_send_request() API change Change-Id: Iea0f21a5f004bafc93dfa73f524cf7ab5ce6d20e --- diff --git a/src/atmodem_call.c b/src/atmodem_call.c index e8a33ae..9314a77 100755 --- a/src/atmodem_call.c +++ b/src/atmodem_call.c @@ -518,11 +518,9 @@ static TelReturn __atmodem_send_call_request(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_atmodem_call_default, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, func_name); /* Free resources */ @@ -561,11 +559,9 @@ static TelReturn __atmodem_call_get_call_list(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_atmodem_call_get_call_list, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get current call list"); return ret; diff --git a/src/atmodem_modem.c b/src/atmodem_modem.c index b91b525..91b769b 100755 --- a/src/atmodem_modem.c +++ b/src/atmodem_modem.c @@ -427,11 +427,9 @@ static TelReturn atmodem_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_atmodem_modem_set_flight_mode, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Flight mode"); /* Free resources */ @@ -494,11 +492,9 @@ static TelReturn atmodem_modem_get_version(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+CGMR", NULL, TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, on_response_atmodem_modem_get_version, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Version"); return ret; @@ -531,11 +527,9 @@ static TelReturn atmodem_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_atmodem_modem_get_imei, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get IMEI"); return ret; diff --git a/src/atmodem_network.c b/src/atmodem_network.c index ce7ae5b..38f96c5 100755 --- a/src/atmodem_network.c +++ b/src/atmodem_network.c @@ -143,11 +143,9 @@ static void __atmodem_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_atmodem_network_registration, NULL, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); dbg("Sending Network Registration request: [%s]", (ret == TEL_RETURN_SUCCESS ? "SUCCESS" : "FAIL")); } @@ -339,11 +337,9 @@ static TelReturn __atmodem_network_fetch_nw_name(CoreObject *co, ret = tcore_at_prepare_and_send_request(co, "AT+COPS=3,0;+COPS?;+COPS=3,1;+COPS?;+COPS=3,0+COPS?;", "+COPS", TCORE_AT_COMMAND_TYPE_MULTILINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_atmodem_network_fetch_nw_name, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Fetch Network name"); return ret; @@ -1070,13 +1066,11 @@ static TelReturn atmodem_network_search(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_atmodem_network_search, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); - + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Network Search"); + return ret; } @@ -1114,13 +1108,11 @@ static TelReturn atmodem_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_atmodem_network_default, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); - + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Automatic network selection"); + return ret; } @@ -1188,13 +1180,11 @@ static TelReturn atmodem_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_atmodem_network_default, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); - + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Manual network selection"); + /* Free resources*/ g_free(at_cmd); return ret; @@ -1234,13 +1224,11 @@ static TelReturn atmodem_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_atmodem_network_get_selection_mode, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); - + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get selection mode"); + return ret; } diff --git a/src/atmodem_ps.c b/src/atmodem_ps.c index 9120247..ec2e0db 100755 --- a/src/atmodem_ps.c +++ b/src/atmodem_ps.c @@ -179,13 +179,10 @@ static void __atmodem_get_ipconfiguration(CoreObject *co_ps, CoreObject *ps_cont ret = tcore_at_prepare_and_send_request(co_ps, "AT+CGDCONT?", NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_atmodem_get_ipconfiguration, ps_context, - on_send_atmodem_request, NULL, - 0, NULL, NULL); - + on_send_atmodem_request, NULL); if (ret != TEL_RETURN_SUCCESS){ err("Failed to prepare and send AT request"); /* Deactivate PDP context */ @@ -237,13 +234,10 @@ static void __atmodem_attach_ps(CoreObject *co_ps, CoreObject *ps_context) ret = tcore_at_prepare_and_send_request(co_ps, "ATD*99***1#", NULL, TCORE_AT_COMMAND_TYPE_NO_RESULT, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_atmodem_attach_ps, ps_context, - on_send_atmodem_request, NULL, - 0, NULL, NULL); - + on_send_atmodem_request, NULL); if (ret != TEL_RETURN_SUCCESS){ err("Failed to prepare and send AT request"); /* Deactivate PDP context */ @@ -402,13 +396,10 @@ static TelReturn atmodem_ps_activate_context(CoreObject *co_ps, CoreObject *ps_c 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_atmodem_ps_activate_context, ps_context, - on_send_atmodem_request, NULL, - 0, NULL, NULL); - + on_send_atmodem_request, NULL); if (ret != TEL_RETURN_SUCCESS){ TcorePsCallState curr_call_status; @@ -464,13 +455,10 @@ static TelReturn atmodem_ps_deactivate_context(CoreObject *co_ps, CoreObject *ps 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_atmodem_ps_deactivate_context, ps_context, - on_send_atmodem_request, NULL, - 0, NULL, NULL); - + on_send_atmodem_request, NULL); if (ret != TEL_RETURN_SUCCESS){ TcorePsCallState curr_call_status; @@ -590,12 +578,10 @@ static TelReturn atmodem_ps_define_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_atmodem_ps_define_context, ps_context, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); tcore_free(pdp_type_str); tcore_free(at_cmd); diff --git a/src/atmodem_sim.c b/src/atmodem_sim.c index af1c2dc..41294e9 100644 --- a/src/atmodem_sim.c +++ b/src/atmodem_sim.c @@ -553,11 +553,9 @@ static void __atmodem_sim_get_sim_type(CoreObject *co_sim, ret = tcore_at_prepare_and_send_request(co_sim, "AT\%SCCT?", "\%SCCT:", TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, __on_response_atmodem_sim_get_sim_type, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get SIM Type"); dbg("ret: [%d]", ret); @@ -1815,13 +1813,11 @@ static void __atmodem_sim_get_file_record(CoreObject *co_sim, AtmodemRespCbData ATMODEM_SIM_ACCESS_READ_RECORD, file_meta->file_id, p1, p2, p3); ret = tcore_at_prepare_and_send_request(co_sim, - at_cmd, "+CRSM:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - __on_response_atmodem_sim_get_file_data, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, "+CRSM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_atmodem_sim_get_file_data, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get File Record"); dbg("ret:[%d]", ret); @@ -1866,13 +1862,11 @@ static void __atmodem_sim_get_file_data(CoreObject *co_sim, ATMODEM_SIM_ACCESS_READ_BINARY, file_meta->file_id, p1, p2, p3); ret = tcore_at_prepare_and_send_request(co_sim, - at_cmd, "+CRSM:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, - NULL, - __on_response_atmodem_sim_get_file_data, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, "+CRSM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_atmodem_sim_get_file_data, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get File Data"); dbg("ret:[%d]", ret); @@ -1895,12 +1889,11 @@ static TelReturn __atmodem_sim_get_file_info(CoreObject *co_sim, ATMODEM_SIM_ACCESS_GET_RESPONSE, file_meta->file_id); ret = tcore_at_prepare_and_send_request(co_sim, - at_cmd, "+CRSM:", - TCORE_AT_COMMAND_TYPE_SINGLELINE, - TCORE_PENDING_PRIORITY_DEFAULT, NULL, - __on_response_atmodem_sim_get_file_info, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, "+CRSM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_atmodem_sim_get_file_info, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get File Info"); g_free(at_cmd); @@ -3237,13 +3230,11 @@ static TelReturn __atmodem_sim_update_file(CoreObject *co, 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_atmodem_sim_update_file, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + cmd_str, "+CRSM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_atmodem_sim_update_file, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Update SIM File"); tcore_free(encoded_data); @@ -3268,13 +3259,12 @@ static void __atmodem_sim_read_record(CoreObject *co, /* According to TS 102 221, values of p1, p2, p3 can be as below: * 11.1.5 READ RECORD - * P1: Record number - * P2: Mode, see table 11.11 - * Lc: Not present - * Data: Not present - * Le: Number of bytes to be read (P3) + * P1: Record number + * P2: Mode, see table 11.11 + * Lc: Not present + * Data: Not present + * Le: Number of bytes to be read (P3) */ - p1 = (unsigned char) file_meta->current_index; p2 = (unsigned char) 0x04; /* 0x4 for absolute mode */ p3 = (unsigned char) file_meta->rec_length; @@ -3282,12 +3272,12 @@ static void __atmodem_sim_read_record(CoreObject *co, at_cmd = g_strdup_printf("AT+CRSM=%d, %d, %d, %d, %d", ATMODEM_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_atmodem_sim_read_data, resp_cb_data, - on_send_atmodem_request, NULL, 0, NULL, NULL); - + ret = tcore_at_prepare_and_send_request(co, + at_cmd, "+CRSM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_atmodem_sim_read_data, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get File Record"); dbg("ret:[%d]", ret); @@ -3308,15 +3298,15 @@ static void __atmodem_sim_read_binary(CoreObject *co, AtmodemRespCbData *resp_cb dbg("Entry File-id:[0x%02x]", file_meta->file_id); - /* According to TS 102 221, values of P1, P2, P3 can be as below: + /* + * According to TS 102 221, values of P1, P2, P3 can be as below: * 11.1.3 READ BINARY - * P1: See table 11.10 - * P2: Offset low - * Lc: Not present - * Data: Not present - * Le: Number of bytes to be read (P3) + * P1: See table 11.10 + * P2: Offset low + * Lc: Not present + * Data: Not present + * Le: Number of bytes to be read (P3) */ - p1 = (unsigned char) (offset & 0xFF00) >> 8; p2 = (unsigned char) offset & 0x00FF; /* offset low */ p3 = (unsigned char) file_meta->data_size; @@ -3325,11 +3315,10 @@ static void __atmodem_sim_read_binary(CoreObject *co, AtmodemRespCbData *resp_cb ATMODEM_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_atmodem_sim_read_data, resp_cb_data, - on_send_atmodem_request, NULL, 0, NULL, NULL); - + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_atmodem_sim_read_data, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get File Data"); dbg("ret:[%d]", ret); @@ -3351,12 +3340,11 @@ static TelReturn __atmodem_sim_get_response(CoreObject *co, AtmodemRespCbData *r ATMODEM_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_atmodem_sim_get_response, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, "+CRSM:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + __on_response_atmodem_sim_get_response, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get File Info"); g_free(at_cmd); @@ -3920,13 +3908,11 @@ static TelReturn atmodem_sim_verify_pins(CoreObject *co, &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_atmodem_sim_verify_pins, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + cmd_str, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_atmodem_sim_verify_pins, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "SIM Verify PIN"); g_free(cmd_str); @@ -3960,13 +3946,11 @@ static TelReturn atmodem_sim_verify_puks(CoreObject *co, &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_atmodem_sim_verify_puks, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + cmd_str, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_atmodem_sim_verify_puks, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "SIM Verify PUK"); g_free(cmd_str); @@ -3999,13 +3983,11 @@ static TelReturn atmodem_sim_change_pins(CoreObject *co, &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_atmodem_sim_change_pins, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + cmd_str, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_atmodem_sim_change_pins, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "SIM Change PIN"); g_free(cmd_str); @@ -4065,13 +4047,11 @@ static TelReturn atmodem_sim_disable_facility(CoreObject *co, &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_atmodem_sim_disable_facility, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + cmd_str, "+CLCK:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_atmodem_sim_disable_facility, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "SIM Disable Facility"); g_free(cmd_str); @@ -4103,13 +4083,11 @@ static TelReturn atmodem_sim_enable_facility(CoreObject *co, &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_atmodem_sim_enable_facility, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + cmd_str, "+CLCK:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_atmodem_sim_enable_facility, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "SIM Disable Facility"); g_free(cmd_str); @@ -4140,13 +4118,11 @@ static TelReturn atmodem_sim_get_facility(CoreObject *co, &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_atmodem_sim_get_facility, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + cmd_str, "+CLCK:", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_atmodem_sim_get_facility, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "SIM Get Facility"); g_free(cmd_str); diff --git a/src/atmodem_sms.c b/src/atmodem_sms.c index bfde4b8..90e5c64 100755 --- a/src/atmodem_sms.c +++ b/src/atmodem_sms.c @@ -492,11 +492,9 @@ static TelReturn atmodem_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_atmodem_sms_send_more_msg, NULL, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, NULL, "More Msgs to Send"); } /* AT-Command : Send SMS */ @@ -506,11 +504,9 @@ static TelReturn atmodem_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_atmodem_sms_send_sms, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Send SMS"); /* Free resources */ @@ -556,11 +552,9 @@ static TelReturn atmodem_sms_get_count(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_atmodem_sms_get_count, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get SMS Count"); /* Free resources */ @@ -602,11 +596,9 @@ static TelReturn atmodem_sms_send_deliver_report(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_atmodem_sms_send_deliver_report, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Send deliver Report"); /* Free resources */ @@ -653,11 +645,9 @@ static TelReturn atmodem_sms_send_deliver_report(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_atmodem_sms_set_sca, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Set SCA"); /* Free resources */ @@ -698,13 +688,11 @@ static TelReturn atmodem_sms_send_deliver_report(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_atmodem_sms_get_sca, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, "+CSCA", + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_atmodem_sms_get_sca, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get SCA"); /* Free resources */ diff --git a/src/atmodem_ss.c b/src/atmodem_ss.c index 0acd61b..b11aeb6 100755 --- a/src/atmodem_ss.c +++ b/src/atmodem_ss.c @@ -1027,13 +1027,11 @@ static TelReturn atmodem_ss_set_barring(CoreObject *co, /* 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_atmodem_ss_set_barring, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_atmodem_ss_set_barring, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Barring"); g_free(at_cmd); @@ -1072,13 +1070,11 @@ static TelReturn atmodem_ss_get_barring_status(CoreObject *co, /* 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_atmodem_ss_get_barring_status, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, "+CLCK", + TCORE_AT_COMMAND_TYPE_MULTILINE, + NULL, + on_response_atmodem_ss_get_barring_status, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Barring Status"); g_free(at_cmd); @@ -1130,13 +1126,11 @@ static TelReturn atmodem_ss_change_barring_password(CoreObject *co, /* 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_atmodem_ss_change_barring_password, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_atmodem_ss_change_barring_password, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Change Barring Password"); g_free(at_cmd); @@ -1244,13 +1238,11 @@ static TelReturn atmodem_ss_set_forwarding(CoreObject *co, /* 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_atmodem_ss_set_forwarding, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_atmodem_ss_set_forwarding, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Forwarding"); g_free(tmp_cmd); @@ -1286,13 +1278,11 @@ static TelReturn atmodem_ss_get_forwarding_status(CoreObject *co, /* 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_atmodem_ss_get_forwarding_status, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, "+CCFC", + TCORE_AT_COMMAND_TYPE_MULTILINE, + NULL, + on_response_atmodem_ss_get_forwarding_status, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Forwarding Status"); g_free(at_cmd); @@ -1355,13 +1345,11 @@ static TelReturn atmodem_ss_set_waiting(CoreObject *co, /* 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_atmodem_ss_set_waiting, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_atmodem_ss_set_waiting, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Set Waiting"); g_free(at_cmd); @@ -1388,13 +1376,11 @@ static TelReturn atmodem_ss_get_waiting_status(CoreObject *co, /* 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_atmodem_ss_get_waiting_status, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, "+CCWA", + TCORE_AT_COMMAND_TYPE_MULTILINE, + NULL, + on_response_atmodem_ss_get_waiting_status, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Waiting Status"); g_free(at_cmd); @@ -1474,13 +1460,11 @@ static TelReturn atmodem_ss_get_cli_status(CoreObject *co, /* 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_atmodem_ss_get_cli_status, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, cmd_prefix, + TCORE_AT_COMMAND_TYPE_SINGLELINE, + NULL, + on_response_atmodem_ss_get_cli_status, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Get Cli Status"); g_free(at_cmd); @@ -1539,13 +1523,11 @@ static TelReturn atmodem_ss_send_ussd_request(CoreObject *co, /* 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_atmodem_ss_send_ussd_request, resp_cb_data, - on_send_atmodem_request, NULL, - 0, NULL, NULL); + at_cmd, NULL, + TCORE_AT_COMMAND_TYPE_NO_RESULT, + NULL, + on_response_atmodem_ss_send_ussd_request, resp_cb_data, + on_send_atmodem_request, NULL); ATMODEM_CHECK_REQUEST_RET(ret, resp_cb_data, "Send Ussd Request"); g_free(at_cmd);