diff options
author | Paul Kocialkowski <contact@paulk.fr> | 2012-11-01 12:40:36 +0100 |
---|---|---|
committer | Paul Kocialkowski <contact@paulk.fr> | 2012-11-01 12:40:36 +0100 |
commit | 1d47003d41e5c2a84c831b32a345ae3c6bbfa6f1 (patch) | |
tree | 164fbd51f937f62cab5e212674cd16fa223286d8 /sat.c | |
parent | afb3c6b921053af7d92701f3580be6c04a337990 (diff) | |
download | hardware_replicant_libsamsung-ril-1d47003d41e5c2a84c831b32a345ae3c6bbfa6f1.tar.gz hardware_replicant_libsamsung-ril-1d47003d41e5c2a84c831b32a345ae3c6bbfa6f1.tar.bz2 hardware_replicant_libsamsung-ril-1d47003d41e5c2a84c831b32a345ae3c6bbfa6f1.zip |
Reworked RIL requests, globals, SIM status, client
* Handling ril requests with lists
* Renamed functions to complete requests
* Globals (most of them) are held in ril_data
* Renamed SIM_Status to ril_sim_state
* Renamed client object to data
* Moved client funcs to a sub-structure
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'sat.c')
-rw-r--r-- | sat.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -40,7 +40,7 @@ void respondSatProactiveCmdIndi(struct ipc_message_info *info) bin2hex((unsigned char*)info->data+2, data_len, hexdata); - RIL_onUnsolicitedResponse(RIL_UNSOL_STK_PROACTIVE_COMMAND, hexdata, sizeof(char*)); + ril_request_unsolicited(RIL_UNSOL_STK_PROACTIVE_COMMAND, hexdata, sizeof(char*)); free(hexdata); } @@ -59,7 +59,7 @@ void respondSatProactiveCmdResp(struct ipc_message_info *info) sw2 = ((unsigned char*)info->data)[1]; if(sw1 == 0x90 && sw2 == 0x00) { - RIL_onUnsolicitedResponse(RIL_UNSOL_STK_SESSION_END, NULL, 0); + ril_request_unsolicited(RIL_UNSOL_STK_SESSION_END, NULL, 0); } else { LOGE("%s: unhandled response sw1=%02x sw2=%02x", __FUNCTION__, sw1, sw2); } @@ -93,7 +93,7 @@ void requestSatSendTerminalResponse(RIL_Token t, void *data, size_t datalen) if(len > 255) { LOGE("%s: data exceeds maximum length", __FUNCTION__); - RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0); + ril_request_complete(t, RIL_E_GENERIC_FAILURE, NULL, 0); } memset(buf, 0, sizeof(buf)); @@ -101,9 +101,9 @@ void requestSatSendTerminalResponse(RIL_Token t, void *data, size_t datalen) buf[0] = len; hex2bin(data, strlen(data), &buf[1]); - ipc_fmt_send(IPC_SAT_PROACTIVE_CMD, IPC_TYPE_GET, buf, sizeof(buf), reqGetId(t)); + ipc_fmt_send(IPC_SAT_PROACTIVE_CMD, IPC_TYPE_GET, buf, sizeof(buf), ril_request_get_id(t)); - RIL_onRequestComplete(t, RIL_E_SUCCESS, buf, sizeof(char*)); + ril_request_complete(t, RIL_E_SUCCESS, buf, sizeof(char*)); } /** @@ -120,7 +120,7 @@ void requestSatSendEnvelopeCommand(RIL_Token t, void *data, size_t datalen) if(len > 255) { LOGE("%s: data exceeds maximum length", __FUNCTION__); - RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0); + ril_request_complete(t, RIL_E_GENERIC_FAILURE, NULL, 0); } memset(buf, 0, sizeof(buf)); @@ -128,7 +128,7 @@ void requestSatSendEnvelopeCommand(RIL_Token t, void *data, size_t datalen) buf[0] = len; hex2bin(data, strlen(data), &buf[1]); - ipc_fmt_send(IPC_SAT_ENVELOPE_CMD, IPC_TYPE_EXEC, buf, sizeof(buf), reqGetId(t)); + ipc_fmt_send(IPC_SAT_ENVELOPE_CMD, IPC_TYPE_EXEC, buf, sizeof(buf), ril_request_get_id(t)); } /** @@ -147,7 +147,7 @@ void respondSatEnvelopeCmd(struct ipc_message_info *info) bin2hex((unsigned char*)info->data+2, data_len, hexdata); - RIL_onRequestComplete(reqGetToken(info->aseq), RIL_E_SUCCESS, hexdata, sizeof(char*)); + ril_request_complete(ril_request_get_token(info->aseq), RIL_E_SUCCESS, hexdata, sizeof(char*)); free(hexdata); } |