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>

9 files changed, 54 insertions, 54 deletions

diff --git a/call.c b/call.c
index 098d163..7daed67 100644
--- a/call.c
+++ b/call.c
@@ -82,7 +82,7 @@ int ril_request_dial(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < sizeof(RIL_Dial))
 		goto error;
 
-	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;
 
@@ -139,7 +139,7 @@ int ril_request_hangup(__attribute__((unused)) void *data,
 	int hangup;
 	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;
 
@@ -176,7 +176,7 @@ int ril_request_answer(__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;
 
@@ -240,7 +240,7 @@ int ril_request_last_call_fail_cause(__attribute__((unused)) void *data,
 	int fail_cause;
 	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;
 
@@ -350,7 +350,7 @@ int ril_request_get_current_calls(__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) {
 		ril_request_complete(token, RIL_E_SUCCESS, NULL, 0);
 		return RIL_REQUEST_COMPLETED;
@@ -486,7 +486,7 @@ int ril_request_dtmf(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < sizeof(char))
 		goto error;
 
-	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;
 
@@ -571,7 +571,7 @@ int ril_request_dtmf_start(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < sizeof(char))
 		goto error;
 
-	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;
 
diff --git a/data.c b/data.c
index 247b00d..93fda8c 100644
--- a/data.c
+++ b/data.c
@@ -467,7 +467,7 @@ int ril_request_setup_data_call(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < 6 * sizeof(char *))
 		goto error;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0) {
 		ril_request_complete(token, RIL_E_OP_NOT_ALLOWED_BEFORE_REG_TO_NW, NULL, 0);
 		return RIL_REQUEST_COMPLETED;
@@ -663,7 +663,7 @@ int ril_request_data_call_list(__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) {
 		ril_request_complete(token, RIL_E_SUCCESS, NULL, 0);
 		return RIL_REQUEST_COMPLETED;
@@ -729,7 +729,7 @@ int ril_request_deactivate_data_call(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < 2 * sizeof(char *))
 		goto error;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -876,7 +876,7 @@ int ipc_gprs_call_status(struct ipc_message *message)
 	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_gprs_call_status_data))
 		return -1;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0)
 		return 0;
 
@@ -1021,7 +1021,7 @@ int ril_request_last_data_call_fail_cause(__attribute__((unused)) void *data,
 	int fail_cause;
 	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;
 
diff --git a/misc.c b/misc.c
index bece1c1..3628e96 100644
--- a/misc.c
+++ b/misc.c
@@ -57,7 +57,7 @@ int ril_request_baseband_version(__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;
 
@@ -115,7 +115,7 @@ int ril_request_get_imsi(__attribute__((unused)) void *data,
 	struct ril_request *request;
 	int rc;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -191,7 +191,7 @@ int ril_request_get_imei(__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;
 
@@ -223,7 +223,7 @@ int ril_request_get_imeisv(__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;
 
@@ -277,7 +277,7 @@ int ril_request_screen_state(void *data, size_t size, RIL_Token token)
 		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;
 
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;
 
diff --git a/samsung-ril.c b/samsung-ril.c
index 0f829df..31d0244 100644
--- a/samsung-ril.c
+++ b/samsung-ril.c
@@ -915,7 +915,7 @@ void *ril_request_loop(__attribute__((unused)) void *data)
 
 		RIL_LOCK();
 
-		rc = ril_has_reached_state(RADIO_STATE_OFF);
+		rc = ril_radio_has_reached_state(RADIO_STATE_OFF);
 		if (rc < 0) {
 			RIL_UNLOCK();
 			continue;
@@ -1200,7 +1200,7 @@ int ril_radio_state_update(RIL_RadioState radio_state)
  * Returns 0 if the RIL has reached the given radio_state
  * Returns -1 otherwise
  */
-int ril_has_reached_state(RIL_RadioState given_state)
+int ril_radio_has_reached_state(RIL_RadioState given_state)
 {
 	RIL_RadioState radio_states[] = {
 		RADIO_STATE_UNAVAILABLE,
diff --git a/samsung-ril.h b/samsung-ril.h
index f86840e..0f936e3 100644
--- a/samsung-ril.h
+++ b/samsung-ril.h
@@ -203,7 +203,7 @@ void *ril_request_data_get(int request);
  */
 
 int ril_radio_state_update(RIL_RadioState radio_state);
-int ril_has_reached_state(RIL_RadioState radio_state);
+int ril_radio_has_reached_state(RIL_RadioState radio_state);
 
 /*
  * RIL data
diff --git a/sim.c b/sim.c
index 47605bd..e8c3373 100644
--- a/sim.c
+++ b/sim.c
@@ -200,7 +200,7 @@ int ipc_sec_pin_status(struct ipc_message *message)
 	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_sec_pin_status_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;
 
@@ -254,7 +254,7 @@ int ril_request_get_sim_status(__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;
 
@@ -311,7 +311,7 @@ int ril_request_query_facility_lock(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < 4 * sizeof(char *))
 		goto error;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -510,7 +510,7 @@ int ril_request_set_facility_lock(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < 4 * sizeof(char *))
 		goto error;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -588,7 +588,7 @@ int ril_request_enter_sim_pin(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < 2 * sizeof(char *) || ril_data == NULL)
 		goto error;
 
-	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;
 
@@ -645,7 +645,7 @@ int ril_request_enter_sim_puk(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < 2 * sizeof(char *))
 		goto error;
 
-	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;
 
@@ -695,7 +695,7 @@ int ril_request_enter_sim_pin2(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < 2 * sizeof(char *))
 		goto error;
 
-	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;
 
@@ -745,7 +745,7 @@ int ril_request_enter_sim_puk2(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < 2 * sizeof(char *))
 		goto error;
 
-	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;
 
@@ -799,7 +799,7 @@ int ril_request_change_sim_pin(void *data, size_t size, RIL_Token token)
 	if (request != NULL)
 		return RIL_REQUEST_UNHANDLED;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -849,7 +849,7 @@ int ril_request_change_sim_pin2(void *data, size_t size, RIL_Token token)
 	if (request != NULL)
 		return RIL_REQUEST_UNHANDLED;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -965,9 +965,9 @@ int ril_request_sim_io(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < sizeof(RIL_SIM_IO_compat))
 		goto error;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0) {
-		rc = ril_has_reached_state(RADIO_STATE_SIM_LOCKED_OR_ABSENT);
+		rc = ril_radio_has_reached_state(RADIO_STATE_SIM_LOCKED_OR_ABSENT);
 		if (rc < 0)
 			return RIL_REQUEST_UNHANDLED;
 		else
@@ -1128,7 +1128,7 @@ int ipc_sec_lock_infomation(struct ipc_message *message)
 	if (message == NULL || message->data == NULL || message->size < sizeof(struct ipc_sec_lock_information_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;
 
diff --git a/sms.c b/sms.c
index 6b77fbe..777dd8e 100644
--- a/sms.c
+++ b/sms.c
@@ -205,7 +205,7 @@ int ril_request_send_sms(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < 2 * sizeof(char *))
 		goto error;
 
-	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;
 
@@ -345,7 +345,7 @@ int ril_request_write_sms_to_sim(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < sizeof(RIL_SMS_WriteArgs))
 		goto error;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
@@ -528,7 +528,7 @@ int ril_request_sms_acknowledge(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < 2 * sizeof(int))
 		goto error;
 
-	rc = ril_has_reached_state(RADIO_STATE_SIM_READY);
+	rc = ril_radio_has_reached_state(RADIO_STATE_SIM_READY);
 	if (rc < 0)
 		return RIL_REQUEST_UNHANDLED;
 
diff --git a/ss.c b/ss.c
index 15d2b55..76dbe2a 100644
--- a/ss.c
+++ b/ss.c
@@ -124,7 +124,7 @@ int ril_request_send_ussd(void *data, size_t size, RIL_Token token)
 	if (data == NULL || size < sizeof(char *))
 		goto error;
 
-	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;
 
@@ -224,7 +224,7 @@ int ril_request_cancel_ussd(__attribute__((unused)) void *data,
 	struct ipc_ss_ussd_header ussd;
 	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;