Merge "diag: Update SSIDs, event ids and log codes" (76fc7e79) · Commits · e / devices / android_kernel_sony_msm8994

drivers/char/diag/diagfwd.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1478,7 +1478,9 @@ int diag_process_apps_pkt(unsigned char *buf, int len)
		(uint16_t )(driver->apps_rsp_buf + 94) = MSG_SSID_21_LAST;
		(uint16_t )(driver->apps_rsp_buf + 96) = MSG_SSID_22;
		(uint16_t )(driver->apps_rsp_buf + 98) = MSG_SSID_22_LAST;
		encode_rsp_and_send(99);
		(uint16_t )(driver->apps_rsp_buf + 100) = MSG_SSID_23;
		(uint16_t )(driver->apps_rsp_buf + 102) = MSG_SSID_23_LAST;
		encode_rsp_and_send(103);
		return 0;
		}
		/* Check for Apps Only Respond to Get Subsys Build mask */

include/linux/diagchar.h

+34 −9

Original line number	Diff line number	Diff line
		@@ -130,11 +130,11 @@ the appropriate macros. */

		/* This needs to be modified manually now, when we add
		a new RANGE of SSIDs to the msg_mask_tbl */
		#define MSG_MASK_TBL_CNT 24
		#define EVENT_LAST_ID 0x09F6
		#define MSG_MASK_TBL_CNT 25
		#define EVENT_LAST_ID 0x0A22

		#define MSG_SSID_0 0
		#define MSG_SSID_0_LAST 101
		#define MSG_SSID_0_LAST 105
		#define MSG_SSID_1 500
		#define MSG_SSID_1_LAST 506
		#define MSG_SSID_2 1000
		@@ -148,7 +148,7 @@ the appropriate macros. */
		#define MSG_SSID_6 4500
		#define MSG_SSID_6_LAST 4526
		#define MSG_SSID_7 4600
		#define MSG_SSID_7_LAST 4614
		#define MSG_SSID_7_LAST 4615
		#define MSG_SSID_8 5000
		#define MSG_SSID_8_LAST 5031
		#define MSG_SSID_9 5500
		@@ -179,8 +179,10 @@ the appropriate macros. */
		#define MSG_SSID_21_LAST 10300
		#define MSG_SSID_22 10350
		#define MSG_SSID_22_LAST 10377
		#define MSG_SSID_23 0xC000
		#define MSG_SSID_23_LAST 0xC063
		#define MSG_SSID_23 10400
		#define MSG_SSID_23_LAST 10414
		#define MSG_SSID_24 0xC000
		#define MSG_SSID_24_LAST 0xC063

		static const uint32_t msg_bld_masks_0[] = {
		MSG_LVL_LOW,
		@@ -301,7 +303,11 @@ static const uint32_t msg_bld_masks_0[] = {
		MSG_LVL_HIGH,
		MSG_LVL_LOW,
		MSG_LVL_HIGH,
		MSG_LVL_HIGH
		MSG_LVL_LOW\|MSG_LVL_MED\|MSG_LVL_HIGH\|MSG_LVL_ERROR\|MSG_LVL_FATAL,
		MSG_LVL_MED\|MSG_LVL_HIGH\|MSG_LVL_ERROR,
		MSG_LVL_MED\|MSG_LVL_HIGH\|MSG_LVL_ERROR,
		MSG_LVL_MED\|MSG_LVL_HIGH,
		MSG_LVL_MED\|MSG_LVL_HIGH
		};

		static const uint32_t msg_bld_masks_1[] = {
		@@ -416,7 +422,8 @@ static const uint32_t msg_bld_masks_7[] = {
		MSG_LVL_MED,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW
		MSG_LVL_LOW,
		MSG_LVL_LOW\|MSG_LVL_MED\|MSG_LVL_HIGH\|MSG_LVL_ERROR\|MSG_LVL_FATAL
		};

		static const uint32_t msg_bld_masks_8[] = {
		@@ -741,10 +748,28 @@ static const uint32_t msg_bld_masks_22[] = {
		MSG_LVL_LOW
		};

		static const uint32_t msg_bld_masks_23[] = {
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW
		};

		/* LOG CODES */
		static const uint32_t log_code_last_tbl[] = {
		0x0, /* EQUIP ID 0 */
		0x184A, /* EQUIP ID 1 */
		0x1871, /* EQUIP ID 1 */
		0x0, /* EQUIP ID 2 */
		0x0, /* EQUIP ID 3 */
		0x4910, /* EQUIP ID 4 */