sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Reorder the declarations of stk data objects

This commit is contained in:
Yang Gu 2010-03-31 17:16:53 +08:00 committed by Denis Kenzior
parent 82687aa58b
commit d9f063f431
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/stkutil.h
View File

@ -307,15 +307,6 @@ struct stk_ccp {
unsigned char ccp[16];
};
/*
* Icon ID denotes a file on the SIM filesystem. Since EF cannot have record
* ids of 0, we use icon_id with 0 to denote empty icon_identifier objects
*/
struct stk_icon_identifier {
unsigned char qualifier;
unsigned char id;
};
/*
* According to 102.223 Section 8.8 interval values of 0x00 are reserved.
* We use this to denote empty duration objects.
@ -347,6 +338,17 @@ struct stk_result {
unsigned char *additional;
};
/* Define the struct of single file in TS102.223 Section 8.18.
* According to TS 11.11 Section 6.2, each file id has two bytes, and the
* maximum Dedicated File level is 2. So the maximum size of file is 8, which
* contains two bytes of Master File, 2 bytes of 1st level Dedicated File,
* 2 bytes of 2nd level Dedicated File and 2 bytes of Elementary File.
*/
struct stk_file {
unsigned char file[8];
unsigned int len;
};
/* Defined in TS 102.223 Section 8.19 */
struct stk_location_info {
char mnc[OFONO_MAX_MNC_LENGTH + 1];
@ -358,15 +360,14 @@ struct stk_location_info {
unsigned short ext_ci;
};
/* Define the struct of single file in TS102.223 Section 8.18.
* According to TS 11.11 Section 6.2, each file id has two bytes, and the
* maximum Dedicated File level is 2. So the maximum size of file is 8, which
* contains two bytes of Master File, 2 bytes of 1st level Dedicated File,
* 2 bytes of 2nd level Dedicated File and 2 bytes of Elementary File.
/*
* Defined in TS 102.223 Section 8.31
* Icon ID denotes a file on the SIM filesystem. Since EF cannot have record
* ids of 0, we use icon_id with 0 to denote empty icon_identifier objects
*/
struct stk_file {
unsigned char file[8];
unsigned int len;
struct stk_icon_identifier {
unsigned char qualifier;
unsigned char id;
};
/*