[PATCH 3/6] Unify some macro names of ber-tlv and comprehension tlv

--- src/stkutil.h | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/stkutil.h b/src/stkutil.h index 4b7c382..5724d29 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -54,7 +54,7 @@ enum stk_command_type { STK_COMMAND_TYPE_GET_INPUT = 0x23, STK_COMMAND_TYPE_SELECT_ITEM = 0x24, STK_COMMAND_TYPE_SETUP_MENU = 0x25, - STK_COMMAND_TYPE_PROVIDE_LOCAL_INFORMATION = 0x26, + STK_COMMAND_TYPE_PROVIDE_LOCAL_INFO = 0x26, STK_COMMAND_TYPE_TIMER_MANAGEMENT = 0x27, STK_COMMAND_TYPE_SETUP_IDLE_MODE_TEXT = 0x28, STK_COMMAND_TYPE_PERFORM_CARD_APDU = 0x30, @@ -69,13 +69,13 @@ enum stk_command_type { STK_COMMAND_TYPE_SEND_DATA = 0x43, STK_COMMAND_TYPE_GET_CHANNEL_STATUS = 0x44, STK_COMMAND_TYPE_SERVICE_SEARCH = 0x45, - STK_COMMAND_TYPE_GET_SERVICE_INFORMATION = 0x46, + STK_COMMAND_TYPE_GET_SERVICE_INFO = 0x46, STK_COMMAND_TYPE_DECLARE_SERVICE = 0x47, STK_COMMAND_TYPE_SET_FRAMES = 0x50, STK_COMMAND_TYPE_GET_FRAMES_STATUS = 0x51, - STK_COMMAND_TYPE_RETRIEVE_MMS = 0x60, - STK_COMMAND_TYPE_SUBMIT_MMS = 0x61, - STK_COMMAND_TYPE_DISPLAY_MMS = 0x62, + STK_COMMAND_TYPE_RETRIEVE_MM = 0x60, + STK_COMMAND_TYPE_SUBMIT_MM = 0x61, + STK_COMMAND_TYPE_DISPLAY_MM = 0x62, STK_COMMAND_TYPE_ACTIVATE = 0x70, STK_COMMAND_TYPE_END_SESSION = 0x81, }; @@ -131,7 +131,7 @@ enum stk_data_object_type { STK_DATA_OBJECT_TYPE_BROWSER_ID = 0x30, STK_DATA_OBJECT_TYPE_URL = 0x31, STK_DATA_OBJECT_TYPE_BEARER = 0x32, - STK_DATA_OBJECT_TYPE_PROVISIONING_REFERENCE_FILE = 0x33, + STK_DATA_OBJECT_TYPE_PROVISIONING_FILE_REFERENCE = 0x33, STK_DATA_OBJECT_TYPE_BROWSER_TERMINATION_CAUSE = 0x34, STK_DATA_OBJECT_TYPE_BEARER_DESCRIPTION = 0x35, STK_DATA_OBJECT_TYPE_CHANNEL_DATA = 0x36, @@ -162,12 +162,12 @@ enum stk_data_object_type { STK_DATA_OBJECT_TYPE_FRAME_LAYOUT = 0x66, STK_DATA_OBJECT_TYPE_FRAMES_INFO = 0x67, STK_DATA_OBJECT_TYPE_FRAME_ID = 0x68, - STK_DATA_OBJECT_TYPE_MMS_REFERENCE = 0x6A, - STK_DATA_OBJECT_TYPE_MMS_ID = 0x6B, - STK_DATA_OBJECT_TYPE_MMS_TRANSFER_STATUS = 0x6C, + STK_DATA_OBJECT_TYPE_MM_REFERENCE = 0x6A, + STK_DATA_OBJECT_TYPE_MM_ID = 0x6B, + STK_DATA_OBJECT_TYPE_MM_TRANSFER_STATUS = 0x6C, STK_DATA_OBJECT_TYPE_MEID = 0x6D, - STK_DATA_OBJECT_TYPE_CONTENT_ID = 0x6E, - STK_DATA_OBJECT_TYPE_MMS_NOTIFICATION = 0x6F, + STK_DATA_OBJECT_TYPE_MM_CONTENT_ID = 0x6E, + STK_DATA_OBJECT_TYPE_MM_NOTIFICATION = 0x6F, STK_DATA_OBJECT_TYPE_LAST_ENVELOPE = 0x70, STK_DATA_OBJECT_TYPE_REGISTRY_APPLICATION_DATA = 0x71, STK_DATA_OBJECT_TYPE_ROUTING_AREA_INFO = 0x73, -- 1.6.3.3