diff options
Diffstat (limited to 'sim.c')
| -rw-r--r-- | sim.c | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -212,7 +212,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_radio_state_check(RADIO_STATE_SIM_NOT_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY); if (rc < 0) return 0; @@ -271,7 +271,7 @@ int ril_request_get_sim_status(__attribute__((unused)) void *data, struct ril_request *request; int rc; - rc = ril_radio_state_check(RADIO_STATE_SIM_NOT_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY); if (rc < 0) return RIL_REQUEST_UNHANDLED; @@ -334,7 +334,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_radio_state_check(RADIO_STATE_SIM_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_READY); if (rc < 0) return RIL_REQUEST_UNHANDLED; @@ -533,7 +533,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_radio_state_check(RADIO_STATE_SIM_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_READY); if (rc < 0) return RIL_REQUEST_UNHANDLED; @@ -611,7 +611,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_radio_state_check(RADIO_STATE_SIM_NOT_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY); if (rc < 0) return RIL_REQUEST_UNHANDLED; @@ -668,7 +668,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_radio_state_check(RADIO_STATE_SIM_NOT_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY); if (rc < 0) return RIL_REQUEST_UNHANDLED; @@ -718,7 +718,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_radio_state_check(RADIO_STATE_SIM_NOT_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY); if (rc < 0) return RIL_REQUEST_UNHANDLED; @@ -768,7 +768,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_radio_state_check(RADIO_STATE_SIM_NOT_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY); if (rc < 0) return RIL_REQUEST_UNHANDLED; @@ -822,7 +822,7 @@ int ril_request_change_sim_pin(void *data, size_t size, RIL_Token token) if (request != NULL) return RIL_REQUEST_UNHANDLED; - rc = ril_radio_state_check(RADIO_STATE_SIM_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_READY); if (rc < 0) return RIL_REQUEST_UNHANDLED; @@ -872,7 +872,7 @@ int ril_request_change_sim_pin2(void *data, size_t size, RIL_Token token) if (request != NULL) return RIL_REQUEST_UNHANDLED; - rc = ril_radio_state_check(RADIO_STATE_SIM_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_READY); if (rc < 0) return RIL_REQUEST_UNHANDLED; @@ -1007,9 +1007,9 @@ int ril_request_sim_io(void *data, size_t size, RIL_Token token) #endif goto error; - rc = ril_radio_state_check(RADIO_STATE_SIM_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_READY); if (rc < 0) { - rc = ril_radio_state_check(RADIO_STATE_SIM_LOCKED_OR_ABSENT); + rc = ril_has_reached_state(RADIO_STATE_SIM_LOCKED_OR_ABSENT); if (rc < 0) return RIL_REQUEST_UNHANDLED; else @@ -1174,7 +1174,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_radio_state_check(RADIO_STATE_SIM_NOT_READY); + rc = ril_has_reached_state(RADIO_STATE_SIM_NOT_READY); if (rc < 0) return 0; |