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>

1 files changed, 5 insertions, 5 deletions

diff --git a/snd.c b/snd.c
index 264879c..a689cfc 100644
--- a/snd.c
+++ b/snd.c
@@ -72,9 +72,9 @@ void ril_request_set_mute(RIL_Token t, void *data, size_t datalen)
 
 	LOGD("Mute data is %d\n", mute_data);
 
-	ipc_gen_phone_res_expect_to_complete(reqGetId(t), IPC_SND_MIC_MUTE_CTRL);
+	ipc_gen_phone_res_expect_to_complete(ril_request_get_id(t), IPC_SND_MIC_MUTE_CTRL);
 
-	ipc_fmt_send(IPC_SND_MIC_MUTE_CTRL, IPC_TYPE_SET, (void *) &mute_data, sizeof(mute_data), reqGetId(t));
+	ipc_fmt_send(IPC_SND_MIC_MUTE_CTRL, IPC_TYPE_SET, (void *) &mute_data, sizeof(mute_data), ril_request_get_id(t));
 }
 
 void srs_snd_set_call_clock_sync(struct srs_message *message)
@@ -82,7 +82,7 @@ void srs_snd_set_call_clock_sync(struct srs_message *message)
 	unsigned char data = *((unsigned char *) message->data);
 	LOGD("Clock sync data is 0x%x\n", data);
 
-	ipc_fmt_send(IPC_SND_CLOCK_CTRL, IPC_TYPE_EXEC, &data, sizeof(data), reqIdNew());
+	ipc_fmt_send(IPC_SND_CLOCK_CTRL, IPC_TYPE_EXEC, &data, sizeof(data), ril_request_id_get());
 }
 
 void srs_snd_set_call_volume(struct srs_message *message)
@@ -95,7 +95,7 @@ void srs_snd_set_call_volume(struct srs_message *message)
 	volume_ctrl.type = srs2ipc_call_type(call_volume->type);
 	volume_ctrl.volume = call_volume->volume;
 
-	ipc_fmt_send(IPC_SND_SPKR_VOLUME_CTRL, IPC_TYPE_SET, (void *) &volume_ctrl, sizeof(volume_ctrl), reqIdNew());
+	ipc_fmt_send(IPC_SND_SPKR_VOLUME_CTRL, IPC_TYPE_SET, (void *) &volume_ctrl, sizeof(volume_ctrl), ril_request_id_get());
 }
 
 void srs_snd_set_call_audio_path(struct srs_message *message)
@@ -105,5 +105,5 @@ void srs_snd_set_call_audio_path(struct srs_message *message)
 
 	LOGD("Audio path to: 0x%x\n", path);
 
-	ipc_fmt_send(IPC_SND_AUDIO_PATH_CTRL, IPC_TYPE_SET, (void *) &path, sizeof(path), reqIdNew());
+	ipc_fmt_send(IPC_SND_AUDIO_PATH_CTRL, IPC_TYPE_SET, (void *) &path, sizeof(path), ril_request_id_get());
 }