Merge "diag: Add new Diag IDs"

This commit is contained in:
Linux Build Service Account 2018-05-08 13:45:52 -07:00 committed by Gerrit - the friendly Code Review server
commit 14effa597c

View file

@ -1,4 +1,4 @@
/* Copyright (c) 2008-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2008-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -145,10 +145,10 @@ the appropriate macros. */
/* This needs to be modified manually now, when we add /* This needs to be modified manually now, when we add
a new RANGE of SSIDs to the msg_mask_tbl */ a new RANGE of SSIDs to the msg_mask_tbl */
#define MSG_MASK_TBL_CNT 26 #define MSG_MASK_TBL_CNT 26
#define APPS_EVENT_LAST_ID 0x0B3F #define APPS_EVENT_LAST_ID 0x0C5A
#define MSG_SSID_0 0 #define MSG_SSID_0 0
#define MSG_SSID_0_LAST 121 #define MSG_SSID_0_LAST 125
#define MSG_SSID_1 500 #define MSG_SSID_1 500
#define MSG_SSID_1_LAST 506 #define MSG_SSID_1_LAST 506
#define MSG_SSID_2 1000 #define MSG_SSID_2 1000
@ -160,11 +160,11 @@ the appropriate macros. */
#define MSG_SSID_5 4000 #define MSG_SSID_5 4000
#define MSG_SSID_5_LAST 4010 #define MSG_SSID_5_LAST 4010
#define MSG_SSID_6 4500 #define MSG_SSID_6 4500
#define MSG_SSID_6_LAST 4583 #define MSG_SSID_6_LAST 4584
#define MSG_SSID_7 4600 #define MSG_SSID_7 4600
#define MSG_SSID_7_LAST 4615 #define MSG_SSID_7_LAST 4616
#define MSG_SSID_8 5000 #define MSG_SSID_8 5000
#define MSG_SSID_8_LAST 5033 #define MSG_SSID_8_LAST 5034
#define MSG_SSID_9 5500 #define MSG_SSID_9 5500
#define MSG_SSID_9_LAST 5516 #define MSG_SSID_9_LAST 5516
#define MSG_SSID_10 6000 #define MSG_SSID_10 6000
@ -264,7 +264,7 @@ static const uint32_t msg_bld_masks_0[] = {
MSG_MASK_6|MSG_MASK_7|MSG_MASK_8|MSG_MASK_9|MSG_MASK_10, MSG_MASK_6|MSG_MASK_7|MSG_MASK_8|MSG_MASK_9|MSG_MASK_10,
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_LOW, MSG_LVL_LOW,
MSG_LVL_LOW, MSG_LVL_MED,
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_LOW, MSG_LVL_LOW,
MSG_LVL_LOW, MSG_LVL_LOW,
@ -317,7 +317,7 @@ static const uint32_t msg_bld_masks_0[] = {
MSG_LVL_LOW|MSG_LVL_MED|MSG_LVL_HIGH|MSG_LVL_ERROR|MSG_LVL_FATAL, MSG_LVL_LOW|MSG_LVL_MED|MSG_LVL_HIGH|MSG_LVL_ERROR|MSG_LVL_FATAL,
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_HIGH, MSG_LVL_HIGH,
MSG_LVL_LOW, MSG_LVL_MED,
MSG_LVL_HIGH, MSG_LVL_HIGH,
MSG_LVL_LOW|MSG_LVL_MED|MSG_LVL_HIGH|MSG_LVL_ERROR|MSG_LVL_FATAL, 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,
@ -486,6 +486,7 @@ static const uint32_t msg_bld_masks_6[] = {
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
}; };
@ -505,7 +506,9 @@ static const uint32_t msg_bld_masks_7[] = {
MSG_LVL_LOW, MSG_LVL_LOW,
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 MSG_LVL_LOW | MSG_LVL_MED | MSG_LVL_HIGH | MSG_LVL_ERROR |
MSG_LVL_FATAL,
MSG_LVL_LOW
}; };
static const uint32_t msg_bld_masks_8[] = { static const uint32_t msg_bld_masks_8[] = {
@ -525,9 +528,6 @@ static const uint32_t msg_bld_masks_8[] = {
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_LOW,
MSG_LVL_LOW,
MSG_LVL_LOW,
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_MED, MSG_LVL_MED,
@ -542,6 +542,10 @@ static const uint32_t msg_bld_masks_8[] = {
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_MED,
MSG_LVL_MED,
MSG_LVL_MED,
MSG_LVL_HIGH,
MSG_LVL_HIGH MSG_LVL_HIGH
}; };
@ -644,14 +648,14 @@ static const uint32_t msg_bld_masks_10[] = {
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_MED, MSG_LVL_MED,
MSG_LVL_LOW, MSG_LVL_LOW,
MSG_LVL_LOW, MSG_LVL_MED,
MSG_LVL_LOW, MSG_LVL_MED,
MSG_LVL_LOW, MSG_LVL_MED,
MSG_LVL_LOW, MSG_LVL_MED,
MSG_LVL_LOW, MSG_LVL_MED,
MSG_LVL_LOW, MSG_LVL_MED,
MSG_LVL_LOW, MSG_LVL_MED,
MSG_LVL_LOW, MSG_LVL_MED,
MSG_LVL_MED MSG_LVL_MED
}; };
@ -797,7 +801,9 @@ static const uint32_t msg_bld_masks_19[] = {
}; };
static const uint32_t msg_bld_masks_20[] = { static const uint32_t msg_bld_masks_20[] = {
MSG_LVL_LOW, MSG_LVL_LOW | MSG_MASK_5 | MSG_MASK_6 | MSG_MASK_7 |
MSG_MASK_8 | MSG_MASK_9 | MSG_MASK_10 | MSG_MASK_11 |
MSG_MASK_12,
MSG_LVL_LOW, MSG_LVL_LOW,
MSG_LVL_LOW, MSG_LVL_LOW,
MSG_LVL_LOW, MSG_LVL_LOW,
@ -875,7 +881,7 @@ static const uint32_t msg_bld_masks_25[] = {
/* LOG CODES */ /* LOG CODES */
static const uint32_t log_code_last_tbl[] = { static const uint32_t log_code_last_tbl[] = {
0x0, /* EQUIP ID 0 */ 0x0, /* EQUIP ID 0 */
0x1A11, /* EQUIP ID 1 */ 0x1C68, /* EQUIP ID 1 */
0x0, /* EQUIP ID 2 */ 0x0, /* EQUIP ID 2 */
0x0, /* EQUIP ID 3 */ 0x0, /* EQUIP ID 3 */
0x4910, /* EQUIP ID 4 */ 0x4910, /* EQUIP ID 4 */
@ -885,7 +891,7 @@ static const uint32_t log_code_last_tbl[] = {
0x0, /* EQUIP ID 8 */ 0x0, /* EQUIP ID 8 */
0x0, /* EQUIP ID 9 */ 0x0, /* EQUIP ID 9 */
0xA38A, /* EQUIP ID 10 */ 0xA38A, /* EQUIP ID 10 */
0xB201, /* EQUIP ID 11 */ 0xB9FF, /* EQUIP ID 11 */
0x0, /* EQUIP ID 12 */ 0x0, /* EQUIP ID 12 */
0xD1FF, /* EQUIP ID 13 */ 0xD1FF, /* EQUIP ID 13 */
0x0, /* EQUIP ID 14 */ 0x0, /* EQUIP ID 14 */