From: Iiro Kaihlaniemi Date: Fri, 19 Aug 2011 12:30:12 +0000 (+0300) Subject: isimodem: Add missing codepoints and debugs X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee92dedf28a48dec9e36ba19d19d363ce21190a5;p=platform%2Fupstream%2Fofono.git isimodem: Add missing codepoints and debugs --- diff --git a/drivers/isimodem/debug.c b/drivers/isimodem/debug.c index 2e44037..7a2b17d 100644 --- a/drivers/isimodem/debug.c +++ b/drivers/isimodem/debug.c @@ -228,6 +228,127 @@ const char *mce_rf_state_name(enum mce_rf_state value) return "MCE_RF"; } +const char *uicc_service_type_name(uint8_t value) +{ + switch (value) { + _(UICC_APPL_LIST); + _(UICC_APPL_HOST_ACTIVATE); + /*_(UICC_APPL_DEACTIVATE);*/ + _(UICC_APPL_START_UP_COMPLETE); + /*_(UICC_SHUT_DOWN_INITIATED);*/ + _(UICC_APPL_SHUT_DOWN_INITIATED); + _(UICC_APPL_STATUS_GET); + _(UICC_APPL_HOST_DEACTIVATE); + _(UICC_PIN_VERIFY); + _(UICC_PIN_UNBLOCK); + _(UICC_PIN_DISABLE); + _(UICC_PIN_ENABLE); + _(UICC_PIN_CHANGE); + _(UICC_PIN_SUBSTITUTE); + _(UICC_PIN_INFO); + _(UICC_PIN_PROMPT_VERIFY); + _(UICC_APPL_READ_TRANSPARENT); + _(UICC_APPL_UPDATE_TRANSPARENT); + _(UICC_APPL_READ_LINEAR_FIXED); + _(UICC_APPL_UPDATE_LINEAR_FIXED); + _(UICC_APPL_FILE_INFO); + _(UICC_APPL_APDU_SEND); + _(UICC_APPL_CLEAR_CACHE); + _(UICC_APPL_SESSION_START); + _(UICC_APPL_SESSION_END); + _(UICC_APPL_READ_CYCLIC); + _(UICC_APPL_UPDATE_CYCLIC); + /*_(UICC_APPL_CACHE_UPDATED);*/ + _(UICC_CONNECT); + _(UICC_DISCONNECT); + _(UICC_RECONNECT); + _(UICC_CAT_ENABLE); + _(UICC_CAT_DISABLE); + _(UICC_CAT_TERMINAL_PROFILE); + _(UICC_CAT_TERMINAL_RESPONSE); + _(UICC_CAT_ENVELOPE); + _(UICC_CAT_POLLING_SET); + _(UICC_CAT_REFRESH); + _(UICC_CAT_POLL); + _(UICC_APDU_SEND); + _(UICC_APDU_ATR_GET); + _(UICC_APDU_CONTROL); + _(UICC_REFRESH_STATUS); + _(UICC_APPL_TERMINATED); + _(UICC_APPL_RECOVERED); + /*_(UICC_APPL_UNAVAILABLE);*/ + /*_(UICC_APPL_SHUT_DOWN);*/ + _(UICC_APPL_ACTIVATED); + _(UICC_PIN_VERIFY_NEEDED); + _(UICC_PIN_UNBLOCK_NEEDED); + _(UICC_PIN_PERMANENTLY_BLOCKED); + _(UICC_PIN_VERIFIED); + _(UICC_CAT_FETCHED_CMD); + _(UICC_CAT_NOT_SUPPORTED); + _(UICC_CAT_REG_FAILED); + _(UICC_CAT_REG_OK); + _(UICC_REFRESH_PERMISSION); + _(UICC_REFRESH_STARTING); + _(UICC_REFRESH_CANCELLED); + _(UICC_REFRESH_NOW); + _(UICC_START_UP_COMPLETE); + _(UICC_STATUS_GET); + _(UICC_READY); + /*_(UICC_READY_FOR_ACTIVATION);*/ + _(UICC_INITIALIZED); + _(UICC_SHUTTING_DOWN); + /*_(UICC_SHUT_DOWN_CONFIG);*/ + _(UICC_ERROR); + _(UICC_CARD_DISCONNECTED); + _(UICC_CARD_REMOVED); + _(UICC_CARD_NOT_PRESENT); + /*_(UICC_CARD_RESET);*/ + _(UICC_CARD_READY); + _(UICC_CARD_STATUS_GET); + _(UICC_CARD_REJECTED); + _(UICC_CARD_INFO_GET); + _(UICC_SIMLOCK_ACTIVE); + _(UICC_APDU_SAP_ACTIVATE); + _(UICC_APDU_SAP_DEACTIVATE); + _(UICC_APDU_SAP_ATR_GET); + _(UICC_APDU_SAP_COLD_RESET); + _(UICC_APDU_SAP_WARM_RESET); + _(UICC_APDU_SAP_APDU_SEND); + _(UICC_APDU_SAP_RECOVERY); + _(UICC_APDU_SAP_CONFIG_GET); + _(UICC_PWR_CTRL_ENABLE); + _(UICC_PWR_CTRL_DISABLE); + _(UICC_PWR_CTRL_WAIT); + _(UICC_PWR_CTRL_PROCEED); + _(UICC_PWR_CTRL_PERMISSION); + } + return "UICC_SERVICE_"; +} + +const char *uicc_details_name(uint8_t value) +{ + + switch (value) { + /* Used when status differs from UICC_STATUS_FAIL */ + _(UICC_NO_DETAILS); + /* Request was sent with one or more invalid parameter */ + _(UICC_INVALID_PARAMETERS); + /* The file wasn't found */ + _(UICC_FILE_NOT_FOUND); + /* User does not have the required priviledges for this */ + _(UICC_SECURITY_CONDITIONS_NOT_SATISFIED); + /* Application can not be activated due to already active app */ + _(UICC_APPL_CONFLICT); + /* Card Communication error */ + _(UICC_CARD_ERROR); + /* Operation not supported */ + _(UICC_SERVICE_NOT_SUPPORTED); + /* Session expired */ + _(UICC_SESSION_EXPIRED); + } + return "UICC_STATUS"; +} + const char *uicc_message_id_name(enum uicc_message_id value) { switch (value) { @@ -1019,6 +1140,7 @@ const char *net_message_id_name(enum net_message_id value) _(NET_SET_RESP); _(NET_RSSI_GET_REQ); _(NET_RSSI_GET_RESP); + _(NET_CS_STATE_IND); _(NET_RSSI_IND); _(NET_CIPHERING_IND); _(NET_TIME_IND); @@ -1026,10 +1148,14 @@ const char *net_message_id_name(enum net_message_id value) _(NET_RAT_IND); _(NET_RAT_REQ); _(NET_RAT_RESP); + _(NET_CS_STATE_REQ); + _(NET_CS_STATE_RESP); _(NET_CELL_INFO_GET_REQ); _(NET_CELL_INFO_GET_RESP); _(NET_CELL_INFO_IND); _(NET_NITZ_NAME_IND); + _(NET_NW_ACCESS_CONF_REQ); + _(NET_NW_ACCESS_CONF_RESP); _(NET_REG_STATUS_GET_REQ); _(NET_REG_STATUS_GET_RESP); _(NET_REG_STATUS_IND); @@ -1060,6 +1186,10 @@ const char *net_subblock_name(enum net_subblock value) _(NET_WCDMA_CELL_INFO); _(NET_FULL_NITZ_NAME); _(NET_SHORT_NITZ_NAME); + _(NET_REGISTRATION_CONF_INFO); + _(NET_ROAMING_CONF_INFO); + _(NET_REGISTRATION_CONF1_INFO); + _(NET_ROAMING_CONF1_INFO); _(NET_AVAIL_NETWORK_INFO_COMMON); _(NET_OPER_NAME_INFO); } diff --git a/drivers/isimodem/debug.h b/drivers/isimodem/debug.h index 3a273e9..7629317 100644 --- a/drivers/isimodem/debug.h +++ b/drivers/isimodem/debug.h @@ -50,7 +50,9 @@ const char *mce_status_info(enum mce_status_info value); const char *uicc_message_id_name(enum uicc_message_id value); const char *uicc_subblock_name(uint8_t value); +const char *uicc_service_type_name(uint8_t value); const char *uicc_status_name(uint8_t value); +const char *uicc_details_name(uint8_t value); const char *sms_gsm_cause_name(enum sms_gsm_cause value); const char *sms_isi_cause_name(enum sms_isi_cause value); diff --git a/drivers/isimodem/network.h b/drivers/isimodem/network.h index 45f61ae..ea70c92 100644 --- a/drivers/isimodem/network.h +++ b/drivers/isimodem/network.h @@ -42,6 +42,7 @@ enum net_message_id { NET_SET_RESP = 0x08, NET_RSSI_GET_REQ = 0x0B, NET_RSSI_GET_RESP = 0x0C, + NET_CS_STATE_IND = 0x19, NET_RSSI_IND = 0x1E, NET_CIPHERING_IND = 0x20, NET_TIME_IND = 0x27, @@ -51,10 +52,14 @@ enum net_message_id { NET_RAT_IND = 0x35, NET_RAT_REQ = 0x36, NET_RAT_RESP = 0x37, + NET_CS_STATE_REQ = 0x3A, + NET_CS_STATE_RESP = 0x3B, NET_CELL_INFO_GET_REQ = 0x40, NET_CELL_INFO_GET_RESP = 0x41, NET_CELL_INFO_IND = 0x42, NET_NITZ_NAME_IND = 0x43, + NET_NW_ACCESS_CONF_REQ = 0x48, + NET_NW_ACCESS_CONF_RESP = 0x49, NET_REG_STATUS_GET_REQ = 0xE0, NET_REG_STATUS_GET_RESP = 0xE1, NET_REG_STATUS_IND = 0xE2, @@ -80,6 +85,10 @@ enum net_subblock { NET_WCDMA_CELL_INFO = 0x47, NET_FULL_NITZ_NAME = 0x48, NET_SHORT_NITZ_NAME = 0x49, + NET_REGISTRATION_CONF_INFO = 0x55, + NET_ROAMING_CONF_INFO = 0x56, + NET_REGISTRATION_CONF1_INFO = 0x59, + NET_ROAMING_CONF1_INFO = 0x5A, NET_AVAIL_NETWORK_INFO_COMMON = 0xE1, NET_OPER_NAME_INFO = 0xE7, }; @@ -197,6 +206,11 @@ enum net_select_mode { NET_SELECT_MODE_NO_SELECTION = 0x04, }; +enum net_cs_states { + NET_CS_INACTIVE = 0x00, + NET_CS_ACTIVE = 0x01, +}; + enum net_isi_cause { NET_CAUSE_OK = 0x00, NET_CAUSE_COMMUNICATION_ERROR = 0x01, diff --git a/drivers/isimodem/uicc.h b/drivers/isimodem/uicc.h index 4b613eb..2eca847 100644 --- a/drivers/isimodem/uicc.h +++ b/drivers/isimodem/uicc.h @@ -248,6 +248,11 @@ enum uicc_details { UICC_NO_DETAILS = 0x00, UICC_INVALID_PARAMETERS = 0x01, UICC_FILE_NOT_FOUND = 0x02, + UICC_SECURITY_CONDITIONS_NOT_SATISFIED = 0x03, + UICC_APPL_CONFLICT = 0x04, + UICC_CARD_ERROR = 0x05, + UICC_SERVICE_NOT_SUPPORTED = 0x06, + UICC_SESSION_EXPIRED = 0x07, }; enum uicc_simlock_status {