rename ril_has_reached_state to ril_radio_has_reached_state

In 2001, in the RIL repository[1], the SIM states were separated from
the radio states by the following commit:
    2bc78d614e349574426d198c37e51ccb7455b5bb
    2bc78d61 Separate SIM states from Radio States

Then in 2016 the SIM states were removed from the RADIO_STATES by the
following commit:
    2baf72329c43d9e3f7850973f087176f535e31e8
    2baf7232 Remove deprecated RADIO_STATES

So to be compatible with recent rild, we need to convert the code to
use separate SIM states.

As at first a ril_sim_has_reached_state function will be introduced,
we can rename ril_has_reached_state to ril_radio_has_reached_state
in a separate patch (this patch) in order not to have too much
changes at once in the same patch.

[1]https://android.googlesource.com/platform/hardware/ril

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

1 files changed, 16 insertions, 16 deletions

diff --git a/network.c b/network.c
index e24be5e..e4dd035 100644
--- a/network.c
+++ b/network.c
@@ -399,7 +399,7 @@ int ipc_disp_icon_info(struct ipc_message *message)
 	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_disp_icon_info_response_data))
 		return -1;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return 0;
 
@@ -428,7 +428,7 @@ int ril_request_signal_strength(__attribute__((unused)) void *data,
 	struct ipc_disp_icon_info_request_data request_data;
 	int rc;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -453,7 +453,7 @@ int ipc_disp_rssi_info(struct ipc_message *message)
 	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_disp_rssi_info_data))
 		return -1;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return 0;
 
@@ -477,7 +477,7 @@ int ipc_net_plmn_sel(struct ipc_message *message)
 	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_net_plmn_sel_response_data))
 		return -1;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return 0;
 
@@ -499,7 +499,7 @@ int ril_request_query_network_selection_mode(__attribute__((unused)) void *data,
 {
 	int rc;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -545,7 +545,7 @@ int ril_request_set_network_selection_automatic(__attribute__((unused)) void *da
 	struct ipc_net_plmn_sel_request_data request_data;
 	int rc;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -584,7 +584,7 @@ int ril_request_set_network_selection_manual(void *data, size_t size,
 		return RIL_REQUEST_COMPLETED;
 	}
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -623,7 +623,7 @@ int ipc_net_serving_network(struct ipc_message *message)
 	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_net_regist_response_data))
 		return -1;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return 0;
 
@@ -670,7 +670,7 @@ int ril_request_operator(__attribute__((unused)) void *data,
 	unsigned int i;
 	int rc;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -720,7 +720,7 @@ int ipc_net_plmn_list(struct ipc_message *message)
 	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_net_plmn_list_header))
 		return -1;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return 0;
 
@@ -796,7 +796,7 @@ int ril_request_query_available_networks(__attribute__((unused)) void *data,
 	struct ril_request *request;
 	int rc;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -835,7 +835,7 @@ int ipc_net_regist(struct ipc_message *message)
 	if (client == NULL || client->data == NULL)
 		return 0;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return 0;
 
@@ -936,7 +936,7 @@ int ril_request_registration_state(__attribute__((unused)) void *data,
 	unsigned int i;
 	int rc;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -1011,7 +1011,7 @@ int ril_request_gprs_registration_state(__attribute__((unused)) void *data,
 	unsigned int i;
 	int rc;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -1076,7 +1076,7 @@ int ipc_net_mode_sel(struct ipc_message *message)
 	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_net_mode_sel_data))
 		return -1;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return 0;
 
@@ -1098,7 +1098,7 @@ int ril_request_get_preferred_network_type(__attribute__((unused)) void *data,
 {
 	int rc;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_NOT_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;