simutil: fixup style according to M11

1 files changed, 158 insertions, 158 deletions

diff --git a/src/simutil.h b/src/simutil.h
index 92b2e0f4..ad84907a 100644
--- a/src/simutil.h
+++ b/src/simutil.h
@@ -53,189 +53,189 @@ enum sim_fileid {
 
 /* 51.011 Section 9.3 */
 enum sim_file_access {
-	SIM_FILE_ACCESS_ALWAYS = 0,
-	SIM_FILE_ACCESS_CHV1 = 1,
-	SIM_FILE_ACCESS_CHV2 = 2,
-	SIM_FILE_ACCESS_RESERVED = 3,
-	SIM_FILE_ACCESS_ADM = 4,
-	SIM_FILE_ACCESS_NEVER = 15,
+	SIM_FILE_ACCESS_ALWAYS =	0,
+	SIM_FILE_ACCESS_CHV1 =		1,
+	SIM_FILE_ACCESS_CHV2 =		2,
+	SIM_FILE_ACCESS_RESERVED =	3,
+	SIM_FILE_ACCESS_ADM =		4,
+	SIM_FILE_ACCESS_NEVER =		15,
 };
 
 /* 51.011 Section 9.3 */
 enum sim_file_status {
-	SIM_FILE_STATUS_VALID			= 0x01,
-	SIM_FILE_STATUS_RW_WHEN_INVALID		= 0x04,
+	SIM_FILE_STATUS_VALID =			0x01,
+	SIM_FILE_STATUS_RW_WHEN_INVALID =	0x04,
 };
 
 /* 131.102 Section 4.2.8 */
 enum sim_ust_service {
-	SIM_UST_SERVICE_LOCAL_PHONE_BOOK		= 0,
-	SIM_UST_SERVICE_FDN				= 1,
-	SIM_UST_SERVICE_EXT_2				= 2,
-	SIM_UST_SERVICE_SDN				= 3,
-	SIM_UST_SERVICE_EXT_3				= 4,
-	SIM_UST_SERVICE_BDN				= 5,
-	SIM_UST_SERVICE_EXT_4				= 6,
-	SIM_UST_SERVICE_OCI_OCT				= 7,
-	SIM_UST_SERVICE_ICI_ICT				= 8,
-	SIM_UST_SERVICE_SMS				= 9,
-	SIM_UST_SERVICE_SMSR				= 10,
-	SIM_UST_SERVICE_SMSP				= 11,
-	SIM_UST_SERVICE_AOC				= 12,
-	SIM_UST_SERVICE_CCP2				= 13,
-	SIM_UST_SERVICE_CBS_ID				= 14,
-	SIM_UST_SERVICE_CBS_ID_RANGE			= 15,
-	SIM_UST_SERVICE_GROUP_ID_LEVEL_1		= 16,
-	SIM_UST_SERVICE_GROUP_ID_LEVEL_2		= 17,
-	SIM_UST_SERVICE_PROVIDER_NAME			= 18,
-	SIM_UST_SERVICE_USER_PLMN			= 19,
-	SIM_UST_SERVICE_MSISDN				= 20,
-	SIM_UST_SERVICE_IMG				= 21,
-	SIM_UST_SERVICE_SOLSA				= 22,
-	SIM_UST_SERVICE_PRECEDENCE_PREEMPTION		= 23,
-	SIM_UST_SERVICE_EMLPP				= 24,
-	SIM_UST_SERVICE_GSM_ACCESS			= 26,
-	SIM_UST_SERVICE_DATA_DOWNLOAD_SMS_PP		= 27,
-	SIM_UST_SERVICE_DATA_DOWNLOAD_SMS_CB		= 28,
-	SIM_UST_SERVICE_CALL_CONTROL_USIM		= 29,
-	SIM_UST_SERVICE_MO_SMS_USIM			= 30,
-	SIM_UST_SERVICE_RUN_AT_COMMAND			= 31,
-	SIM_UST_SERVICE_ENABLED_SERVICE_TABLE		= 33,
-	SIM_UST_SERVICE_ACL				= 34,
-	SIM_UST_SERVICE_DEPERSONALISATION_CTRL_KEY	= 35,
-	SIM_UST_SERVICE_NETWORK_LIST			= 36,
-	SIM_UST_SERVICE_GSM_SECURITY_CONTEXT		= 37,
-	SIM_UST_SERVICE_CPBCCH				= 38,
-	SIM_UST_SERVICE_INVESTIGATION_SCAN		= 39,
-	SIM_UST_SERVICE_MEXE				= 40,
-	SIM_UST_SERVICE_OPERATOR_PLMN			= 41,
-	SIM_UST_SERVICE_HPLMN				= 42,
-	SIM_UST_SERVICE_EXT_5				= 43,
-	SIM_UST_SERVICE_PLMN_NETWORK_NAME		= 44,
-	SIM_UST_SERVICE_OPERATOR_PLMN_LIST		= 45,
-	SIM_UST_SERVICE_MAILBOX_DIALLING_NUMBERS	= 46,
-	SIM_UST_SERVICE_MWIS				= 47,
-	SIM_UST_SERVICE_CFIS				= 48,
-	SIM_UST_SERVICE_PROVIDER_DISPLAY_INFO		= 50,
-	SIM_UST_SERVICE_MMS				= 51,
-	SIM_UST_SERVICE_EXT_8				= 52,
-	SIM_UST_SERVICE_CALL_CONTROL_GPRS_USIM		= 53,
-	SIM_UST_SERVICE_MMS_USER_CONN_PARAM		= 54,
-	SIM_UST_SERVICE_NIA				= 55,
-	SIM_UST_SERVICE_EFVGCS_EFVGCSS			= 56,
-	SIM_UST_SERVICE_EFVBS_EFVBSS			= 57,
-	SIM_UST_SERVICE_PSEUDONYM			= 58,
-	SIM_UST_SERVICE_USER_PLMN_I_WLAN		= 59,
-	SIM_UST_SERVICE_OPERATOR_PLMN_I_WLAN		= 60,
-	SIM_UST_SERVICE_USER_WSID			= 61,
-	SIM_UST_SERVICE_OPERATOR_WSID			= 62,
-	SIM_UST_SERVICE_VGCS_SECURITY			= 63,
-	SIM_UST_SERVICE_VBS_SECURITY			= 64,
-	SIM_UST_SERVICE_WLAN_REAUTH_ID			= 65,
-	SIM_UST_SERVICE_MMS_STORAGE			= 66,
-	SIM_UST_SERVICE_GBA				= 67,
-	SIM_UST_SERVICE_MBMS_SECURITY			= 68,
-	SIM_UST_SERVICE_USSD_APPLICATION_MODE		= 69,
-	SIM_UST_SERVICE_EQUIVALENT_HPLMN		= 70,
-	SIM_UST_SERVICE_ADDITIONAL_TERMINAL_PROFILE	= 71,
-	SIM_UST_SERVICE_EQUIVALENT_HPLMN_IND		= 72,
-	SIM_UST_SERVICE_LAST_RPLMN_IND			= 73,
-	SIM_UST_SERVICE_OMA_BCAST_SC_PROFILE		= 74,
-	SIM_UST_SERVICE_BGA_LOCAL_KEY			= 75,
-	SIM_UST_SERVICE_TERMINAL_APPLICATIONS		= 76,
-	SIM_UST_SERVICE_PROVIDER_NAME_ICON		= 77,
-	SIM_UST_SERVICE_PLMN_NETWORK_NAME_ICON		= 78,
-	SIM_UST_SERVICE_CONN_PARAM_USIM_IP		= 79,
-	SIM_UST_SERVICE_HOME_I_WLAN_ID_LIST		= 80,
-	SIM_UST_SERVICE_I_WLAN_EQUIVALENT_HPLMN_IND	= 81,
-	SIM_UST_SERVICE_I_WLAN_HPLMN_PRIORITY_IND	= 82,
-	SIM_UST_SERVICE_I_WLAN_LAST_PLMN		= 83,
-	SIM_UST_SERVICE_EPS_INFO			= 84,
-	SIM_UST_SERVICE_CSG_IND				= 85,
-	SIM_UST_SERVICE_CALL_CONTROL_EPS_PDN_USIM	= 86,
-	SIM_UST_SERVICE_HPLMN_DIRECT_ACCESS		= 87,
-	SIM_UST_SERVICE_ECALL_DATA			= 88,
-	SIM_UST_SERVICE_OPERATOR_CSG			= 89
+	SIM_UST_SERVICE_LOCAL_PHONE_BOOK =		0,
+	SIM_UST_SERVICE_FDN =				1,
+	SIM_UST_SERVICE_EXT_2 =				2,
+	SIM_UST_SERVICE_SDN =				3,
+	SIM_UST_SERVICE_EXT_3 =				4,
+	SIM_UST_SERVICE_BDN =				5,
+	SIM_UST_SERVICE_EXT_4 =				6,
+	SIM_UST_SERVICE_OCI_OCT =			7,
+	SIM_UST_SERVICE_ICI_ICT =			8,
+	SIM_UST_SERVICE_SMS =				9,
+	SIM_UST_SERVICE_SMSR =				10,
+	SIM_UST_SERVICE_SMSP =				11,
+	SIM_UST_SERVICE_AOC =				12,
+	SIM_UST_SERVICE_CCP2 =				13,
+	SIM_UST_SERVICE_CBS_ID =			14,
+	SIM_UST_SERVICE_CBS_ID_RANGE =			15,
+	SIM_UST_SERVICE_GROUP_ID_LEVEL_1 =		16,
+	SIM_UST_SERVICE_GROUP_ID_LEVEL_2 =		17,
+	SIM_UST_SERVICE_PROVIDER_NAME =			18,
+	SIM_UST_SERVICE_USER_PLMN =			19,
+	SIM_UST_SERVICE_MSISDN =			20,
+	SIM_UST_SERVICE_IMG =				21,
+	SIM_UST_SERVICE_SOLSA =				22,
+	SIM_UST_SERVICE_PRECEDENCE_PREEMPTION =		23,
+	SIM_UST_SERVICE_EMLPP =				24,
+	SIM_UST_SERVICE_GSM_ACCESS =			26,
+	SIM_UST_SERVICE_DATA_DOWNLOAD_SMS_PP =		27,
+	SIM_UST_SERVICE_DATA_DOWNLOAD_SMS_CB =		28,
+	SIM_UST_SERVICE_CALL_CONTROL_USIM =		29,
+	SIM_UST_SERVICE_MO_SMS_USIM =			30,
+	SIM_UST_SERVICE_RUN_AT_COMMAND =		31,
+	SIM_UST_SERVICE_ENABLED_SERVICE_TABLE =		33,
+	SIM_UST_SERVICE_ACL =				34,
+	SIM_UST_SERVICE_DEPERSONALISATION_CTRL_KEY =	35,
+	SIM_UST_SERVICE_NETWORK_LIST =			36,
+	SIM_UST_SERVICE_GSM_SECURITY_CONTEXT =		37,
+	SIM_UST_SERVICE_CPBCCH =			38,
+	SIM_UST_SERVICE_INVESTIGATION_SCAN =		39,
+	SIM_UST_SERVICE_MEXE =				40,
+	SIM_UST_SERVICE_OPERATOR_PLMN =			41,
+	SIM_UST_SERVICE_HPLMN =				42,
+	SIM_UST_SERVICE_EXT_5 =				43,
+	SIM_UST_SERVICE_PLMN_NETWORK_NAME =		44,
+	SIM_UST_SERVICE_OPERATOR_PLMN_LIST =		45,
+	SIM_UST_SERVICE_MAILBOX_DIALLING_NUMBERS =	46,
+	SIM_UST_SERVICE_MWIS =				47,
+	SIM_UST_SERVICE_CFIS =				48,
+	SIM_UST_SERVICE_PROVIDER_DISPLAY_INFO =		50,
+	SIM_UST_SERVICE_MMS =				51,
+	SIM_UST_SERVICE_EXT_8 =				52,
+	SIM_UST_SERVICE_CALL_CONTROL_GPRS_USIM =	53,
+	SIM_UST_SERVICE_MMS_USER_CONN_PARAM =		54,
+	SIM_UST_SERVICE_NIA =				55,
+	SIM_UST_SERVICE_EFVGCS_EFVGCSS =		56,
+	SIM_UST_SERVICE_EFVBS_EFVBSS =			57,
+	SIM_UST_SERVICE_PSEUDONYM =			58,
+	SIM_UST_SERVICE_USER_PLMN_I_WLAN =		59,
+	SIM_UST_SERVICE_OPERATOR_PLMN_I_WLAN =		60,
+	SIM_UST_SERVICE_USER_WSID =			61,
+	SIM_UST_SERVICE_OPERATOR_WSID =			62,
+	SIM_UST_SERVICE_VGCS_SECURITY =			63,
+	SIM_UST_SERVICE_VBS_SECURITY =			64,
+	SIM_UST_SERVICE_WLAN_REAUTH_ID =		65,
+	SIM_UST_SERVICE_MMS_STORAGE =			66,
+	SIM_UST_SERVICE_GBA =				67,
+	SIM_UST_SERVICE_MBMS_SECURITY =			68,
+	SIM_UST_SERVICE_USSD_APPLICATION_MODE =		69,
+	SIM_UST_SERVICE_EQUIVALENT_HPLMN =		70,
+	SIM_UST_SERVICE_ADDITIONAL_TERMINAL_PROFILE =	71,
+	SIM_UST_SERVICE_EQUIVALENT_HPLMN_IND =		72,
+	SIM_UST_SERVICE_LAST_RPLMN_IND =		73,
+	SIM_UST_SERVICE_OMA_BCAST_SC_PROFILE =		74,
+	SIM_UST_SERVICE_BGA_LOCAL_KEY =			75,
+	SIM_UST_SERVICE_TERMINAL_APPLICATIONS =		76,
+	SIM_UST_SERVICE_PROVIDER_NAME_ICON =		77,
+	SIM_UST_SERVICE_PLMN_NETWORK_NAME_ICON =	78,
+	SIM_UST_SERVICE_CONN_PARAM_USIM_IP =		79,
+	SIM_UST_SERVICE_HOME_I_WLAN_ID_LIST =		80,
+	SIM_UST_SERVICE_I_WLAN_EQUIVALENT_HPLMN_IND =	81,
+	SIM_UST_SERVICE_I_WLAN_HPLMN_PRIORITY_IND =	82,
+	SIM_UST_SERVICE_I_WLAN_LAST_PLMN =		83,
+	SIM_UST_SERVICE_EPS_INFO =			84,
+	SIM_UST_SERVICE_CSG_IND =			85,
+	SIM_UST_SERVICE_CALL_CONTROL_EPS_PDN_USIM =	86,
+	SIM_UST_SERVICE_HPLMN_DIRECT_ACCESS =		87,
+	SIM_UST_SERVICE_ECALL_DATA =			88,
+	SIM_UST_SERVICE_OPERATOR_CSG =			89
 };
 
 /* 131.102 Section 4.2.47 */
 enum sim_est_service {
-	SIM_EST_SERVICE_FDN				= 0,
-	SIM_EST_SERVICE_BDN				= 1,
-	SIM_EST_SERVICE_ACL				= 2
+	SIM_EST_SERVICE_FDN =		0,
+	SIM_EST_SERVICE_BDN =		1,
+	SIM_EST_SERVICE_ACL =		2
 };
 
 /* 51.011 Section 10.3.7 */
 enum sim_sst_service {
-	SIM_SST_SERVICE_CHV1_DISABLE			= 0,
-	SIM_SST_SERVICE_ADN				= 1,
-	SIM_SST_SERVICE_FDN				= 2,
-	SIM_SST_SERVICE_SMS				= 3,
-	SIM_SST_SERVICE_AOC				= 4,
-	SIM_SST_SERVICE_CCP				= 5,
-	SIM_SST_SERVICE_PLMN_SELECTOR			= 6,
-	SIM_SST_SERVICE_MSISDN				= 8,
-	SIM_SST_SERVICE_EXT_1				= 9,
-	SIM_SST_SERVICE_EXT_2				= 10,
-	SIM_SST_SERVICE_SMSP				= 11,
-	SIM_SST_SERVICE_LND				= 12,
-	SIM_SST_SERVICE_CBS_ID				= 13,
-	SIM_SST_SERVICE_GROUP_ID_LEVEL_1		= 14,
-	SIM_SST_SERVICE_GROUP_ID_LEVEL_2		= 15,
-	SIM_SST_SERVICE_PROVIDER_NAME			= 16,
-	SIM_SST_SERVICE_SDN				= 17,
-	SIM_SST_SERVICE_EXT_3				= 18,
-	SIM_SST_SERVICE_EFVGCS_EFVGCSS			= 20,
-	SIM_SST_SERVICE_EFVBS_EFVBSS			= 21,
-	SIM_SST_SERVICE_PRECEDENCE_PREEMPTION		= 22,
-	SIM_SST_SERVICE_EMLPP				= 23,
-	SIM_SST_SERVICE_DATA_DOWNLOAD_SMS_CB		= 24,
-	SIM_SST_SERVICE_DATA_DOWNLOAD_SMS_PP		= 25,
-	SIM_SST_SERVICE_MENU_SELECTION			= 26,
-	SIM_SST_SERVICE_CALL_CONTROL			= 27,
-	SIM_SST_SERVICE_PROACTIVE_SIM			= 28,
-	SIM_SST_SERVICE_CBS_ID_RANGE			= 29,
-	SIM_SST_SERVICE_BDN				= 30,
-	SIM_SST_SERVICE_EXT_4				= 31,
-	SIM_SST_SERVICE_DEPERSONALISATION_CTRL_KEY	= 32,
-	SIM_SST_SERVICE_NETWORK_LIST			= 33,
-	SIM_SST_SERVICE_SMSR				= 34,
-	SIM_SST_SERVICE_NIA				= 35,
-	SIM_SST_SERVICE_MO_SMS_SIM			= 36,
-	SIM_SST_SERVICE_GPRS				= 37,
-	SIM_SST_SERVICE_IMG				= 38,
-	SIM_SST_SERVICE_SOLSA				= 39,
-	SIM_SST_SERVICE_USSD_CALL_CONTROL		= 40,
-	SIM_SST_SERVICE_RUN_AT_COMMAND			= 41,
-	SIM_SST_SERVICE_USER_PLMN			= 42,
-	SIM_SST_SERVICE_OPERATOR_PLMN			= 43,
-	SIM_SST_SERVICE_HPLMN				= 44,
-	SIM_SST_SERVICE_CPBCCH				= 45,
-	SIM_SST_SERVICE_INVESTIGATION_SCAN		= 46,
-	SIM_SST_SERVICE_EXT_CCP				= 47,
-	SIM_SST_SERVICE_MEXE				= 48,
-	SIM_SST_SERVICE_RPLMN				= 49,
-	SIM_SST_SERVICE_PLMN_NETWORK_NAME		= 50,
-	SIM_SST_SERVICE_OPERATOR_PLMN_LIST		= 51,
-	SIM_SST_SERVICE_MAILBOX_DIALLING_NUMBERS	= 52,
-	SIM_SST_SERVICE_MWIS				= 53,
-	SIM_SST_SERVICE_CFIS				= 54,
-	SIM_SST_SERVICE_PROVIDER_DISPLAY_INFO		= 55
+	SIM_SST_SERVICE_CHV1_DISABLE =			0,
+	SIM_SST_SERVICE_ADN =				1,
+	SIM_SST_SERVICE_FDN =				2,
+	SIM_SST_SERVICE_SMS =				3,
+	SIM_SST_SERVICE_AOC =				4,
+	SIM_SST_SERVICE_CCP =				5,
+	SIM_SST_SERVICE_PLMN_SELECTOR =			6,
+	SIM_SST_SERVICE_MSISDN =			8,
+	SIM_SST_SERVICE_EXT_1 =				9,
+	SIM_SST_SERVICE_EXT_2 =				10,
+	SIM_SST_SERVICE_SMSP =				11,
+	SIM_SST_SERVICE_LND =				12,
+	SIM_SST_SERVICE_CBS_ID =			13,
+	SIM_SST_SERVICE_GROUP_ID_LEVEL_1 =		14,
+	SIM_SST_SERVICE_GROUP_ID_LEVEL_2 =		15,
+	SIM_SST_SERVICE_PROVIDER_NAME =			16,
+	SIM_SST_SERVICE_SDN =				17,
+	SIM_SST_SERVICE_EXT_3 =				18,
+	SIM_SST_SERVICE_EFVGCS_EFVGCSS =		20,
+	SIM_SST_SERVICE_EFVBS_EFVBSS =			21,
+	SIM_SST_SERVICE_PRECEDENCE_PREEMPTION =		22,
+	SIM_SST_SERVICE_EMLPP =				23,
+	SIM_SST_SERVICE_DATA_DOWNLOAD_SMS_CB =		24,
+	SIM_SST_SERVICE_DATA_DOWNLOAD_SMS_PP =		25,
+	SIM_SST_SERVICE_MENU_SELECTION =		26,
+	SIM_SST_SERVICE_CALL_CONTROL =			27,
+	SIM_SST_SERVICE_PROACTIVE_SIM =			28,
+	SIM_SST_SERVICE_CBS_ID_RANGE =			29,
+	SIM_SST_SERVICE_BDN =				30,
+	SIM_SST_SERVICE_EXT_4 =				31,
+	SIM_SST_SERVICE_DEPERSONALISATION_CTRL_KEY =	32,
+	SIM_SST_SERVICE_NETWORK_LIST =			33,
+	SIM_SST_SERVICE_SMSR =				34,
+	SIM_SST_SERVICE_NIA =				35,
+	SIM_SST_SERVICE_MO_SMS_SIM =			36,
+	SIM_SST_SERVICE_GPRS =				37,
+	SIM_SST_SERVICE_IMG =				38,
+	SIM_SST_SERVICE_SOLSA =				39,
+	SIM_SST_SERVICE_USSD_CALL_CONTROL =		40,
+	SIM_SST_SERVICE_RUN_AT_COMMAND =		41,
+	SIM_SST_SERVICE_USER_PLMN =			42,
+	SIM_SST_SERVICE_OPERATOR_PLMN =			43,
+	SIM_SST_SERVICE_HPLMN =				44,
+	SIM_SST_SERVICE_CPBCCH =			45,
+	SIM_SST_SERVICE_INVESTIGATION_SCAN =		46,
+	SIM_SST_SERVICE_EXT_CCP =			47,
+	SIM_SST_SERVICE_MEXE =				48,
+	SIM_SST_SERVICE_RPLMN =				49,
+	SIM_SST_SERVICE_PLMN_NETWORK_NAME =		50,
+	SIM_SST_SERVICE_OPERATOR_PLMN_LIST =		51,
+	SIM_SST_SERVICE_MAILBOX_DIALLING_NUMBERS =	52,
+	SIM_SST_SERVICE_MWIS =				53,
+	SIM_SST_SERVICE_CFIS =				54,
+	SIM_SST_SERVICE_PROVIDER_DISPLAY_INFO =		55
 };
 
 #define SIM_EFSPN_DC_HOME_PLMN_BIT 0x1
 #define SIM_EFSPN_DC_ROAMING_SPN_BIT 0x2
 
 enum ber_tlv_data_type {
-	BER_TLV_DATA_TYPE_UNIVERSAL = 0,
-	BER_TLV_DATA_TYPE_APPLICATION = 1,
-	BER_TLV_DATA_TYPE_CONTEXT_SPECIFIC = 2,
-	BER_TLV_DATA_TYPE_PRIVATE = 3,
+	BER_TLV_DATA_TYPE_UNIVERSAL =		0,
+	BER_TLV_DATA_TYPE_APPLICATION =		1,
+	BER_TLV_DATA_TYPE_CONTEXT_SPECIFIC =	2,
+	BER_TLV_DATA_TYPE_PRIVATE =		3,
 };
 
 enum ber_tlv_data_encoding_type {
-	BER_TLV_DATA_ENCODING_TYPE_PRIMITIVE = 0,
-	BER_TLV_DATA_ENCODING_TYPE_CONSTRUCTED = 1,
+	BER_TLV_DATA_ENCODING_TYPE_PRIMITIVE =		0,
+	BER_TLV_DATA_ENCODING_TYPE_CONSTRUCTED =	1,
 };
 
 struct sim_eons_operator_info {