isimodem: Move common debugs to a single place

9 files changed, 5 insertions, 16 deletions

diff --git a/drivers/isimodem/call.h b/drivers/isimodem/call.h
index ebd62283..9b3acb7d 100644
--- a/drivers/isimodem/call.h
+++ b/drivers/isimodem/call.h
@@ -112,7 +112,6 @@ enum call_message_id {
 	CALL_SECURITY_IND =			0x41,
 	CALL_MEDIA_HANDLE_REQ =			0x42,
 	CALL_MEDIA_HANDLE_RESP =		0x43,
-	CALL_COMMON_MESSAGE =			0xF0,
 };
 
 enum call_status {
diff --git a/drivers/isimodem/debug.c b/drivers/isimodem/debug.c
index bcc6544b..3e35b784 100644
--- a/drivers/isimodem/debug.c
+++ b/drivers/isimodem/debug.c
@@ -39,6 +39,8 @@
 
 #include "debug.h"
 
+#define COMMON_MESSAGE	0xF0
+
 #define _(X) case X: return #X
 
 const char *pn_resource_name(int value)
@@ -75,7 +77,6 @@ const char *ss_message_id_name(enum ss_message_id value)
 		_(SS_GSM_USSD_RECEIVE_IND);
 		_(SS_STATUS_IND);
 		_(SS_SERVICE_COMPLETED_IND);
-		_(SS_COMMON_MESSAGE);
 	}
 	return "SS_<UNKNOWN>";
 }
@@ -149,7 +150,6 @@ const char *mtc_message_id_name(enum mtc_message_id value)
 		_(MTC_STARTUP_SYNQ_RESP);
 		_(MTC_SHUTDOWN_SYNC_RESP);
 		_(MTC_STATE_INFO_IND);
-		_(MTC_COMMON_MESSAGE);
 	}
 	return "MTC_<UNKNOWN>";
 }
@@ -461,7 +461,6 @@ const char *sms_message_id_name(enum sms_message_id value)
 		_(SMS_RECEIVE_MESSAGE_REQ);
 		_(SMS_RECEIVE_MESSAGE_RESP);
 		_(SMS_RECEIVED_MSG_IND);
-		_(SMS_COMMON_MESSAGE);
 	}
 	return "SMS_<UNKNOWN>";
 }
@@ -589,7 +588,6 @@ const char *sim_message_id_name(enum sim_message_id value)
 		_(SIM_PB_RESP_SIM_PB_READ);
 		_(SIM_SERVER_READY_IND);
 		_(SIM_IND);
-		_(SIM_COMMON_MESSAGE);
 	}
 
 	return "SIM_<UNKNOWN>";
@@ -676,7 +674,6 @@ const char *info_message_id_name(enum info_message_id value)
 		_(INFO_VERSION_READ_RESP);
 		_(INFO_PRODUCT_INFO_READ_REQ);
 		_(INFO_PRODUCT_INFO_READ_RESP);
-		_(INFO_COMMON_MESSAGE);
 	}
 	return "INFO_<UNKNOWN>";
 }
@@ -803,7 +800,6 @@ char const *call_message_id_name(enum call_message_id value)
 		_(CALL_SECURITY_IND);
 		_(CALL_MEDIA_HANDLE_REQ);
 		_(CALL_MEDIA_HANDLE_RESP);
-		_(CALL_COMMON_MESSAGE);
 	}
 	return "CALL_<UNKNOWN>";
 }
@@ -1039,7 +1035,6 @@ const char *net_message_id_name(enum net_message_id value)
 		_(NET_OPER_NAME_READ_RESP);
 		_(NET_OLD_OPER_NAME_READ_REQ);
 		_(NET_OLD_OPER_NAME_READ_RESP);
-		_(NET_COMMON_MESSAGE);
 	}
 	return "NET_<UNKNOWN>";
 }
@@ -1181,7 +1176,6 @@ const char *gpds_subblock_name(enum gpds_subblock value)
 		_(GPDS_SDNS_ADDRESS_INFO);
 		_(GPDS_CHALLENGE_INFO);
 		_(GPDS_DNS_ADDRESS_REQ_INFO);
-		_(GPDS_COMMON_MESSAGE);
 	}
 	return "GPDS_<UNKNOWN>";
 }
@@ -1324,6 +1318,9 @@ static void hex_dump(const char *resname, uint8_t res, const char *name,
 
 static const char *res_to_name(uint8_t res, uint8_t id)
 {
+	if (id == COMMON_MESSAGE)
+		return "COMMON_MESSAGE";
+
 	switch (res) {
 	case PN_NETWORK:
 		return net_message_id_name(id);
diff --git a/drivers/isimodem/gpds.h b/drivers/isimodem/gpds.h
index e6a4b573..43ce4295 100644
--- a/drivers/isimodem/gpds.h
+++ b/drivers/isimodem/gpds.h
@@ -131,7 +131,6 @@ enum gpds_subblock {
 	GPDS_SDNS_ADDRESS_INFO =		0x0E,
 	GPDS_CHALLENGE_INFO =			0x0F,
 	GPDS_DNS_ADDRESS_REQ_INFO =		0x90,
-	GPDS_COMMON_MESSAGE =			0xF0
 };
 
 enum gpds_status {
diff --git a/drivers/isimodem/info.h b/drivers/isimodem/info.h
index e6d143c7..93ab24f8 100644
--- a/drivers/isimodem/info.h
+++ b/drivers/isimodem/info.h
@@ -48,7 +48,6 @@ enum info_message_id {
 	INFO_VERSION_READ_RESP =		0x08,
 	INFO_PRODUCT_INFO_READ_REQ =		0x15,
 	INFO_PRODUCT_INFO_READ_RESP =		0x16,
-	INFO_COMMON_MESSAGE =			0xF0,
 };
 
 enum info_subblock {
diff --git a/drivers/isimodem/mtc.h b/drivers/isimodem/mtc.h
index 57e5040c..32b05f49 100644
--- a/drivers/isimodem/mtc.h
+++ b/drivers/isimodem/mtc.h
@@ -103,7 +103,6 @@ enum mtc_message_id {
 	MTC_STARTUP_SYNQ_RESP =		0x6E,
 	MTC_SHUTDOWN_SYNC_RESP =	0x75,
 	MTC_STATE_INFO_IND =		0xC0,
-	MTC_COMMON_MESSAGE =		0xF0,
 };
 
 enum mtc_modem_state {
diff --git a/drivers/isimodem/network.h b/drivers/isimodem/network.h
index 57c92aca..45f61aea 100644
--- a/drivers/isimodem/network.h
+++ b/drivers/isimodem/network.h
@@ -62,7 +62,6 @@ enum net_message_id {
 	NET_AVAILABLE_GET_RESP =			0xE4,
 	NET_OPER_NAME_READ_REQ =			0xE5,
 	NET_OPER_NAME_READ_RESP =			0xE6,
-	NET_COMMON_MESSAGE =				0xF0,
 };
 
 enum net_subblock {
diff --git a/drivers/isimodem/sim.h b/drivers/isimodem/sim.h
index 15859062..f7c187c2 100644
--- a/drivers/isimodem/sim.h
+++ b/drivers/isimodem/sim.h
@@ -144,7 +144,6 @@ enum sim_message_id {
 	SIM_PB_RESP_SIM_PB_READ =				0xDD,
 	SIM_SERVER_READY_IND =					0xED,
 	SIM_IND =						0xEF,
-	SIM_COMMON_MESSAGE =					0xF0,
 };
 
 enum sim_service_type {
diff --git a/drivers/isimodem/sms.h b/drivers/isimodem/sms.h
index a51adf2a..4c3846fb 100644
--- a/drivers/isimodem/sms.h
+++ b/drivers/isimodem/sms.h
@@ -135,7 +135,6 @@ enum sms_message_id {
 	SMS_RECEIVE_MESSAGE_REQ = 0x41,
 	SMS_RECEIVE_MESSAGE_RESP = 0x42,
 	SMS_RECEIVED_MSG_IND = 0x43,
-	SMS_COMMON_MESSAGE = 0xF0
 };
 
 enum sms_subblock {
diff --git a/drivers/isimodem/ss.h b/drivers/isimodem/ss.h
index 41aa2cb9..8f06b60a 100644
--- a/drivers/isimodem/ss.h
+++ b/drivers/isimodem/ss.h
@@ -36,7 +36,6 @@ enum ss_message_id {
 	SS_GSM_USSD_RECEIVE_IND =		0x06,
 	SS_STATUS_IND =				0x09,
 	SS_SERVICE_COMPLETED_IND =		0x10,
-	SS_COMMON_MESSAGE =			0xF0
 };
 
 enum ss_ussd_type {