diff options
| author | Akash Patel <akashp@codeaurora.org> | 2014-02-21 01:48:04 -0800 |
|---|---|---|
| committer | Akash Patel <akashp@codeaurora.org> | 2014-02-21 02:06:48 -0800 |
| commit | aefdfac503172a79ef2e35f772cdcf8784662947 (patch) | |
| tree | c65db27baddf3de78f4c4f52d9dcd66c142b9701 /tools/fwdebuglog | |
| parent | aa57f24c536606920cf9d1d17facd60f9f0ef4f3 (diff) | |
| parent | 455a1583e7ee80a0d3741bd3ef31195f1359afe1 (diff) | |
Merge remote-tracking branch 'origin/caf/caf-wlan/master'
Release 1.0.0.40 QCACLD WLAN DRIVER
Change-Id: Icdff9678ec419817fb5996873e1a1b73e07bcdf3
* origin/caf/caf-wlan/master:
cafstaging Release 1.0.0.40
qcalcd: Fix of double fre panic in SLUB builds
qcacld: Fail to suspend when host has pending commands in cfg80211 suspend
qcacld: CORE/BAP cleanfile
qcacld: CL 842584 - update fw common interface files
qcacld: txrx: support rx forward switch for intra-bss
qcacld: Update host-side FW debug logs
qcacld: Add the memory corruption fix to SSR routine
Fix cnss-diag for file based logging.
qcacld: csr: Fix frame size warning
qcacld: hdd: Add channel 144 support
wlan: set short GI for fixed rate mcast
MAC: Avoid host requesting NOA if scanoffload is enabled.
qcacld: ini: ipa: Disable IPA-RM in ini
qcacld: Enable dbglog for EBT
qcacld: voss: Validate 5G channel power list
Diffstat (limited to 'tools/fwdebuglog')
| -rw-r--r-- | tools/fwdebuglog/cld-fwlog-netlink.c | 8 | ||||
| -rw-r--r-- | tools/fwdebuglog/cld-fwlog-parser.c | 8 | ||||
| -rw-r--r-- | tools/fwdebuglog/parser.c | 8 |
3 files changed, 21 insertions, 3 deletions
diff --git a/tools/fwdebuglog/cld-fwlog-netlink.c b/tools/fwdebuglog/cld-fwlog-netlink.c index 1fbd9789723a..1114d42747b5 100644 --- a/tools/fwdebuglog/cld-fwlog-netlink.c +++ b/tools/fwdebuglog/cld-fwlog-netlink.c @@ -252,7 +252,7 @@ static void stop(int signum) int main(int argc, char *argv[]) { - int res =0; + unsigned int res =0; unsigned char *eventbuf; unsigned char *dbgbuf; int c, rc = 0; @@ -409,7 +409,7 @@ int main(int argc, char *argv[]) continue; } slot = (struct dbglog_slot *)dbgbuf; - timestamp = get_le32((unsigned char *)&slot->length); + timestamp = get_le32((unsigned char *)&slot->timestamp); length = get_le32((unsigned char *)&slot->length); dropped = get_le32((unsigned char *)&slot->dropped); if (!((optionflag & SILENT_FLAG) == SILENT_FLAG)) { @@ -418,7 +418,9 @@ int main(int argc, char *argv[]) timestamp, length, dropped); } fseek(log_out, record * RECLEN, SEEK_SET); - if ((res = fwrite(dbgbuf, RECLEN, 1, log_out)) != 1){ + /* Diag type is not required so +4 */ + if ((res = fwrite((dbgbuf+sizeof(slot->diag_type)), RECLEN, + 1, log_out)) != 1){ perror("fwrite"); break; } diff --git a/tools/fwdebuglog/cld-fwlog-parser.c b/tools/fwdebuglog/cld-fwlog-parser.c index 888211066da1..6eb1633eb9f9 100644 --- a/tools/fwdebuglog/cld-fwlog-parser.c +++ b/tools/fwdebuglog/cld-fwlog-parser.c @@ -699,6 +699,7 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "BEACON_EVENT_EARLY_RX_SLEEP_SLOP", "BEACON_EVENT_EARLY_RX_CONT_BMISS_TIMEOUT", "BEACON_EVENT_EARLY_RX_PAUSE_SKIP_BCN_NUM", + "BEACON_EVENT_EARLY_RX_BCN_TYPE", }, { /* Offload Mgr */ "OFFLOAD_MGR_DBGID_DEFINITION_START", @@ -2328,6 +2329,13 @@ dbglog_beacon_print_handler( args[0]); } break; + case BEACON_EVENT_EARLY_RX_BCN_TYPE: + if (numargs == 1) { + dbglog_printf(timestamp, vap_id, + "early_rx bcn type:%d", + args[0]); + } + break; default: return FALSE; } diff --git a/tools/fwdebuglog/parser.c b/tools/fwdebuglog/parser.c index 3f39902809a3..3b555aa6613c 100644 --- a/tools/fwdebuglog/parser.c +++ b/tools/fwdebuglog/parser.c @@ -708,6 +708,7 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "BEACON_EVENT_EARLY_RX_SLEEP_SLOP", "BEACON_EVENT_EARLY_RX_CONT_BMISS_TIMEOUT", "BEACON_EVENT_EARLY_RX_PAUSE_SKIP_BCN_NUM", + "BEACON_EVENT_EARLY_RX_BCN_TYPE", }, { /* Offload Mgr */ "OFFLOAD_MGR_DBGID_DEFINITION_START", @@ -2335,6 +2336,13 @@ dbglog_beacon_print_handler( args[0]); } break; + case BEACON_EVENT_EARLY_RX_BCN_TYPE: + if (numargs == 1) { + dbglog_printf(timestamp, vap_id, + "early_rx skip bcn num:%d", + args[0]); + } + break; default: return FALSE; } |