Prefer official Samsung IPC protocol names

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

10 files changed, 221 insertions, 222 deletions

diff --git a/include/gprs.h b/include/gprs.h
index 3323a4e..0b5dcc9 100644
--- a/include/gprs.h
+++ b/include/gprs.h
@@ -34,14 +34,14 @@
 #define IPC_GPRS_ENTER_DATA                                     0x0D05
 #define IPC_GPRS_SHOW_PDP_ADDR                                  0x0D06
 #define IPC_GPRS_MS_CLASS                                       0x0D07
-#define IPC_GPRS_3G_QUAL_SERVICE_PROFILE                        0x0D08
+#define IPC_GPRS_3G_QUAL_SRVC_PROFILE                           0x0D08
 #define IPC_GPRS_IP_CONFIGURATION                               0x0D09
 #define IPC_GPRS_DEFINE_SEC_PDP_CONTEXT                         0x0D0A
 #define IPC_GPRS_TFT                                            0x0D0B
 #define IPC_GPRS_HSDPA_STATUS                                   0x0D0C
-#define IPC_GPRS_CURRENT_SESSION_DATA_COUNT                     0x0D0D
+#define IPC_GPRS_CURRENT_SESSION_DATA_COUNTER                   0x0D0D
 #define IPC_GPRS_DATA_DORMANT                                   0x0D0E
-#define IPC_GPRS_DUN_PIN_CTRL                                   0x0D0F
+#define IPC_GPRS_PIN_CTRL                                       0x0D0F
 #define IPC_GPRS_CALL_STATUS                                    0x0D10
 #define IPC_GPRS_PORT_LIST                                      0x0D11
 
diff --git a/include/net.h b/include/net.h
index 2a49493..310a12d 100644
--- a/include/net.h
+++ b/include/net.h
@@ -30,7 +30,7 @@
 
 #define IPC_NET_PREF_PLMN                                       0x0801
 #define IPC_NET_PLMN_SEL                                        0x0802
-#define IPC_NET_CURRENT_PLMN                                    0x0803
+#define IPC_NET_SERVING_NETWORK                                 0x0803
 #define IPC_NET_PLMN_LIST                                       0x0804
 #define IPC_NET_REGIST                                          0x0805
 #define IPC_NET_SUBSCRIBER_NUM                                  0x0806
@@ -40,7 +40,7 @@
 #define IPC_NET_MODE_SEL                                        0x080A
 #define IPC_NET_ACQ_ORDER                                       0x080B
 #define IPC_NET_IDENTITY                                        0x080C
-#define IPC_NET_CURRENT_RRC_STATUS                              0x080D
+#define IPC_NET_PREFERRED_NETWORK_INFO                          0x080D
 
 /*
  * Values
@@ -88,7 +88,7 @@ struct ipc_net_plmn_sel_request_data {
     unsigned char act; // IPC_NET_ACCESS_TECHNOLOGY
 } __attribute__((__packed__));
 
-struct ipc_net_current_plmn_data {
+struct ipc_net_serving_network_data {
     unsigned char unknown[3];
     char plmn[5];
     unsigned char type;
diff --git a/include/pb.h b/include/pb.h
index d525755..1072684 100644
--- a/include/pb.h
+++ b/include/pb.h
@@ -30,7 +30,7 @@
 #define IPC_PB_STORAGE                                          0x0602
 #define IPC_PB_STORAGE_LIST                                     0x0603
 #define IPC_PB_ENTRY_INFO                                       0x0604
-#define IPC_PB_CAPABILITY_INFO                                  0x0605
+#define IPC_PB_3GPB_CAPA                                        0x0605
 
 #endif
 
diff --git a/include/sat.h b/include/sat.h
index e36c5c0..2d8a129 100644
--- a/include/sat.h
+++ b/include/sat.h
@@ -37,7 +37,7 @@
 #define IPC_SAT_SETUP_EVENT_LIST                                0x0E09
 #define IPC_SAT_CALL_CONTROL_RESULT                             0x0E0A
 #define IPC_SAT_IMAGE_CLUT                                      0x0E0B
-#define IPC_SAT_CALL_PROCESSING                                 0x0E0C
+#define IPC_SAT_SETUP_CALL_PROCESSING                           0x0E0C
 
 #endif
 
diff --git a/include/sec.h b/include/sec.h
index 692e7ad..052737a 100644
--- a/include/sec.h
+++ b/include/sec.h
@@ -27,33 +27,33 @@
  * Commands
  */
 
-#define IPC_SEC_SIM_STATUS                                      0x0501
+#define IPC_SEC_PIN_STATUS                                      0x0501
 #define IPC_SEC_PHONE_LOCK                                      0x0502
 #define IPC_SEC_CHANGE_LOCKING_PW                               0x0503
 #define IPC_SEC_SIM_LANG                                        0x0504
 #define IPC_SEC_RSIM_ACCESS                                     0x0505
 #define IPC_SEC_GSIM_ACCESS                                     0x0506
 #define IPC_SEC_SIM_ICC_TYPE                                    0x0507
-#define IPC_SEC_LOCK_INFO                                       0x0508
-#define IPC_SEC_ISIM_AUTH                                       0x0509
+#define IPC_SEC_LOCK_INFOMATION                                 0x0508
+#define IPC_SEC_IMS_AUTH                                        0x0509
 
 /*
  * Values
  */
 
-#define IPC_SEC_SIM_STATUS_READY                                0x00
-#define IPC_SEC_SIM_STATUS_SIM_LOCK_REQUIRED                    0x01
-#define IPC_SEC_SIM_STATUS_INSIDE_PF_ERROR                      0x02
-#define IPC_SEC_SIM_STATUS_LOCK_SC                              0x03
-#define IPC_SEC_SIM_STATUS_LOCK_FD                              0x04
-#define IPC_SEC_SIM_STATUS_LOCK_PN                              0x05
-#define IPC_SEC_SIM_STATUS_LOCK_PU                              0x06
-#define IPC_SEC_SIM_STATUS_LOCK_PP                              0x07
-#define IPC_SEC_SIM_STATUS_LOCK_PC                              0x08
-#define IPC_SEC_SIM_STATUS_CARD_NOT_PRESENT                     0x80
-#define IPC_SEC_SIM_STATUS_CARD_ERROR                           0x81
-#define IPC_SEC_SIM_STATUS_INIT_COMPLETE                        0x82
-#define IPC_SEC_SIM_STATUS_PB_INIT_COMPLETE                     0x83
+#define IPC_SEC_PIN_STATUS_READY                                0x00
+#define IPC_SEC_PIN_STATUS_SIM_LOCK_REQUIRED                    0x01
+#define IPC_SEC_PIN_STATUS_INSIDE_PF_ERROR                      0x02
+#define IPC_SEC_PIN_STATUS_LOCK_SC                              0x03
+#define IPC_SEC_PIN_STATUS_LOCK_FD                              0x04
+#define IPC_SEC_PIN_STATUS_LOCK_PN                              0x05
+#define IPC_SEC_PIN_STATUS_LOCK_PU                              0x06
+#define IPC_SEC_PIN_STATUS_LOCK_PP                              0x07
+#define IPC_SEC_PIN_STATUS_LOCK_PC                              0x08
+#define IPC_SEC_PIN_STATUS_CARD_NOT_PRESENT                     0x80
+#define IPC_SEC_PIN_STATUS_CARD_ERROR                           0x81
+#define IPC_SEC_PIN_STATUS_INIT_COMPLETE                        0x82
+#define IPC_SEC_PIN_STATUS_PB_INIT_COMPLETE                     0x83
 
 #define IPC_SEC_FACILITY_LOCK_TYPE_SC_UNLOCKED                  0x00
 #define IPC_SEC_FACILITY_LOCK_TYPE_SC_PIN1_REQ                  0x01
@@ -90,12 +90,12 @@
  * Structures
  */
 
-struct ipc_sec_sim_status_response_data {
-    unsigned char status; // IPC_SEC_SIM_STATUS
+struct ipc_sec_pin_status_response_data {
+    unsigned char status; // IPC_SEC_PIN_STATUS
     unsigned char facility_lock; // IPC_SEC_FACILITY_LOCK_TYPE
 } __attribute__((__packed__));
 
-struct ipc_sec_sim_status_request_data {
+struct ipc_sec_pin_status_request_data {
     unsigned char type; // IPC_SEC_PIN_TYPE
     unsigned char pin1_length;
     unsigned char pin2_length;
@@ -150,12 +150,12 @@ struct ipc_sec_sim_icc_type {
     unsigned char type; // IPC_SEC_SIM_CARD_TYPE
 } __attribute__((__packed__));
 
-struct ipc_sec_lock_info_request_data {
+struct ipc_sec_lock_infomation_request_data {
     unsigned char magic;
     unsigned char type; // IPC_SEC_PIN_TYPE
 } __attribute__((__packed__));
 
-struct ipc_sec_lock_info_response_data {
+struct ipc_sec_lock_infomation_response_data {
     unsigned char unknown;
     unsigned char type; // IPC_SEC_PIN_TYPE
     unsigned char key;
@@ -166,9 +166,9 @@ struct ipc_sec_lock_info_response_data {
  * Helpers
  */
 
-void ipc_sec_sim_status_setup(struct ipc_sec_sim_status_request_data *message,
+void ipc_sec_pin_status_setup(struct ipc_sec_pin_status_request_data *message,
     unsigned char pin_type, char *pin1, char *pin2);
-void ipc_sec_lock_info_setup(struct ipc_sec_lock_info_request_data *message,
+void ipc_sec_lock_infomation_setup(struct ipc_sec_lock_infomation_request_data *message,
     unsigned char pin_type);
 void ipc_sec_phone_lock_request_set_setup(struct ipc_sec_phone_lock_request_set_data *message,
     int pin_type, int enable, char *passwd);
diff --git a/include/sms.h b/include/sms.h
index f92683d..cb49df2 100644
--- a/include/sms.h
+++ b/include/sms.h
@@ -40,7 +40,7 @@
 #define IPC_SMS_SVC_OPTION                                      0x040B
 #define IPC_SMS_MEM_STATUS                                      0x040C
 #define IPC_SMS_CBS_MSG                                         0x040D
-#define IPC_SMS_CBS_CONFIG                                      0x040E
+#define IPC_SMS_CBS_CFG                                         0x040E
 #define IPC_SMS_STORED_MSG_STATUS                               0x040F
 #define IPC_SMS_PARAM_COUNT                                     0x0410
 #define IPC_SMS_PARAM                                           0x0411
diff --git a/include/svc.h b/include/svc.h
index 718886f..e998789 100644
--- a/include/svc.h
+++ b/include/svc.h
@@ -33,8 +33,8 @@
 #define IPC_SVC_DISPLAY_SCREEN                                  0x0B05
 #define IPC_SVC_CHANGE_SVC_MODE                                 0x0B06
 #define IPC_SVC_DEVICE_TEST                                     0x0B07
-#define IPC_SVC_DEBUG_DUMP_MESSAGE                              0x0B08
-#define IPC_SVC_DEBUG_STRING_MESSAGE                            0x0B09
+#define IPC_SVC_DEBUG_DUMP                                      0x0B08
+#define IPC_SVC_DEBUG_STRING                                    0x0B09
 
 /*
  * Values
diff --git a/samsung-ipc/ipc_util.c b/samsung-ipc/ipc_util.c
index 969afa1..3cbb5af 100644
--- a/samsung-ipc/ipc_util.c
+++ b/samsung-ipc/ipc_util.c
@@ -68,6 +68,20 @@ const char *ipc_request_type_to_str(int type)
 const char *ipc_command_to_str(int command)
 {
     switch (command) {
+        case IPC_PWR_PHONE_PWR_UP:
+            return "IPC_PWR_PHONE_PWR_UP";
+        case IPC_PWR_PHONE_PWR_OFF:
+            return "IPC_PWR_PHONE_PWR_OFF";
+        case IPC_PWR_PHONE_RESET:
+            return "IPC_PWR_PHONE_RESET";
+        case IPC_PWR_BATT_STATUS:
+            return "IPC_PWR_BATT_STATUS";
+        case IPC_PWR_BATT_TYPE:
+            return "IPC_PWR_BATT_TYPE";
+        case IPC_PWR_BATT_COMP:
+            return "IPC_PWR_BATT_COMP";
+        case IPC_PWR_PHONE_STATE:
+            return "IPC_PWR_PHONE_STATE";
         case IPC_CALL_OUTGOING:
             return "IPC_CALL_OUTGOING";
         case IPC_CALL_INCOMING:
@@ -88,158 +102,6 @@ const char *ipc_command_to_str(int command)
             return "IPC_CALL_WAITING";
         case IPC_CALL_LINE_ID:
             return "IPC_CALL_LINE_ID";
-        case IPC_DISP_ICON_INFO:
-            return "IPC_DISP_ICON_INFO";
-        case IPC_DISP_HOMEZONE_INFO:
-            return "IPC_DISP_HOMEZONE_INFO";
-        case IPC_DISP_RSSI_INFO:
-            return "IPC_DISP_RSSI_INFO";
-        case IPC_GEN_PHONE_RES:
-            return "IPC_GEN_PHONE_RES";
-        case IPC_GPRS_DEFINE_PDP_CONTEXT:
-            return "IPC_GPRS_DEFINE_PDP_CONTEXT";
-        case IPC_GPRS_QOS:
-            return "IPC_GPRS_QOS";
-        case IPC_GPRS_PS:
-            return "IPC_GPRS_PS";
-        case IPC_GPRS_PDP_CONTEXT:
-            return "IPC_GPRS_PDP_CONTEXT";
-        case IPC_GPRS_ENTER_DATA:
-            return "IPC_GPRS_ENTER_DATA";
-        case IPC_GPRS_SHOW_PDP_ADDR:
-            return "IPC_GPRS_SHOW_PDP_ADDR";
-        case IPC_GPRS_MS_CLASS:
-            return "IPC_GPRS_MS_CLASS";
-        case IPC_GPRS_3G_QUAL_SERVICE_PROFILE:
-            return "IPC_GPRS_3G_QUAL_SERVICE_PROFILE";
-        case IPC_GPRS_IP_CONFIGURATION:
-            return "IPC_GPRS_IP_CONFIGURATION";
-        case IPC_GPRS_DEFINE_SEC_PDP_CONTEXT:
-            return "IPC_GPRS_DEFINE_SEC_PDP_CONTEXT";
-        case IPC_GPRS_TFT:
-            return "IPC_GPRS_TFT";
-        case IPC_GPRS_HSDPA_STATUS:
-            return "IPC_GPRS_HSDPA_STATUS";
-        case IPC_GPRS_CURRENT_SESSION_DATA_COUNT:
-            return "IPC_GPRS_CURRENT_SESSION_DATA_COUNT";
-        case IPC_GPRS_DATA_DORMANT:
-            return "IPC_GPRS_DATA_DORMANT";
-        case IPC_GPRS_DUN_PIN_CTRL:
-            return "IPC_GPRS_DUN_PIN_CTRL";
-        case IPC_GPRS_CALL_STATUS:
-            return "IPC_GPRS_CALL_STATUS";
-        case IPC_GPRS_PORT_LIST:
-            return "IPC_GPRS_PORT_LIST";
-        case IPC_IMEI_START:
-            return "IPC_IMEI_START";
-        case IPC_IMEI_CHECK_DEVICE_INFO:
-            return "IPC_IMEI_CHECK_DEVICE_INFO";
-        case IPC_MISC_ME_VERSION:
-            return "IPC_MISC_ME_VERSION";
-        case IPC_MISC_ME_IMSI:
-            return "IPC_MISC_ME_IMSI";
-        case IPC_MISC_ME_SN:
-            return "IPC_MISC_ME_SN";
-        case IPC_MISC_TIME_INFO:
-            return "IPC_MISC_TIME_INFO";
-        case IPC_MISC_DEBUG_LEVEL:
-            return "IPC_MISC_DEBUG_LEVEL";
-        case IPC_NET_PREF_PLMN:
-            return "IPC_NET_PREF_PLMN";
-        case IPC_NET_PLMN_SEL:
-            return "IPC_NET_PLMN_SEL";
-        case IPC_NET_CURRENT_PLMN:
-            return "IPC_NET_CURRENT_PLMN";
-        case IPC_NET_PLMN_LIST:
-            return "IPC_NET_PLMN_LIST";
-        case IPC_NET_REGIST:
-            return "IPC_NET_REGIST";
-        case IPC_NET_SUBSCRIBER_NUM:
-            return "IPC_NET_SUBSCRIBER_NUM";
-        case IPC_NET_BAND_SEL:
-            return "IPC_NET_BAND_SEL";
-        case IPC_NET_SERVICE_DOMAIN_CONFIG:
-            return "IPC_NET_SERVICE_DOMAIN_CONFIG";
-        case IPC_NET_POWERON_ATTACH:
-            return "IPC_NET_POWERON_ATTACH";
-        case IPC_NET_MODE_SEL:
-            return "IPC_NET_MODE_SEL";
-        case IPC_NET_ACQ_ORDER:
-            return "IPC_NET_ACQ_ORDER";
-        case IPC_NET_IDENTITY:
-            return "IPC_NET_IDENTITY";
-        case IPC_NET_CURRENT_RRC_STATUS:
-            return "IPC_NET_CURRENT_RRC_STATUS";
-        case IPC_PB_ACCESS:
-            return "IPC_PB_ACCESS";
-        case IPC_PB_STORAGE:
-            return "IPC_PB_STORAGE";
-        case IPC_PB_STORAGE_LIST:
-            return "IPC_PB_STORAGE_LIST";
-        case IPC_PB_ENTRY_INFO:
-            return "IPC_PB_ENTRY_INFO";
-        case IPC_PB_CAPABILITY_INFO:
-            return "IPC_PB_CAPABILITY_INFO";
-        case IPC_PWR_PHONE_PWR_UP:
-            return "IPC_PWR_PHONE_PWR_UP";
-        case IPC_PWR_PHONE_PWR_OFF:
-            return "IPC_PWR_PHONE_PWR_OFF";
-        case IPC_PWR_PHONE_RESET:
-            return "IPC_PWR_PHONE_RESET";
-        case IPC_PWR_BATT_STATUS:
-            return "IPC_PWR_BATT_STATUS";
-        case IPC_PWR_BATT_TYPE:
-            return "IPC_PWR_BATT_TYPE";
-        case IPC_PWR_BATT_COMP:
-            return "IPC_PWR_BATT_COMP";
-        case IPC_PWR_PHONE_STATE:
-            return "IPC_PWR_PHONE_STATE";
-        case IPC_RFS_NV_READ_ITEM:
-            return "IPC_RFS_NV_READ_ITEM";
-        case IPC_RFS_NV_WRITE_ITEM:
-            return "IPC_RFS_NV_WRITE_ITEM";
-        case IPC_SAT_PROFILE_DOWNLOAD:
-            return "IPC_SAT_PROFILE_DOWNLOAD";
-        case IPC_SAT_ENVELOPE_CMD:
-            return "IPC_SAT_ENVELOPE_CMD";
-        case IPC_SAT_PROACTIVE_CMD:
-            return "IPC_SAT_PROACTIVE_CMD";
-        case IPC_SAT_TERMINATE_USAT_SESSION:
-            return "IPC_SAT_TERMINATE_USAT_SESSION";
-        case IPC_SAT_EVENT_DOWNLOAD:
-            return "IPC_SAT_EVENT_DOWNLOAD";
-        case IPC_SAT_PROVIDE_LOCAL_INFO:
-            return "IPC_SAT_PROVIDE_LOCAL_INFO";
-        case IPC_SAT_POLLING:
-            return "IPC_SAT_POLLING";
-        case IPC_SAT_REFRESH:
-            return "IPC_SAT_REFRESH";
-        case IPC_SAT_SETUP_EVENT_LIST:
-            return "IPC_SAT_SETUP_EVENT_LIST";
-        case IPC_SAT_CALL_CONTROL_RESULT:
-            return "IPC_SAT_CALL_CONTROL_RESULT";
-        case IPC_SAT_IMAGE_CLUT:
-            return "IPC_SAT_IMAGE_CLUT";
-        case IPC_SAT_CALL_PROCESSING:
-            return "IPC_SAT_CALL_PROCESSING";
-        case IPC_SEC_SIM_STATUS:
-            return "IPC_SEC_SIM_STATUS";
-        case IPC_SEC_PHONE_LOCK:
-            return "IPC_SEC_PHONE_LOCK";
-        case IPC_SEC_CHANGE_LOCKING_PW:
-            return "IPC_SEC_CHANGE_LOCKING_PW";
-        case IPC_SEC_SIM_LANG:
-            return "IPC_SEC_SIM_LANG";
-        case IPC_SEC_RSIM_ACCESS:
-            return "IPC_SEC_RSIM_ACCESS";
-        case IPC_SEC_GSIM_ACCESS:
-            return "IPC_SEC_GSIM_ACCESS";
-        case IPC_SEC_SIM_ICC_TYPE:
-            return "IPC_SEC_SIM_ICC_TYPE";
-        case IPC_SEC_LOCK_INFO:
-            return "IPC_SEC_LOCK_INFO";
-        case IPC_SEC_ISIM_AUTH:
-            return "IPC_SEC_ISIM_AUTH";
         case IPC_SMS_SEND_MSG:
             return "IPC_SMS_SEND_MSG";
         case IPC_SMS_INCOMING_MSG:
@@ -266,14 +128,74 @@ const char *ipc_command_to_str(int command)
             return "IPC_SMS_MEM_STATUS";
         case IPC_SMS_CBS_MSG:
             return "IPC_SMS_CBS_MSG";
-        case IPC_SMS_CBS_CONFIG:
-            return "IPC_SMS_CBS_CONFIG";
+        case IPC_SMS_CBS_CFG:
+            return "IPC_SMS_CBS_CFG";
         case IPC_SMS_STORED_MSG_STATUS:
             return "IPC_SMS_STORED_MSG_STATUS";
         case IPC_SMS_PARAM_COUNT:
             return "IPC_SMS_PARAM_COUNT";
         case IPC_SMS_PARAM:
             return "IPC_SMS_PARAM";
+        case IPC_SEC_PIN_STATUS:
+            return "IPC_SEC_PIN_STATUS";
+        case IPC_SEC_PHONE_LOCK:
+            return "IPC_SEC_PHONE_LOCK";
+        case IPC_SEC_CHANGE_LOCKING_PW:
+            return "IPC_SEC_CHANGE_LOCKING_PW";
+        case IPC_SEC_SIM_LANG:
+            return "IPC_SEC_SIM_LANG";
+        case IPC_SEC_RSIM_ACCESS:
+            return "IPC_SEC_RSIM_ACCESS";
+        case IPC_SEC_GSIM_ACCESS:
+            return "IPC_SEC_GSIM_ACCESS";
+        case IPC_SEC_SIM_ICC_TYPE:
+            return "IPC_SEC_SIM_ICC_TYPE";
+        case IPC_SEC_LOCK_INFOMATION:
+            return "IPC_SEC_LOCK_INFOMATION";
+        case IPC_SEC_IMS_AUTH:
+            return "IPC_SEC_IMS_AUTH";
+        case IPC_PB_ACCESS:
+            return "IPC_PB_ACCESS";
+        case IPC_PB_STORAGE:
+            return "IPC_PB_STORAGE";
+        case IPC_PB_STORAGE_LIST:
+            return "IPC_PB_STORAGE_LIST";
+        case IPC_PB_ENTRY_INFO:
+            return "IPC_PB_ENTRY_INFO";
+        case IPC_PB_3GPB_CAPA:
+            return "IPC_PB_3GPB_CAPA";
+        case IPC_DISP_ICON_INFO:
+            return "IPC_DISP_ICON_INFO";
+        case IPC_DISP_HOMEZONE_INFO:
+            return "IPC_DISP_HOMEZONE_INFO";
+        case IPC_DISP_RSSI_INFO:
+            return "IPC_DISP_RSSI_INFO";
+        case IPC_NET_PREF_PLMN:
+            return "IPC_NET_PREF_PLMN";
+        case IPC_NET_PLMN_SEL:
+            return "IPC_NET_PLMN_SEL";
+        case IPC_NET_SERVING_NETWORK:
+            return "IPC_NET_SERVING_NETWORK";
+        case IPC_NET_PLMN_LIST:
+            return "IPC_NET_PLMN_LIST";
+        case IPC_NET_REGIST:
+            return "IPC_NET_REGIST";
+        case IPC_NET_SUBSCRIBER_NUM:
+            return "IPC_NET_SUBSCRIBER_NUM";
+        case IPC_NET_BAND_SEL:
+            return "IPC_NET_BAND_SEL";
+        case IPC_NET_SERVICE_DOMAIN_CONFIG:
+            return "IPC_NET_SERVICE_DOMAIN_CONFIG";
+        case IPC_NET_POWERON_ATTACH:
+            return "IPC_NET_POWERON_ATTACH";
+        case IPC_NET_MODE_SEL:
+            return "IPC_NET_MODE_SEL";
+        case IPC_NET_ACQ_ORDER:
+            return "IPC_NET_ACQ_ORDER";
+        case IPC_NET_IDENTITY:
+            return "IPC_NET_IDENTITY";
+        case IPC_NET_PREFERRED_NETWORK_INFO:
+            return "IPC_NET_PREFERRED_NETWORK_INFO";
         case IPC_SND_SPKR_VOLUME_CTRL:
             return "IPC_SND_SPKR_VOLUME_CTRL";
         case IPC_SND_MIC_MUTE_CTRL:
@@ -294,6 +216,34 @@ const char *ipc_command_to_str(int command)
             return "IPC_SND_CLOCK_CTRL";
         case IPC_SND_WB_AMR_STATUS:
             return "IPC_SND_WB_AMR_STATUS";
+        case IPC_MISC_ME_VERSION:
+            return "IPC_MISC_ME_VERSION";
+        case IPC_MISC_ME_IMSI:
+            return "IPC_MISC_ME_IMSI";
+        case IPC_MISC_ME_SN:
+            return "IPC_MISC_ME_SN";
+        case IPC_MISC_TIME_INFO:
+            return "IPC_MISC_TIME_INFO";
+        case IPC_MISC_DEBUG_LEVEL:
+            return "IPC_MISC_DEBUG_LEVEL";
+        case IPC_SVC_ENTER:
+            return "IPC_SVC_ENTER";
+        case IPC_SVC_END:
+            return "IPC_SVC_END";
+        case IPC_SVC_PRO_KEYCODE:
+            return "IPC_SVC_PRO_KEYCODE";
+        case IPC_SVC_SCREEN_CFG:
+            return "IPC_SVC_SCREEN_CFG";
+        case IPC_SVC_DISPLAY_SCREEN:
+            return "IPC_SVC_DISPLAY_SCREEN";
+        case IPC_SVC_CHANGE_SVC_MODE:
+            return "IPC_SVC_CHANGE_SVC_MODE";
+        case IPC_SVC_DEVICE_TEST:
+            return "IPC_SVC_DEVICE_TEST";
+        case IPC_SVC_DEBUG_DUMP:
+            return "IPC_SVC_DEBUG_DUMP";
+        case IPC_SVC_DEBUG_STRING:
+            return "IPC_SVC_DEBUG_STRING";
         case IPC_SS_WAITING:
             return "IPC_SS_WAITING";
         case IPC_SS_CLI:
@@ -314,24 +264,74 @@ const char *ipc_command_to_str(int command)
             return "IPC_SS_AOC";
         case IPC_SS_RELEASE_COMPLETE:
             return "IPC_SS_RELEASE_COMPLETE";
-        case IPC_SVC_ENTER:
-            return "IPC_SVC_ENTER";
-        case IPC_SVC_END:
-            return "IPC_SVC_END";
-        case IPC_SVC_PRO_KEYCODE:
-            return "IPC_SVC_PRO_KEYCODE";
-        case IPC_SVC_SCREEN_CFG:
-            return "IPC_SVC_SCREEN_CFG";
-        case IPC_SVC_DISPLAY_SCREEN:
-            return "IPC_SVC_DISPLAY_SCREEN";
-        case IPC_SVC_CHANGE_SVC_MODE:
-            return "IPC_SVC_CHANGE_SVC_MODE";
-        case IPC_SVC_DEVICE_TEST:
-            return "IPC_SVC_DEVICE_TEST";
-        case IPC_SVC_DEBUG_DUMP_MESSAGE:
-            return "IPC_SVC_DEBUG_DUMP_MESSAGE";
-        case IPC_SVC_DEBUG_STRING_MESSAGE:
-            return "IPC_SVC_DEBUG_STRING_MESSAGE";
+        case IPC_GPRS_DEFINE_PDP_CONTEXT:
+            return "IPC_GPRS_DEFINE_PDP_CONTEXT";
+        case IPC_GPRS_QOS:
+            return "IPC_GPRS_QOS";
+        case IPC_GPRS_PS:
+            return "IPC_GPRS_PS";
+        case IPC_GPRS_PDP_CONTEXT:
+            return "IPC_GPRS_PDP_CONTEXT";
+        case IPC_GPRS_ENTER_DATA:
+            return "IPC_GPRS_ENTER_DATA";
+        case IPC_GPRS_SHOW_PDP_ADDR:
+            return "IPC_GPRS_SHOW_PDP_ADDR";
+        case IPC_GPRS_MS_CLASS:
+            return "IPC_GPRS_MS_CLASS";
+        case IPC_GPRS_3G_QUAL_SRVC_PROFILE:
+            return "IPC_GPRS_3G_QUAL_SRVC_PROFILE";
+        case IPC_GPRS_IP_CONFIGURATION:
+            return "IPC_GPRS_IP_CONFIGURATION";
+        case IPC_GPRS_DEFINE_SEC_PDP_CONTEXT:
+            return "IPC_GPRS_DEFINE_SEC_PDP_CONTEXT";
+        case IPC_GPRS_TFT:
+            return "IPC_GPRS_TFT";
+        case IPC_GPRS_HSDPA_STATUS:
+            return "IPC_GPRS_HSDPA_STATUS";
+        case IPC_GPRS_CURRENT_SESSION_DATA_COUNTER:
+            return "IPC_GPRS_CURRENT_SESSION_DATA_COUNTER";
+        case IPC_GPRS_DATA_DORMANT:
+            return "IPC_GPRS_DATA_DORMANT";
+        case IPC_GPRS_PIN_CTRL:
+            return "IPC_GPRS_PIN_CTRL";
+        case IPC_GPRS_CALL_STATUS:
+            return "IPC_GPRS_CALL_STATUS";
+        case IPC_GPRS_PORT_LIST:
+            return "IPC_GPRS_PORT_LIST";
+        case IPC_SAT_PROFILE_DOWNLOAD:
+            return "IPC_SAT_PROFILE_DOWNLOAD";
+        case IPC_SAT_ENVELOPE_CMD:
+            return "IPC_SAT_ENVELOPE_CMD";
+        case IPC_SAT_PROACTIVE_CMD:
+            return "IPC_SAT_PROACTIVE_CMD";
+        case IPC_SAT_TERMINATE_USAT_SESSION:
+            return "IPC_SAT_TERMINATE_USAT_SESSION";
+        case IPC_SAT_EVENT_DOWNLOAD:
+            return "IPC_SAT_EVENT_DOWNLOAD";
+        case IPC_SAT_PROVIDE_LOCAL_INFO:
+            return "IPC_SAT_PROVIDE_LOCAL_INFO";
+        case IPC_SAT_POLLING:
+            return "IPC_SAT_POLLING";
+        case IPC_SAT_REFRESH:
+            return "IPC_SAT_REFRESH";
+        case IPC_SAT_SETUP_EVENT_LIST:
+            return "IPC_SAT_SETUP_EVENT_LIST";
+        case IPC_SAT_CALL_CONTROL_RESULT:
+            return "IPC_SAT_CALL_CONTROL_RESULT";
+        case IPC_SAT_IMAGE_CLUT:
+            return "IPC_SAT_IMAGE_CLUT";
+        case IPC_SAT_SETUP_CALL_PROCESSING:
+            return "IPC_SAT_SETUP_CALL_PROCESSING";
+        case IPC_IMEI_START:
+            return "IPC_IMEI_START";
+        case IPC_IMEI_CHECK_DEVICE_INFO:
+            return "IPC_IMEI_CHECK_DEVICE_INFO";
+        case IPC_RFS_NV_READ_ITEM:
+            return "IPC_RFS_NV_READ_ITEM";
+        case IPC_RFS_NV_WRITE_ITEM:
+            return "IPC_RFS_NV_WRITE_ITEM";
+        case IPC_GEN_PHONE_RES:
+            return "IPC_GEN_PHONE_RES";
         default:
             return "UNKNOWN";
     }
diff --git a/samsung-ipc/sec.c b/samsung-ipc/sec.c
index 76584e8..be26170 100644
--- a/samsung-ipc/sec.c
+++ b/samsung-ipc/sec.c
@@ -23,13 +23,13 @@
 
 #include <samsung-ipc.h>
 
-void ipc_sec_sim_status_setup(struct ipc_sec_sim_status_request_data *message,
+void ipc_sec_pin_status_setup(struct ipc_sec_pin_status_request_data *message,
     unsigned char pin_type, char *pin1, char *pin2)
 {
     if (message == NULL)
         return;
 
-    memset(message, 0, sizeof(struct ipc_sec_sim_status_request_data));
+    memset(message, 0, sizeof(struct ipc_sec_pin_status_request_data));
 
     message->type = pin_type;
 
@@ -46,7 +46,7 @@ void ipc_sec_sim_status_setup(struct ipc_sec_sim_status_request_data *message,
     }
 }
 
-void ipc_sec_lock_info_setup(struct ipc_sec_lock_info_request_data *message,
+void ipc_sec_lock_infomation_setup(struct ipc_sec_lock_infomation_request_data *message,
     unsigned char pin_type)
 {
     if (message == NULL)
diff --git a/tools/modemctrl.c b/tools/modemctrl.c
index d8a9007..0edfa8d 100644
--- a/tools/modemctrl.c
+++ b/tools/modemctrl.c
@@ -137,33 +137,32 @@ void modem_set_sms_device_ready(struct ipc_client *client)
 
 void modem_set_sec_pin_status(struct ipc_client *client, char *pin1, char *pin2)
 {
-    struct ipc_sec_sim_status_request_data pin_status;
-    struct ipc_sec_lock_info_request_data lock_info_req;
+    struct ipc_sec_pin_status_request_data pin_status;
 
     printf("[I] Sending PIN1 unlock request\n");
 
-    ipc_sec_sim_status_setup(&pin_status, IPC_SEC_PIN_TYPE_PIN1, pin1, pin2);
-    ipc_client_send(client, IPC_SEC_SIM_STATUS, IPC_TYPE_SET, (void *) &pin_status, sizeof(pin_status), seq_get());
+    ipc_sec_pin_status_setup(&pin_status, IPC_SEC_PIN_TYPE_PIN1, pin1, pin2);
+    ipc_client_send(client, IPC_SEC_PIN_STATUS, IPC_TYPE_SET, (void *) &pin_status, sizeof(pin_status), seq_get());
 }
 
 void modem_response_sec(struct ipc_client *client, struct ipc_message_info *resp)
 {
-    struct ipc_sec_sim_status_response_data *sim_status;
+    struct ipc_sec_pin_status_response_data *sim_status;
     unsigned char type;
     int status;
     char *data;
 
     switch(IPC_COMMAND(resp))
     {
-        case IPC_SEC_SIM_STATUS :
-            sim_status = (struct ipc_sec_sim_status_response *)resp->data;
+        case IPC_SEC_PIN_STATUS :
+            sim_status = (struct ipc_sec_pin_status_response_data *)resp->data;
 
             switch(sim_status->status)
             {
-                case IPC_SEC_SIM_STATUS_CARD_NOT_PRESENT:
+                case IPC_SEC_PIN_STATUS_CARD_NOT_PRESENT:
                     printf("[I] SIM card is definitely absent\n");
                 break;
-                case IPC_SEC_SIM_STATUS_LOCK_SC:
+                case IPC_SEC_PIN_STATUS_LOCK_SC:
                     switch(sim_status->facility_lock)
                     {
                         case IPC_SEC_FACILITY_LOCK_TYPE_SC_PIN1_REQ:
@@ -182,13 +181,13 @@ void modem_response_sec(struct ipc_client *client, struct ipc_message_info *resp
                         break;
                     }
                 break;
-                case IPC_SEC_SIM_STATUS_INIT_COMPLETE:
+                case IPC_SEC_PIN_STATUS_INIT_COMPLETE:
                     printf("[3] SIM init complete\n");
                     if(state == MODEM_STATE_NORMAL)
                         state = MODEM_STATE_SIM_OK;
 
                 break;
-                case IPC_SEC_SIM_STATUS_PB_INIT_COMPLETE:
+                case IPC_SEC_PIN_STATUS_PB_INIT_COMPLETE:
                     printf("[I] SIM Phone Book init complete\n");
                 break;
             }
@@ -317,14 +316,14 @@ void modem_response_net(struct ipc_client *client, struct ipc_message_info *resp
     switch(IPC_COMMAND(resp))
     {
         case IPC_NET_REGIST:
-            regi = (struct ipc_net_regist_response*) resp->data;
+            regi = (struct ipc_net_regist_response_data *) resp->data;
             if(regi->status == IPC_NET_REGISTRATION_STATUS_HOME)
             {
                 printf("[I] Registered with network successfully!\n");
 
             }
         break;
-        case IPC_NET_CURRENT_PLMN:
+        case IPC_NET_SERVING_NETWORK:
 
             memcpy(mnc, (char *)(resp->data + 3), 5);
             mnc[5]=0;