Re: [RFC PATCH 5/8] isimodem: returns file-status of SIM EF-file

[Denis Kenzior <denkenz@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1862 bytes --]

Hi Petteri,

On 10/12/2010 10:18 AM, Petteri Tikander wrote:
> ---
>  drivers/isimodem/sim.c |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/isimodem/sim.c b/drivers/isimodem/sim.c
> index e2ea275..bd7e9d6 100644
> --- a/drivers/isimodem/sim.c
> +++ b/drivers/isimodem/sim.c
> @@ -54,6 +54,7 @@ struct file_info {
>  	int structure;
>  	int record_length;
>  	unsigned char access[3];
> +	unsigned char file_status;
>  };
>  
>  /* Returns file info */
> @@ -66,7 +67,7 @@ static gboolean fake_file_info(gpointer user)
>  	DBG("Returning static file_info for %04x", fi->fileid);
>  	CALLBACK_WITH_SUCCESS(cb,
>  				fi->length, fi->structure, fi->record_length,
> -				fi->access, cbd->data);
> +				fi->access, fi->file_status, cbd->data);
>  	g_free(cbd);
>  	return FALSE;
>  }
> @@ -76,8 +77,10 @@ static void isi_read_file_info(struct ofono_sim *sim, int fileid,
>  {
>  	int i;
>  	static struct file_info const info[] = {
> -		{ SIM_EFSPN_FILEID, 17, 0, 0, { 0x0f, 0xff, 0xff } },
> -		{ SIM_EF_ICCID_FILEID, 10, 0, 0, { 0x0f, 0xff, 0xff } },
> +		{ SIM_EFSPN_FILEID, 17, 0, 0, { 0x0f, 0xff, 0xff },
> +			SIM_FILE_STATUS_NOT_INVALID },
> +		{ SIM_EF_ICCID_FILEID, 10, 0, 0, { 0x0f, 0xff, 0xff },
> +			SIM_FILE_STATUS_NOT_INVALID },

Using 0 instead of SIM_FILE_STATUS_NOT_INVALID seems better.

>  	};
>  	int N = sizeof(info) / sizeof(info[0]);
>  	struct isi_cb_data *cbd;
> @@ -91,7 +94,8 @@ static void isi_read_file_info(struct ofono_sim *sim, int fileid,
>  	}
>  
>  	DBG("Not implemented (fileid = %04x)", fileid);
> -	CALLBACK_WITH_FAILURE(cb, -1, -1, -1, NULL, data);
> +	CALLBACK_WITH_FAILURE(cb, -1, -1, -1, NULL,
> +		SIM_FILE_STATUS_NOT_AVAILABLE, data);
>  }
>  
>  static gboolean spn_resp_cb(GIsiClient *client,

Regards,
-Denis