From 93181cb54ee0a95395439ecc8cf275fc83957f56 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 20 Nov 2015 21:36:50 -0600 Subject: gril: Remove g_ril_request_sim_read_info --- gril/grilrequest.c | 49 ------------------------------------------------- gril/grilrequest.h | 12 ------------ 2 files changed, 61 deletions(-) diff --git a/gril/grilrequest.c b/gril/grilrequest.c index 91b43c4e..701fa978 100644 --- a/gril/grilrequest.c +++ b/gril/grilrequest.c @@ -60,7 +60,6 @@ /* Commands defined for TS 27.007 +CRSM */ #define CMD_READ_BINARY 176 /* 0xB0 */ #define CMD_READ_RECORD 178 /* 0xB2 */ -#define CMD_GET_RESPONSE 192 /* 0xC0 */ #define CMD_UPDATE_BINARY 214 /* 0xD6 */ #define CMD_UPDATE_RECORD 220 /* 0xDC */ #define CMD_STATUS 242 /* 0xF2 */ @@ -340,54 +339,6 @@ error: return FALSE; } -gboolean g_ril_request_sim_read_info(GRil *gril, - const struct req_sim_read_info *req, - struct parcel *rilp) -{ - parcel_init(rilp); - - parcel_w_int32(rilp, CMD_GET_RESPONSE); - parcel_w_int32(rilp, req->fileid); - - g_ril_append_print_buf(gril, - "(cmd=0x%.2X,efid=0x%.4X,", - CMD_GET_RESPONSE, - req->fileid); - - if (set_path(gril, req->app_type, rilp, req->fileid, - req->path, req->path_len) == FALSE) - goto error; - - parcel_w_int32(rilp, 0); /* P1 */ - parcel_w_int32(rilp, 0); /* P2 */ - - /* - * TODO: review parameters values used by Android. - * The values of P1-P3 in this code were based on - * values used by the atmodem driver impl. - * - * NOTE: - * GET_RESPONSE_EF_SIZE_BYTES == 15; !255 - */ - parcel_w_int32(rilp, 15); /* P3 - max length */ - parcel_w_string(rilp, NULL); /* data; only req'd for writes */ - parcel_w_string(rilp, NULL); /* pin2; only req'd for writes */ - parcel_w_string(rilp, req->aid_str); /* AID (Application ID) */ - - /* - * sessionId, specific to latest MTK modems (harmless for older ones). - * It looks like this field selects one or another SIM application, but - * we use only one at a time so using zero here seems safe. - */ - if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) - parcel_w_int32(rilp, 0); - - return TRUE; - -error: - return FALSE; -} - gboolean g_ril_request_sim_read_binary(GRil *gril, const struct req_sim_read_binary *req, struct parcel *rilp) diff --git a/gril/grilrequest.h b/gril/grilrequest.h index 87510942..da6043cc 100644 --- a/gril/grilrequest.h +++ b/gril/grilrequest.h @@ -50,14 +50,6 @@ struct req_setup_data_call { unsigned req_cid; }; -struct req_sim_read_info { - guint app_type; - gchar *aid_str; - int fileid; - const unsigned char *path; - unsigned int path_len; -}; - struct req_sim_read_binary { guint app_type; @@ -124,10 +116,6 @@ gboolean g_ril_request_setup_data_call(GRil *gril, struct parcel *rilp, struct ofono_error *error); -gboolean g_ril_request_sim_read_info(GRil *gril, - const struct req_sim_read_info *req, - struct parcel *rilp); - gboolean g_ril_request_sim_read_binary(GRil *gril, const struct req_sim_read_binary *req, struct parcel *rilp); -- cgit v1.2.3