Rename: stk data object enum names

Be more consistent

diff --git a/src/stkutil.h b/src/stkutil.h
index e66b4c0..23c6a3f 100644 (file)
--- 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,7 +69,7 @@ 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,
@@ -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,
@@ -167,7 +167,7 @@ enum stk_data_object_type {
        STK_DATA_OBJECT_TYPE_MMS_ID =                           0x6B,
        STK_DATA_OBJECT_TYPE_MMS_TRANSFER_STATUS =              0x6C,
        STK_DATA_OBJECT_TYPE_MEID =                             0x6D,
-       STK_DATA_OBJECT_TYPE_CONTENT_ID =                       0x6E,
+       STK_DATA_OBJECT_TYPE_MMS_CONTENT_ID =                   0x6E,
        STK_DATA_OBJECT_TYPE_MMS_NOTIFICATION =                 0x6F,
        STK_DATA_OBJECT_TYPE_LAST_ENVELOPE =                    0x70,
        STK_DATA_OBJECT_TYPE_REGISTRY_APPLICATION_DATA =        0x71,