diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-08-09 02:57:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-08-09 02:57:53 -0700 |
| commit | e387fa8686acd0fbbd7be2f1e2a58e2875eb1a56 (patch) | |
| tree | 272f7a46245c93131783274fd2934e693ae8bc5d | |
| parent | 57f49d72f7fe514089d44305f329ad3eff0b5272 (diff) | |
| parent | 24b2c7a7d6fb11239a318957d587e9327a24a3f2 (diff) | |
Merge "Release 1.0.0.164 QCACLD WLAN Driver"
82 files changed, 389 insertions, 3682 deletions
diff --git a/CORE/CLD_TXRX/HTT/htt.c b/CORE/CLD_TXRX/HTT/htt.c index 7ce284a19bae..c16e6c8d31b6 100644 --- a/CORE/CLD_TXRX/HTT/htt.c +++ b/CORE/CLD_TXRX/HTT/htt.c @@ -184,6 +184,8 @@ htt_attach( /* for efficiency, store a local copy of the is_high_latency flag */ pdev->cfg.is_high_latency = ol_cfg_is_high_latency(pdev->ctrl_pdev); + pdev->cfg.default_tx_comp_req = + !ol_cfg_tx_free_at_download(pdev->ctrl_pdev); pdev->cfg.is_full_reorder_offload = ol_cfg_is_full_reorder_offload(pdev->ctrl_pdev); diff --git a/CORE/CLD_TXRX/HTT/htt_h2t.c b/CORE/CLD_TXRX/HTT/htt_h2t.c index 3ac693fd6f13..d9d5ee573776 100644 --- a/CORE/CLD_TXRX/HTT/htt_h2t.c +++ b/CORE/CLD_TXRX/HTT/htt_h2t.c @@ -158,6 +158,10 @@ htt_h2t_ver_req_msg(struct htt_pdev_t *pdev) #else HTCSendPkt(pdev->htc_pdev, &pkt->htc_pkt); #endif + if ((pdev->cfg.is_high_latency) && + (!pdev->cfg.default_tx_comp_req)) { + ol_tx_target_credit_update(pdev->txrx_pdev, -1); + } return A_OK; } @@ -486,6 +490,9 @@ htt_h2t_rx_ring_cfg_msg_hl(struct htt_pdev_t *pdev) #else HTCSendPkt(pdev->htc_pdev, &pkt->htc_pkt); #endif + if (!pdev->cfg.default_tx_comp_req) { + ol_tx_target_credit_update(pdev->txrx_pdev, -1); + } return A_OK; } @@ -576,6 +583,10 @@ htt_h2t_dbg_stats_get( #else HTCSendPkt(pdev->htc_pdev, &pkt->htc_pkt); #endif + if ((pdev->cfg.is_high_latency) && + (!pdev->cfg.default_tx_comp_req)) { + ol_tx_target_credit_update(pdev->txrx_pdev, -1); + } return 0; } @@ -634,6 +645,10 @@ htt_h2t_sync_msg(struct htt_pdev_t *pdev, u_int8_t sync_cnt) #else HTCSendPkt(pdev->htc_pdev, &pkt->htc_pkt); #endif + if ((pdev->cfg.is_high_latency) && + (!pdev->cfg.default_tx_comp_req)) { + ol_tx_target_credit_update(pdev->txrx_pdev, -1); + } return A_OK; } @@ -701,6 +716,10 @@ htt_h2t_aggr_cfg_msg(struct htt_pdev_t *pdev, #else HTCSendPkt(pdev->htc_pdev, &pkt->htc_pkt); #endif + if ((pdev->cfg.is_high_latency) && + (!pdev->cfg.default_tx_comp_req)) { + ol_tx_target_credit_update(pdev->txrx_pdev, -1); + } return 0; } diff --git a/CORE/CLD_TXRX/HTT/htt_t2h.c b/CORE/CLD_TXRX/HTT/htt_t2h.c index bd0ec60c0632..2593ff29377e 100644 --- a/CORE/CLD_TXRX/HTT/htt_t2h.c +++ b/CORE/CLD_TXRX/HTT/htt_t2h.c @@ -334,28 +334,14 @@ htt_t2h_lp_msg_handler(void *context, adf_nbuf_t htt_t2h_msg ) #endif case HTT_T2H_MSG_TYPE_TX_CREDIT_UPDATE_IND: { - A_INT16 htt_credit_delta_abs = HTT_TX_CREDIT_DELTA_ABS_GET(*msg_word); - struct ol_txrx_pdev_t* ptxrx_pdev = pdev->txrx_pdev; - if ( HTT_TX_CREDIT_SIGN_BIT_GET(*msg_word) ) { - /* negative delta */ -#if DEBUG_CREDIT - adf_os_print(" <HTT> Decrease Credit %d - %d = %d(Msg).\n", - adf_os_atomic_read(&ptxrx_pdev->target_tx_credit), - htt_credit_delta_abs, - adf_os_atomic_read(&ptxrx_pdev->target_tx_credit) - htt_credit_delta_abs); -#endif - adf_os_atomic_add((A_INT32)(-htt_credit_delta_abs), &ptxrx_pdev->target_tx_credit); - } else { - /* positive delta */ -#if DEBUG_CREDIT - adf_os_print(" <HTT> Increase Credit %d + %d = %d(Msg).\n", - adf_os_atomic_read(&ptxrx_pdev->target_tx_credit), - htt_credit_delta_abs, - adf_os_atomic_read(&ptxrx_pdev->target_tx_credit) + htt_credit_delta_abs); -#endif - adf_os_atomic_add((A_INT32)htt_credit_delta_abs, &ptxrx_pdev->target_tx_credit); - } - + u_int32_t htt_credit_delta_abs; + int32_t htt_credit_delta; + int sign; + + htt_credit_delta_abs = HTT_TX_CREDIT_DELTA_ABS_GET(*msg_word); + sign = HTT_TX_CREDIT_SIGN_BIT_GET(*msg_word) ? -1 : 1; + htt_credit_delta = sign * htt_credit_delta_abs; + ol_tx_credit_completion_handler(pdev->txrx_pdev, htt_credit_delta); break; } diff --git a/CORE/CLD_TXRX/HTT/htt_types.h b/CORE/CLD_TXRX/HTT/htt_types.h index 51fddfc3552a..56369a42c303 100644 --- a/CORE/CLD_TXRX/HTT/htt_types.h +++ b/CORE/CLD_TXRX/HTT/htt_types.h @@ -213,6 +213,7 @@ struct htt_pdev_t { struct { int is_high_latency; int is_full_reorder_offload; + int default_tx_comp_req; } cfg; struct { u_int8_t major; diff --git a/CORE/CLD_TXRX/TXRX/ol_cfg.c b/CORE/CLD_TXRX/TXRX/ol_cfg.c index ba111262162c..98954f0af8b1 100644 --- a/CORE/CLD_TXRX/TXRX/ol_cfg.c +++ b/CORE/CLD_TXRX/TXRX/ol_cfg.c @@ -53,6 +53,9 @@ ol_pdev_handle ol_pdev_cfg_attach(adf_os_device_t osdev, cfg_ctx->is_high_latency = 1; /* 802.1Q and SNAP / LLC headers are accounted for elsewhere */ cfg_ctx->tx_download_size = 1500; +#ifdef HIF_SDIO + cfg_ctx->tx_free_at_download = 0; +#endif #else /* * Need to change HTT_LL_TX_HDR_SIZE_IP accordingly. diff --git a/CORE/CLD_TXRX/TXRX/ol_tx.c b/CORE/CLD_TXRX/TXRX/ol_tx.c index 1d9233bb8a60..5bf89dc46fe3 100644 --- a/CORE/CLD_TXRX/TXRX/ol_tx.c +++ b/CORE/CLD_TXRX/TXRX/ol_tx.c @@ -480,7 +480,8 @@ static inline adf_nbuf_t ol_tx_hl_base( ol_txrx_vdev_handle vdev, enum ol_tx_spec tx_spec, - adf_nbuf_t msdu_list) + adf_nbuf_t msdu_list, + int tx_comp_req) { struct ol_txrx_pdev_t *pdev = vdev->pdev; adf_nbuf_t msdu = msdu_list; @@ -562,6 +563,7 @@ ol_tx_hl_base( tx_msdu_info.htt.info.vdev_id = vdev->vdev_id; tx_msdu_info.htt.info.frame_type = htt_frm_type_data; tx_msdu_info.htt.info.l2_hdr_type = pdev->htt_pkt_type; + tx_msdu_info.htt.action.tx_comp_req = tx_comp_req; txq = ol_tx_classify(vdev, tx_desc, msdu, &tx_msdu_info); @@ -644,7 +646,10 @@ MSDU_LOOP_BOTTOM: adf_nbuf_t ol_tx_hl(ol_txrx_vdev_handle vdev, adf_nbuf_t msdu_list) { - return ol_tx_hl_base(vdev, ol_tx_spec_std, msdu_list); + struct ol_txrx_pdev_t *pdev = vdev->pdev; + int tx_comp_req = pdev->cfg.default_tx_comp_req; + + return ol_tx_hl_base(vdev, ol_tx_spec_std, msdu_list, tx_comp_req); } adf_nbuf_t @@ -653,7 +658,16 @@ ol_tx_non_std_hl( enum ol_tx_spec tx_spec, adf_nbuf_t msdu_list) { - return ol_tx_hl_base(vdev, tx_spec, msdu_list); + struct ol_txrx_pdev_t *pdev = vdev->pdev; + int tx_comp_req = pdev->cfg.default_tx_comp_req; + + if (!tx_comp_req) { + if ((tx_spec == ol_tx_spec_no_free) && + (pdev->tx_data_callback.func)) { + tx_comp_req = 1; + } + } + return ol_tx_hl_base(vdev, tx_spec, msdu_list, tx_comp_req); } adf_nbuf_t @@ -754,6 +768,7 @@ ol_txrx_mgmt_send( adf_nbuf_map_single(pdev->osdev, tx_mgmt_frm, ADF_OS_DMA_TO_DEVICE); if (pdev->cfg.is_high_latency) { + tx_msdu_info.htt.action.tx_comp_req = 1; tx_desc = ol_tx_desc_hl(pdev, vdev, tx_mgmt_frm, &tx_msdu_info); } else { tx_desc = ol_tx_desc_ll(pdev, vdev, tx_mgmt_frm, &tx_msdu_info); diff --git a/CORE/CLD_TXRX/TXRX/ol_tx_send.c b/CORE/CLD_TXRX/TXRX/ol_tx_send.c index faf499ddf2a4..86c86adaeae7 100644 --- a/CORE/CLD_TXRX/TXRX/ol_tx_send.c +++ b/CORE/CLD_TXRX/TXRX/ol_tx_send.c @@ -326,7 +326,14 @@ ol_tx_download_done_hl_free( tx_desc = ol_tx_desc_find(pdev, msdu_id); adf_os_assert(tx_desc); - ol_tx_desc_frame_free_nonstd(pdev, tx_desc, status != A_OK); + + ol_tx_download_done_base(pdev, status, msdu, msdu_id); + + if ((tx_desc->pkt_type != ol_tx_frm_no_free) && + (tx_desc->pkt_type < OL_TXRX_MGMT_TYPE_BASE)) { + adf_os_atomic_add(1, &pdev->tx_queue.rsrc_cnt); + ol_tx_desc_frame_free_nonstd(pdev, tx_desc, status != A_OK); + } #if 0 /* TODO: Advanced feature */ //ol_tx_dwl_sched(pdev, OL_TX_HL_SCHED_DOWNLOAD_DONE); adf_os_assert(0); @@ -468,6 +475,17 @@ ol_tx_discard_target_frms(ol_txrx_pdev_handle pdev) } } +void +ol_tx_credit_completion_handler(ol_txrx_pdev_handle pdev, int credits) +{ + ol_tx_target_credit_update(pdev, credits); + if (pdev->cfg.is_high_latency) { + ol_tx_sched(pdev); + } + /* UNPAUSE OS Q */ + OL_TX_FLOW_CT_UNPAUSE_OS_Q(pdev); +} + /* WARNING: ol_tx_inspect_handler()'s bahavior is similar to that of ol_tx_completion_handler(). * any change in ol_tx_completion_handler() must be mirrored in ol_tx_inspect_handler(). */ diff --git a/CORE/CLD_TXRX/TXRX/ol_txrx.c b/CORE/CLD_TXRX/TXRX/ol_txrx.c index 9b7c1a903d9b..ea8382edf4d2 100644 --- a/CORE/CLD_TXRX/TXRX/ol_txrx.c +++ b/CORE/CLD_TXRX/TXRX/ol_txrx.c @@ -255,6 +255,7 @@ ol_txrx_pdev_attach( /* init LL/HL cfg here */ pdev->cfg.is_high_latency = ol_cfg_is_high_latency(ctrl_pdev); + pdev->cfg.default_tx_comp_req = !ol_cfg_tx_free_at_download(ctrl_pdev); /* store provided params */ pdev->ctrl_pdev = ctrl_pdev; diff --git a/CORE/CLD_TXRX/TXRX/ol_txrx_types.h b/CORE/CLD_TXRX/TXRX/ol_txrx_types.h index 42d7e69adb38..a60c1acb8286 100644 --- a/CORE/CLD_TXRX/TXRX/ol_txrx_types.h +++ b/CORE/CLD_TXRX/TXRX/ol_txrx_types.h @@ -391,6 +391,7 @@ struct ol_txrx_pdev_t { int is_high_latency; int host_addba; int ll_pause_txq_limit; + int default_tx_comp_req; } cfg; /* WDI subscriber's event list */ diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h index 4f71219bcbb1..1c751d6fec88 100644 --- a/CORE/HDD/inc/wlan_hdd_main.h +++ b/CORE/HDD/inc/wlan_hdd_main.h @@ -1093,7 +1093,6 @@ struct hdd_adapter_s int connection; #endif v_BOOL_t is_roc_inprogress; - v_U32_t maxRateFlags; #ifdef QCA_LL_TX_FLOW_CT vos_timer_t tx_flow_control_timer; diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index 11a8218ca028..a16e5a560245 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -1409,7 +1409,6 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs "%s: Set HDD connState to eConnectionState_Associated", __func__); hdd_connSetConnectionState( pHddStaCtx, eConnectionState_Associated ); - pAdapter->maxRateFlags = pRoamInfo->maxRateFlags; } // Save the connection info from CSR... diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 2f4415602681..3b5b01eb558a 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -113,7 +113,7 @@ #define a_mode_rates_size (8) #define FREQ_BASE_80211G (2407) #define FREQ_BAND_DIFF_80211G (5) -#define MAX_SCAN_SSID 9 +#define MAX_SCAN_SSID 10 #define MAX_PENDING_LOG 5 #define MAX_HT_MCS_IDX 8 #define MAX_VHT_MCS_IDX 10 @@ -10464,7 +10464,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( dev ); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); int ssidlen = pHddStaCtx->conn_info.SSID.SSID.length; - tANI_U32 rate_flags; + tANI_U8 rate_flags; hdd_context_t *pHddCtx = (hdd_context_t*) wiphy_priv(wiphy); hdd_config_t *pCfg = pHddCtx->cfg_ini; @@ -10533,13 +10533,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, wlan_hdd_get_station_stats(pAdapter); rate_flags = pAdapter->hdd_stats.ClassA_stat.tx_rate_flags; - /*overwrite rate_flags if MAX link-speed need to be reported*/ - if ((eHDD_LINK_SPEED_REPORT_MAX == pCfg->reportMaxLinkSpeed) || - (eHDD_LINK_SPEED_REPORT_MAX_SCALED == pCfg-> reportMaxLinkSpeed && - sinfo->signal >= pCfg->linkSpeedRssiHigh)) { - rate_flags = pAdapter->maxRateFlags; - } - //convert to the UI units of 100kbps myRate = pAdapter->hdd_stats.ClassA_stat.tx_rate * 5; if (!(rate_flags & eHAL_TX_RATE_LEGACY)) { diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c index 1803644468cc..4c9f73e81221 100644 --- a/CORE/HDD/src/wlan_hdd_tdls.c +++ b/CORE/HDD/src/wlan_hdd_tdls.c @@ -678,38 +678,43 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) wlan_hdd_tdls_free_scan_request(&pHddCtx->tdls_scan_ctxt); - tInfo = vos_mem_malloc(sizeof(tdlsInfo_t)); - if (NULL != tInfo) - { - tInfo->vdev_id = pAdapter->sessionId; - tInfo->tdls_state = eTDLS_SUPPORT_DISABLED; - tInfo->notification_interval_ms = - pHddTdlsCtx->threshold_config.tx_period_t; - tInfo->tx_discovery_threshold = - pHddTdlsCtx->threshold_config.tx_packet_n; - tInfo->tx_teardown_threshold = pHddTdlsCtx->threshold_config.idle_packet_n; - tInfo->rssi_teardown_threshold = - pHddTdlsCtx->threshold_config.rssi_teardown_threshold; - tInfo->rssi_delta = pHddTdlsCtx->threshold_config.rssi_delta; - tInfo->tdls_options = 0; - if (pHddCtx->cfg_ini->fEnableTDLSOffChannel) - tInfo->tdls_options |= ENA_TDLS_OFFCHAN; - if (pHddCtx->cfg_ini->fEnableTDLSBufferSta) - tInfo->tdls_options |= ENA_TDLS_BUFFER_STA; - if (pHddCtx->cfg_ini->fEnableTDLSSleepSta) - tInfo->tdls_options |= ENA_TDLS_SLEEP_STA; - tInfo->peer_traffic_ind_window = - pHddCtx->cfg_ini->fTDLSPuapsdPTIWindow; - tInfo->peer_traffic_response_timeout = - pHddCtx->cfg_ini->fTDLSPuapsdPTRTimeout; - tInfo->puapsd_mask = - pHddCtx->cfg_ini->fTDLSUapsdMask; - tInfo->puapsd_inactivity_time = - pHddCtx->cfg_ini->fTDLSPuapsdInactivityTimer; - tInfo->puapsd_rx_frame_threshold = - pHddCtx->cfg_ini->fTDLSRxFrameThreshold; + /* No need to post message during driver unlaod because MC thread is + already shutdown */ + if ( !pHddCtx->isUnloadInProgress) + { + tInfo = vos_mem_malloc(sizeof(tdlsInfo_t)); + if (NULL != tInfo) + { + tInfo->vdev_id = pAdapter->sessionId; + tInfo->tdls_state = eTDLS_SUPPORT_DISABLED; + tInfo->notification_interval_ms = + pHddTdlsCtx->threshold_config.tx_period_t; + tInfo->tx_discovery_threshold = + pHddTdlsCtx->threshold_config.tx_packet_n; + tInfo->tx_teardown_threshold = + pHddTdlsCtx->threshold_config.idle_packet_n; + tInfo->rssi_teardown_threshold = + pHddTdlsCtx->threshold_config.rssi_teardown_threshold; + tInfo->rssi_delta = pHddTdlsCtx->threshold_config.rssi_delta; + tInfo->tdls_options = 0; + if (pHddCtx->cfg_ini->fEnableTDLSOffChannel) + tInfo->tdls_options |= ENA_TDLS_OFFCHAN; + if (pHddCtx->cfg_ini->fEnableTDLSBufferSta) + tInfo->tdls_options |= ENA_TDLS_BUFFER_STA; + if (pHddCtx->cfg_ini->fEnableTDLSSleepSta) + tInfo->tdls_options |= ENA_TDLS_SLEEP_STA; + tInfo->peer_traffic_ind_window = + pHddCtx->cfg_ini->fTDLSPuapsdPTIWindow; + tInfo->peer_traffic_response_timeout = + pHddCtx->cfg_ini->fTDLSPuapsdPTRTimeout; + tInfo->puapsd_mask = + pHddCtx->cfg_ini->fTDLSUapsdMask; + tInfo->puapsd_inactivity_time = + pHddCtx->cfg_ini->fTDLSPuapsdInactivityTimer; + tInfo->puapsd_rx_frame_threshold = + pHddCtx->cfg_ini->fTDLSRxFrameThreshold; - VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL, + VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL, "%s: Setting tdls state and param in fw: " "vdev_id: %d, " "tdls_state: %d, " @@ -739,17 +744,18 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) tInfo->puapsd_inactivity_time, tInfo->puapsd_rx_frame_threshold); - halStatus = sme_UpdateFwTdlsState(pHddCtx->hHal, tInfo, FALSE); - if (eHAL_STATUS_SUCCESS != halStatus) - { - vos_mem_free(tInfo); - } - } - else - { + halStatus = sme_UpdateFwTdlsState(pHddCtx->hHal, tInfo, FALSE); + if (eHAL_STATUS_SUCCESS != halStatus) + { + vos_mem_free(tInfo); + } + } + else + { hddLog(VOS_TRACE_LEVEL_ERROR, "%s: vos_mem_alloc failed for tInfo", __func__); - } + } + } vos_mem_free(pHddTdlsCtx); pAdapter->sessionCtx.station.pHddTdlsCtx = NULL; diff --git a/CORE/MAC/inc/aniDbgTest.h b/CORE/MAC/inc/aniDbgTest.h deleted file mode 100644 index 1f73a8bb52bf..000000000000 --- a/CORE/MAC/inc/aniDbgTest.h +++ /dev/null @@ -1,1588 +0,0 @@ -/* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _ANIDBGTEST_H_ -#define _ANIDBGTEST_H_ - -#include "sirTypes.h" - -#define MAX_PARMS_SIZE 256 -#define MAX_RESPONSE_SIZE 512 -#define MAX_PCI_CFG_WRDS 19 -#define MAX_NUM_TST_STAS_PER_AP 3 - -#define ANI_PCI_CFG_MIN_GNT 4 -#define ANI_PCI_CFG_MAX_LAT 32 -/// EEPROM Product Ids for different types of NICs. -#define EEP_PRODUCT_ID_MPCI_3_2 1 -#define EEP_PRODUCT_ID_MPCI_2_2 2 -#define EEP_PRODUCT_ID_CARDBUS 3 -#define EEP_PRODUCT_ID_HEAP_W_INT 4 -#define EEP_PRODUCT_ID_HEAP_W_EXT 5 -#define EEP_PRODUCT_ID_MRAP 6 - -#define ANI_CARDBUS_EXPECTED_CIS \ - (((0x3416 + sizeof(tPolSystemParameters)) << 3)|1) - - -/// Here is an example of a test structure -typedef enum sANI_TEST_ID -{ - // All DVT test Ids, beginning with BMU, INT, HIF, SP, TFP, RHP, - // RFP, SYS, PHY, SPI, CYG, LO, and EEPROM in the order specified. - ANI_TESTID_NONE = 0, - - // PLEASE PRESERVE THE ORDER; IF YOU NEED TO CHANGE. - // TEST SCRIPTS DEPEND ON THIS ORDER. - - ANI_BUS_ACCESS_TEST, - ANI_MEMORY_TEST, - ANI_INTERRUPT_TEST, - ANI_REG_READ_WRITE_TEST, - ANI_BMU_INIT_PDU_TEST, - ANI_HASH_TBL_ADD_DEL_GET_TEST_ID, - ANI_HASH_TBL_MULT_ENTRY_TEST_ID, - - // Data path tests - ANI_SEND_CONTINUOUS_TEST, - ANI_PKT_ROUTING_TEST, - - ANI_ADD_STA_TEST_ID, - ANI_DELETE_STA_TEST_ID, - - // HIF Tests - ANI_BURST_READ_WRITE_TEST_ID, - ANI_MOVE_ACK_TEST_ID, - ANI_RESET_WQ_TEST_ID, - ANI_HIF_LPBK_TEST_ID, - - // SP Tests - - // TFP Tests - ANI_BCN_GEN_TEST_ID, - - // RHP Tests - - ANI_HASH_TBL_DELETE_TEST_ID, - ANI_HASH_TBL_GET_TEST_ID, - - // RHP Tests - ANI_AGING_TEST_ID, - ANI_COUNTERS_TEST_ID, - - // SYS Tests - ANI_SET_PROMOSCOUS_MODE_TEST_ID, - ANI_SET_SCAN_MODE_TEST_ID, - - // SPI Tests - ANI_SET_CYG_REG_READ_WRITE_TEST_ID, - - // CYG Tests - ANI_SET_BB_CAL_TEST_ID, - - // LO Tests - ANI_SET_LO_CHAN_TEST_ID, - - // EEPROM Tests - - // Cal test - ANI_CAL_TEST_ID, - - // HIF Burst DMA test - ANI_HIF_BURST_DMA_TEST_ID, - - // Add all your test Ids above this. - ANI_TESTS_MAX -} tANI_TEST_ID; - -/// Test IDs for tests directly handled by the HDD -typedef enum sANI_HDD_TEST_ID { - ANI_HDD_TESTS_START = 0x10000, - ANI_PCI_CFG_TEST = ANI_HDD_TESTS_START, - ANI_EEPROM_TEST, - - // Add all your HDD test Ids above this. - ANI_HDD_TESTS_MAX - -} tANI_HDD_TEST_ID; - -/// Test trigger types can be enhanced with this enumeration -typedef enum sANI_TEST_TRIG_TYPE -{ - ANI_TRIG_TYPE_NONE = 0, - - ANI_TRIG_TYPE_CFG, - ANI_TRIG_TYPE_START, - ANI_TRIG_TYPE_GET_RESULTS, - ANI_TRIG_TYPE_STOP, - - ANI_TRIG_TYPE_MAX -} tANI_TEST_TRIG_TYPE; - -/// Test states -typedef enum sANI_DBG_TEST_STATE -{ - ANI_TEST_STATE_IDLE = 0, - ANI_TEST_STATE_IN_PROGRESS, - ANI_TEST_STATE_DONE - -} tANI_DBG_TEST_STATE; - -/** - * The following CFG Types are defined for each type of a parameter that can - * be independently set - */ -typedef enum sANI_DBG_CFG_TYPES -{ - ANI_DBG_CFG_PHY_MODE_RATE, - ANI_DBG_CFG_ROUTING_FLAGS, - ANI_DBG_CFG_STA_ID, - ANI_DBG_CFG_IS_INFRASTRUCTURE_MODE, - ANI_DBG_CFG_USE_REAL_PHY, - ANI_DBG_CFG_PHY_DROPS, - ANI_DBG_CFG_ADD_STA, - ANI_DBG_CFG_DEL_STA, - ANI_DBG_CFG_ENABLE_STA_TX, - ANI_DBG_CFG_DISABLE_STA_TX, - ANI_DBG_CFG_READ_REGISTER, - ANI_DBG_CFG_WRITE_REGISTER, - ANI_DBG_CFG_GET_ARQ_WINDOW_SIZE, - ANI_DBG_CFG_SET_ARQ_WINDOW_SIZE, - ANI_DBG_CFG_SET_CHANNEL, - ANI_DBG_CFG_SET_MAC_ADDRESS, - ANI_DBG_CFG_SET_MEM, - ANI_DBG_CFG_GET_MEM, - ANI_DBG_CFG_CTRL_TXWQ, - ANI_DBG_CFG_GET_ACTIVITY_SET, - ANI_DBG_CFG_SET_ACK_POLICY, - ANI_DBG_CFG_AGING_CMD, - ANI_DBG_CFG_SET_KEY, - ANI_DBG_CFG_SET_PER_STA_KEY, - ANI_DBG_CFG_TFP_ABORT, - ANI_DBG_CFG_GET_ACT_CHAINS, - ANI_DBG_CFG_IS_CHAIN_ACTIVE, - ANI_DBG_CFG_BB_FILTER_CAL, - ANI_DBG_CFG_DCO_CAL, - ANI_DBG_CFG_IQ_CAL, - ANI_DBG_CFG_TX_LO_LEAKAGE_CAL, - ANI_DBG_CFG_SEND_PKTS, - ANI_DBG_CFG_STOP_PKTS, - ANI_DBG_CFG_ENABLE_DISABLE_BEACON_GEN, - ANI_DBG_CFG_DCO_GET, - ANI_DBG_CFG_DCO_SET, - ANI_DBG_CFG_SET_PWR_TEMPL, - ANI_DBG_CFG_GET_PWR_TEMPL, - ANI_DBG_CFG_INIT, - ANI_DBG_CFG_SET_EEPROM_FLD, - ANI_DBG_CFG_GET_EEPROM_FLD, - ANI_DBG_CFG_SET_NUM_TRANSMITTERS, - ANI_DBG_CFG_SET_RX_CHAINS, - ANI_DBG_CFG_HCF_TEST, - ANI_DBG_CFG_POLARIS_REV_ID, - ANI_DBG_CFG_UPDATE_DATA_FROM_EEPROM, - ANI_DBG_CFG_GET_TEMP, - ANI_DBG_CFG_SET_STA_ADDRLST, - ANI_DBG_CFG_GET_PWR_GAIN, - ANI_DBG_CFG_SW_CLOSED_LOOP_TPC, - - ANI_DBG_CFG_TYPE_MAX -} tANI_DBG_CFG_TYPES; - -/** - * The following are the length definitions for each CFG TYPE defined - * in earlier Type enum. - */ - -// first byte mode and second rate -# define ANI_DBG_CFG_PHY_MODE_RATE_LEN 2 - -// MSN is type and LSN is sub-type in the MSB. 4 LSBs are routing flags -# define ANI_DBG_CFG_ROUTING_FLAGS_LEN 5 - -# define ANI_DBG_CFG_STA_ID_LEN 2 - -// ====================================================================== -// -// Following are the structure definitions for the config input parameters -// -// ====================================================================== -// -// -------------------------------------------------------- - -// -------------------------------------------------------- -// Output Params for Read Register Config request -typedef struct sAniDbgCfgGetPolarisVersionResponse -{ - // Output parameters - unsigned int rc; // 0 - SUCCESS - unsigned long version; -} tAniDbgCfgGetPolarisVersionResponse, *tpAniDbgCfgGetPolarisVersionResponse; - -// ------------------------------------------------------------- -// Input Params for the Phy Mode Rate - -typedef struct sAniDbgCfgPhyModeRateParams -{ - unsigned int phyMode; - unsigned int phyRate; -} tAniDbgCfgPhyModeRateParams, *tpAniDbgCfgPhyModeRateParams; - -// -------------------------------------------------------- -// Input Params for the Routing Flags -typedef struct sAniDbgCfgRoutingFlagsParams -{ - unsigned int type; - unsigned int subType; - unsigned int routingFlags; -} tAniDbgCfgRoutingFlagsParams, *tpAniDbgCfgRoutingFlagsParams; - -// -------------------------------------------------------- -// Input Params for the STA ID -typedef struct sAniDbgCfgStaIdParams -{ - unsigned int staId; -} tAniDbgCfgStaIdParams, *tpAniDbgCfgStaIdParams; - -// -------------------------------------------------------- -// Input Params for "Is Infrastructure Mode" -typedef struct sAniDbgCfgIsInfrastructureParams -{ - unsigned int isInfrastructureMode; -} tAniDbgCfgIsInfrastructureParams, *tpAniDbgCfgIsInfrastructureParams; - -// -------------------------------------------------------- -// Input Params for the Real Phy -typedef struct sAniDbgCfgRealPhyParams -{ - unsigned int useRealPhy; -} tAniDbgCfgRealPhyParams, *tpAniDbgCfgRealPhyParams; - -// -------------------------------------------------------- -// Input Params for Phy Drops -typedef struct sAniDbgCfgPhyDropParams -{ - unsigned int usePhyDrops; - unsigned int rate; - unsigned int burstSize; - unsigned int mode; -} tAniDbgCfgPhyDropParams, *tpAniDbgCfgPhyDropParams; - -// -------------------------------------------------------- -// Input Params for Add Sta -typedef struct sAniDbgCfgAddStaParams -{ - unsigned int staId; - unsigned char macAddr[6]; - unsigned int phyMode; - unsigned int rate; - unsigned int skipSP; - unsigned int ackPolicy; -} tAniDbgCfgAddStaParams, *tpAniDbgCfgAddStaParams; - -// -------------------------------------------------------- -// Input Params for Delete Sta -typedef struct sAniDbgCfgDelStaParams -{ - unsigned int staId; - unsigned char macAddr[6]; -} tAniDbgCfgDelStaParams, *tpAniDbgCfgDelStaParams; - -// -------------------------------------------------------- -// Lowest register address allowable for the Read Register calls -#define ANI_TIT_MIN_REG_ADDR 0x02000000 - - -// -------------------------------------------------------- -// Highest register address allowable for the Read Register call -#define ANI_TIT_MAX_REG_ADDR 0x0203ffff - -// -------------------------------------------------------- -// Input Params for Read Register Config request -typedef struct sAniDbgCfgReadRegParams -{ - unsigned long regAddr; -} tAniDbgCfgReadRegParams, *tpAniDbgCfgReadRegParams; - -// -------------------------------------------------------- -// Input Params for Write Register Config request -typedef struct sAniDbgCfgWriteRegParams -{ - unsigned long regAddr; - unsigned long regVal; -} tAniDbgCfgWriteRegParams, *tpAniDbgCfgWriteRegParams; - - - - -// -------------------------------------------------------- -// ANI_DBG_CFG_SET_CAL_TONE, -typedef struct -{ - unsigned long toneID; //0 = -28, 1 = -24, ..., 6 = -4, 7 = +4, 8 = +8, 9 = +12, ..., 13 = +28 -}tAniDbgCfgSetToneId, *tpAniDbgCfgSetToneId; - - -// -------------------------------------------------------- -// Output Params for Read Register Config request -typedef struct sAniDbgCfgRegReadResponse -{ - // Output parameters - unsigned int rc; // 0 - SUCCESS - unsigned long regVal; -} tAniDbgCfgReadRegResponse, *tpAniDbgCfgReadRegResponse; - -// -------------------------------------------------------- -// Output Params for getting ARQ Window -typedef struct sAniDbgCfgGetArqWindowResponse -{ - unsigned int rc; // 0 - SUCCESS - unsigned long val; -} tAniDbgCfgGetArqWindowResponse, *tpAniDbgCfgGetArqWindowResponse; - -// -------------------------------------------------------- -// Input Params for Write Register Config request -typedef struct sAniDbgCfgSetArqWindowParams -{ - unsigned long windowSize; -} tAniDbgCfgSetArqWindowRegParams, *tpAniDbgCfgSetArqWindowParams; - -// -------------------------------------------------------- -// Input Params for Write Register Config request -typedef struct sAniDbgCfgSetChanParams -{ - unsigned long chId; -} tAniDbgCfgSetChanParams, *tpAniDbgCfgSetChanParams; - - -// -------------------------------------------------------- -// Input Params for Write Register Config request -typedef struct sAniDbgCfgSetMacAddrParams -{ - unsigned char macAddr[6]; - unsigned int flag; // 0 - BSSID; 1 - MAC Address of DUT -} tAniDbgCfgSetMacAddrParams, *tpAniDbgCfgSetMacAddrParams; - -// -------------------------------------------------------- -// Input Params for Set Memory request -typedef struct sAniDbgCfgSetMemoryParams -{ - unsigned int fUseBurstDma; - unsigned int numOfWords; - unsigned int ahbAddr; - unsigned int writeData; // Pattern to be written out in memory -} tAniDbgCfgSetMemoryParams, *tpAniDbgCfgSetMemoryParams; - -// -------------------------------------------------------- -// Input Params for Get Memory request -typedef struct sAniDbgCfgGetMemoryParams -{ - unsigned int fUseBurstDma; - unsigned int numOfWords; - unsigned int ahbAddr; -} tAniDbgCfgGetMemoryParams, *tpAniDbgCfgGetMemoryParams; - -// -------------------------------------------------------- -// Response structure for the Get Memory request -typedef struct sAniDbgCfgGetMemoryResponse -{ - unsigned int rc; // 0 - SUCCESS; Otherwise FAILED - unsigned int readData[1]; -} tAniDbgCfgGetMemoryResponse, *tpAniDbgCfgGetMemoryResponse; - - -// -------------------------------------------------------- -// Input Params for Controls Enable/Disable of TX WQ -typedef struct sAniDbgCfgCtrlTxWqParams -{ - unsigned int staId; - unsigned int wqId; - unsigned int action; // 0 - Disable; 1 - Enable - -} tAniDbgCfgCtrlTxWqParams, *tpAniDbgCfgCtrlTxWqParams; - -// -------------------------------------------------------- -// Input Params for Getting TX/RX Activity Set -typedef struct sAniDbgCfgGetAsParams -{ - unsigned int id; // 0 - tx; 1 - rx - -} tAniDbgCfgGetAsParams, *tpAniDbgCfgGetAsParams; - -// Input Params for Getting TX/RX Activity Set -typedef struct sAniDbgCfgGetAsResponse -{ - unsigned int rc; // 0 - Success - unsigned int nEntries; - unsigned int entries[64]; - -} tAniDbgCfgGetAsResponse, *tpAniDbgCfgGetAsResponse; - -// -------------------------------------------------------- -// Input Params for Set ACK Policy -typedef struct sAniDbgCfgSetAckPolicyParams -{ - unsigned int id; // 0 - tx; 1 - rx - unsigned int policy; - unsigned int staId; - unsigned int tcId; - -} tAniDbgCfgSetAckPolicyParams, *tpAniDbgCfgSetAckPolicyParams; - -// -------------------------------------------------------- -// Input Params to Run AGING command -typedef struct sAniDbgCfgAgingCmdParams -{ - unsigned int staId; - unsigned int tcId; - -} tAniDbgCfgAgingCmdParams, *tpAniDbgCfgAgingCmdParams; - -// -------------------------------------------------------- -// Input Params to TFP Abort command -typedef struct sAniDbgCfgTfpAbortParams -{ - unsigned int staId; - -} tAniDbgCfgTfpAbortParams, *tpAniDbgCfgTfpAbortParams; - -// -------------------------------------------------------- -// Input Params to Enable/Disable Beacon command -typedef struct sAniDbgCfgEnableBeaconParams -{ - unsigned int fEnableBeacons; - -} tAniDbgCfgEnableBeaconParams, *tpAniDbgCfgEnableBeaconParams; - -// -------------------------------------------------------- -// Input Params to SET WEP / AES MULTICAST KEY -typedef struct sAniDbgCfgSetKeyParams -{ - unsigned int type; // 0 - WEP; 1 - AES - unsigned int keyId; // If AES, 0 - TX; 1 - RX - unsigned int keyLen; - unsigned char key[16]; - -} tAniDbgCfgSetKeyParams, *tpAniDbgCfgSetKeyParams; - -// -------------------------------------------------------- -// Input Params to SET per STA keys -typedef struct sAniDbgCfgSetPerStaKeyParams -{ - unsigned int staId; - unsigned int id0; - unsigned int id1; - unsigned int keyValid; // 0 - Tx; Anything else Rx - unsigned int useDefaultKey; - unsigned int defaultKeyId; - unsigned int edPolicy; - unsigned char key[16]; - unsigned char keylen; - -} tAniDbgCfgSetPerStaKeyParams, *tpAniDbgCfgSetPerStaKeyParams; - -// -------------------------------------------------------- -// Cal test and Set Chan functions -typedef struct sAniDbgCalTestParams -{ - unsigned int id; // 0 - Cal; 1 - Set Channel - unsigned int chId; // if id == 1; then chId is 1 - 14 or 36 - end of 11a -}tAniDbgCalTestParams, *tpAniDbgCalTestParams; - -typedef struct sAniDbgCalTestResponse -{ - unsigned int rc; -}tAniDbgCalTestResponse, *tpAniDbgCalTestResponse; - -// --------------------------------------------------------- -// Input params to Get DCO params -typedef struct sAniDbgCfgGetDcoParams -{ - unsigned int chain; - unsigned int address; -} tAniDbgCfgGetDcoParams, *tpAniDbgCfgGetDcoParams; - -typedef struct sAniDbgCfgGetDcoResponse -{ - unsigned int rc; - unsigned int val; -} tAniDbgCfgGetDcoResponse, *tpAniDbgCfgGetDcoResponse; - -// -------------------------------------------------------- -// Input params to Get DCO params -typedef struct sAniDbgCfgSetDcoParams -{ - unsigned int chain; - unsigned int address; - unsigned int val; -} tAniDbgCfgSetDcoParams, *tpAniDbgCfgSetDcoParams; - -// -------------------------------------------------------- -// Input params to setting power template -typedef struct sAniDbgCfgSetPwrTemplParams -{ - unsigned int staId; - unsigned int mode; - unsigned int rate; -} tAniDbgCfgSetPwrTemplParams, *tpAniDbgCfgSetPwrTemplParams; - - -// Response struct for Getting power template -typedef struct sAniDbgCfgGetPwrTemplParams -{ - unsigned int staId; -} tAniDbgCfgGetPwrTemplParams, *tpAniDbgCfgGetPwrTemplParams; - -// -------------------------------------------------------- -// Request struct for Setting the init config parameters -typedef struct sAniDbgCfgInitParams -{ - unsigned int mode; // default mode - unsigned int rate; // default rate - unsigned int fIsInfMode; // Set 1 for infrastructure mode - unsigned int staId; - unsigned char ownMacAddr[6]; // Set the configured MAC address - unsigned int fFwd2Host; // Set 1 to Forward data to host - unsigned int fUseRealPhy; // Set 1 to use the real Phy - unsigned int fEnablePhyDrops; // Set 1 to enable Phy drops - unsigned int dropModeRate; // Set this when Phy drops are enabled - unsigned int dropModeSize; // Set this when Phy drops are enabled - unsigned int dropModeMode; // Set this when Phy drops are enabled -} tAniDbgCfgInitParams, *tpAniDbgCfgInitParams; - - -// Response struct for Getting power template -typedef struct sAniDbgCfgGetPwrTemplResponse -{ - unsigned int rc; - unsigned int val; -} tAniDbgCfgGetPwrTemplResponse, *tpAniDbgCfgGetPwrTemplResponse; - - -// -------------------------------------------------------- -// Input params for setting a field in the EEPROM - -typedef union sAniDbgCfgEepByteSetParams -{ - unsigned char mask; - unsigned char value; - -} tAniDbgCfgEepByteSetParams, *tpAniDbgCfgEepByteSetParams; - - -// Request struct for Setting the EEPROM field -typedef struct sAniDbgCfgEepSetParams -{ - unsigned int offset; - unsigned int size; - unsigned int fIsMaskPresent; - unsigned char setParams[1]; -} tAniDbgCfgEepSetParams, *tpAniDbgCfgEepSetParams; - -// The response structure for this particular request is same as -// the generic response structure. - -// ------------------------------------------------------------ -// Input params for getting the value of a field in the EEPROM - -// Request struct for Getting the EEPROM field -typedef struct sAniDbgCfgEepGetParams -{ - unsigned int offset; - unsigned int size; -} tAniDbgCfgEepGetParams, *tpAniDbgCfgEepGetParams; - - -// Response struct for Getting the EEPROM field -typedef struct sAniDbgCfgEepGetResponse -{ - unsigned int rc; - unsigned char value[1]; -} tAniDbgCfgEepGetResponse, *tpAniDbgCfgEepGetResponse; - -// -------------------------------------------------------- -// Input params for setting the number of transmitters - -// Request struct for setting the number of transmitters -typedef struct sAniDbgCfgSetNumTransmitters -{ - unsigned int numTransmitters; - -} tAniDbgCfgSetNumTransmitters, *tpAniDbgCfgSetNumTransmitters; - -// -------------------------------------------------------- -// Input params for Enabling/Disabling Rx chains - -// Request struct for Enabling/Disabling Rx chains -typedef struct sAniDbgCfgSetRxChains -{ - unsigned int numChains; - unsigned char chainIndices[3]; -} tAniDbgCfgSetRxChains, *tpAniDbgCfgSetRxChains; - -// -------------------------------------------------------- -// Input params for enable/disable SW closed loop TPC - -// Request struct for enable/disable SW closed loop TPC -typedef struct sAniDbgCfgSwClosedLoopTpc -{ - unsigned int action; -} tAniDbgCfgSwClosedLoopTpc, *tpAniDbgCfgSwClosedLoopTpc; - -// -------------------------------------------------------- -// Input params for setting the list of test STA MAC address, -// that will be operating with the AP, for the Multi-NIC tests. -typedef struct sAniDbgCfgSetStaAddrLst -{ - unsigned long numStas; - unsigned char macAddrLst[MAX_NUM_TST_STAS_PER_AP][6]; -} tAniDbgCfgSetStaAddrLst, *tpAniDbgCfgSetStaAddrLst; - -// -------------------------------------------------------- -// Output Params for getting the current Power and Gain settings -// for a particular STA. -typedef struct sAniDbgCfgGetPwrGainResponse -{ - unsigned int rc; // 0 - SUCCESS - unsigned long pwrCode; - unsigned long gain0; - unsigned long gain1; -} tAniDbgCfgGetPwrGainResponse, *tpAniDbgCfgGetPwrGainResponse; - -// -------------------------------------------------------- -// Input Params containing the STAID for getting the current Power and Gain settings. -typedef struct sAniDbgCfgGetPwrGainParams -{ - unsigned long staID; -} tAniDbgCfgGetPwrGainParams, *tpAniDbgCfgGetPwrGainParams; - - -// -------------------------------------------------------- -// Output params for getting temperature - -// Response struct for getting temperature of the radio card -// NOTE:- Stop the traffic to measure temperature -typedef struct sAniDbgCfgGetTempRsp -{ - unsigned int rc; // 0 - SUCCESS; Otherwise FAILED - unsigned int temp0; // Chain 0 temperature - unsigned int temp1; // Chain 1 temperature -} tAniDbgCfgGetTempRsp, *tpAniDbgCfgGetTempRsp; - - -// -------------------------------------------------------- -// Generic Response structure for Config requests -typedef struct sAniDbgCfgResponse -{ - unsigned int rc; // 0 - SUCCESS; Otherwise FAILED -} tAniDbgCfgResponse, *tpAniDbgCfgResponse; - -// ==================================================================== -/* - For each test there will be a structure defined in this file with - the following test descriptions of testId, test trigger type, input - parameters and expected output - - This is a template for DBG test structure - - typedef struct sANIAPI_XXXX_TEST_PARAMS - { - // Input paramters - int xyz; // Test specific - } tANIAPI_XXXX_TEST_PARAMS; - - typedef struct sANIAPI_XXXX_TEST_RESPONSE - { - // Output parameters - int rc; // Must be ZERO for success and must have error code - // for failure - int zyx; // Any counters or any debug these will be test spefics - } tANIAPI_XXXX_TEST_RESPONSE; - - ********************************************* */ -// ===================================================================== - -#define ANI_CFG_OPER_GET 0x0 -#define ANI_CFG_OPER_SET 0x1 - - -typedef struct sAniDbgCfg -{ - unsigned char oper; - unsigned char data[124]; // total parms structure must be MAX 128 bytes -} tAniDbgCfg; - -// -------------------------------------------------------------------- - -// Response structures for InitPdu test -// No Input Params for this test -typedef struct sAniDbgInitPduTestResponse -{ - // Output parameters - unsigned int rc; // Must be ZERO for success and must have error code - // for failure - - unsigned int expected; - unsigned int i_current; - unsigned int totalPduCount; -} tAniDbgInitPduTestResponse, *tpAniDbgInitPduTestResponse; - - -// -------------------------------------------------------- -// Response structures for BusAccess/RegReadWrite tests -// No Input Params for this test - -typedef struct sAniDbgRegReadWriteTestResponse -{ - // Output parameters - unsigned int rc; // 0 - SUCCESS; Anything else is an ERROR - unsigned int registerAddress; - unsigned int expected; - unsigned int i_current; -} tAniDbgRegReadWriteTestResponse, *tpAniDbgRegReadWriteTestResponse; - -// -------------------------------------------------------- -// Response structures for Interrupt test -// No Input Params for this test - -typedef struct sAniDbgIntrTestResponse -{ - // Output parameters - unsigned int rc; // 0 - SUCCESS; Anything else is an ERROR - unsigned int status; // Interrupt status register - unsigned int mask; // Interrupt mask in test - unsigned int bmu; // BMU MB status register contents - -} tAniDbgIntrTestResponse, *tpAniDbgIntrTestResponse; - -// -------------------------------------------------------- -// No Input Params for this test - -typedef struct sAniDbgMemoryTestParams -{ - unsigned int startAddress; - unsigned int endAddress; - unsigned int pattern; - unsigned int testLevel; -} tAniDbgMemoryTestParams, *tpAniDbgMemoryTestParams; - -// --------------------------------------------------------------------- - -// Response structures for RegReadWrite test - -typedef struct sAniDbgMemoryTestResponse -{ - // Output parameters - unsigned int rc; // Must be ZERO for success and must have error code - // for failure - unsigned int expected; - unsigned int i_current; - unsigned int currentAddress; - unsigned int testAddress; -} tAniDbgMemoryTestResponse, *tpAniDbgMemoryTestResponse; - -// -------------------------------------------------------- -// Input Parameters for the HIF Burst Read Write test - -typedef struct sAniDbgHIFBurstRdWrtTestParams -{ - unsigned int AHBAddr; - unsigned int size; - unsigned char data[1]; - -} tAniDbgHIFBurstRdWrtTestParams, *tpAniDbgHIFBurstRdWrtTestParams; - -// --------------------------------------------------------------------- - -// Response structure for the HIF Burst Read Write test - -typedef struct sAniDbgHIFBurstRdWrtTestResponse -{ - // Output parameters - unsigned int rc; // Must be ZERO for success and must have error code - // for failure - unsigned char readData[1]; - -} tAniDbgHIFBurstRdWrtTestResponse, *tpAniDbgHIFBurstRdWrtTestResponse; - - -// -------------------------------------------------------- - -// Take the routing flags and number of frames, as Params for this test - -typedef struct sAniDbgSendContinuousTestParams -{ - unsigned int routingFlags; - - // 0 - continuously send packets till it is instructed to stop. - unsigned int numFramesToSend; - - // 1 - TM ring, otherwise the TD ring will be used. - unsigned int fUseTMRing; - - // 1 - loopback packets through the MAC - unsigned int fLoopBkPkts; -} tAniDbgSendContinuousTestParams, *tpAniDbgSendContinuousTestParams; - -// Response structures for SendContinuous test - -typedef struct sAniDbgSendContinuousTestResponse -{ - unsigned int rc; // 0 - Success and anything else is a failure - - unsigned int numPktsSent; - unsigned int numPktsFailed; - // Size of the last frame attempted to be sent, in case of a failure - unsigned int lastFailedPayloadSize; -} tAniDbgSendContinuousTestResponse, *tpAniDbgSendContinuousTestResponse; - -// -------------------------------------------------------- -// Input parameters for the Packet Routing test -typedef struct sAniDbgPktRoutingTestParams -{ - // Routing flags for the test - unsigned int routingFlags; - - // Enter 1 for Hardware Seqno - unsigned int hsBit; - - // Enter unicast ackPolicy(4 for random) - unsigned int ackPolicy; - - // RTS (2 for random) - unsigned int rtsFlag; - - // 0 - continuously send packets till it is instructed to stop. - unsigned int numPktsToSend; - - // 0xffffffff - For random frame types. - unsigned int frameType; - - // 0xffffffff - generates random frame sub-types. - unsigned int frmSubType; - - // 1 - TM ring; Otherwise the TD ring will be used. - unsigned int fUseTMRing; - - // 0 - random payload sizes - unsigned int payloadSize; - - // If "payloadSize" above is set to zero then this is ignored - unsigned int fragSize; - - // This parameter specifies whether a unicast packet should be fragmented. - // Ignored, if "payloadSize" above is set to a non-zero value. - unsigned int fragment; - - // Use a value >3 for random staId generation - unsigned int staId; - - // Use a value >7 for random tcId generation - unsigned int tcId; - - // Enter random STA range (1 for STAs(0-1),3 for STAs(0-3)) - unsigned int staRange; - - // TC range (1 for TCs(0-1),3 for TCs(0-3),7 for TCs(0-7) - unsigned int tcRange; - - // burst size (< 11) - unsigned int burst; - - // Enter 1 to compute CRC - unsigned int crc; - - // Enter 1 to loopback packets through the MAC - unsigned int fLoopBkPkts; - -} tAniDbgPktRoutingTestParams, *tpAniDbgPktRoutingTestParams; - -// Structures where response parameters are constructed by the -// dvtSendPackets() routine - -typedef struct sAniDbgSendPktResponse -{ - // Total packets sent - unsigned int pktGenCount; - - unsigned int fragCnt; - - unsigned int byteCnt; - - unsigned int lowPduCnt; - - unsigned int qFullCnt; - - // Specifies the size of the last frame attempted to be sent - unsigned int lastPayloadSize; - - // Specifies the size of the last frame's fragment size - unsigned int lastFragSize; - - // Immediate ACK - unsigned int cumImmAck; - - // NoACK - unsigned int cumNoAck; - - // RTS - unsigned int cumRTS; - - // No ACK - unsigned int cumNoRTS; - - // TC histogram (pkts) - unsigned int cumTC[8]; - - //Fragments histogram (frags) - unsigned int cumFrag[16]; - - // STA histogram (pkts,frags) - unsigned int cumSTA[4]; - unsigned int cumSTAFrags[4]; - -} tAniDbgSendPktResponse, *tpAniDbgSendPktResponse; - -// Response structures for the Packet Routing test -typedef struct sAniDbgPktRoutingTestResponse -{ - // Output parameters - unsigned int rc; // Must be ZERO for success and must have error code - // for failure - - // Field where response parameters are constructed by the - // dvtSendPackets() routine - tAniDbgSendPktResponse sendPktsRsp; - -} tAniDbgPktRoutingTestResponse, *tpAniDbgPktRoutingTestResponse; - -// -------------------------------------------------------- - -typedef enum sPciCfgTestStatus -{ - ePCI_CFG_TEST_SUCCESS, - ePCI_CFG_TEST_READ_FAILURE, - ePCI_CFG_TEST_VEN_DEV_ID_MISMATCH, - ePCI_CFG_TEST_MIN_GNT_MISMATCH, - ePCI_CFG_TEST_MAX_LAT_MISMATCH, - ePCI_CFG_TEST_CIS_PTR_MISMATCH, - ePCI_CFG_TEST_CIS_CONTENTS_MISMATCH -} tPciCfgTestStatus; - -// Response structures for the PCI Config test -typedef struct sAniDbgPciCfgTestResponse -{ - // Output parameters - unsigned int rc; // Must be ZERO for success and must have error code - // for failure - - // Field where the PCI config words, for Polaris are returned by the HDD - unsigned int pciConfig[MAX_PCI_CFG_WRDS]; - -} tAniDbgPciCfgTestResponse, *tpAniDbgPciCfgTestResponse; - -// -------------------------------------------------------- - -// Various return codes returned for the EEPROM test. -typedef enum sEepromTestStatus -{ - eEEPROM_TEST_SUCCESS, - eEEPROM_TEST_FILE_OPEN_FAILURE, - eEEPROM_TEST_FILE_MAP_FAILURE, - eEEPROM_TEST_INVALID_FILE_SIZE, - eEEPROM_TEST_MEMORY_ALLOC_FAILURE, - eEEPROM_TEST_CRC_MISMATCH_FAILURE -} tEepromTestStatus; - - -// Take the EEPROM filename, as Params for this test - -typedef struct sAniDbgEepromTestParams -{ - // EEPROM File Name. - char eepromFilename[256]; - -} tAniDbgEepromTestParams, *tpAniDbgEepromTestParams; - -// Response structures for SendContinuous test - -typedef struct sAniDbgEepromTestResponse -{ - unsigned int rc; // 0 - Success and anything else is a failure - -} tAniDbgEepromTestResponse, *tpAniDbgEepromTestResponse; - -// --------------------------------------------------------------------- - -// input params for RHP HASH TBL tests - -typedef struct sAniDbgRhpHashTblMultipleEntryTestParams -{ - unsigned int n; // number of entries - -} tAniDbgRhpHashTblMultipleEntryTestParams, - *tpAniDbgRhpHashTblMultipleEntryTestParams; - -typedef struct sAniDbgRhpHashTblTestParams -{ - unsigned int staId; - unsigned char macAddr[6]; - unsigned int flags; - unsigned int hashFlagRsvd; - unsigned int rsvdField; - -} tAniDbgRhpHashTblTestParams, *tpAniDbgRhpHashTblTestParams; - - -typedef struct sAniDbgRhpHashTblTestResponse -{ - unsigned int rc; // 0 For Success -} tAniDbgRhpHashTblTestResponse, *tpAniDbgRhpHashTblTestResponse; - - -// ----------------------------------------------------------- - -// Here both pParms and pResponse structures are interpreted by the -// User of the API based on testId - -typedef struct sANI_DBG_TEST_INFO { - - tANI_TEST_ID testId; - - // This field indicates this test runs synchronously or not. - // If it is not, then, the test originator will have the - // ability to query for intermediate results. - // ANI_START = 1; ANI_GET_RESULTS = 2; ANI_STOP = 3 - tANI_TEST_TRIG_TYPE testTriggerType; - - // test state - tANI_DBG_TEST_STATE testState; - - // This points to a structure which contains parameters for - // test defined by dvtTestId. May be NULL if no parameters - // are needed - unsigned long sizeOfParms; - unsigned char parms[MAX_PARMS_SIZE]; - - // This points to a buffer to hold response from the test - // Response shall be there from the test and it MUST have - // return code ZERO for SUCCESS and error code for test - // failure - unsigned long sizeOfResponse; - unsigned char response[MAX_RESPONSE_SIZE]; - -} tANI_DBG_TEST_INFO; - -// Returns test start function pointer or stop function pointer or -// get info on test function pointer from the function pointer array -// that is initialized during the dvtInitGlobal routine. -#ifdef __cplusplus -extern "C" void* dvtGetFuncPtr(void *, int, int ); -#else -extern void* dvtGetFuncPtr(void *, int, int ); -#endif - - -// declare a function prototype for 'start', 'update' and 'stop' routines -typedef void t_DbgTestRoutine(void *); - -// called by the test routine when it completes -extern void dbgTestCompleted(void *mpAdapterPtr); - - -// DBG/DVT dump information structures & defines - -#define ANI_DBG_GRP_INFO_TYPE_MISC 0x00000001 -#define ANI_DBG_GRP_INFO_TYPE_BMU 0x00000002 -#define ANI_DBG_GRP_INFO_TYPE_TFP 0x00000004 -#define ANI_DBG_GRP_INFO_TYPE_RHP 0x00000008 -#define ANI_DBG_GRP_INFO_TYPE_RFP 0x00000010 -#define ANI_DBG_GRP_INFO_TYPE_STA 0x00000020 -#define ANI_DBG_GRP_INFO_TYPE_FPHY 0x00000040 -#define ANI_DBG_GRP_INFO_TYPE_FPHY_FIFO 0x00000080 -#define ANI_DBG_GRP_INFO_TYPE_RPHY 0x00000100 -#define ANI_DBG_GRP_INFO_TYPE_HCF 0x00000200 -#define ANI_DBG_GRP_INFO_TYPE_SP 0x00000400 -#define ANI_DBG_GRP_INFO_TYPE_CP 0x00000800 - - -#define ANI_DBG_GRP_INFO_TYPE_ALL (ANI_DBG_GRP_INFO_TYPE_MISC | \ - ANI_DBG_GRP_INFO_TYPE_BMU | \ - ANI_DBG_GRP_INFO_TYPE_TFP | \ - ANI_DBG_GRP_INFO_TYPE_RHP | \ - ANI_DBG_GRP_INFO_TYPE_RFP | \ - ANI_DBG_GRP_INFO_TYPE_STA | \ - ANI_DBG_GRP_INFO_TYPE_FPHY| \ - ANI_DBG_GRP_INFO_TYPE_FPHY_FIFO | \ - ANI_DBG_GRP_INFO_TYPE_RPHY | \ - ANI_DBG_GRP_INFO_TYPE_HCF | \ - ANI_DBG_GRP_INFO_TYPE_SP) - - - -typedef struct sANI_DBG_MISC_INFO { - - unsigned long sysMode; - unsigned long sysIntrMask; - unsigned long intrMask; - unsigned long phyIntrMask; - unsigned long intrStatus[32]; - unsigned long phyIntrStatus[16]; - unsigned long eofSofExceptionResets; - unsigned long bmuExceptionResets; - unsigned long lowPduExceptionResets; - unsigned long userTriggeredResets; - unsigned long logPExceptionResets; - -} tANI_DBG_MISC_INFO; - - -typedef struct sANI_DBG_BMU_INFO { - - unsigned long control; - unsigned long fp_hptr; - unsigned long tptr; - unsigned long pdu; - unsigned long exception; - unsigned long exceptionMaster; - unsigned long dropCount; - unsigned long workQueue[10][4]; - -} tANI_DBG_BMU_INFO; - - -typedef struct sANI_DBG_TFP_INFO { - - unsigned long control; - unsigned long modeEnable; - unsigned long templEnable; - unsigned long retryQid; - unsigned long tsfHi; - unsigned long tsfLo; - unsigned long beacon; - unsigned long probeDelay; - unsigned long tbttHi; - unsigned long tbttLo; - unsigned long nav; - unsigned long listenInterval; - unsigned long delayTx; - unsigned long dtimPeriod; - unsigned long rtsCount; - unsigned long rtsFailure; - -} tANI_DBG_TFP_INFO; - - -typedef struct sANI_DBG_RHP_INFO { - - unsigned long sof; - unsigned long sof_chunk; - unsigned long fragCount; - unsigned long dropCount; - unsigned long fcsCount; - unsigned long bssIdMismatch; - unsigned long destMismatch; - unsigned long lengthError; - unsigned long pduError; - unsigned long abortCount; - unsigned long reqRate; - unsigned long delayAB; - unsigned long macAddrHi; - unsigned long macAddrLo; - unsigned long bssIdHi; - unsigned long bssIdLo; - unsigned long relayCount; - unsigned long hash_MissCount; - unsigned long hash_srcHi; - unsigned long hash_srcLo; - unsigned long hash_type; - unsigned long hash_subType; - unsigned long dbg_hangStatus; - unsigned long dbg_fragIgnoreCount; - unsigned long pduCount; - -} tANI_DBG_RHP_INFO; - - -typedef struct sANI_DBG_RFP_INFO { - - unsigned long packets; - unsigned long multicastPackets; - unsigned long dupPackets; - unsigned long byteCount; - unsigned long dropCount; - unsigned long byte64; - unsigned long byte128; - unsigned long byte256; - unsigned long byte512; - unsigned long byte1024; - unsigned long byte1519; - unsigned long byte2048; - unsigned long byte4096; - -} tANI_DBG_RFP_INFO; - -typedef struct sANI_DBG_SP_INFO { - - unsigned long wep_dky0_w0; - unsigned long wep_dky0_w1; - unsigned long wep_default_rc0; - - unsigned long wep_dky1_w0; - unsigned long wep_dky1_w1; - unsigned long wep_default_rc1; - - unsigned long wep_dky2_w0; - unsigned long wep_dky2_w1; - unsigned long wep_default_rc2; - - unsigned long wep_dky3_w0; - unsigned long wep_dky3_w1; - unsigned long wep_default_rc3; - -} tANI_DBG_SP_INFO; - -typedef struct sANI_DBG_CP_INFO { - - unsigned long cp_control; - unsigned long Compression_Expansion_Cnt; - unsigned long Compression_NUM_pkts; - - unsigned long Decompression_NUM_pkts; - unsigned long Compression_50p_NUM_pkts; - unsigned long CP_Error_status; - - unsigned long Cp_maximum_pkt_len; - -} tANI_DBG_CP_INFO; - - -typedef struct sANI_DBG_STA_TX_WQ_INFO { - - unsigned long txWqAddr; - unsigned long txWqDump[4]; - - unsigned long tptr; - unsigned long hptr; - unsigned long aptr; - unsigned long a_tpkts; - unsigned long h_tpkts; - unsigned long frag; - unsigned long bytes; - unsigned long ack; - unsigned long valid; - -} tANI_DBG_STA_TX_WQ_INFO; - - - -typedef struct sANI_DBG_TC_DESC { - - unsigned long valid; - unsigned long rxAckType; - unsigned long newPkt; - unsigned long rxSeqNum; - unsigned long rxPktTimeStamp; - unsigned long SV; - unsigned long ackTimeout; - unsigned long numOfFragsSucessful; - unsigned long rxBDPtr; - unsigned long txReplayCountHi; - unsigned long txReplayCountLo; - unsigned long rxReplayCountHi; - unsigned long rxReplayCountLo; - -} tANI_DBG_TC_DESC; - - -typedef struct sANI_DBG_PWR_TEMPL { - - unsigned long retryPhyMode; - unsigned long retryCb; - unsigned long retryEsf; - unsigned long sb; - unsigned long rate; - unsigned long esf; - unsigned long tifs; - unsigned long edcf; - unsigned long cb; - unsigned long mode; - unsigned long pwrLvl; - unsigned long nTransmitters; - unsigned long retry1rate; - unsigned long retry2rate; - - unsigned long pwrTemplate; //entire value - -} tANI_DBG_PWR_TEMPL; - - -typedef struct sANI_DBG_STA { - - unsigned long staDescAddr; - unsigned long staDump[256]; - - tANI_DBG_TC_DESC tcDesc[9]; // 8 tc Ids and 9th mgmt TC - - unsigned long cbits_hcf; - unsigned long cbits_ps; - unsigned long cbits_ps1; - unsigned long cbits_tx_en; - - unsigned long descStat_aes_sent; - unsigned long descStat_aes_recv; - unsigned long descStat_replays; - unsigned long descStat_formaterr; - unsigned long descStat_aes_decypterr_default; - unsigned long descStat_aes_decypterr_ucast; - - unsigned long tfpStat_failed; - unsigned long tfpStat_retry; - unsigned long tfpStat_multiretry; - unsigned long tfpStat_ackto; - unsigned long tfpStat_frags; - unsigned long tfpStat_rtsBrqs; - unsigned long tfpStat_pkts; - unsigned long tfpStat_ctsBackTimeouts; - - - unsigned long phyStatHi; - unsigned long phyStatLo; - - unsigned long ackToNonPrimRates; - unsigned long nFragSuccNonPrimRates; - -} tANI_DBG_STA; - - -typedef struct sANI_DBG_STA_INFO { - - unsigned long staId; // input - - tANI_DBG_STA sta; - - tANI_DBG_STA_TX_WQ_INFO txwq[8]; - - tANI_DBG_PWR_TEMPL pwrTempl; - -} tANI_DBG_STA_INFO; - - -typedef struct sANI_DBG_FPHY_INFO { - - unsigned long fphy_symPer; - unsigned long cca_delayOffset; - unsigned long cca_startDelay; - unsigned long timeStamp_Hi; - unsigned long timeStamp_Lo; - unsigned long dropRate; - unsigned long burstSize; - unsigned long reg; - unsigned long stat_bytes01; - unsigned long stat_bytes23; - unsigned long stat_bytes45; - unsigned long pkts_tx; - unsigned long pkts_rx; - unsigned long pkts_drops; - unsigned long rxin_sof; - unsigned long rxin_eof; - unsigned long rxout_sof; - unsigned long rxout_eof; - unsigned long txin_sof; - unsigned long txin_eof; - unsigned long txout_sof; - unsigned long txout_eof; - -} tANI_DBG_FPHY_INFO; - - -#define MAX_FIFO_ENTRIES_PER_REQUEST 200 - -typedef struct sAniDvtPhyfEntry -{ - unsigned char bytes[50]; - unsigned char len; - unsigned char mode; - unsigned char phyLen; - unsigned char macLen; - unsigned char dropByte; - unsigned char reserved; - unsigned long sof; - unsigned long eof; -} tAniDvtPhyfEntry; - - -#define ANI_DBG_FIFO_CMD_GET 0x1 -#define ANI_DBG_FIFO_CMD_CLEAR 0x2 - - -typedef struct sANI_DBG_FPHY_FIFO { - - unsigned long command; // set to either 'get' of 'clear' fifo - unsigned long entries; // entries to read - unsigned long offset; // offset to read from - - unsigned long totalBytes; - unsigned long approxEntries; - - unsigned long validEntries; - tAniDvtPhyfEntry Fifo[MAX_FIFO_ENTRIES_PER_REQUEST]; - -} tANI_DBG_FPHY_FIFO; - - -typedef struct sANI_DBG_RPHY_MPI_INFO { - - unsigned long tfp_phy_sof; - unsigned long tfp_phy_eof; - unsigned long phy_tfp_req; - unsigned long txa_mpi_data_req; - unsigned long txb_mpi_data_req; - unsigned long mpi_txa_data_val; - unsigned long mpi_txb_data_val; - unsigned long mpi_txa_pktend; - unsigned long mpi_txb_pktend; - unsigned long mpi_txctl_pktend; - unsigned long mpi_txctl_ctlbytes_val; - -} tANI_DBG_RPHY_MPI_INFO; - - -typedef struct sANI_DBG_RPHY_PMI_INFO { - - unsigned long rxa_mpi_pktstart; - unsigned long rxb_mpi_pktstart; - unsigned long rxa_mpi_pktend; - unsigned long rxb_mpi_pktend; - unsigned long rxa_mpi_data_val; - unsigned long rxb_mpi_data_val; - unsigned long rhp_phy_shutoff; - unsigned long rhp_phy_sof_c; - unsigned long rhp_phy_sof_p; - unsigned long rhp_phy_eof_c; - unsigned long rhp_phy_eof_p; - unsigned long phy_rhp_data_val; - unsigned long pmi_int; - -} tANI_DBG_RPHY_PMI_INFO; - -typedef struct sANI_DBG_RPHY_PHYINT_INFO { - - unsigned long status; - unsigned long fast_mask; - unsigned long slow_mask; - unsigned long host_mask; - -} tANI_DBG_RPHY_PHYINT_INFO; - - -typedef struct sANI_DBG_RPHY_INFO { - - tANI_DBG_RPHY_MPI_INFO mpi; - tANI_DBG_RPHY_PMI_INFO pmi; - tANI_DBG_RPHY_PHYINT_INFO phyint; - -} tANI_DBG_RPHY_INFO; - - -typedef struct sANI_DBG_SCH_INFO -{ - unsigned long curSch; // RO - unsigned long numSch; // RO - unsigned long numInt; // RO - unsigned long numEndInt; // RO - unsigned long numCFB; // RO - unsigned long firstCFB; // RO - - unsigned long fixedSch; // RW - unsigned long gDvtPoll; // RW - unsigned long maxTimeout; // RW - unsigned long minTxop; // RW - unsigned long maxTxop; // RW - unsigned long maxTcid; // RW - unsigned long maxSta; // RW - unsigned long minSta; // RW - unsigned long maxInst; // RW - - unsigned long firstSch; // RO - unsigned long cfbStart; // RO - unsigned long cfbEnd; // RO - unsigned long cumCFB; // RO - unsigned long cumCP; // RO - - unsigned long haltSch; // RW - unsigned long numTim; // RO -} tANI_DBG_SCH_INFO; - - -typedef struct sANI_DBG_HCF_INFO { - - unsigned long bSetInfo; // 0 = read info, 1 = set info - tANI_DBG_SCH_INFO schInfo; - -} tANI_DBG_HCF_INFO; - -typedef struct sANI_DBG_AP_SWITCH_INFO { - - - // Space to hold the SSIDList and the BSSID. - unsigned char SSID_BSSID_BUF[262]; // 262 == WNIAPI_MAX_SSID_LIST_STR + WNIAPI_BSSID_SIZE - - -} tANI_DBG_AP_SWITCH_INFO; - - -typedef struct sANI_DBG_INFO { - - unsigned long dbgInfoMask; // indicates which members are valid - - tANI_DBG_MISC_INFO miscInfo; - tANI_DBG_BMU_INFO bmuInfo; - tANI_DBG_TFP_INFO tfpInfo; - tANI_DBG_RHP_INFO rhpInfo; - tANI_DBG_RFP_INFO rfpInfo; - tANI_DBG_STA_INFO staInfo; - tANI_DBG_FPHY_INFO fphyInfo; - tANI_DBG_FPHY_FIFO fphyFifo; - tANI_DBG_RPHY_INFO rphyInfo; - tANI_DBG_HCF_INFO hcfInfo; - tANI_DBG_SP_INFO spInfo; - tANI_DBG_CP_INFO cpInfo; - -} tANI_DBG_INFO; - -extern tSirRetStatus dvtGetDumpInfo(void *pMac, tANI_DBG_INFO *pDbgInfo ); - -extern tSirRetStatus dvtGetConfigInfo(void *pMac, tANI_DBG_TEST_INFO *pTestInfo ); - -#ifdef __cplusplus -extern "C" void dvtSetStopTestFlag( unsigned char stopTest ); -#else -extern void dvtSetStopTestFlag( unsigned char stopTest ); -#endif - - -#endif // _ANIDBGTEST_H_ diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h index b5586204e88a..6ba7f650365f 100644 --- a/CORE/MAC/inc/aniGlobal.h +++ b/CORE/MAC/inc/aniGlobal.h @@ -564,7 +564,6 @@ typedef struct sAniSirLim tANI_U32 propRateAdjustPeriod; tANI_U32 scanStartTime; // used to measure scan time - //tANI_U8 gLimBssid[6]; tANI_U8 gLimMyMacAddr[6]; tANI_U8 ackPolicy; diff --git a/CORE/MAC/inc/aniSystemDefs.h b/CORE/MAC/inc/aniSystemDefs.h index ca79ec57513a..d89d406f9b04 100644 --- a/CORE/MAC/inc/aniSystemDefs.h +++ b/CORE/MAC/inc/aniSystemDefs.h @@ -47,10 +47,6 @@ /// Max WDS info length. #define ANI_WDS_INFO_MAX_LENGTH 64 - -/// Max number of SSIDs to support Multiple SSID feature -#define ANI_MAX_NUM_OF_SSIDS 16 - //This is to force compiler to use the maximum of an int for enum #define SIR_MAX_ENUM_SIZE 0x7FFFFFFF @@ -127,12 +123,6 @@ typedef enum eAniKeyDirection eSIR_DONOT_USE_KEY_DIRECTION = SIR_MAX_ENUM_SIZE } tAniKeyDirection; -/// Enum for rate -typedef enum eAniRate -{ - eSIR_ANY_RATE -} tAniRate; - typedef struct sAniSSID { tANI_U8 length; @@ -174,16 +164,6 @@ typedef struct sSirCCKMie #endif -/// Need to refine structure definitions for Keying material, -/// QoS policy, etc - -/// Definition Quality of Service -typedef struct sSirQos -{ - tANI_U16 temp1; // Need to define later - tANI_U16 temp2; // Need to define later -} tSirQos, *tpSirQos; - /// Definition for Encryption Keys typedef struct sSirKeys { @@ -222,13 +202,6 @@ typedef struct sSirMicFailureInfo } tSirMicFailureInfo, *tpSirMicFailureInfo; -// Boa command. Used mainly for radar info persistance -typedef struct sBoaCommand -{ - tANI_U8 length; - tANI_U8 cmd[64]; -}tBoaCommand; - typedef __ani_attr_pre_packed struct sTrafStrmMetrics { tANI_U16 UplinkPktQueueDly; diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index 3724f41064be..dd66c6ef7415 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -42,9 +42,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 163 +#define QWLAN_VERSION_BUILD 164 -#define QWLAN_VERSIONSTR "1.0.0.163" +#define QWLAN_VERSIONSTR "1.0.0.164" #ifdef QCA_WIFI_2_0 diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h index d7b166da7270..1f734bcee41d 100644 --- a/CORE/MAC/inc/sirApi.h +++ b/CORE/MAC/inc/sirApi.h @@ -48,32 +48,12 @@ #include "eseGlobal.h" #endif -/// Maximum number of STAs allowed in the BSS -#define SIR_MAX_NUM_STA 256 - -/// Maximum number of Neighbors reported by STA for LB feature -#define SIR_MAX_NUM_NEIGHBOR_BSS 3 - -/// Maximum number of Neighbors reported by STA for LB feature -#define SIR_MAX_NUM_ALTERNATE_RADIOS 5 - -/// Maximum size of SCAN_RSP message -#define SIR_MAX_SCAN_RSP_MSG_LENGTH 2600 - /// Start of Sirius software/Host driver message types #define SIR_HAL_HOST_MSG_START 0x1000 -/// Power save level definitions -#define SIR_MAX_POWER_SAVE 3 -#define SIR_INTERMEDIATE_POWER_SAVE 4 -#define SIR_NO_POWER_SAVE 5 - /// Max supported channel list #define SIR_MAX_SUPPORTED_CHANNEL_LIST 96 -/// Maximum DTIM Factor -#define SIR_MAX_DTIM_FACTOR 32 - #define SIR_MDIE_SIZE 3 // Increase dwell time for P2P search in ms @@ -99,16 +79,6 @@ #define SIR_NUM_TAURUS_RATES 4 //136.5, 151.7,283.5,315 #define SIR_NUM_PROP_RATES (SIR_NUM_TITAN_RATES + SIR_NUM_TAURUS_RATES) -#define SIR_11N_PROP_RATE_136_5 (1<<28) -#define SIR_11N_PROP_RATE_151_7 (1<<29) -#define SIR_11N_PROP_RATE_283_5 (1<<30) -#define SIR_11N_PROP_RATE_315 (1<<31) -#define SIR_11N_PROP_RATE_BITMAP 0x80000000 //only 315MBPS rate is supported today -//Taurus is going to support 26 Titan Rates(no ESF/concat Rates will be supported) -//First 26 bits are reserved for Titan and last 4 bits for Taurus, 2(27 and 28) bits are reserved. -//#define SIR_TITAN_PROP_RATE_BITMAP 0x03FFFFFF -//Disable all Titan rates -#define SIR_TITAN_PROP_RATE_BITMAP 0 #define SIR_CONVERT_2_U32_BITMAP(nRates) ((nRates + 31)/32) /* #tANI_U32's needed for a bitmap representation for all prop rates */ @@ -118,13 +88,9 @@ #define SIR_PM_SLEEP_MODE 0 #define SIR_PM_ACTIVE_MODE 1 -// Used by various modules to load ALL CFG's -#define ANI_IGNORE_CFG_ID 0xFFFF - //hidden SSID options #define SIR_SCAN_NO_HIDDEN_SSID 0 #define SIR_SCAN_HIDDEN_SSID_PE_DECISION 1 -#define SIR_SCAN_HIDDEN_SSID 2 #define SIR_MAC_ADDR_LEN 6 #define SIR_IPV4_ADDR_LEN 4 @@ -881,7 +847,7 @@ typedef enum eSirLinkTrafficCheck #define SIR_BG_SCAN_RETURN_CACHED_RESULTS 0x0 #define SIR_BG_SCAN_PURGE_RESUTLS 0x80 #define SIR_BG_SCAN_RETURN_FRESH_RESULTS 0x01 -#define SIR_SCAN_MAX_NUM_SSID 0x09 +#define SIR_SCAN_MAX_NUM_SSID 0x0A #define SIR_BG_SCAN_RETURN_LFR_CACHED_RESULTS 0x02 #define SIR_BG_SCAN_PURGE_LFR_RESULTS 0x40 @@ -1067,35 +1033,6 @@ typedef struct sSirBackgroundScanInfo { #define SIR_BACKGROUND_SCAN_INFO_SIZE (3 * sizeof(tANI_U32)) -/// Definition for Authentication request -typedef struct sSirSmeAuthReq -{ - tANI_U16 messageType; // eWNI_SME_AUTH_REQ - tANI_U16 length; - tANI_U8 sessionId; // Session ID - tANI_U16 transactionId; // Transaction ID for cmd - tSirMacAddr bssId; // Self BSSID - tSirMacAddr peerMacAddr; - tAniAuthType authType; - tANI_U8 channelNumber; -} tSirSmeAuthReq, *tpSirSmeAuthReq; - -/// Definition for reponse message to previously issued Auth request -typedef struct sSirSmeAuthRsp -{ - tANI_U16 messageType; // eWNI_SME_AUTH_RSP - tANI_U16 length; - tANI_U8 sessionId; // Session ID - tANI_U16 transactionId; // Transaction ID for cmd - tSirMacAddr peerMacAddr; - tAniAuthType authType; - tSirResultCodes statusCode; - tANI_U16 protStatusCode; //It holds reasonCode when Pre-Auth fails due to deauth frame. - //Otherwise it holds status code. -} tSirSmeAuthRsp, *tpSirSmeAuthRsp; - - - /// Definition for Join/Reassoc info - Reshmi: need to check if this is a def which moved from elsehwere. typedef struct sJoinReassocInfo { @@ -1233,9 +1170,6 @@ typedef struct sSirSmeJoinRsp /*Broadcast DPU signature*/ tANI_U8 bcastSig; - /*to report MAX link-speed populate rate-flags from ASSOC RSP frame*/ - tANI_U32 maxRateFlags; - /*Timing measurement capability*/ tANI_U8 timingMeasCap; @@ -1660,10 +1594,6 @@ typedef struct sAniStatSummaryStruct //The stats are saved into here before reset. It should be tANI_U32 aligned. typedef struct _sPermStaStats { - //tANI_U32 sentAesBlksUcastHi; - //tANI_U32 sentAesBlksUcastLo; - //tANI_U32 recvAesBlksUcastHi; - //tANI_U32 recvAesBlksUcastLo; tANI_U32 aesFormatErrorUcastCnts; tANI_U32 aesReplaysUcast; tANI_U32 aesDecryptErrUcast; @@ -1870,9 +1800,6 @@ typedef struct sSirSmeSetContextReq tANI_U16 transactionId; //Transaction ID for cmd tSirMacAddr peerMacAddr; tSirMacAddr bssId; // BSSID - // TBD Following QOS fields to be uncommented - //tAniBool qosInfoPresent; - //tSirQos qos; tSirKeyMaterial keyMaterial; } tSirSmeSetContextReq, *tpSirSmeSetContextReq; @@ -2787,7 +2714,6 @@ typedef struct sSirPlmReq #if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR) -#define SIR_QOS_NUM_TSPEC_MAX 2 #define SIR_QOS_NUM_AC_MAX 4 typedef struct sSirAggrQosReqInfo @@ -3090,165 +3016,6 @@ typedef struct sSmeCsaOffloadInd tANI_U16 mesgLen; tSirMacAddr bssId; // BSSID } tSmeCsaOffloadInd, *tpSmeCsaOffloadInd; -/*--------------------------------------------------------------------*/ -/* BootLoader message definition */ -/*--------------------------------------------------------------------*/ - -/*--------------------------------------------------------------------*/ -/* FW image size */ -/*--------------------------------------------------------------------*/ -#define SIR_FW_IMAGE_SIZE 146332 - - -#define SIR_BOOT_MODULE_ID 1 - -#define SIR_BOOT_SETUP_IND ((SIR_BOOT_MODULE_ID << 8) | 0x11) -#define SIR_BOOT_POST_RESULT_IND ((SIR_BOOT_MODULE_ID << 8) | 0x12) -#define SIR_BOOT_DNLD_RESULT_IND ((SIR_BOOT_MODULE_ID << 8) | 0x13) -#define SIR_BOOT_DNLD_DEV_REQ ((SIR_BOOT_MODULE_ID << 8) | 0x41) -#define SIR_BOOT_DNLD_DEV_RSP ((SIR_BOOT_MODULE_ID << 8) | 0x81) -#define SIR_BOOT_DNLD_REQ ((SIR_BOOT_MODULE_ID << 8) | 0x42) -#define SIR_BOOT_DNLD_RSP ((SIR_BOOT_MODULE_ID << 8) | 0x82) - -/*--------------------------------------------------------------------*/ -/* Bootloader message syntax */ -/*--------------------------------------------------------------------*/ - -// Message header -#define SIR_BOOT_MB_HEADER 0 -#define SIR_BOOT_MB_HEADER2 1 - -#define SIR_BOOT_MSG_HDR_MASK 0xffff0000 -#define SIR_BOOT_MSG_LEN_MASK 0x0000ffff - -// BOOT_SETUP_IND parameter indices -#define SIR_BOOT_SETUP_IND_MBADDR 2 -#define SIR_BOOT_SETUP_IND_MBSIZE 3 -#define SIR_BOOT_SETUP_IND_MEMOPT 4 -#define SIR_BOOT_SETUP_IND_LEN \ - ((SIR_BOOT_SETUP_IND_MEMOPT+1)<<2) - -// BOOT_POST_RESULT_IND parameter indices -#define SIR_BOOT_POST_RESULT_IND_RES 2 -#define SIR_BOOT_POST_RESULT_IND_LEN \ - ((SIR_BOOT_POST_RESULT_IND_RES+1)<<2) - -#define SIR_BOOT_POST_RESULT_IND_SUCCESS 1 -#define SIR_BOOT_POST_RESULT_IND_MB_FAILED 2 -#define SIR_BOOT_POST_RESULT_IND_SDRAM_FAILED 3 -#define SIR_BOOT_POST_RESULT_IND_ESRAM_FAILED 4 - - -// BOOT_DNLD_RESULT_IND parameter indices -#define SIR_BOOT_DNLD_RESULT_IND_RES 2 -#define SIR_BOOT_DNLD_RESULT_IND_LEN \ - ((SIR_BOOT_DNLD_RESULT_IND_RES+1)<<2) - -#define SIR_BOOT_DNLD_RESULT_IND_SUCCESS 1 -#define SIR_BOOT_DNLD_RESULT_IND_HDR_ERR 2 -#define SIR_BOOT_DNLD_RESULT_IND_ERR 3 - -// BOOT_DNLD_DEV_REQ -#define SIR_BOOT_DNLD_DEV_REQ_SDRAMSIZE 2 -#define SIR_BOOT_DNLD_DEV_REQ_FLASHSIZE 3 -#define SIR_BOOT_DNLD_DEV_REQ_LEN \ - ((SIR_BOOT_DNLD_DEV_REQ_FLASHSIZE+1)<<2) - -// BOOT_DNLD_DEV_RSP -#define SIR_BOOT_DNLD_DEV_RSP_DEVTYPE 2 -#define SIR_BOOT_DNLD_DEV_RSP_LEN \ - ((SIR_BOOT_DNLD_DEV_RSP_DEVTYPE+1)<<2) - -#define SIR_BOOT_DNLD_DEV_RSP_SRAM 1 -#define SIR_BOOT_DNLD_DEV_RSP_FLASH 2 - -// BOOT_DNLD_REQ -#define SIR_BOOT_DNLD_REQ_OFFSET 2 -#define SIR_BOOT_DNLD_REQ_WRADDR 3 -#define SIR_BOOT_DNLD_REQ_SIZE 4 -#define SIR_BOOT_DNLD_REQ_LEN ((SIR_BOOT_DNLD_REQ_SIZE+1)<<2) - -// BOOT_DNLD_RSP -#define SIR_BOOT_DNLD_RSP_SIZE 2 -#define SIR_BOOT_DNLD_RSP_LEN ((SIR_BOOT_DNLD_RSP_SIZE+1)<<2) - - -// board capabilities fields are defined here. -typedef __ani_attr_pre_packed struct sSirBoardCapabilities -{ -#ifndef ANI_LITTLE_BIT_ENDIAN - tANI_U32 concat:1; // 0 - Concat is not supported, 1 - Concat is supported - tANI_U32 compression:1; // 0 - Compression is not supported, 1 - Compression is supported - tANI_U32 chnlBonding:1; // 0 - Channel Bonding is not supported, 1 - Channel Bonding is supported - tANI_U32 reverseFCS:1; // 0 - Reverse FCS is not supported, 1 - Reverse FCS is supported - tANI_U32 rsvd1:2; - // (productId derives sub-category in the following three families) - tANI_U32 cbFamily:1; // 0 - Not CB family, 1 - Cardbus - tANI_U32 apFamily:1; // 0 - Not AP family, 1 - AP - tANI_U32 mpciFamily:1; // 0 - Not MPCI family, 1 - MPCI - tANI_U32 bgOnly:1; // 0 - default a/b/g; 1 - b/g only - tANI_U32 bbChipVer:4; // Baseband chip version - tANI_U32 loType:2; // 0 = no LO, 1 = SILABS, 2 = ORION - tANI_U32 radioOn:2; // Not supported is 3 or 2, 0 = Off and 1 = On - tANI_U32 nReceivers:2; // 0 based. - tANI_U32 nTransmitters:1; // 0 = 1 transmitter, 1 = 2 transmitters - tANI_U32 sdram:1; // 0 = no SDRAM, 1 = SDRAM - tANI_U32 rsvd:1; - tANI_U32 extVsIntAnt:1; // 0 = ext antenna, 1 = internal antenna -#else - - tANI_U32 extVsIntAnt:1; // 0 = ext antenna, 1 = internal antenna - tANI_U32 rsvd:1; - tANI_U32 sdram:1; // 0 = no SDRAM, 1 = SDRAM - tANI_U32 nTransmitters:1; // 0 = 1 transmitter, 1 = 2 transmitters - tANI_U32 nReceivers:2; // 0 based. - tANI_U32 radioOn:2; // Not supported is 3 or 2, 0 = Off and 1 = On - tANI_U32 loType:2; // 0 = no LO, 1 = SILABS, 2 = ORION - tANI_U32 bbChipVer:4; // Baseband chip version - tANI_U32 bgOnly:1; // 0 - default a/b/g; 1 - b/g only - // (productId derives sub-category in the following three families) - tANI_U32 mpciFamily:1; // 0 - Not MPCI family, 1 - MPCI - tANI_U32 apFamily:1; // 0 - Not AP family, 1 - AP - tANI_U32 cbFamily:1; // 0 - Not CB family, 1 - Cardbus - tANI_U32 rsvd1:2; - tANI_U32 reverseFCS:1; // 0 - Reverse FCS is not supported, 1 - Reverse FCS is supported - tANI_U32 chnlBonding:1; // 0 - Channel Bonding is not supported, 1 - Channel Bonding is supported - tANI_U32 compression:1; // 0 - Compression is not supported, 1 - Compression is supported - tANI_U32 concat:1; // 0 - Concat is not supported, 1 - Concat is supported -#endif -} __ani_attr_packed tSirBoardCapabilities, *tpSirBoardCapabilities; - -# define ANI_BCAP_EXT_VS_INT_ANT_MASK 0x1 -# define ANI_BCAP_EXT_VS_INT_ANT_OFFSET 0 - -# define ANI_BCAP_GAL_ON_BOARD_MASK 0x2 -# define ANI_BCAP_GAL_ON_BOARD_OFFSET 1 - -# define ANI_BCAP_SDRAM_MASK 0x4 -# define ANI_BCAP_SDRAM_OFFSET 2 - -# define ANI_BCAP_NUM_TRANSMITTERS_MASK 0x8 -# define ANI_BCAP_NUM_TRANSMITTERS_OFFSET 3 - -# define ANI_BCAP_NUM_RECEIVERS_MASK 0x30 -# define ANI_BCAP_NUM_RECEIVERS_OFFSET 4 - -# define ANI_BCAP_RADIO_ON_MASK 0xC0 -# define ANI_BCAP_RADIO_ON_OFFSET 6 - -# define ANI_BCAP_LO_TYPE_MASK 0x300 -# define ANI_BCAP_LO_TYPE_OFFSET 8 - -# define ANI_BCAP_BB_CHIP_VER_MASK 0xC00 -# define ANI_BCAP_BB_CHIP_VER_OFFSET 10 - -# define ANI_BCAP_CYG_DATE_CODE_MASK 0xFF000 -# define ANI_BCAP_CYG_DATE_CODE_OFFSET 12 - -# define ANI_BCAP_RADIO_OFF 0 -# define ANI_BCAP_RADIO_ON 1 -# define ANI_BCAP_RADIO_ON_NOT_SUPPORTED 3 - /// WOW related structures // SME -> PE <-> HAL @@ -3684,10 +3451,6 @@ typedef struct sSirHostOffloadReq #define SIR_KEEP_ALIVE_NULL_PKT 1 #define SIR_KEEP_ALIVE_UNSOLICIT_ARP_RSP 2 -/* Enable or disable offload. */ -#define SIR_KEEP_ALIVE_DISABLE 0 -#define SIR_KEEP_ALIVE_ENABLE 1 - /* Keep Alive request. */ typedef struct sSirKeepAliveReq { @@ -3824,9 +3587,6 @@ typedef struct sSirWlanSetRxpFilters #define SIR_PNO_MAX_SUPP_NETWORKS 16 #define SIR_PNO_MAX_SCAN_TIMERS 10 -/* TODO: Need to sync max ie len size with FW */ -#define SIR_PNO_MAX_IE_LEN 500 - /*size based of dot11 declaration without extra IEs as we will not carry those for PNO*/ #define SIR_PNO_MAX_PB_REQ_SIZE 450 @@ -3873,7 +3633,6 @@ typedef struct sSirPNOScanReq tSirScanTimersType scanTimers; tANI_U8 sessionId; - /*added by SME*/ tANI_U16 us24GProbeTemplateLen; tANI_U8 p24GProbeTemplate[SIR_PNO_MAX_PB_REQ_SIZE]; tANI_U16 us5GProbeTemplateLen; @@ -4005,6 +3764,8 @@ typedef struct sSirRoamOffloadScanReq tANI_U8 BTK[SIR_BTK_KEY_LEN]; tANI_U32 ReassocFailureTimeout; tSirAcUapsd AcUapsd; + tANI_U32 R0KH_ID; + tANI_U32 R0KH_ID_Length; #endif } tSirRoamOffloadScanReq, *tpSirRoamOffloadScanReq; @@ -4427,6 +4188,7 @@ typedef struct sSirResetAPCapsChange tANI_U16 length; tSirMacAddr bssId; } tSirResetAPCapsChange, *tpSirResetAPCapsChange; + /// Definition for Candidate found indication from FW typedef struct sSirSmeCandidateFoundInd { diff --git a/CORE/MAC/inc/sirMacPropExts.h b/CORE/MAC/inc/sirMacPropExts.h index 2f1ec3716f04..af9ddc983a9e 100644 --- a/CORE/MAC/inc/sirMacPropExts.h +++ b/CORE/MAC/inc/sirMacPropExts.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -47,30 +47,6 @@ // Proprietary IEs -// Types definitions used within proprietary IE -#define SIR_MAC_PROP_EXT_RATES_TYPE 0 -#define SIR_MAC_PROP_AP_NAME_TYPE 1 -#define SIR_MAC_PROP_LOAD_INFO_TYPE 6 -#define SIR_MAC_PROP_ASSOC_TYPE 7 -#define SIR_MAC_PROP_LOAD_BALANCE_TYPE 8 -#define SIR_MAC_PROP_LL_ATTR_TYPE 9 -#define SIR_MAC_PROP_CAPABILITY 10 // proprietary capabilities -#define SIR_MAC_PROP_VERSION 11 // version info -#define SIR_MAC_PROP_EDCAPARAMS 12 // edca params for 11e and wme -#define SIR_MAC_PROP_SRCMAC 13 // sender's mac address -#define SIR_MAC_PROP_TITAN 14 // Advertises a TITAN device -#define SIR_MAC_PROP_CHANNEL_SWITCH 15 // proprietary channel switch info -#define SIR_MAC_PROP_QUIET_BSS 16 // Broadcast's REQ for Quiet BSS -#define SIR_MAC_PROP_TRIG_STA_BK_SCAN 17 // trigger station bk scan during quiet bss duration -#define SIR_MAC_PROP_TAURUS 18 // Advertises a TAURUS device - -// capability ie info -#define SIR_MAC_PROP_CAPABILITY_MIN sizeof(tANI_U16) - -// trigger sta scan ie length defines -#define SIR_MAC_PROP_TRIG_STA_BK_SCAN_EID_MIN 0 -#define SIR_MAC_PROP_TRIG_STA_BK_SCAN_EID_MAX 1 - // the bit map is also used as a config enable, setting a bit in the // propIE config variable, enables the corresponding capability in the propIE // the enables simply result in including the corresponding element in the @@ -96,13 +72,6 @@ #define SIR_MAC_PROP_CAPABILITY_VERSION WNI_CFG_PROP_CAPABILITY_VERSION #define SIR_MAC_PROP_CAPABILITY_MAXBITOFFSET WNI_CFG_PROP_CAPABILITY_MAXBITOFFSET -// macro to set/get a capability bit, bitname is one of HCF/11EQOS/etc... -#define PROP_CAPABILITY_SET(bitname, value) \ - ((value) = (value) | ((tANI_U16)(1 << SIR_MAC_PROP_CAPABILITY_ ## bitname))) - -#define PROP_CAPABILITY_RESET(bitname, value) \ - ((value) = (value) & ~((tANI_U16)(1 << SIR_MAC_PROP_CAPABILITY_ ## bitname))) - #define PROP_CAPABILITY_GET(bitname, value) \ (((value) >> SIR_MAC_PROP_CAPABILITY_ ## bitname) & 1) @@ -128,53 +97,10 @@ (dot11Mode == WNI_CFG_DOT11_MODE_TAURUS) || \ (dot11Mode == WNI_CFG_DOT11_MODE_ALL)) ? TRUE: FALSE) #endif - /* - * When Titan capabilities can be turned on based on the - * Proprietary Extensions CFG, then this macro can be used. - * Here Titan capabilities can be turned on for 11G/Gonly/N/NOnly mode also. - */ -#define IS_DOT11_MODE_TITAN_ALLOWED(dot11Mode) \ - (((dot11Mode == WNI_CFG_DOT11_MODE_TITAN) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_TAURUS) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_11G) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_11N) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_ALL)) ? TRUE: FALSE) - - - /* - * When Taurus capabilities can be turned on based on the - * Proprietary Extensions CFG, then this macro can be used. - * Here Taurus capabilities can be turned on for 11N/Nonly mode also. - */ -#define IS_DOT11_MODE_TAURUS_ALLOWED(dot11Mode) \ - (((dot11Mode == WNI_CFG_DOT11_MODE_TAURUS) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_11N) || \ - (dot11Mode == WNI_CFG_DOT11_MODE_ALL)) ? TRUE: FALSE) - - - -#define IS_DOT11_MODE_POLARIS(dot11Mode) IS_DOT11_MODE_PROPRIETARY(dot11Mode) #define IS_DOT11_MODE_11B(dot11Mode) \ ((dot11Mode == WNI_CFG_DOT11_MODE_11B) ? TRUE : FALSE) -/// ANI proprietary Status Codes enum -/// (present in Management response frames) -typedef enum eSirMacPropStatusCodes -{ - dummy -} tSirMacPropStatusCodes; - -/** - * ANI proprietary Reason Codes enum - * (present in Deauthentication/Disassociation Management frames) - */ -typedef enum eSirMacPropReasonCodes -{ - eSIR_MAC_ULA_TIMEOUT_REASON=0xFF00 -} tSirMacPropReasonCodes; - - /// Proprietary IE definition typedef struct sSirMacPropIE { @@ -192,11 +118,6 @@ typedef struct sSirMacPropRateSet } tSirMacPropRateSet, *tpSirMacPropRateSet; -typedef struct sSirMacPropLLSet -{ - tANI_U32 deferThreshold; -} tSirMacPropLLSet, *tpSirMacPropLLSet; - #define SIR_PROP_VERSION_STR_MAX 20 typedef struct sSirMacPropVersion { @@ -204,35 +125,7 @@ typedef struct sSirMacPropVersion tANI_U8 card_type; // Type of Card tANI_U8 build_version[SIR_PROP_VERSION_STR_MAX]; //build version string } tSirMacPropVersion, *tpSirMacPropVersion; -#define SIR_MAC_PROP_VERSION_MIN (SIR_PROP_VERSION_STR_MAX + sizeof(tANI_U32)) - - -// TCID MACRO's -#define TCID_0 0x01 -#define TCID_1 0x02 -#define TCID_2 0x04 -#define TCID_3 0x08 -#define TCID_4 0x10 -#define TCID_5 0x20 -#define TCID_6 0x40 -#define TCID_7 0x80 -#define TCID_ALL 0xFF - -// Get state of Concatenation -#define GET_CONCAT_STATE(ccBitmap,tcid) \ - ((ccBitmap) & (tcid)) - -// Get state of Compression -#define GET_COMPRESSION_STATE(cpBitmap,tcid) \ - ((cpBitmap) & (tcid)) - -// Get/Set the state of Reverse FCS -#define GET_RFCS_OPER_STATE(revFcsState) (revFcsState & 0x01) -#define GET_RFCS_PATTERN_ID(revFcsState) ((revFcsState & 0x0E) >> 1) - -/* STA CB Legacy Bss detect states */ -#define LIM_CB_LEGACY_BSS_DETECT_IDLE 0 -#define LIM_CB_LEGACY_BSS_DETECT_RUNNING 1 + /* Default value for gLimRestoreCBNumScanInterval */ #define LIM_RESTORE_CB_NUM_SCAN_INTERVAL_DEFAULT 2 diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h index b38fa656f6da..d962bdf00344 100644 --- a/CORE/MAC/inc/sirMacProtDef.h +++ b/CORE/MAC/inc/sirMacProtDef.h @@ -49,14 +49,6 @@ #define CAPABILITY_INFO_DELAYED_BA_BIT 14 #define CAPABILITY_INFO_IMMEDIATE_BA_BIT 15 -/// 11d MAC defaults -#define SIR_11B_CHANNEL_ID_BEGIN 1 -#define SIR_TOTAL_NUM_11B_CHANNELS 14 -#define SIR_11B_DEFAULT_MAX_TRANSMIT_POWER 20 -#define SIR_11A_CHANNEL_ID_BEGIN 240 -#define SIR_TOTAL_NUM_11A_CHANNELS 34 -#define SIR_11A_DEFAULT_MAX_TRANSMIT_POWER 16 - /// 11h MAC defaults #define SIR_11A_CHANNEL_BEGIN 34 #define SIR_11A_CHANNEL_END 165 @@ -65,25 +57,6 @@ #define SIR_11A_FREQUENCY_OFFSET 4 #define SIR_11B_FREQUENCY_OFFSET 1 - -#define PRIM_DEVICE_LEN (8) - -/// Maximum fragment size -#define SIR_MAC_MAX_FRAG_SIZE 2398 - -// maximum 802.11 PDU size -#define SIR_MAC_MAX_PDU_SIZE 2346 - -/// Length of the Frame Check Sum field at the end of every MAC frame -#define SIR_MAC_FCS_LENGTH 4 - -// Sizes of control frames -#define SIR_MAC_ACK_SIZE 14 -#define SIR_MAC_CTS_SIZE 14 -#define SIR_MAC_RTS_SIZE 20 -#define SIR_MAC_BRQ_SIZE 24 -#define SIR_MAC_BACK_SIZE 26 - /// Current version of 802.11 #define SIR_MAC_PROTOCOL_VERSION 0 @@ -794,13 +767,6 @@ typedef enum eSirMacReasonCodes } tSirMacReasonCodes; -typedef enum eSirMacChannelType -{ - eSIR_MAC_11A_BAND, - eSIR_MAC_11B_BAND, - eSIR_MAC_UNKNOWN_BAND -} tSirMacChannelType; - // BA Initiator v/s Recipient typedef enum eBADirection { @@ -829,17 +795,6 @@ typedef enum eBAPolicyType eBA_POLICY_IMMEDIATE } tBAPolicyType; -#ifdef WLAN_FEATURE_VOWIFI -/* Based on table 7-43a from 802.11k Spec */ -typedef enum eRrmNeighborReachability -{ - eREACHABILITY_RESERVED, - eREACHABILITY_NOT_REACHABLE, - eREACHABILITY_UNKNOWN, - eREACHABILITY_REACHABLE, -} tRrmNeighborReachability; -#endif /* WLAN_FEATURE_VOWIFI */ - /// Frame control field format (2 bytes) typedef __ani_attr_pre_packed struct sSirMacFrameCtl { @@ -898,16 +853,6 @@ typedef __ani_attr_pre_packed struct sSirMacSeqCtl #endif } __ani_attr_packed tSirMacSeqCtl, *tpSirMacSeqCtl; -// ACK policies - -typedef enum eSirMacAckPolicy -{ - eSIR_MAC_IMMEDIATE_ACK=0 , - eSIR_MAC_NO_ACK, - eSIR_MAC_NO_EXPLICIT_ACK, - eSIR_MAC_BURST_ACK -} tSirMacAckPolicy; - /// QoS control field typedef __ani_attr_pre_packed struct sSirMacQosCtl { @@ -936,12 +881,6 @@ typedef __ani_attr_pre_packed struct sSirMacQosCtl /// Length (in bytes) of MAC header in 3 address format #define SIR_MAC_HDR_LEN_3A 24 -/// Length (in bytes) of MAC header in 4 address format -#define SIR_MAC_HDR_LEN_4A 30 - -/// Length (in bytes) of the QoS control field in the MAC header -#define SIR_MAC_QOS_CTL_LEN 2 - /// 3 address MAC data header format (24/26 bytes) typedef __ani_attr_pre_packed struct sSirMacDot3Hdr { @@ -964,20 +903,6 @@ typedef __ani_attr_pre_packed struct sSirMacDataHdr3a tSirMacQosCtl qosControl; } __ani_attr_packed tSirMacDataHdr3a, *tpSirMacDataHdr3a; -/// 4 address MAC data header format (30/32 bytes) -typedef __ani_attr_pre_packed struct sSirMacDataHdr4a -{ - tSirMacFrameCtl fc; - tANI_U8 durationLo; - tANI_U8 durationHi; - tANI_U8 addr1[6]; - tANI_U8 addr2[6]; - tANI_U8 addr3[6]; - tSirMacSeqCtl seqControl; - tANI_U8 addr4[6]; - tSirMacQosCtl qosControl; -} __ani_attr_packed tSirMacDataHdr4a, *tpSirMacDataHdr4a; - /// Management header format typedef __ani_attr_pre_packed struct sSirMacMgmtHdr { @@ -990,17 +915,6 @@ typedef __ani_attr_pre_packed struct sSirMacMgmtHdr tSirMacSeqCtl seqControl; } __ani_attr_packed tSirMacMgmtHdr, *tpSirMacMgmtHdr; -/// PS-poll header format -typedef __ani_attr_pre_packed struct sSirMacPSpoll -{ - tSirMacFrameCtl fc; - tANI_U8 aidLo; - tANI_U8 aidHi; - tANI_U8 bssId[6]; - tANI_U8 ta[6]; - tANI_U8 fcs[4]; -} __ani_attr_packed tSirMacPSpoll, *tpSirMacPSpoll; - /// ERP information field typedef __ani_attr_pre_packed struct sSirMacErpInfo { @@ -1189,18 +1103,7 @@ typedef __ani_attr_pre_packed struct sSirMacRRMEnabledCap #define AC_MGMT_LO 4 #define AC_MGMT_HI 5 #define MAX_NUM_AC 4 -#define TOT_NUM_AC (MAX_NUM_AC + 2) /* +2 for AC_MGMT_xx */ -/* -#define EDCA_INDEX_0_RSVD 0 -#define EDCA_INDEX_1_BEACON 1 -#define EDCA_INDEX_2_MGMT_PROBERSP 2 -#define EDCA_INDEX_3_MGMT_OTHER 3 -#define EDCA_INDEX_4_AC_VO 4 -#define EDCA_INDEX_5_AC_VI 5 -#define EDCA_INDEX_6_AC_BE 6 -#define EDCA_INDEX_7_AC_BK 7 -*/ // access categories #define SIR_MAC_EDCAACI_BESTEFFORT (EDCA_AC_BE) #define SIR_MAC_EDCAACI_BACKGROUND (EDCA_AC_BK) @@ -1303,15 +1206,6 @@ typedef __ani_attr_pre_packed struct sSirMacQoSParams tANI_U8 AIFS[8]; } __ani_attr_packed tSirMacQoSParams; -typedef __ani_attr_pre_packed struct sSirMacQbssLoadIE -{ - tANI_U8 type; - tANI_U8 length; - tANI_U16 staCount; - tANI_U8 chnlUtil; - tANI_U16 admitCapacity; -} __ani_attr_packed tSirMacQbssLoadIE; - // ts info direction field can take any of these values #define SIR_MAC_DIRECTION_UPLINK 0 #define SIR_MAC_DIRECTION_DNLINK 1 @@ -1324,10 +1218,6 @@ typedef __ani_attr_pre_packed struct sSirMacQbssLoadIE #define SIR_MAC_ACCESSPOLICY_HCCA 2 #define SIR_MAC_ACCESSPOLICY_BOTH 3 -#define SIR_MAC_HCCA_TSID_MIN 8 // valid HCCA tsid's are 8 or higher -#define SIR_MAC_TID_MAX 15 -#define MAC_BA_TID_MAX 8 - typedef __ani_attr_pre_packed struct sSirMacTSInfoTfc { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1399,16 +1289,12 @@ typedef __ani_attr_pre_packed struct sSirMacTspecIE } __ani_attr_packed tSirMacTspecIE; -// max size of the classifier params in the tclas IE -#define SIR_MAC_CLSPARAM_LEN 253 - // frame classifier types #define SIR_MAC_TCLASTYPE_ETHERNET 0 #define SIR_MAC_TCLASTYPE_TCPUDPIP 1 #define SIR_MAC_TCLASTYPE_8021DQ 2 // reserved 3-255 -#define SIR_MAC_TCLAS_PARAM_ETHERNET_MIN 14 typedef __ani_attr_pre_packed struct sSirMacTclasParamEthernet { tANI_U8 srcAddr[6]; @@ -1416,7 +1302,6 @@ typedef __ani_attr_pre_packed struct sSirMacTclasParamEthernet tANI_U16 type; }__ani_attr_packed tSirMacTclasParamEthernet; -#define SIR_MAC_TCLAS_PARAM_IPV4_MIN 16 typedef __ani_attr_pre_packed struct sSirMacTclasParamIPv4 { tANI_U8 version; @@ -1432,7 +1317,6 @@ typedef __ani_attr_pre_packed struct sSirMacTclasParamIPv4 #define SIR_MAC_TCLAS_IPV4 4 #define SIR_MAC_TCLAS_IPV6 6 -#define SIR_MAC_TCLAS_PARAM_IPV6_MIN 40 typedef __ani_attr_pre_packed struct sSirMacTclasParamIPv6 { tANI_U8 version; @@ -1443,7 +1327,6 @@ typedef __ani_attr_pre_packed struct sSirMacTclasParamIPv6 tANI_U8 flowLabel[3]; } __ani_attr_packed tSirMacTclasParamIPv6; -#define SIR_MAC_TCLAS_PARAM_8021DQ_MIN 2 typedef __ani_attr_pre_packed struct sSirMacTclasParam8021dq { tANI_U16 tag; @@ -1465,13 +1348,6 @@ typedef __ani_attr_pre_packed struct sSirMacTsDelayIE tANI_U32 delay; } __ani_attr_packed tSirMacTsDelayIE; -typedef __ani_attr_pre_packed struct sSirMacTclasProcIE -{ - tANI_U8 type; - tANI_U8 length; - tANI_U8 processing; -} __ani_attr_packed tSirMacTclasProcIE; - typedef __ani_attr_pre_packed struct sSirMacScheduleInfo { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1513,15 +1389,6 @@ typedef __ani_attr_pre_packed struct sSirMacQosCapabilityStaIE } __ani_attr_packed tSirMacQosCapabilityStaIE; -#define ADDTS -typedef __ani_attr_pre_packed struct sSirMacQosActionIE -{ - tANI_U8 type; - tANI_U8 length; - tANI_U8 qosAction; - tANI_U8 qosBody[1]; -} __ani_attr_packed tSirMacQosActionIE; - typedef tANI_U32 tSirMacTimeStamp[2]; typedef tANI_U16 tSirMacBeaconInterval; @@ -1534,13 +1401,6 @@ typedef tANI_U8 tSirMacAddr[6]; // IE definitions -typedef __ani_attr_pre_packed struct sSirMacIE -{ - tANI_U8 elementID; - tANI_U8 length; - tANI_U8 info[1]; -} __ani_attr_packed tSirMacIE; - typedef __ani_attr_pre_packed struct sSirMacSSidIE { tANI_U8 type; @@ -1574,20 +1434,6 @@ typedef __ani_attr_pre_packed struct sSirMacChanInfo tANI_S8 maxTxPower; } __ani_attr_packed tSirMacChanInfo; -typedef __ani_attr_pre_packed struct sSirMacCountry -{ - tANI_U8 countryString[3]; // This from CFG_COUNTRY_STRING - tANI_U8 numChanInfo; - tSirMacChanInfo chanInfo[1]; -} __ani_attr_packed tSirMacCountry; - -typedef __ani_attr_pre_packed struct sSirMacCountryIE -{ - tANI_U8 type; - tANI_U8 length; - tSirMacCountry country; -} __ani_attr_packed tSirMacCountryIE; - typedef __ani_attr_pre_packed struct sSirMacNonErpPresentIE { tANI_U8 type; @@ -1595,12 +1441,6 @@ typedef __ani_attr_pre_packed struct sSirMacNonErpPresentIE tANI_U8 erp; } __ani_attr_packed tSirMacNonErpPresentIE; -typedef __ani_attr_pre_packed struct sSirMacWpaIE -{ - tANI_U8 type; - tSirMacWpaInfo wpa; -} __ani_attr_packed tSirMacWpaIE; - typedef struct sSirMacPowerCapabilityIE { tANI_U8 type; @@ -1633,63 +1473,6 @@ typedef struct sSirMacMeasReqIE tSirMacMeasReqField measReqField; } tSirMacMeasReqIE, *tpSirMacMeasReqIE; -// Basic Measurement Report -typedef struct sSirMacBasicReport -{ - tANI_U8 channelNumber; - tANI_U8 measStartTime[8]; - tANI_U16 measDuration; - tANI_U8 mapField; -} tSirMacBasicReport, *tpSirMacBasicReport; - -typedef struct sSirMacBasicReportIE -{ - tANI_U8 type; - tANI_U8 length; - tANI_U8 measToken; - tANI_U8 measReportMode; - tANI_U8 measType; - tSirMacBasicReport basicReport; -} tSirMacBasicReportIE, *tpSirMacBasicReportIE; - -// CCA Measurement Report -typedef struct sSirMacCcaReport -{ - tANI_U8 channelNumber; - tANI_U8 measStartTime[8]; - tANI_U16 measDuration; - tANI_U8 ccaBusyFraction; -} tSirMacCcaReport, *tpSirMacCcaReport; - -typedef struct sSirMacCcaReportIE -{ - tANI_U8 type; - tANI_U8 length; - tANI_U8 measToken; - tANI_U8 measReportMode; - tANI_U8 measType; - tSirMacCcaReport ccaReport; -} tSirMacCcaReportIE, *tpSirMacCcaReportIE; - -// RPI Histogram Measurement Report -typedef struct sSirMacRpiReport -{ - tANI_U8 channelNumber; - tANI_U8 measStartTime[8]; - tANI_U16 measDuration; - tANI_U8 rpiDensity[8]; -} tSirMacRpiReport, *tpSirMacRpiReport; - -typedef struct sSirMacRpiReportIE -{ - tANI_U8 type; - tANI_U8 length; - tANI_U8 measToken; - tANI_U8 measReportMode; - tANI_U8 measType; - tSirMacRpiReport rpiReport; -} tSirMacRpiReportIE, *tpSirMacRpiReportIE; - #define SIR_MAC_MAX_SUPP_RATES 32 #define SIR_MAC_MAX_SUPP_CHANNELS 100 @@ -2331,24 +2114,6 @@ typedef struct sSirMacMeasReqActionFrame } tSirMacMeasReqActionFrame, *tpSirMacMeasReqActionFrame; #endif -typedef struct sSirMacBasicMeasReportActionFrame -{ - tSirMacMeasActionFrameHdr actionHeader; - tSirMacBasicReportIE measReportIE; -} tSirMacBasicMeasReportActionFrame, *tpSirMacBasicMeasReportActionFrame; - -typedef struct sSirMacCcaMeasReportActionFrame -{ - tSirMacMeasActionFrameHdr actionHeader; - tSirMacCcaReportIE measReportIE; -} tSirMacCcaMeasReportActionFrame, *tpSirMacCcaMeasReportActionFrame; - -typedef struct sSirMacRpiMeasReportActionFrame -{ - tSirMacMeasActionFrameHdr actionHeader; - tSirMacRpiReportIE measReportIE; -} tSirMacRpiMeasReportActionFrame, *tpSirMacRpiMeasReportActionFrame; - #if defined WLAN_FEATURE_VOWIFI typedef struct sSirMacNeighborReportReq @@ -2408,187 +2173,6 @@ typedef struct sSirMacRadioMeasureReport // max number of possible tclas elements in any frame #define SIR_MAC_TCLASIE_MAXNUM 2 -// ADDTS request -typedef __ani_attr_pre_packed struct sSirMacQosAddtsReqAF -{ - tSirMacActionFrameHdr afHdr; - tANI_U8 dlgToken; - tSirMacTspecIE tspec; - tANI_U8 tclas[1]; // variable length element -} __ani_attr_packed tSirMacQosAddtsReqAF; - -// ADDTS response -typedef __ani_attr_pre_packed struct sSirMacQosAddtsRspAF -{ - tSirMacActionFrameHdr afHdr; - tANI_U8 dlgToken; - tSirMacStatusCodes status; - tSirMacTsDelayIE delay; - tSirMacTspecIE tspec; - tANI_U8 tclas[1]; -} __ani_attr_packed tSirMacQosAddtsRspAF; - -// DELTS frame -typedef __ani_attr_pre_packed struct sSirMacQosDeltsAF -{ - tSirMacActionFrameHdr afHdr; - tSirMacTSInfo tsinfo; -} __ani_attr_packed tSirMacQosDeltsAF; - -// Schedule frame -typedef __ani_attr_pre_packed struct sSirMacQosScheduleAF -{ - tSirMacActionFrameHdr afHdr; - tSirMacScheduleIE schedule; -} __ani_attr_packed tSirMacQosScheduleAF; - -// DLP action frame definitions - -// DLP request -typedef __ani_attr_pre_packed struct sSirMacQosDlpReqAF -{ - tSirMacActionFrameHdr afHdr; - tANI_U8 dstMAC[6]; - tANI_U8 srcMAC[6]; - tSirMacQosCapabilityIE qosCapability; - tANI_U16 dlpTimeout; - tSirMacRateSetIE supportedRates; -} __ani_attr_packed tSirMacQosDlpReqAF; - -// DLP response -typedef __ani_attr_pre_packed struct sSirMacQosDlpRspAF -{ - tSirMacActionFrameHdr afHdr; - tANI_U8 dstMAC[6]; - tANI_U8 srcMAC[6]; - tSirMacStatusCodes status; - tSirMacQosCapabilityIE qosCapability; - tSirMacRateSetIE supportedRates; -} __ani_attr_packed tSirMacQosDlpRspAF; - -// DLP teardown -typedef __ani_attr_pre_packed struct sSirMacQosDlpTdnAF -{ - tSirMacActionFrameHdr afHdr; - tANI_U8 dstMAC[6]; - tANI_U8 srcMAC[6]; -} __ani_attr_packed tSirMacQosDlpTdnAF; - - - - -// -/// Common header for all ANI proprietary action frames -typedef __ani_attr_pre_packed struct sSirMacAniActionFrame -{ - tSirMacActionFrameHdr afHdr; - tANI_U8 aniOui[3]; // 00 0A F5 - tANI_U8 type; // 0 - request; 1 - report; 2 - snr -} __ani_attr_packed tSirMacAniActionFrame, *tpSirMacAniActionFrame; - - -typedef __ani_attr_pre_packed struct sSirMacLinkTestReqData -{ - tSirMacAniActionFrame hdr; - tANI_U8 frameStatus; // bit0 - first frame - // bit1 - last frame; - // if both bit0/1 are on, - // intermediate frame - // bit2-7 - reserved - tANI_U8 rate; - tANI_U8 randomData[SIR_MAC_MAX_RANDOM_LENGTH]; -} __ani_attr_packed tSirMacLinkTestReqData, *tpSirMacLinkTestReqData; - -/// SNR report specific fields -typedef __ani_attr_pre_packed struct sSirMacSnrReport -{ - tSirMacAniActionFrame hdr; - tANI_U32 numSamples; - tANI_U32 snr; - tANI_U32 snrComp; - tANI_U32 sq; - tANI_U32 rssi; -} __ani_attr_packed tSirMacSnrReport, *tpSirMacSnrReport; - -typedef __ani_attr_pre_packed struct sSirMacStaCbLegacyBssDetect -{ - tSirMacAniActionFrame hdr; - tANI_U8 channelNum; - tANI_U8 numLegacyBssid; - /* Below is declared as a place holder. Don't add anything after it since LegacyBssidList will take up memory after it */ - tANI_U8 LegacyBssidList[1]; /* Need to declare size 1 cause win build doesn't like size 0 */ -} __ani_attr_packed tSirMacStaCbLegacyBssDetect, *tpSirMacStaCbLegacyBssDetect; - -typedef __ani_attr_pre_packed struct sSirMacQoSDefBAReq -{ - tSirMacActionFrameHdr hdr; - - tANI_U8 rsvd1; - -#ifdef ANI_LITTLE_BIT_ENDIAN - tANI_U8 tid: 4; - tANI_U8 rsvd2: 4; -#else - tANI_U8 rsvd2: 4; - tANI_U8 tid: 4; -#endif -} __ani_attr_packed tSirMacQoSDefBAReq, *tpSirMacQoSDefBAReq; - -typedef __ani_attr_pre_packed struct sSirMacQoSDefBARsp -{ - tSirMacActionFrameHdr hdr; - -#ifdef ANI_LITTLE_BIT_ENDIAN - tANI_U8 tid: 4; - tANI_U8 policy: 1; - tANI_U8 reject: 1; - tANI_U8 rsvd1: 2; -#else - tANI_U8 rsvd1: 2; - tANI_U8 reject: 1; - tANI_U8 policy: 1; - tANI_U8 tid: 4; -#endif - - tANI_U8 bufferSize; -} __ani_attr_packed tSirMacQoSDefBARsp, *tpSirMacQoSDefBARsp; - -typedef __ani_attr_pre_packed struct sSirMacQoSDelBAReq -{ - tSirMacActionFrameHdr hdr; - tANI_U8 rsvd1; - -#ifdef ANI_LITTLE_BIT_ENDIAN - tANI_U8 rsvd2: 3; - tANI_U8 direction: 1; - tANI_U8 tid: 4; -#else - tANI_U8 tid: 4; - tANI_U8 direction: 1; - tANI_U8 rsvd2: 3; -#endif -} __ani_attr_packed tSirMacQoSDelBAReq, *tpSirMacQoSDelBAReq; - -typedef __ani_attr_pre_packed struct sSirMacQoSDelBARsp -{ - tSirMacActionFrameHdr hdr; - -#ifdef ANI_LITTLE_BIT_ENDIAN - tANI_U8 tid: 4; - tANI_U8 policy: 1; - tANI_U8 reject: 1; - tANI_U8 rsvd1: 2; -#else - tANI_U8 rsvd1: 2; - tANI_U8 reject: 1; - tANI_U8 policy: 1; - tANI_U8 tid: 4; -#endif - -} __ani_attr_packed tSirMacQoSDelBARsp, *tpSirMacQoSDelBARsp; - - - // 11b rate encoding in MAC format #define SIR_MAC_RATE_1 0x02 @@ -2663,62 +2247,6 @@ typedef __ani_attr_pre_packed struct sSirMacQoSDelBARsp (((tANI_U8)x)==SIR_MAC_RATE_48) || \ (((tANI_U8)x)==SIR_MAC_RATE_54)) -#define sirIsProprate(x) ((((tANI_U8)x)==SIR_MAC_RATE_72) || \ - (((tANI_U8)x)==SIR_MAC_RATE_96) || \ - (((tANI_U8)x)==SIR_MAC_RATE_108)) - -#define sirIsEnhancedRate(x) \ - (((x)==SIR_MAC_RATE_42) || \ - ((x)==SIR_MAC_RATE_84) || \ - ((x)==SIR_MAC_RATE_126) || \ - ((x)==SIR_MAC_RATE_144) || \ - ((x)==SIR_MAC_RATE_168) || \ - ((x)==SIR_MAC_RATE_192) || \ - ((x)==SIR_MAC_RATE_216) || \ - ((x)==SIR_MAC_RATE_240)) - -/// Table that has MAC<-->PHY rate encodings -typedef __ani_attr_pre_packed struct sSirMacPhyRates -{ - tANI_U8 rateId; - tANI_U8 phyRate; // Rate in PHY encoding format - tANI_U16 macRate; // Rate in MAC encoding format -} __ani_attr_packed tSirMacPhyRates, *tpSirMacPhyRates; - - -typedef __ani_attr_pre_packed struct sSirPhy11aHdr -{ - -#ifndef ANI_LITTLE_BIT_ENDIAN - - tANI_U8 lengthLo : 3; - tANI_U8 reserved : 1; - tANI_U8 rate : 4; - - tANI_U8 lengthMid : 8; - - tANI_U8 tail: 6; - tANI_U8 parity : 1; - tANI_U8 lengthHi : 1; - - tANI_U8 serviceLo; - tANI_U8 serviceHi; -#else - tANI_U8 rate : 4; - tANI_U8 reserved : 1; - tANI_U8 lengthLo : 3; - - tANI_U8 lengthMid : 8; - - tANI_U8 lengthHi : 1; - tANI_U8 parity : 1; - tANI_U8 tail: 6; - - tANI_U8 serviceLo; - tANI_U8 serviceHi; -#endif -} __ani_attr_packed tSirPhy11aHdr, *tpSirPhy11aHdr; - #define SIR_MAC_MIN_IE_LEN 2 // Minimum IE length for IE validation diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h index 18aabb777c05..26f5910cc13e 100644 --- a/CORE/MAC/inc/wniApi.h +++ b/CORE/MAC/inc/wniApi.h @@ -122,8 +122,6 @@ enum eWniMsgTypes eWNI_SME_SETCONTEXT_RSP, eWNI_SME_REASSOC_REQ, eWNI_SME_REASSOC_RSP, - eWNI_SME_AUTH_REQ, - eWNI_SME_AUTH_RSP, eWNI_SME_DISASSOC_REQ, eWNI_SME_DISASSOC_RSP, eWNI_SME_DISASSOC_IND, @@ -150,8 +148,6 @@ enum eWniMsgTypes eWNI_SME_DEFINE_QOS_RSP, eWNI_SME_DELETE_QOS_REQ, eWNI_SME_DELETE_QOS_RSP, - eWNI_SME_PROMISCUOUS_MODE_REQ, - eWNI_SME_PROMISCUOUS_MODE_RSP, eWNI_SME_LINK_TEST_START_REQ, eWNI_SME_LINK_TEST_START_RSP, eWNI_SME_LINK_TEST_STOP_REQ, @@ -609,11 +605,6 @@ typedef enum { /*---------------------------------------------------------------------*/ /* CFG definitions */ /*---------------------------------------------------------------------*/ -#define WNI_CFG_TYPE_STR 0x0000000 -#define WNI_CFG_TYPE_INT 0x0000001 -#define WNI_CFG_HOST_RE 0x0000002 -#define WNI_CFG_HOST_WE 0x0000004 - // Shall be removed after integration of stats. // Get statistic response diff --git a/CORE/MAC/inc/wniStat.h b/CORE/MAC/inc/wniStat.h deleted file mode 100644 index 045970c4e4bc..000000000000 --- a/CORE/MAC/inc/wniStat.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * - * This file wniStat.h contains statistics related definitions - * exported by Sirius software modules. - * - * Author: Kevin Nguyen - * Date: 08/21/2002 - * History:- - * Date Modified by Modification Information - * -------------------------------------------------------------------- - */ - -#ifndef _WNISTAT_H -#define _WNISTAT_H - - -// WNI Statistic Parameter ID -#define WNI_STAT_RTS_SUCC_CNT 1 -#define WNI_STAT_RTS_FAILED_CNT 2 -#define WNI_STAT_PACKET_CNT 3 -#define WNI_STAT_MULTI_CNT 4 -#define WNI_STAT_DUPL_FRAG_CNT 5 -#define WNI_STAT_TOTAL_BYTE_CNT 6 -#define WNI_STAT_PKT_DROP_CNT 7 -#define WNI_STAT_PKT64_CNT 8 -#define WNI_STAT_PKT127_CNT 9 -#define WNI_STAT_PKT255_CNT 10 -#define WNI_STAT_PKT511_CNT 11 -#define WNI_STAT_PKT1023_CNT 12 -#define WNI_STAT_PKT1518_CNT 13 -#define WNI_STAT_PKT2047_CNT 14 -#define WNI_STAT_PKT4095_CNT 15 -#define WNI_STAT_FRAG_CNT 16 -#define WNI_STAT_FCS_CNT 17 -#define WNI_STAT_BSSID_MISS_CNT 18 -#define WNI_STAT_PDU_ERR_CNT 19 -#define WNI_STAT_DST_MISS_CNT 20 -#define WNI_STAT_DROP_CNT 21 -#define WNI_STAT_ABORT_CNT 22 -#define WNI_STAT_RELAY_CNT 23 -#define WNI_STAT_HASH_MISS_CNT 24 -#define WNI_STAT_PLCP_CRC_ERR_CNT 25 -#define WNI_STAT_PLCP_SIG_ERR_CNT 26 -#define WNI_STAT_PLCP_SVC_ERR_CNT 27 -#define WNI_STAT_BEACONS_RECEIVED_CNT 28 -#define WNI_STAT_BEACONS_TRANSMITTED_CNT 29 -#define WNI_STAT_CURRENT_TX_RATE 30 - -#define WNI_STAT_LAST_ID WNI_STAT_CURRENT_TX_RATE - - -#endif diff --git a/CORE/MAC/src/cfg/cfgApi.c b/CORE/MAC/src/cfg/cfgApi.c index 4e51d15fa4b5..a5ae387d3041 100644 --- a/CORE/MAC/src/cfg/cfgApi.c +++ b/CORE/MAC/src/cfg/cfgApi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -343,69 +343,6 @@ wlan_cfgGetInt(tpAniSirGlobal pMac, tANI_U16 cfgId, tANI_U32 *pValue) } /*** end wlan_cfgGetInt() ***/ -#ifdef NOT_CURRENTLY_USED -// --------------------------------------------------------------------- -/** - * cfgIncrementInt() - * - * FUNCTION: - * This function is called to increment an integer parameter by n. - * - * LOGIC: - * - * ASSUMPTIONS: - * - No range checking will be performed. - * - Host RW permission should be checked prior to calling this - * function. - * - * NOTE: - * - * @param cfgId: 16-bit CFG parameter ID - * @param value: increment value - * - * @return eSIR_SUCCESS: request completed successfully - * @return eSIR_CFG_INVALID_ID: invalid CFG parameter ID - */ - -tSirRetStatus -cfgIncrementInt(tpAniSirGlobal pMac, tANI_U16 cfgId, tANI_U32 value) -{ - tANI_U32 index; - tANI_U32 control; - tSirRetStatus retVal; - - if (cfgId >= CFG_PARAM_MAX_NUM) - { - PELOGE(cfgLog(pMac, LOGE, FL("Invalid cfg id %d"), cfgId);) - retVal = eSIR_CFG_INVALID_ID; - } - if (!pMac->cfg.gCfgEntry) - { - PELOGE(cfgLog(pMac, LOGE, FL("gCfgEntry is NULL"));) - return eSIR_CFG_INVALID_ID; - } - - control = pMac->cfg.gCfgEntry[cfgId].control; - index = control & CFG_BUF_INDX_MASK; - retVal = eSIR_SUCCESS; - - // Check if parameter is valid - if ((control & CFG_CTL_VALID) == 0) - { - PELOGE(cfgLog(pMac, LOGE, FL("Not valid cfg id %d"), cfgId);) - retVal = eSIR_CFG_INVALID_ID; - } - else - { - // Increment integer value - pMac->cfg.gCfgIBuf[index] += value; - - } - - return (retVal); -} -#endif // NOT_CURRENTLY_USED - // --------------------------------------------------------------------- /** * cfgSetStr() diff --git a/CORE/MAC/src/cfg/cfgPriv.h b/CORE/MAC/src/cfg/cfgPriv.h index a45eb7c53f90..bec65f83ed85 100644 --- a/CORE/MAC/src/cfg/cfgPriv.h +++ b/CORE/MAC/src/cfg/cfgPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -43,7 +43,6 @@ #include <sirCommon.h> #include <sirTypes.h> #include <sirDebug.h> -#include <wniStat.h> #include <utilsApi.h> #include <limApi.h> #include <schApi.h> diff --git a/CORE/MAC/src/include/cfgApi.h b/CORE/MAC/src/include/cfgApi.h index e25fbf4f61d5..fbd2f582a8ce 100644 --- a/CORE/MAC/src/include/cfgApi.h +++ b/CORE/MAC/src/include/cfgApi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -48,10 +48,6 @@ /*---------------------------------------------------------------------*/ /* CFG definitions */ /*---------------------------------------------------------------------*/ -#define CFG_TYPE_STR 0x0000000 -#define CFG_TYPE_INT 0x0000001 -#define CFG_HOST_RE 0x0000002 -#define CFG_HOST_WE 0x0000004 // CFG status typedef enum eCfgStatusTypes { @@ -92,9 +88,6 @@ tSirRetStatus cfgCheckValid(tpAniSirGlobal, tANI_U16); /// Get integer parameter value tSirRetStatus wlan_cfgGetInt(tpAniSirGlobal, tANI_U16, tANI_U32*); -/// Increment integer parameter -tSirRetStatus cfgIncrementInt(tpAniSirGlobal, tANI_U16, tANI_U32); - /// Set string parameter value tSirRetStatus cfgSetStr(tpAniSirGlobal, tANI_U16, tANI_U8*, tANI_U32); diff --git a/CORE/MAC/src/include/dphGlobal.h b/CORE/MAC/src/include/dphGlobal.h index b6d4e4d8bd96..7eb5197cd718 100644 --- a/CORE/MAC/src/include/dphGlobal.h +++ b/CORE/MAC/src/include/dphGlobal.h @@ -50,8 +50,6 @@ #include "limGlobal.h" -//#include "parserApi.h" - #include "sirMacProtDef.h" #include "sirMacPropExts.h" @@ -63,76 +61,6 @@ #define DPH_STATS - -/// traffic category not allowed - -#define DPH_TID_NOTALLOWED 0xFF - - -/// Periodicity of invocation of rate adaptation (in ms) - -#define DPH_RATE_ADAPTATION_PERIOD 20 - - -// Rate indices - -#define DPH_PHY_RATE_1_INDEX 0 - -#define DPH_PHY_RATE_2_INDEX 1 - -#define DPH_PHY_RATE_5_5_INDEX 2 - -#define DPH_PHY_RATE_11_INDEX 3 - -#define DPH_PHY_RATE_6_INDEX 4 - -#define DPH_PHY_RATE_9_INDEX 5 - -#define DPH_PHY_RATE_12_INDEX 6 - -#define DPH_PHY_RATE_18_INDEX 7 - -#define DPH_PHY_RATE_24_INDEX 8 - -#define DPH_PHY_RATE_36_INDEX 9 - -#define DPH_PHY_RATE_48_INDEX 10 - -#define DPH_PHY_RATE_54_INDEX 11 - -#define DPH_PHY_RATE_72_INDEX 12 - -#define DPH_PHY_RATE_96_INDEX 13 - -#define DPH_PHY_RATE_108_INDEX 14 - -#define DPH_PHY_RATE_144_INDEX 15 - -#define DPH_PHY_RATE_MAX_INDEX 16 - - -/// Maximum time to wait for a management packet to go out (ms) - -#define DPH_MAX_MGMT_WAIT_TIME 10000 - - -/// Step size for the wait time histogram (ms) - -#define DPH_WAIT_HIST_STEP 20 - - -/// Number of entries in wait time histogram - -#define DPH_WAIT_HIST_SIZE 100 - - -/// TCID for Management & Keep Alive Mgmt frames - -#define DPH_MGMT_TCID 4 - -#define DPH_KEEPALIVE_PROBE_RESPONSE_TCID 0 - - /// STAID for Management frames #define DPH_USE_MGMT_STAID -1 @@ -144,35 +72,6 @@ #define DPH_KEEPALIVE_FRAME 1 - -/// Mask for subtype, type, protocol version, order and wep fields in the mac frame control - -#define DPH_FC_BD_FILL_MASK 0xFFCC - - -/// Enable/Disable Txop generation in TFP for HCF mode - -#define DPH_ENABLE_HCF_TXOP_GEN_AT_TFP 0x00 - -#define DPH_DISABLE_HCF_TXOP_GEN_AT_TFP 0x02 - - -/// Enable/Disable Txop generation in TFP for EDCF mode - -#define DPH_ENABLE_EDCF_TXOP_GEN_AT_TFP 0x00 - -#define DPH_DISABLE_EDCF_TXOP_GEN_AT_TFP 0x01 - - -#define DPH_DUMP_ALL_STA_ID -1 - -#define DPH_DUMP_RX_BD 0 - -#define DPH_DUMP_TX_BD 1 - -#define DPH_DUMP_TX_MGMT_BD 2 - - //DPH Hash Index for BSS(STA's Peer) on station. #define DPH_STA_HASH_INDEX_PEER 1 @@ -655,17 +554,6 @@ typedef struct sDphHashNode // ------------------------------------------------------------------- -// get protection overrides from config variable - -// bit0: force cts to self protection for tx to Airgo peers - -// bit1: force cts to self protection for tx to non Airgo peers - -#define DPH_PROT_OVERRIDE_NONANI_PEER_GET(cfgval) ((cfgval) & 1) - -#define DPH_PROT_OVERRIDE_ANI_PEER_GET(cfgval) (((cfgval) & 2) >> 1) - - typedef struct sAniSirDph { diff --git a/CORE/MAC/src/include/sirDebug.h b/CORE/MAC/src/include/sirDebug.h index 54f527934712..9407ee1f483f 100644 --- a/CORE/MAC/src/include/sirDebug.h +++ b/CORE/MAC/src/include/sirDebug.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -48,27 +48,6 @@ #define LOG3 6 #define LOG4 7 -#ifdef ANI_DEBUG -#define PMM_LOG_LEVEL LOG4 -#define SCH_LOG_LEVEL LOG4 -#define ARQ_LOG_LEVEL LOG4 -#define LIM_LOG_LEVEL LOG4 -#define HAL_LOG_LEVEL LOG4 -#define SYS_LOG_LEVEL LOG4 -#define CFG_LOG_LEVEL LOG4 -#define DPH_LOG_LEVEL LOG4 -#else -#define PMM_LOG_LEVEL LOGW -#define SCH_LOG_LEVEL LOGW -#define ARQ_LOG_LEVEL LOGW -#define LIM_LOG_LEVEL LOGW -#define HAL_LOG_LEVEL LOGW -#define SYS_LOG_LEVEL LOGW -#define CFG_LOG_LEVEL LOGW -#define DPH_LOG_LEVEL LOGW -#endif - - #ifdef WLAN_MDM_CODE_REDUCTION_OPT #ifdef PE_DEBUG_LOGE #define PELOGE(p) { p } diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h index d4fd9ec3065e..a4d8a759e31a 100644 --- a/CORE/MAC/src/include/sirParams.h +++ b/CORE/MAC/src/include/sirParams.h @@ -48,7 +48,6 @@ #define SIR_MAX_PACKET_SIZE 2048 #define SIR_MAX_NUM_CHANNELS 64 #define SIR_MAX_NUM_STA_IN_IBSS 16 -#define SIR_MAX_NUM_STA_IN_BSS 256 #define SIR_ESE_MAX_MEAS_IE_REQS 8 typedef enum @@ -199,86 +198,6 @@ typedef struct sSirMbMsgP2p tANI_U32 data[1]; } tSirMbMsgP2p, *tpSirMbMsgP2p; -/// Message queue definitions -// msgtype(2bytes) reserved(2bytes) bodyptr(4bytes) bodyval(4bytes) -// NOTE tSirMsgQ should be always multiples of WORD(4Bytes) -// All Queue Message Size are multiples of word Size (4 bytes) -#define SYS_MSG_SIZE (sizeof(tSirMsgQ)/4) - -/// gHalMsgQ - -#define SYS_HAL_MSG_SIZE SYS_MSG_SIZE - -/// gMMHhiPriorityMsgQ - -#define SYS_MMH_HI_PRI_MSG_SIZE SYS_MSG_SIZE - -/// gMMHprotocolMsgQ - -#define SYS_MMH_PROT_MSG_SIZE SYS_MSG_SIZE - -/// gMMHdebugMsgQ - -#define SYS_MMH_DEBUG_MSG_SIZE SYS_MSG_SIZE - -/// gMAINTmsgQ - -#define SYS_MNT_MSG_SIZE SYS_MSG_SIZE - -/// LIM Message Queue - -#define SYS_LIM_MSG_SIZE SYS_MSG_SIZE - -/// ARQ Message Queue - -#define SYS_ARQ_MSG_SIZE SYS_MSG_SIZE - -/// Scheduler Message Queue - -#define SYS_SCH_MSG_SIZE SYS_MSG_SIZE - -/// PMM Message Queue - -#define SYS_PMM_MSG_SIZE SYS_MSG_SIZE - -/// TX Message Queue - -#define SYS_TX_MSG_SIZE (sizeof(void *)/4) // Message pointer size - -/// RX Message Queue - -#define SYS_RX_MSG_SIZE (sizeof(void *)/4) // Message pointer size - -/// PTT Message Queue -#define SYS_NIM_PTT_MSG_SIZE SYS_MSG_SIZE // Message pointer size - - - -/* *************************************** * - * * - * Block pool configuration * - * * - * *************************************** */ - -// The following values specify the number of blocks to be created -// for each block pool size. - -#define SIR_BUF_BLK_32_NUM 64 -#define SIR_BUF_BLK_64_NUM 128 -#define SIR_BUF_BLK_96_NUM 16 -#define SIR_BUF_BLK_128_NUM 128 -#define SIR_BUF_BLK_160_NUM 8 -#define SIR_BUF_BLK_192_NUM 0 -#define SIR_BUF_BLK_224_NUM 0 -#define SIR_BUF_BLK_256_NUM 128 -#define SIR_BUF_BLK_512_NUM 0 -#define SIR_BUF_BLK_768_NUM 0 -#define SIR_BUF_BLK_1024_NUM 2 -#define SIR_BUF_BLK_1280_NUM 0 -#define SIR_BUF_BLK_1536_NUM 2 -#define SIR_BUF_BLK_1792_NUM 0 -#define SIR_BUF_BLK_2048_NUM 2 -#define SIR_BUF_BLK_2304_NUM 0 /* ******************************************* * * * diff --git a/CORE/MAC/src/pe/include/limApi.h b/CORE/MAC/src/pe/include/limApi.h index be415a16ef7f..efac4f9521f4 100644 --- a/CORE/MAC/src/pe/include/limApi.h +++ b/CORE/MAC/src/pe/include/limApi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -50,8 +50,6 @@ #include "halMsgApi.h" #include "wlan_qct_wdi_ds.h" #include "wlan_qct_wda.h" -#define LIM_POL_SYS_SCAN_MODE 0 -#define LIM_POL_SYS_LEARN_MODE 1 /* Macro to count heartbeat */ #define limResetHBPktCount(psessionEntry) (psessionEntry->LimRxedBeaconCntDuringHB = 0) @@ -79,9 +77,6 @@ #define GET_LIM_PROCESS_DEFD_MESGS(pMac) (pMac->lim.gLimProcessDefdMsgs) #define SET_LIM_PROCESS_DEFD_MESGS(pMac, val) (pMac->lim.gLimProcessDefdMsgs = val) // LIM exported function templates -//inline tANI_U16 -//limGetNumAniPeersInBss(tpAniSirGlobal pMac) -//{ return pMac->lim.gLimNumOfAniSTAs; } #define LIM_IS_RADAR_DETECTED(pMac) (pMac->lim.gLimSpecMgmt.fRadarDetCurOperChan) #define LIM_SET_RADAR_DETECTED(pMac, val) (pMac->lim.gLimSpecMgmt.fRadarDetCurOperChan = val) #define LIM_MIN_BCN_PR_LENGTH 12 @@ -97,8 +92,6 @@ typedef enum eMgmtFrmDropReason }tMgmtFrmDropReason; -/// During TD ring clean up at HDD in RTAI, will call this call back -extern void limPostTdDummyPktCallbak(void* pMacGlobals, unsigned int* pBd); /** * Function to initialize LIM state machines. * This called upon LIM thread creation. @@ -107,10 +100,6 @@ extern tSirRetStatus limInitialize(tpAniSirGlobal); tSirRetStatus peOpen(tpAniSirGlobal pMac, tMacOpenParameters *pMacOpenParam); tSirRetStatus peClose(tpAniSirGlobal pMac); tSirRetStatus limStart(tpAniSirGlobal pMac); -/** - * Function to Initialize radar interrupts. - */ -void limRadarInit(tpAniSirGlobal pMac); tSirRetStatus peStart(tpAniSirGlobal pMac); void peStop(tpAniSirGlobal pMac); tSirRetStatus pePostMsgApi(tpAniSirGlobal pMac, tSirMsgQ* pMsg); @@ -146,9 +135,7 @@ limGetSmeState(tpAniSirGlobal pMac) { return pMac->lim.gLimSmeState; } /// Function used by other Sirius modules to read global system role static inline tLimSystemRole limGetSystemRole(tpPESession psessionEntry) { return psessionEntry->limSystemRole; } -//limGetAID(tpPESession psessionEntry) { return psessionEntry->limAID; } extern void limReceivedHBHandler(tpAniSirGlobal, tANI_U8, tpPESession); -//extern void limResetHBPktCount(tpPESession); extern void limCheckAndQuietBSS(tpAniSirGlobal); /// Function to send WDS info to WSM if needed extern void limProcessWdsInfo(tpAniSirGlobal, tSirPropIEStruct); @@ -173,14 +160,11 @@ tSirRetStatus limUpdateShortSlot(tpAniSirGlobal pMac, extern void limSendAddtsReq (tpAniSirGlobal pMac, tANI_U16 staid, tANI_U8 tsid, tANI_U8 userPrio, tANI_U8 wme); /// creates a delts request action frame and sends it out to staid extern void limSendDeltsReq (tpAniSirGlobal pMac, tANI_U16 staid, tANI_U8 tsid, tANI_U8 userPrio, tANI_U8 wme); -/// creates a SM Power State Mode update request action frame and sends it out to staid -extern void limPostStartLearnModeMsgToSch(tpAniSirGlobal pMac); #ifdef WLAN_FEATURE_11AC extern ePhyChanBondState limGet11ACPhyCBState(tpAniSirGlobal pMac, tANI_U8 channel, tANI_U8 htSecondaryChannelOffset, tANI_U8 CenterChan,tpPESession ); #endif tANI_U8 limIsSystemInActiveState(tpAniSirGlobal pMac); -void limHandleLowRssiInd(tpAniSirGlobal pMac); void limHandleMissedBeaconInd(tpAniSirGlobal pMac, tpSirMsgQ pMsg); void limPsOffloadHandleMissedBeaconInd(tpAniSirGlobal pMac, tpSirMsgQ pMsg); void @@ -189,10 +173,7 @@ tMgmtFrmDropReason limIsPktCandidateForDrop(tpAniSirGlobal pMac, tANI_U8 *pRxPac void limMicFailureInd(tpAniSirGlobal pMac, tpSirMsgQ pMsg); /* ----------------------------------------------------------------------- */ // These used to be in DPH -extern void limSetBssid(tpAniSirGlobal pMac, tANI_U8 *bssId); -extern void limGetBssid(tpAniSirGlobal pMac, tANI_U8 *bssId); extern void limGetMyMacAddr(tpAniSirGlobal pMac, tANI_U8 *mac); -extern tSirRetStatus limCheckRxSeqNumber(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo); #define limGetQosMode(psessionEntry, pVal) (*(pVal) = (psessionEntry)->limQosEnabled) #define limGetWmeMode(psessionEntry, pVal) (*(pVal) = (psessionEntry)->limWmeEnabled) #define limGetWsmMode(psessionEntry, pVal) (*(pVal) = (psessionEntry)->limWsmEnabled) diff --git a/CORE/MAC/src/pe/include/limFTDefs.h b/CORE/MAC/src/pe/include/limFTDefs.h index ba238f3a3297..183f219781be 100644 --- a/CORE/MAC/src/pe/include/limFTDefs.h +++ b/CORE/MAC/src/pe/include/limFTDefs.h @@ -43,7 +43,6 @@ Preprocessor definitions and constants ------------------------------------------------------------------------*/ #define SIR_MDIE_SIZE 3 // MD ID(2 bytes), Capability(1 byte) -#define MAX_TIDS 8 #define MAX_FTIE_SIZE 256 // Max size limited to 256, on acct. of IW custom events diff --git a/CORE/MAC/src/pe/include/limGlobal.h b/CORE/MAC/src/pe/include/limGlobal.h index 3fddb1c32ff3..e8750ac08f07 100644 --- a/CORE/MAC/src/pe/include/limGlobal.h +++ b/CORE/MAC/src/pe/include/limGlobal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -53,20 +53,6 @@ /// Maximum number of scan hash table entries #define LIM_MAX_NUM_OF_SCAN_RESULTS 256 -// Link Test Report Status. This appears in the report frame -#define LINK_TEST_STATUS_SUCCESS 0x1 -#define LINK_TEST_STATUS_UNSUPPORTED_RATE 0x2 -#define LINK_TEST_STATUS_INVALID_ADDR 0x3 - -// Amount of time in nanosec to be sleep-waited before -// enabling RHP (1 millisec) -#define LIM_RHP_WORK_AROUND_DURATION 1000000 - -// Maximum amount of Quiet duration in millisec -#define LIM_MAX_QUIET_DURATION 32 - -#define LIM_TX_WQ_EMPTY_SLEEP_NS 100000 - // Sending Disassociate frames threshold #define LIM_SEND_DISASSOC_FRAME_THRESHOLD 2 #define LIM_HASH_MISS_TIMER_MS 10000 @@ -74,9 +60,6 @@ // Deferred Message Queue Length #define MAX_DEFERRED_QUEUE_LEN 80 -// Maximum Buffer size -#define LIM_MAX_BUF_SIZE 8192 - // Maximum number of PS - TIM's to be sent with out wakeup from STA #define LIM_TIM_WAIT_COUNT_FACTOR 5 @@ -414,22 +397,6 @@ typedef struct sLimDeferredMsgQParams tANI_U16 write; } tLimDeferredMsgQParams, *tpLimDeferredMsgQParams; -typedef struct sLimTraceQ -{ - tANI_U32 type; - tLimSmeStates smeState; - tLimMlmStates mlmState; - tANI_U32 value; - tANI_U32 value2; -} tLimTraceQ; - -typedef struct sLimTraceParams -{ - tLimTraceQ traceQueue[1024]; - tANI_U16 write; - tANI_U16 enabled; -} tLimTraceParams; - typedef struct sCfgProtection { tANI_U32 overlapFromlla:1; diff --git a/CORE/MAC/src/pe/include/limSession.h b/CORE/MAC/src/pe/include/limSession.h index ed841368063d..a69768896c06 100644 --- a/CORE/MAC/src/pe/include/limSession.h +++ b/CORE/MAC/src/pe/include/limSession.h @@ -335,7 +335,6 @@ typedef struct sPESession // Added to Support BT-AMP tANI_U8 htSmpsvalue; tANI_U8 spectrumMgtEnabled; /* *********************11H related*****************************/ - //tANI_U32 gLim11hEnable; tLimSpecMgmtInfo gLimSpecMgmt; // CB Primary/Secondary Channel Switch Info tLimChannelSwitchInfo gLimChannelSwitch; @@ -454,9 +453,6 @@ typedef struct sPESession // Added to Support BT-AMP }tPESession, *tpPESession; -#define LIM_MAX_ACTIVE_SESSIONS 4 - - /*------------------------------------------------------------------------- Function declarations and documenation ------------------------------------------------------------------------*/ diff --git a/CORE/MAC/src/pe/include/pmmApi.h b/CORE/MAC/src/pe/include/pmmApi.h index 3a9e33ed8751..60f3541e7cf2 100644 --- a/CORE/MAC/src/pe/include/pmmApi.h +++ b/CORE/MAC/src/pe/include/pmmApi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -118,8 +118,6 @@ void pmmImpsUpdateWakeupErrStats(tpAniSirGlobal pMac, tSirRetStatus retStatus); void pmmImpsUpdateErrStateStats(tpAniSirGlobal pMac); void pmmImpsUpdatePktDropStats(tpAniSirGlobal pMac); -void pmmUpdatePwrSaveStats(tpAniSirGlobal pMac); -void pmmUpdateWakeupStats(tpAniSirGlobal pMac); void pmmBmpsUpdatePktDropStats(tpAniSirGlobal pMac); void pmmBmpsUpdateHalReqFailureCnt(tpAniSirGlobal pMac); void pmmBmpsUpdateInitFailureCnt(tpAniSirGlobal pMac); diff --git a/CORE/MAC/src/pe/include/pmmGlobal.h b/CORE/MAC/src/pe/include/pmmGlobal.h index 2fcf02cc6496..e24252071a68 100644 --- a/CORE/MAC/src/pe/include/pmmGlobal.h +++ b/CORE/MAC/src/pe/include/pmmGlobal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -40,25 +40,6 @@ #include "sirApi.h" -typedef struct sPmmStaState -{ - /// Whether this STA is in powersave or not - tANI_U8 powerSave : 1; - /// Whether this STA is CF-pollable or not - tANI_U8 cfPollable : 1; - /// counter to indicate PS state update due to asynchronous PS Poll - tANI_U8 psPollUpdate:2; - - /// Reserved - tANI_U8 rsvd : 4; - - /// Index of the next STA in PS closest to this one - tANI_U8 nextPS; -} tPmmStaState, *tpPmmStaState; - - -#define NO_STATE_CHANGE 0xFF - typedef enum ePmmState { ePMM_STATE_INVALID, @@ -105,16 +86,6 @@ typedef struct sPmmTim typedef struct sAniSirPmm { - - - //tANI_U32 disModeBeforeSleeping; - //tANI_U32 txMCastCtrl; - //tANI_U32 nListenBeforeSleeping; - //tANI_U32 txTrafficIdleThreshold; - //tANI_U32 rxTrafficIdleThreshold; - //tANI_U32 ledInfoBeforeSleeping; - - tANI_U64 BmpsmaxSleepTime; tANI_U64 BmpsavgSleepTime; tANI_U64 BmpsminSleepTime; diff --git a/CORE/MAC/src/pe/include/schGlobal.h b/CORE/MAC/src/pe/include/schGlobal.h index 1142e951190f..2b04ba2e4a6c 100644 --- a/CORE/MAC/src/pe/include/schGlobal.h +++ b/CORE/MAC/src/pe/include/schGlobal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -44,23 +44,6 @@ #include "parserApi.h" - -#define ANI_SCH_ADAPTIVE_THRESHOLD_TH_CD 0x00000001 -#define ANI_SCH_ADAPTIVE_THRESHOLD_TH_D0 0x00000002 - -#define ANI_SCH_ADAPTIVE_THRESHOLD_ALL (ANI_SCH_ADAPTIVE_THRESHOLD_TH_CD | ANI_SCH_ADAPTIVE_THRESHOLD_TH_D0) - -#define ANI_SCH_ADAPTIVE_ALGO_BAND_2GHZ 0x00000001 -#define ANI_SCH_ADAPTIVE_ALGO_BAND_5GHZ 0x00000002 - -#define ANI_SCH_ADAPTIVE_ALGO_BAND_ALL (ANI_SCH_ADAPTIVE_ALGO_BAND_2GHZ | ANI_SCH_ADAPTIVE_ALGO_BAND_5GHZ) - - -// Diagnostic bitmap defines - -#define SCH_DIAG_RR_TIMEOUT_DELETE 0x1 -#define SCH_DIAG_RR_LOWER_RATE 0x2 - #ifdef WLAN_SOFTAP_VSTA_FEATURE #define TIM_IE_SIZE 0xB #else diff --git a/CORE/MAC/src/pe/include/wmmApsd.h b/CORE/MAC/src/pe/include/wmmApsd.h index 4f1f47f1f4d5..fc112290d7a0 100644 --- a/CORE/MAC/src/pe/include/wmmApsd.h +++ b/CORE/MAC/src/pe/include/wmmApsd.h @@ -30,19 +30,6 @@ #include "aniGlobal.h" -// WMM Info Element OUI subtypes -#define WMM_APSD_INFO_ELEMENT 0 -#define WMM_APSD_PARAM_ELEMENT 1 - -// Length of IEs (Including the EID byte). -#define WMM_INFO_ELEMENT_LENGTH_TOTAL 8 -#define WMM_PARAM_ELEMENT_LENGTH_TOTAL 25 - -// IE lenght. -#define WMM_INFO_ELEMENT_LENGTH 7 -#define WMM_PARAM_ELEMENT_LENGTH 24 - - // UAPSD Flag for each AC (WMM spec 2.2.1) #define LIM_UAPSD_BITOFFSET_ACVO 0 #define LIM_UAPSD_BITOFFSET_ACVI 1 @@ -56,19 +43,8 @@ #define LIM_UAPSD_GET(ac, mask) (((mask) & (LIM_UAPSD_FLAG_ ## ac)) >> LIM_UAPSD_BITOFFSET_ ## ac) -// Definitions for AC mode. -#define AC_DELIVERY_ENABLED 0x1 -#define AC_TRIGGER_ENABLED 0x2 -#define ALL_AC_UAPSD_SET 0x0F - // Definition for setting/clearing Uapsd Mask #define SET_UAPSD_MASK 1 #define CLEAR_UAPSD_MASK 0 -#define ac2tcId(ac) (ac << 1) - -// Function prototypes. -extern void apsdSendQosNull(tpAniSirGlobal pMac, tANI_U16 staId, tANI_U8 tcId, tANI_U8 *staAddr); - - #endif /* __WMMAPSD_H__ */ diff --git a/CORE/MAC/src/pe/lim/limAdmitControl.c b/CORE/MAC/src/pe/lim/limAdmitControl.c index 40cd78311cec..8259c1be9c1b 100644 --- a/CORE/MAC/src/pe/lim/limAdmitControl.c +++ b/CORE/MAC/src/pe/lim/limAdmitControl.c @@ -47,7 +47,6 @@ #define ADMIT_CONTROL_LOGLEVEL LOG1 #define ADMIT_CONTROL_POLICY_LOGLEVEL LOG1 -#define ADMIT_CONTROL_MIN_INTERVAL 1000 // min acceptable service interval 1mSec /* total available bandwidth in bps in each phy mode * these should be defined in hal or dph - replace these later diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c index d4b756349d9a..d03e92c1afae 100644 --- a/CORE/MAC/src/pe/lim/limApi.c +++ b/CORE/MAC/src/pe/lim/limApi.c @@ -1795,28 +1795,6 @@ tSirRetStatus limUpdateShortSlot(tpAniSirGlobal pMac, tpSirProbeRespBeacon pBeac return eSIR_SUCCESS; } - - - - - - -/** ----------------------------------------------------------------- - \brief limHandleLowRssiInd() - handles low rssi indication - - This function process the SIR_HAL_LOW_RSSI_IND message from - HAL, and sends a eWNI_SME_LOW_RSSI_IND to CSR. - - \param pMac - global mac structure - - \return - - \sa - ----------------------------------------------------------------- */ -void limHandleLowRssiInd(tpAniSirGlobal pMac) -{ -} - /** ----------------------------------------------------------------- \brief limHandleMissedBeaconInd() - handles missed beacon indication diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c index 113853347c5a..fecb2adff2cd 100644 --- a/CORE/MAC/src/pe/lim/limAssocUtils.c +++ b/CORE/MAC/src/pe/lim/limAssocUtils.c @@ -1534,7 +1534,6 @@ tSirRetStatus limPopulateVhtMcsSet(tpAniSirGlobal pMac, tANI_U32 selfStaDot11Mode=0; wlan_cfgGetInt(pMac,WNI_CFG_DOT11_MODE,&selfStaDot11Mode); -// if(IS_DOT11_MODE_VHT(psessionEntry->dot11mode)) if (IS_DOT11_MODE_VHT(selfStaDot11Mode)) { if ( wlan_cfgGetInt( pMac,WNI_CFG_VHT_RX_MCS_MAP,&val) != @@ -1793,8 +1792,6 @@ limPopulateOwnRateSet(tpAniSirGlobal pMac, } - - //if(IS_DOT11_MODE_HT(psessionEntry->dot11mode)) if (IS_DOT11_MODE_HT(selfStaDot11Mode)) { val = SIZE_OF_SUPPORTED_MCS_SET; diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c index 7a9d4047911f..b31c5589f24c 100644 --- a/CORE/MAC/src/pe/lim/limFT.c +++ b/CORE/MAC/src/pe/lim/limFT.c @@ -49,11 +49,6 @@ #include <limAdmitControl.h> #include "wmmApsd.h" -#define LIM_FT_RIC_BA_SSN 1 -#define LIM_FT_RIC_BA_DIALOG_TOKEN_TID_0 248 -#define LIM_FT_RIC_DESCRIPTOR_RESOURCE_TYPE_BA 1 -#define LIM_FT_RIC_DESCRIPTOR_MAX_VAR_DATA_LEN 255 - extern void limSendSetStaKeyReq( tpAniSirGlobal pMac, tLimMlmSetKeysReq *pMlmSetKeysReq, tANI_U16 staIdx, diff --git a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c index 4fab65bdd988..f83aebc95dc9 100644 --- a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c @@ -317,8 +317,11 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub tpDphHashNode pStaDs; tpSirAssocRsp pAssocRsp; tLimMlmAssocCnf mlmAssocCnf; - - tSchBeaconStruct *pBeaconStruct; + tSchBeaconStruct *pBeaconStruct; +#ifdef WLAN_FEATURE_ROAM_OFFLOAD + tANI_U8 smeSessionId = 0; + tANI_U32 r0kh_id_len; +#endif //Initialize status code to success. #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -328,6 +331,10 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub #endif pHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo); +#ifdef WLAN_FEATURE_ROAM_OFFLOAD + smeSessionId = psessionEntry->smeSessionId; +#endif + mlmAssocCnf.resultCode = eSIR_SME_SUCCESS; /* Update PE session Id*/ mlmAssocCnf.sessionId = psessionEntry->peSessionId; @@ -527,6 +534,23 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub } #endif +#ifdef WLAN_FEATURE_ROAM_OFFLOAD + if(pAssocRsp->FTInfo.R0KH_ID.present) + { + r0kh_id_len = pAssocRsp->FTInfo.R0KH_ID.num_PMK_R0_ID; + pMac->roam.roamSession[smeSessionId].ftSmeContext.r0kh_id_len = + (r0kh_id_len >= sizeof(tANI_U32))? sizeof(tANI_U32):r0kh_id_len; + vos_mem_copy(&pMac->roam.roamSession[smeSessionId].ftSmeContext.r0kh_id, + &pAssocRsp->FTInfo.R0KH_ID.PMK_R0_ID[0], + pMac->roam.roamSession[smeSessionId].ftSmeContext.r0kh_id_len); + } + else + { + pMac->roam.roamSession[smeSessionId].ftSmeContext.r0kh_id_len = 0; + pMac->roam.roamSession[smeSessionId].ftSmeContext.r0kh_id = 0; + } +#endif + #ifdef FEATURE_WLAN_ESE if (psessionEntry->tspecIes != NULL) { diff --git a/CORE/MAC/src/pe/lim/limProcessLmmMessages.c b/CORE/MAC/src/pe/lim/limProcessLmmMessages.c deleted file mode 100644 index 5148c3f48641..000000000000 --- a/CORE/MAC/src/pe/lim/limProcessLmmMessages.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * - * This file limProcessLmmMessages.cc contains the code - * for processing SME/LMM messages related to ANI feature set. - * Author: Chandra Modumudi - * Date: 10/20/02 - * History:- - * Date Modified by Modification Information - * -------------------------------------------------------------------- - * - */ - -#include "aniGlobal.h" -#include "wniApi.h" -#include "wniCfgSta.h" -#include "cfgApi.h" -#include "sirApi.h" -#include "schApi.h" -#include "utilsApi.h" -#include "limTypes.h" -#include "limUtils.h" -#include "limAssocUtils.h" -#include "limSerDesUtils.h" -#include "limPropExtsUtils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R -#include "limFTDefs.h" -#endif -#include "limSession.h" diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c index 3eea3723f58a..ec64e29725ba 100644 --- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c +++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c @@ -1267,10 +1267,7 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) break; case eWNI_SME_START_REQ: case eWNI_SME_SYS_READY_IND: -#ifndef WNI_ASKEY_NON_SUPPORT_FEATURE case eWNI_SME_JOIN_REQ: -#endif - case eWNI_SME_AUTH_REQ: case eWNI_SME_REASSOC_REQ: case eWNI_SME_START_BSS_REQ: case eWNI_SME_STOP_BSS_REQ: @@ -1279,9 +1276,6 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) case eWNI_SME_SWITCH_CHL_CB_SECONDARY_REQ: case eWNI_SME_SETCONTEXT_REQ: case eWNI_SME_REMOVEKEY_REQ: -#ifndef WNI_ASKEY_NON_SUPPORT_FEATURE - case eWNI_SME_PROMISCUOUS_MODE_REQ: -#endif case eWNI_SME_DISASSOC_CNF: case eWNI_SME_DEAUTH_CNF: case eWNI_SME_ASSOC_CNF: @@ -1522,10 +1516,6 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) pmmOffloadProcessMessage(pMac, limMsg); break; - case WDA_LOW_RSSI_IND: - //limHandleLowRssiInd(pMac); - break; - case WDA_MISSED_BEACON_IND: if(pMac->psOffloadEnabled) limPsOffloadHandleMissedBeaconInd(pMac, limMsg); @@ -1818,13 +1808,10 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) #endif - case WDA_SET_MIMOPS_RSP: //limProcessSetMimoRsp(pMac, limMsg); - case WDA_SET_TX_POWER_RSP: //limProcessSetTxPowerRsp(pMac, limMsg); - case WDA_GET_TX_POWER_RSP: //limProcessGetTxPowerRsp(pMac, limMsg); - case WDA_GET_NOISE_RSP: + case WDA_SET_MIMOPS_RSP: + case WDA_SET_TX_POWER_RSP: vos_mem_free((v_VOID_t*)limMsg->bodyptr); limMsg->bodyptr = NULL; - //limProcessGetNoiseRsp(pMac, limMsg); break; case WDA_SET_MAX_TX_POWER_RSP: @@ -1845,10 +1832,7 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) limMsg->type); /*a message from HAL indicating addr2 mismatch interrupt occurred limMsg->bodyptr contains only pointer to 48-bit addr2 field*/ - //Dinesh fix this. the third parameter should be sessionentry. - //limHandleUnknownA2IndexFrames(pMac, (void *)limMsg->bodyptr); - /*Free message body pointer*/ vos_mem_free((v_VOID_t *)(limMsg->bodyptr)); limMsg->bodyptr = NULL; break; diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c index 6b7d46261067..e0ac873cce73 100644 --- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c @@ -652,12 +652,6 @@ limProcessMlmAuthCnf(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) */ psessionEntry->limSmeState = psessionEntry->limPrevSmeState; MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, psessionEntry->peSessionId, psessionEntry->limSmeState)); - limSendSmeAuthRsp( - pMac, - ((tLimMlmAuthCnf *) pMsgBuf)->resultCode, - ((tLimMlmAuthCnf *) pMsgBuf)->peerMacAddr, - ((tLimMlmAuthCnf *) pMsgBuf)->authType, - ((tLimMlmAuthCnf *) pMsgBuf)->protStatusCode,psessionEntry,psessionEntry->smeSessionId,psessionEntry->transactionId); } } // end if (cfgAuthType == eAUTO_SWITCH) } // if (((tLimMlmAuthCnf *) pMsgBuf)->resultCode != ... @@ -791,12 +785,6 @@ limProcessMlmAuthCnf(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) */ psessionEntry->limSmeState = psessionEntry->limPrevSmeState; MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, psessionEntry->peSessionId, psessionEntry->limSmeState)); - limSendSmeAuthRsp( - pMac, - ((tLimMlmAuthCnf *) pMsgBuf)->resultCode, - ((tLimMlmAuthCnf *) pMsgBuf)->peerMacAddr, - ((tLimMlmAuthCnf *) pMsgBuf)->authType, - ((tLimMlmAuthCnf *) pMsgBuf)->protStatusCode,psessionEntry,psessionEntry->smeSessionId,psessionEntry->transactionId); } } // end if (((tLimMlmAuthCnf *) pMsgBuf)->resultCode != ... } /*** end limProcessMlmAuthCnf() ***/ @@ -1395,8 +1383,6 @@ limProcessMlmDisassocCnf(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) else psessionEntry->limSmeState = eLIM_SME_OFFLINE_STATE; MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, psessionEntry->peSessionId, psessionEntry->limSmeState)); - // Send Promiscuous mode response to host - limSendSmePromiscuousModeRsp(pMac); } else { @@ -4492,29 +4478,7 @@ returnAfterCleanup: vos_mem_free(limMsgQ->bodyptr); limMsgQ->bodyptr = NULL; } -/** - * @function : limProcessSetMimoRsp() - * - * @brief : This function is called upon receiving the WDA_SET_MIMOPS_RSP from the HAL - * after Processing the Req from the SME (PMC) - * - * LOGIC: - * - * ASSUMPTIONS: - * NA - * - * NOTE: - * NA - * - * @param pMac - Pointer to Global MAC structure - * @param limMsg - Lim Message structure object with the MimoPSparam in body - * @return None - */ -void -limProcessSetMimoRsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) -{ -} /** * @function : limHandleDelBssInReAssocContext * @brief : While Processing the ReAssociation Response Frame in STA, diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c index 6f42fb4aad7b..b696c2b5d9bb 100644 --- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c @@ -5598,21 +5598,11 @@ limProcessSmeReqMessages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) __limProcessSmeJoinReq(pMac, pMsgBuf); break; - case eWNI_SME_AUTH_REQ: - // __limProcessSmeAuthReq(pMac, pMsgBuf); - - break; - case eWNI_SME_REASSOC_REQ: __limProcessSmeReassocReq(pMac, pMsgBuf); break; - case eWNI_SME_PROMISCUOUS_MODE_REQ: - //__limProcessSmePromiscuousReq(pMac, pMsgBuf); - - break; - case eWNI_SME_DISASSOC_REQ: __limProcessSmeDisassocReq(pMac, pMsgBuf); diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c index f0ae2927af5b..fb8058ff464d 100644 --- a/CORE/MAC/src/pe/lim/limProcessTdls.c +++ b/CORE/MAC/src/pe/lim/limProcessTdls.c @@ -243,19 +243,12 @@ enum tdls_peer_capability { } eTdlsPeerCapability; /* some local defines */ -#define LINK_IDEN_BSSID_OFFSET (0) -#define PEER_MAC_OFFSET (12) -#define STA_MAC_OFFSET (6) -#define LINK_IDEN_ELE_ID (101) -//#define LINK_IDEN_LENGTH (18) #define LINK_IDEN_ADDR_OFFSET(x) (&x.LinkIdentifier) #define PTI_LINK_IDEN_OFFSET (5) #define PTI_BUF_STATUS_OFFSET (25) /* TODO, Move this parameters to configuration */ #define PEER_PSM_SUPPORT (0) -#define PEER_BUFFER_STA_SUPPORT (0) -#define CH_SWITCH_SUPPORT (0) #define TDLS_SUPPORT (1) #define TDLS_PROHIBITED (0) #define TDLS_CH_SWITCH_PROHIBITED (1) @@ -282,7 +275,6 @@ enum tdls_peer_capability { #ifdef LIM_DEBUG_TDLS #ifdef FEATURE_WLAN_TDLS -#define WNI_CFG_TDLS_DISCOVERY_RSP_WAIT (100) #define WNI_CFG_TDLS_LINK_SETUP_RSP_TIMEOUT (800) #define WNI_CFG_TDLS_LINK_SETUP_CNF_TIMEOUT (200) #endif diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c index c29120472dbe..998da5ae7a4a 100644 --- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c +++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c @@ -271,69 +271,6 @@ static void limSendSmeJoinReassocRspAfterResume( tpAniSirGlobal pMac, limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT); } -/** - * limGetMaxRateFlags() - * - *FUNCTION: - *This function is called by limSendSmeJoinReassocRsp get rateFlags. - *These rateflags are used when MAX link-speed need to be reported - *to UI. - * - *PARAMS: - * @param pStaDs - Pointer to internal STA Datastructure - * @param psessionEntry - Pointer to the session entry - * - *LOGIC: - * - *ASSUMPTIONS: - * - *NOTE: - * - * @return rateFlags - */ -tANI_U32 limGetMaxRateFlags(tpDphHashNode pStaDs, tpPESession psessionEntry) -{ - tANI_U32 rate_flags = 0; - - if (NULL == psessionEntry) - { - return rate_flags; - } - - if(!IS_DOT11_MODE_HT(psessionEntry->dot11mode) && - !IS_DOT11_MODE_VHT(psessionEntry->dot11mode)) - { - rate_flags |= eHAL_TX_RATE_LEGACY; - } - else - { - if(IS_DOT11_MODE_HT(psessionEntry->dot11mode)) - { - if (pStaDs->htShortGI20Mhz || pStaDs->htShortGI40Mhz ) - rate_flags |= eHAL_TX_RATE_SGI; - - if (pStaDs->htDsssCckRate40MHzSupport) - rate_flags |=eHAL_TX_RATE_HT40; - else - rate_flags |=eHAL_TX_RATE_HT20; - } -#ifdef WLAN_FEATURE_11AC - if(IS_DOT11_MODE_VHT(psessionEntry->dot11mode)) - { - if (eHT_CHANNEL_WIDTH_80MHZ == pStaDs->vhtSupportedChannelWidthSet) - rate_flags |= eHAL_TX_RATE_VHT80; - - if (eHT_CHANNEL_WIDTH_40MHZ == pStaDs->vhtSupportedChannelWidthSet) - rate_flags |= eHAL_TX_RATE_VHT40; - - if (eHT_CHANNEL_WIDTH_20MHZ == pStaDs->vhtSupportedChannelWidthSet) - rate_flags |= eHAL_TX_RATE_VHT20; - } -#endif - } - - return rate_flags; -} /** * limSendSmeJoinReassocRsp() @@ -439,10 +376,6 @@ limSendSmeJoinReassocRsp(tpAniSirGlobal pMac, tANI_U16 msgType, pSirSmeJoinRsp->staId = pStaDs->staIndex; pSirSmeJoinRsp->ucastSig = pStaDs->ucUcastSig; pSirSmeJoinRsp->bcastSig = pStaDs->ucBcastSig; - pSirSmeJoinRsp->maxRateFlags = - limGetMaxRateFlags(pStaDs, psessionEntry); - PELOGE(limLog(pMac, LOG1, FL("maxRateFlags: %x"), - pSirSmeJoinRsp->maxRateFlags);) pSirSmeJoinRsp->timingMeasCap = pStaDs->timingMeasCap; } } @@ -617,6 +550,7 @@ limSendSmeJoinReassocRsp(tpAniSirGlobal pMac, tANI_U16 msgType, } /*** end limSendSmeJoinReassocRsp() ***/ + /** * limSendSmeStartBssRsp() * @@ -787,6 +721,10 @@ limSendSmeStartBssRsp(tpAniSirGlobal pMac, limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT); } /*** end limSendSmeStartBssRsp() ***/ + + + + #define LIM_MAX_NUM_OF_SCAN_RESULTS_REPORTED 20 #define LIM_SIZE_OF_EACH_BSS 400 // this is a rough estimate @@ -1359,41 +1297,6 @@ void limSendSmeOemDataRsp(tpAniSirGlobal pMac, tANI_U32* pMsgBuf, tSirResultCode #endif -/** - * limSendSmeAuthRsp() - * - *FUNCTION: - * This function is called by limProcessSmeMessages() to send - * eWNI_SME_AUTH_RSP message to host - * - *PARAMS: - * - *LOGIC: - * - *ASSUMPTIONS: - * NA - * - *NOTE: - * NA - * - * @param pMac Pointer to Global MAC structure - * @param statusCode Indicates the result of previously issued - * eWNI_SME_AUTH_REQ message - * - * @return None - */ -void -limSendSmeAuthRsp(tpAniSirGlobal pMac, - tSirResultCodes statusCode, - tSirMacAddr peerMacAddr, - tAniAuthType authType, - tANI_U16 protStatusCode, - tpPESession psessionEntry,tANI_U8 smesessionId, - tANI_U16 smetransactionId) -{ -} /*** end limSendSmeAuthRsp() ***/ - - void limSendSmeDisassocDeauthNtf( tpAniSirGlobal pMac, eHalStatus status, tANI_U32 *pCtx ) { @@ -2247,34 +2150,6 @@ limSendSmeRemoveKeyRsp(tpAniSirGlobal pMac, /** - * limSendSmePromiscuousModeRsp() - * - *FUNCTION: - * This function is called by limProcessSmeMessages() to send - * eWNI_PROMISCUOUS_MODE_RSP message to host - * - *PARAMS: - * - *LOGIC: - * - *ASSUMPTIONS: - * NA - * - *NOTE: - * This function is used for sending eWNI_SME_PROMISCUOUS_MODE_RSP to - * host as a reply to eWNI_SME_PROMISCUOUS_MODE_REQ directive from it. - * - * @param None - * @return None - */ -void -limSendSmePromiscuousModeRsp(tpAniSirGlobal pMac) -{ -} /*** end limSendSmePromiscuousModeRsp() ***/ - - - -/** * limSendSmeNeighborBssInd() * *FUNCTION: diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h index ea14639bf931..e52d3ffb8778 100644 --- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h +++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h @@ -52,8 +52,6 @@ void limSendSmeScanRsp(tpAniSirGlobal, tANI_U16, tSirResultCodes,tANI_U8, tANI_U void limSendSmeLfrScanRsp(tpAniSirGlobal, tANI_U16, tSirResultCodes,tANI_U8, tANI_U16); #endif void limPostSmeScanRspMessage(tpAniSirGlobal, tANI_U16, tSirResultCodes,tANI_U8,tANI_U16); -void limSendSmeAuthRsp(tpAniSirGlobal, tSirResultCodes, - tSirMacAddr, tAniAuthType, tANI_U16,tpPESession,tANI_U8,tANI_U16); void limSendSmeJoinReassocRsp(tpAniSirGlobal, tANI_U16, tSirResultCodes, tANI_U16,tpPESession,tANI_U8,tANI_U16); void limSendSmeDisassocNtf(tpAniSirGlobal, tSirMacAddr, tSirResultCodes, tANI_U16, tANI_U16,tANI_U8,tANI_U16,tpPESession); @@ -67,7 +65,6 @@ void limSendSmeCandidateFoundInd(tpAniSirGlobal, tANI_U8); void limSendSmeWmStatusChangeNtf(tpAniSirGlobal, tSirSmeStatusChangeCode, tANI_U32 *, tANI_U16, tANI_U8); void limSendSmeSetContextRsp(tpAniSirGlobal, tSirMacAddr, tANI_U16, tSirResultCodes,tpPESession,tANI_U8,tANI_U16); -void limSendSmePromiscuousModeRsp(tpAniSirGlobal pMac); void limSendSmeNeighborBssInd(tpAniSirGlobal, tLimScanResultNode *); void limHandleDeleteBssRsp(tpAniSirGlobal pMac,tpSirMsgQ MsgQ); diff --git a/CORE/MAC/src/pe/lim/limSmeReqUtils.c b/CORE/MAC/src/pe/lim/limSmeReqUtils.c index 42ebaf93f632..6385aa1b2a3e 100644 --- a/CORE/MAC/src/pe/lim/limSmeReqUtils.c +++ b/CORE/MAC/src/pe/lim/limSmeReqUtils.c @@ -904,45 +904,6 @@ end: } /*** end limIsSmeScanReqValid() ***/ - -/** - * limIsSmeAuthReqValid() - * - *FUNCTION: - * This function is called by limProcessSmeReqMessages() upon - * receiving SME_AUTH_REQ message from application. - * - *LOGIC: - * Message validity checks are performed in this function - * - *ASSUMPTIONS: - * - *NOTE: - * - * @param pAuthReq Pointer to received SME_AUTH_REQ message - * @return true when received SME_AUTH_REQ is formatted correctly - * false otherwise - */ - -tANI_U8 -limIsSmeAuthReqValid(tpSirSmeAuthReq pAuthReq) -{ - tANI_U8 valid = true; - - if (limIsGroupAddr(pAuthReq->peerMacAddr) || - (pAuthReq->authType > eSIR_AUTO_SWITCH) || - !pAuthReq->channelNumber) - { - valid = false; - goto end; - } - -end: - return valid; -} /*** end limIsSmeAuthReqValid() ***/ - - - /** * limIsSmeSetContextReqValid() * diff --git a/CORE/MAC/src/pe/lim/limSmeReqUtils.h b/CORE/MAC/src/pe/lim/limSmeReqUtils.h index bb3560e7b542..6dbf0fe64262 100644 --- a/CORE/MAC/src/pe/lim/limSmeReqUtils.h +++ b/CORE/MAC/src/pe/lim/limSmeReqUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -50,7 +50,6 @@ tANI_U8 limSetRSNieWPAiefromSmeStartBSSReqMessage(tpAniSirGlobal, tpPESession); tANI_U8 limIsSmeScanReqValid(tpAniSirGlobal, tpSirSmeScanReq); tANI_U8 limIsSmeJoinReqValid(tpAniSirGlobal, tpSirSmeJoinReq); -tANI_U8 limIsSmeAuthReqValid(tpSirSmeAuthReq); tANI_U8 limIsSmeDisassocReqValid(tpAniSirGlobal, tpSirSmeDisassocReq, tpPESession); tANI_U8 limIsSmeDeauthReqValid(tpAniSirGlobal, tpSirSmeDeauthReq, tpPESession); tANI_U8 limIsSmeSetContextReqValid(tpAniSirGlobal, tpSirSmeSetContextReq); diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c index 3285446cb6b0..14468be14a3f 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -70,7 +70,6 @@ * this information. */ static tAniBool glimTriggerBackgroundScanDuringQuietBss_Status = eSIR_TRUE; -#define SUCCESS 1 //defined temporarily for BT-AMP #define MAX_BA_WINDOW_SIZE_FOR_CISCO 25 @@ -477,10 +476,6 @@ char *limMsgStr(tANI_U32 msgType) return "eWNI_SME_REASSOC_REQ"; case eWNI_SME_REASSOC_RSP: return "eWNI_SME_REASSOC_RSP"; - case eWNI_SME_AUTH_REQ: - return "eWNI_SME_AUTH_REQ"; - case eWNI_SME_AUTH_RSP: - return "eWNI_SME_AUTH_RSP"; case eWNI_SME_DISASSOC_REQ: return "eWNI_SME_DISASSOC_REQ"; case eWNI_SME_DISASSOC_RSP: @@ -523,10 +518,6 @@ char *limMsgStr(tANI_U32 msgType) return "eWNI_SME_STOP_BSS_REQ"; case eWNI_SME_STOP_BSS_RSP: return "eWNI_SME_STOP_BSS_RSP"; - case eWNI_SME_PROMISCUOUS_MODE_REQ: - return "eWNI_SME_PROMISCUOUS_MODE_REQ"; - case eWNI_SME_PROMISCUOUS_MODE_RSP: - return "eWNI_SME_PROMISCUOUS_MODE_RSP"; case eWNI_SME_NEIGHBOR_BSS_IND: return "eWNI_SME_NEIGHBOR_BSS_IND"; case eWNI_SME_MEASUREMENT_REQ: @@ -3079,21 +3070,6 @@ void limProcessQuietBssTimeout( tpAniSirGlobal pMac ) } } } -/** - * limProcessWPSOverlapTimeout - * - * FUNCTION: This function call limWPSPBCTimeout() to clean WPS PBC probe request entries - * - * LOGIC: - * - * ASSUMPTIONS: - * - * NOTE: - * - * @param pMac - Pointer to Global MAC structure - * - * @return None - */ /**---------------------------------------------- \fn limStartQuietTimer diff --git a/CORE/MAC/src/pe/pmm/pmmApi.c b/CORE/MAC/src/pe/pmm/pmmApi.c index f19742704859..cba7b151acf5 100644 --- a/CORE/MAC/src/pe/pmm/pmmApi.c +++ b/CORE/MAC/src/pe/pmm/pmmApi.c @@ -232,9 +232,6 @@ void pmmInitBmpsResponseHandler(tpAniSirGlobal pMac, tpSirMsgQ limMsg ) pMac->pmm.gPmmState = ePMM_STATE_BMPS_SLEEP; - // Update sleep statistics - pmmUpdatePwrSaveStats(pMac); - // Disable background scan mode pMac->sys.gSysEnableScanMode = false; @@ -836,11 +833,6 @@ void pmmExitBmpsResponseHandler(tpAniSirGlobal pMac, tpSirMsgQ limMsg) return; } - - - /* Update wakeup statistics */ - pmmUpdateWakeupStats(pMac); - if (NULL == limMsg->bodyptr) { pmmLog(pMac, LOGE, FL("Received SIR_HAL_EXIT_BMPS_RSP with NULL ")); @@ -885,7 +877,6 @@ void pmmExitBmpsResponseHandler(tpAniSirGlobal pMac, tpSirMsgQ limMsg) } pMac->pmm.gPmmState = ePMM_STATE_BMPS_WAKEUP; - pmmUpdateWakeupStats(pMac); // turn on background scan pMac->sys.gSysEnableScanMode = true; @@ -1050,9 +1041,7 @@ void pmmExitBmpsIndicationHandler(tpAniSirGlobal pMac, tANI_U8 mode, eHalStatus PELOGW(pmmLog(pMac, LOGW, FL("pmmBmps: Received SIR_HAL_EXIT_BMPS_IND from HAL, Exiting BMPS sleep mode")); ) - pMac->pmm.gPmmState = ePMM_STATE_BMPS_WAKEUP; - pmmUpdateWakeupStats(pMac); /* turn on background scan */ pMac->sys.gSysEnableScanMode = true; @@ -1315,51 +1304,6 @@ pmmPostMessage(tpAniSirGlobal pMac, tpSirMsgQ pMsg) return eSIR_SUCCESS; } - - - - -/** - * pmmUpdatePwrSaveStats - * - * FUNCTION: updated BMPS stats, when Station is going into power save state. - * - * LOGIC: - * - * ASSUMPTIONS: - * - * NOTE: - * - * @param pMac pointer to Global MAC Structure. - * @return None - */ - -void pmmUpdatePwrSaveStats(tpAniSirGlobal pMac) -{ -} - - - - -/** - * pmmUpdatePwrSaveStats - * - * FUNCTION: updated BMPS stats, when Station is waking up. - * - * LOGIC: - * - * ASSUMPTIONS: - * - * NOTE: - * - * @param pMac pointer to Global MAC Structure. - * @return None - */ - -void pmmUpdateWakeupStats(tpAniSirGlobal pMac) -{ -} - // -------------------------------------------------------------------- /** * pmmEnterImpsRequestHandler diff --git a/CORE/SERVICES/BMI/ol_fw.h b/CORE/SERVICES/BMI/ol_fw.h index 89f62379f43f..c52db71d2927 100644 --- a/CORE/SERVICES/BMI/ol_fw.h +++ b/CORE/SERVICES/BMI/ol_fw.h @@ -52,7 +52,7 @@ #define QCA_OTP_FILE "otp.bin" #define QCA_SETUP_FILE "athsetup.bin" #define AR61X4_SINGLE_FILE "qca61x4.bin" -#define QCA_FIRMWARE_EPPING_FILE "endpointping.bin" +#define QCA_FIRMWARE_EPPING_FILE "epping.bin" /* Configuration for statistics pushed by firmware */ #define PDEV_DEFAULT_STATS_UPDATE_PERIOD 500 diff --git a/CORE/SERVICES/COMMON/dbglog_id.h b/CORE/SERVICES/COMMON/dbglog_id.h index b808e3ca3f55..eb5b32d6992d 100644 --- a/CORE/SERVICES/COMMON/dbglog_id.h +++ b/CORE/SERVICES/COMMON/dbglog_id.h @@ -839,7 +839,8 @@ extern "C" { #define WOW_ARP_REPLIED 20 #define WOW_BEACON_OFFLOAD_TX 21 #define WOW_BEACON_OFFLOAD_CFG 22 -#define WOW_DBGID_DEFINITION_END 23 +#define WOW_IBSS_VDEV_ALLOW 23 +#define WOW_DBGID_DEFINITION_END 24 /* SWBMISS module DBGIDs */ #define SWBMISS_DBGID_DEFINITION_START 0 diff --git a/CORE/SERVICES/COMMON/ol_htt_tx_api.h b/CORE/SERVICES/COMMON/ol_htt_tx_api.h index 323c71d0b2fa..f4eeafbf9aac 100644 --- a/CORE/SERVICES/COMMON/ol_htt_tx_api.h +++ b/CORE/SERVICES/COMMON/ol_htt_tx_api.h @@ -154,6 +154,8 @@ struct htt_msdu_info_t { u_int8_t use_6mbps; /* mgmt frames: option to force 6 Mbps rate */ u_int8_t do_encrypt; u_int8_t do_tx_complete; + u_int8_t tx_comp_req; + /* * cksum_offload - Specify whether checksum offload is enabled or not * Target FW uses this flag to turn on HW checksumming @@ -409,6 +411,7 @@ htt_tx_desc_init( HTT_TX_DESC_VDEV_ID_SET(local_word0, msdu_info->info.vdev_id); HTT_TX_DESC_EXT_TID_SET(local_word0, msdu_info->info.ext_tid); HTT_TX_DESC_CKSUM_OFFLOAD_SET(local_word0, msdu_info->action.cksum_offload); + HTT_TX_DESC_TX_COMP_SET(local_word0, msdu_info->action.tx_comp_req); HTT_TX_DESC_NO_ENCRYPT_SET(local_word0, msdu_info->action.do_encrypt ? 0 : 1); *word0 = local_word0; diff --git a/CORE/SERVICES/COMMON/ol_txrx_htt_api.h b/CORE/SERVICES/COMMON/ol_txrx_htt_api.h index e0e07e6ccf69..9a1f164f9b3c 100644 --- a/CORE/SERVICES/COMMON/ol_txrx_htt_api.h +++ b/CORE/SERVICES/COMMON/ol_txrx_htt_api.h @@ -164,6 +164,9 @@ ol_tx_completion_handler( enum htt_tx_status status, void *tx_msdu_id_iterator); +void +ol_tx_credit_completion_handler(ol_txrx_pdev_handle pdev, int credits); + /** * @brief Init the total amount of target credit. * @details diff --git a/CORE/SERVICES/COMMON/wlan_tgt_def_config_hl.h b/CORE/SERVICES/COMMON/wlan_tgt_def_config_hl.h index 1016a25dec2a..513d03259148 100644 --- a/CORE/SERVICES/COMMON/wlan_tgt_def_config_hl.h +++ b/CORE/SERVICES/COMMON/wlan_tgt_def_config_hl.h @@ -210,17 +210,7 @@ #ifndef HIF_SDIO #define CFG_TGT_NUM_MSDU_DESC (32) #else -/* - * For SDIO Only 16 tx-buffers are hooked onto SDIO MBOX DMA engine - * in Firmware. So set the targe number of descriptors to map the - * same. - * This is only temporary solution. - * The better solution is defining CFG_TGT_NUM_MSDU_DESC to be 0 - * and waiting for an initial TX_TARGET_CREDIT_UPDATE_IND message - * from the FW to know how many tx buffers the FW has provided - * for the host's downloads. - */ -#define CFG_TGT_NUM_MSDU_DESC (16) +#define CFG_TGT_NUM_MSDU_DESC (0) #endif /* * Maximum number of frag table entries diff --git a/CORE/SERVICES/HIF/sdio/hif_sdio_dev.c b/CORE/SERVICES/HIF/sdio/hif_sdio_dev.c index f81c835153ce..b0b34e67a720 100644 --- a/CORE/SERVICES/HIF/sdio/hif_sdio_dev.c +++ b/CORE/SERVICES/HIF/sdio/hif_sdio_dev.c @@ -290,12 +290,12 @@ A_STATUS HIFDevEnableInterrupts(HIF_SDIO_DEVICE *pDev) /* Set up the Error Interrupt Status Register */ pDev->IrqEnableRegisters.error_status_enable = - ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET(0x01) - | ERROR_STATUS_ENABLE_TX_OVERFLOW_SET(0x01); + (ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET(0x01) + | ERROR_STATUS_ENABLE_TX_OVERFLOW_SET(0x01)) >> 16; /* Set up the Counter Interrupt Status Register (only for debug interrupt to catch fatal errors) */ pDev->IrqEnableRegisters.counter_int_status_enable = - COUNTER_INT_STATUS_ENABLE_BIT_SET(AR6K_TARGET_DEBUG_INTR_MASK); + (COUNTER_INT_STATUS_ENABLE_BIT_SET(AR6K_TARGET_DEBUG_INTR_MASK)) >> 24; /* copy into our temp area */ A_MEMCPY(®s, diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index c72ebabb9a02..e7ed64cd0280 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -7316,10 +7316,12 @@ VOS_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE; roam_offload_11r = (wmi_roam_11r_offload_tlv_param *) buf_ptr; - roam_offload_11r->r0kh_id = 0; - roam_offload_11r->r0kh_id_len = 0; + roam_offload_11r->r0kh_id = roam_req->R0KH_ID; + roam_offload_11r->r0kh_id_len = roam_req->R0KH_ID_Length; vos_mem_copy (roam_offload_11r->psk_msk, roam_req->PSK_PMK, sizeof(roam_req->PSK_PMK)); + roam_offload_11r->mdie_present = roam_req->MDID.mdiePresent; + roam_offload_11r->mdid = roam_req->MDID.mobilityDomain; WMITLV_SET_HDR(&roam_offload_11r->tlv_header, WMITLV_TAG_STRUC_wmi_roam_11r_offload_tlv_param, WMITLV_GET_STRUCT_TLVLEN diff --git a/CORE/SERVICES/WMA/wma.h b/CORE/SERVICES/WMA/wma.h index efea0d2de048..2846e03f99f0 100644 --- a/CORE/SERVICES/WMA/wma.h +++ b/CORE/SERVICES/WMA/wma.h @@ -163,13 +163,13 @@ static const t_probeTime_dwellTime {28, 20}, /* 1 SSID */ {28, 20}, /* 2 SSID */ {28, 20}, /* 3 SSID */ - {28, 12}, /* 4 SSID */ - {28, 12}, /* 5 SSID */ - {28, 12}, /* 6 SSID */ - {28, 12}, /* 7 SSID */ - {28, 12}, /* 8 SSID */ - {28, 12}, /* 9 SSID */ - {28, 9} /* 10 SSID */ + {28, 20}, /* 4 SSID */ + {28, 20}, /* 5 SSID */ + {28, 20}, /* 6 SSID */ + {28, 11}, /* 7 SSID */ + {28, 11}, /* 8 SSID */ + {28, 11}, /* 9 SSID */ + {28, 8} /* 10 SSID */ }; /* Roaming default values diff --git a/CORE/SME/inc/ccmApi.h b/CORE/SME/inc/ccmApi.h index af33bd3a89ce..ddffaf0de083 100644 --- a/CORE/SME/inc/ccmApi.h +++ b/CORE/SME/inc/ccmApi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -39,12 +39,9 @@ #ifndef CCMAPI_H__ #define CCMAPI_H__ -//#include "wniCfgAp.h" /* CFG_PARAM_MAX_NUM */ #include "wniCfgSta.h" #include "halTypes.h" -#define CCM_11B_CHANNEL_END 14 - #define CCM_IS_RESULT_SUCCESS(result) (WNI_CFG_SUCCESS == (result) ||\ WNI_CFG_NEED_RESTART == (result) || \ WNI_CFG_NEED_RELOAD == (result)) diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h index c3c21a9b52fe..8e1c6e1b22bc 100644 --- a/CORE/SME/inc/csrApi.h +++ b/CORE/SME/inc/csrApi.h @@ -226,8 +226,6 @@ typedef enum }eIniChanBondState; -#define CSR_SCAN_TIME_DEFAULT 0 -#define CSR_VALUE_IGNORED 0xFFFFFFFF #define CSR_RSN_PMKID_SIZE 16 #define CSR_MAX_PMKID_ALLOWED 32 #define CSR_WEP40_KEY_LEN 5 @@ -1324,7 +1322,6 @@ typedef struct tagCsrRoamInfo tANI_U8* assocReqPtr; tANI_S8 rxRssi; - tANI_U32 maxRateFlags; tSirSmeDfsEventInd dfs_event; tSirChanChangeResponse *channelChangeRespEvent; tANI_U8 timingMeasCap; diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h index 6fed9fb387f8..eac4e1f3b818 100644 --- a/CORE/SME/inc/csrInternal.h +++ b/CORE/SME/inc/csrInternal.h @@ -50,11 +50,6 @@ #define CSR_MAX_STA (HAL_NUM_STA) -#define CSR_SME_SCAN_FLAGS_DELETE_CACHE 0x80 - -#define CSR_TITAN_MAX_RATE_MIMO_CB 240 -#define CSR_TITAN_MAX_RATE_MIMO 126 - //define scan return criteria. LIM should use these define as well #define CSR_SCAN_RETURN_AFTER_ALL_CHANNELS ( 0 ) #define CSR_SCAN_RETURN_AFTER_FIRST_MATCH ( 0x01 ) @@ -62,7 +57,6 @@ #define CSR_SCAN_RETURN_AFTER_24_BAND_11d_FOUND ( 0x40 ) #define CSR_SCAN_RETURN_AFTER_EITHER_BAND_11d_FOUND ( CSR_SCAN_RETURN_AFTER_5_BAND_11d_FOUND | CSR_SCAN_RETURN_AFTER_24_BAND_11d_FOUND ) #define CSR_NUM_RSSI_CAT 15 -#define CSR_MAX_STATISTICS_REQ 10 #define CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME 3 //Support for multiple session @@ -297,18 +291,6 @@ typedef enum }eCsrDiagWlanStatusEventReason; -typedef enum -{ - eCSR_WLAN_HANDOFF_EVENT =0, - -}eCsrDiagWlanHandoffEventSubtype; - -typedef enum -{ - eCSR_WLAN_VCC_EVENT =0, - -}eCsrDiagWlanVccEventSubtype; - #endif //FEATURE_WLAN_DIAG_SUPPORT typedef struct tagCsrChannel @@ -740,7 +722,7 @@ typedef struct tagCsrScanStruct tANI_U8 scanResultCfgAgingTime; //changes on every scan, a flag to tell whether conflict 11d info found on each BSS tANI_BOOLEAN fAmbiguous11dInfoFound; - //Tush: changes on every scan, a flag to tell whether the applied 11d info present in one of the scan results + //changes on every scan, a flag to tell whether the applied 11d info present in one of the scan results tANI_BOOLEAN fCurrent11dInfoMatch; tANI_BOOLEAN f11dInfoReset; //to indicate whether the 11d info in CFG is reset to default tSirScanType curScanType; @@ -1037,9 +1019,6 @@ typedef struct tagCsrRoamStruct eCsrRoamLinkQualityInd vccLinkQuality; tCsrLinkQualityIndInfo linkQualityIndInfo; v_CONTEXT_t gVosContext; //used for interaction with TL - //To specify whether an association or a IBSS is WMM enabled - //This parameter is only valid during a join or start BSS command is being executed - //tANI_BOOLEAN fWMMConnection; /* Moving it to be part of roamsession */ v_U8_t ucACWeights[WLANTL_MAX_AC]; /* TODO : Upto here */ tCsrTimerInfo WaitForKeyTimerInfo; @@ -1348,9 +1327,6 @@ eHalStatus csrGetTsmStats(tpAniSirGlobal pMac, tANI_U8 tid); #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -eHalStatus csrRoamRegisterCallback(tpAniSirGlobal pMac, - csrRoamCompleteCallback callback, - void *pContext); /* --------------------------------------------------------------------------- \fn csrGetConfigParam \brief HDD calls this function to get the global settings currently maintained by CSR. diff --git a/CORE/SME/inc/csrNeighborRoam.h b/CORE/SME/inc/csrNeighborRoam.h index 8658e71cba59..3daeb096b054 100644 --- a/CORE/SME/inc/csrNeighborRoam.h +++ b/CORE/SME/inc/csrNeighborRoam.h @@ -129,12 +129,6 @@ typedef struct sCsr11rAssocNeighborInfo } tCsr11rAssocNeighborInfo, *tpCsr11rAssocNeighborInfo; #endif /* WLAN_FEATURE_VOWIFI_11R */ -/* Below macros are used to increase the registered neighbor Lookup threshold with TL when - * we dont see any AP during back ground scanning. The values are incremented from neighborLookupThreshold - * from CFG, incremented by 5,10,15...50(LOOKUP_THRESHOLD_INCREMENT_MULTIPLIER_MAX * - * NEIGHBOR_LOOKUP_THRESHOLD_INCREMENT_CONSTANT) */ -#define NEIGHBOR_LOOKUP_THRESHOLD_INCREMENT_CONSTANT 5 -#define LOOKUP_THRESHOLD_INCREMENT_MULTIPLIER_MAX 4 /* * Set lookup UP threshold 5 dB higher than the configured * lookup DOWN threshold to minimize thrashing between diff --git a/CORE/SME/inc/csrSupport.h b/CORE/SME/inc/csrSupport.h index 3f69f5bfb4b6..9244090baf56 100644 --- a/CORE/SME/inc/csrSupport.h +++ b/CORE/SME/inc/csrSupport.h @@ -70,31 +70,8 @@ #define CSR_DOT11_SUPPORTED_RATES_MAX ( 12 ) #define CSR_DOT11_EXTENDED_SUPPORTED_RATES_MAX ( 8 ) -#define CSR_DOT11_MAX_NUM_SUPPORTED_11B_RATES ( 4 ) -#define CSR_DOT11_MAX_NUM_SUPPORTED_11A_RATES ( 8 ) #define CSR_DOT11_BASIC_RATE_MASK ( 0x80 ) -#define CSR_WME_INFO_IE_VERSION_SUPPORTED ( 1 ) -#define CSR_WME_PARM_IE_VERSION_SUPPORTED ( 1 ) - -#define CSR_PASSIVE_SCAN_STARTING_CHANNEL ( 52) -#define CSR_PASSIVE_SCAN_ENDING_CHANNEL ( 140) - -#define CSR_DOT11_MAX_11A_RATE ( 54 * 2 ) -#define CSR_DOT11_MIN_11A_RATE ( 6 * 2 ) -#define CSR_DOT11_MAX_11B_RATE ( 11 * 2 ) -#define CSR_DOT11_MIN_11B_RATE ( 1 * 2 ) -#define CSR_DOT11_MAX_11G_RATE ( 54 * 2 ) -#define CSR_DOT11_MIN_11G_RATE ( 6 * 2 ) - -//Define the frequency ranges that need to be passive scan, MHz -#define CSR_PASSIVE_SCAN_CAT1_LOW 5250 -#define CSR_PASSIVE_SCAN_CAT1_HIGH 5350 -#define CSR_PASSIVE_SCAN_CAT2_LOW 5470 -#define CSR_PASSIVE_SCAN_CAT2_HIGH 5725 -#define CSR_PASSIVE_SCAN_CAT3_LOW 5500 -#define CSR_PASSIVE_SCAN_CAT3_HIGH 5560 - #define CSR_OUI_USE_GROUP_CIPHER_INDEX 0x00 #define CSR_OUI_WEP40_OR_1X_INDEX 0x01 #define CSR_OUI_TKIP_OR_PSK_INDEX 0x02 diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h index ff60e304de3a..44bafb79eed6 100644 --- a/CORE/SME/inc/sme_Api.h +++ b/CORE/SME/inc/sme_Api.h @@ -77,9 +77,6 @@ #define SME_INVALID_COUNTRY_CODE "XX" -//Macro to disable split scan -#define SME_DISABLE_SPLIT_SCAN 255 - #define SME_2_4_GHZ_MAX_FREQ 3000 #define SME_MODE_11A 0 /* 11a mode */ #define SME_MODE_11G 1 /* 11b/g mode */ @@ -1858,9 +1855,6 @@ VOS_STATUS sme_GetWcnssSoftwareVersion(tHalHandle hHal, VOS_STATUS sme_GetWcnssHardwareVersion(tHalHandle hHal, tANI_U8 *pVersion, tANI_U32 versionBufferSize); -eHalStatus sme_RoamRegisterCallback(tHalHandle hHal, - csrRoamCompleteCallback callback, - void *pContext); #ifdef FEATURE_WLAN_WAPI /* --------------------------------------------------------------------------- diff --git a/CORE/SME/inc/sme_FTApi.h b/CORE/SME/inc/sme_FTApi.h index 24296caa251b..759a629143cd 100644 --- a/CORE/SME/inc/sme_FTApi.h +++ b/CORE/SME/inc/sme_FTApi.h @@ -81,6 +81,11 @@ typedef struct sFTSMEContext v_BOOL_t addMDIE; +#ifdef WLAN_FEATURE_ROAM_OFFLOAD + tANI_U32 r0kh_id_len; + tANI_U32 r0kh_id; +#endif + /* User context for the timer callback */ tpFTRoamCallbackUsrCtx pUsrCtx; } tftSMEContext, *tpftSMEContext; diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index 582f5ffc553e..0ba5537dae84 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -69,8 +69,6 @@ #endif /* FEATURE_WLAN_ESE && !FEATURE_WLAN_ESE_UPLOAD */ #define CSR_NUM_IBSS_START_CHANNELS_50 4 #define CSR_NUM_IBSS_START_CHANNELS_24 3 -#define CSR_DEF_IBSS_START_CHANNEL_50 36 -#define CSR_DEF_IBSS_START_CHANNEL_24 1 #define CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD ( 5 * PAL_TIMER_TO_SEC_UNIT ) // 5 seconds, for WPA, WPA2, CCKM #define CSR_WAIT_FOR_WPS_KEY_TIMEOUT_PERIOD ( 120 * PAL_TIMER_TO_SEC_UNIT ) // 120 seconds, for WPS /*--------------------------------------------------------------------------- @@ -84,8 +82,7 @@ #define CSR_MIN_GLOBAL_STAT_QUERY_PERIOD 500 //ms #define CSR_MIN_GLOBAL_STAT_QUERY_PERIOD_IN_BMPS 2000 //ms #define CSR_MIN_TL_STAT_QUERY_PERIOD 500 //ms -#define CSR_DIAG_LOG_STAT_PERIOD 3000 //ms -//We use constatnt 4 here +//We use constant 4 here //This macro returns true when higher AC parameter is bigger than lower AC for a difference //The bigger the number, the less chance of TX //It must put lower AC as the first parameter. @@ -5691,7 +5688,6 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman roamInfo.staId = ( tANI_U8 )pJoinRsp->staId; roamInfo.ucastSig = ( tANI_U8 )pJoinRsp->ucastSig; roamInfo.bcastSig = ( tANI_U8 )pJoinRsp->bcastSig; - roamInfo.maxRateFlags = pJoinRsp->maxRateFlags; roamInfo.timingMeasCap = pJoinRsp->timingMeasCap; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH if (pMac->roam.configParam.cc_switch_mode @@ -6333,12 +6329,6 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman return ( fReleaseCommand ); } -eHalStatus csrRoamRegisterCallback(tpAniSirGlobal pMac, csrRoamCompleteCallback callback, void *pContext) -{ - eHalStatus status = eHAL_STATUS_SUCCESS; - return (status); -} - eHalStatus csrRoamCopyProfile(tpAniSirGlobal pMac, tCsrRoamProfile *pDstProfile, tCsrRoamProfile *pSrcProfile) { eHalStatus status = eHAL_STATUS_SUCCESS; @@ -8148,18 +8138,6 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res }//we have active entry } -static void csrRoamRoamingStateAuthRspProcessor( tpAniSirGlobal pMac, tSirSmeAuthRsp *pSmeAuthRsp ) -{ - //No one is sending eWNI_SME_AUTH_REQ to PE. - smsLog(pMac, LOGW, FL("is no-op")); - if (eSIR_SME_SUCCESS == pSmeAuthRsp->statusCode) { - smsLog(pMac, LOGW, "CSR SmeAuthReq Successful"); - } else { - smsLog(pMac, LOGW, "CSR SmeAuthReq failed with statusCode= 0x%08X [%d]", - pSmeAuthRsp->statusCode, pSmeAuthRsp->statusCode); - } -} - static void csrRoamRoamingStateReassocRspProcessor( tpAniSirGlobal pMac, tpSirSmeJoinRsp pSmeJoinRsp ) { eCsrRoamCompleteResult result; @@ -8576,14 +8554,6 @@ void csrRoamingStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf ) } break; - case eWNI_SME_AUTH_RSP: // or the Authenticate response message... - if (CSR_IS_ROAM_SUBSTATE_AUTH_REQ( pMac, pSmeRsp->sessionId) ) - { - //We sent a AUTH_REQ - csrRoamRoamingStateAuthRspProcessor( pMac, (tSirSmeAuthRsp *)pSmeRsp ); - } - break; - case eWNI_SME_REASSOC_RSP: // or the Reassociation response message... if (CSR_IS_ROAM_SUBSTATE_REASSOC_REQ( pMac, pSmeRsp->sessionId) ) { @@ -16327,6 +16297,8 @@ void csrRoamOffload(tpAniSirGlobal pMac, tSirRoamOffloadScanReq *pRequestBuf, tCsrRoamSession *pSession) { vos_mem_copy(pRequestBuf->PSK_PMK, pSession->psk_pmk, sizeof(pRequestBuf->PSK_PMK)); + pRequestBuf->R0KH_ID_Length = pSession->ftSmeContext.r0kh_id_len; + pRequestBuf->R0KH_ID = pSession->ftSmeContext.r0kh_id; pRequestBuf->Prefer5GHz = pMac->roam.configParam.nRoamPrefer5GHz; pRequestBuf->RoamRssiCatGap = pMac->roam.configParam.bCatRssiOffset; pRequestBuf->Select5GHzMargin = pMac->roam.configParam.nSelect5GHzMargin; diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c index 02851a750b31..0627330f3151 100644 --- a/CORE/SME/src/csr/csrApiScan.c +++ b/CORE/SME/src/csr/csrApiScan.c @@ -67,36 +67,12 @@ #define HIDDEN_TIMER (1*60*1000) #define CSR_SCAN_RESULT_RSSI_WEIGHT 80 // must be less than 100, represent the persentage of new RSSI -/*--------------------------------------------------------------------------- - PER filter constant fraction: it is a % ----------------------------------------------------------------------------*/ -#define CSR_SCAN_PER_FILTER_FRAC 100 - -/*--------------------------------------------------------------------------- - RSSI filter constant fraction: it is a % ----------------------------------------------------------------------------*/ -#define CSR_SCAN_RSSI_FILTER_FRAC 100 - -/*--------------------------------------------------------------------------- -Convert RSSI into overall score: Since RSSI is in -dBm values, and the -overall needs to be weighted inversely (where greater value means better -system), we convert. -RSSI *cannot* be more than 0xFF or less than 0 for meaningful WLAN operation ----------------------------------------------------------------------------*/ -#define CSR_SCAN_MAX_SCORE_VAL 0xFF -#define CSR_SCAN_MIN_SCORE_VAL 0x0 -#define CSR_SCAN_HANDOFF_DELTA 10 #define MAX_ACTIVE_SCAN_FOR_ONE_CHANNEL 140 #define MIN_ACTIVE_SCAN_FOR_ONE_CHANNEL 120 #define MAX_ACTIVE_SCAN_FOR_ONE_CHANNEL_FASTREASSOC 30 #define MIN_ACTIVE_SCAN_FOR_ONE_CHANNEL_FASTREASSOC 20 -#define CSR_SCAN_OVERALL_SCORE( rssi ) \ - (( rssi < CSR_SCAN_MAX_SCORE_VAL ) \ - ? (CSR_SCAN_MAX_SCORE_VAL-rssi) : CSR_SCAN_MIN_SCORE_VAL) - - #define CSR_SCAN_IS_OVER_BSS_LIMIT(pMac) \ ( (pMac)->scan.nBssLimit <= (csrLLCount(&(pMac)->scan.scanResultList)) ) @@ -8908,6 +8884,12 @@ eHalStatus csrScanSaveRoamOffloadApToScanCache(tpAniSirGlobal pMac, sizeof(tSirMacAddr)); pBssDescr->nReceivedTime = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd); + if(pParsedFrame->mdiePresent) + { + pBssDescr->mdiePresent = pParsedFrame->mdiePresent; + vos_mem_copy((tANI_U8 *)pBssDescr->mdie, (tANI_U8 *)pParsedFrame->mdie, SIR_MDIE_SIZE); + } + VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "LFR3:%s:BssDescr Info:", __func__); VOS_TRACE_HEX_DUMP(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c index 919a455193fc..f750529a551b 100644 --- a/CORE/SME/src/csr/csrNeighborRoam.c +++ b/CORE/SME/src/csr/csrNeighborRoam.c @@ -4720,7 +4720,7 @@ eHalStatus csrNeighborRoamIndicateDisconnect(tpAniSirGlobal pMac, * outside of Disassoc Handoff sub-state, then it means that * this is a genuine disconnect and we need to clean up. * Otherwise, we will be stuck in reassoc state which will - * in-turn block scans (see csrIsScanAllowed). + * in-turn block scans. */ CSR_NEIGHBOR_ROAM_STATE_TRANSITION( eCSR_NEIGHBOR_ROAM_STATE_INIT, diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c index 812c8e709483..c7a4b96fa1d2 100644 --- a/CORE/SME/src/csr/csrUtil.c +++ b/CORE/SME/src/csr/csrUtil.c @@ -2797,15 +2797,6 @@ static tANI_BOOLEAN csrIsAuthWpa( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_W return( csrIsOuiMatch( pMac, AllSuites, cAllSuites, csrWpaOui[01], Oui ) ); } -#ifdef NOT_CURRENTLY_USED -static tANI_BOOLEAN csrIsAuth802_1x( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_WPA_OUI_SIZE], - tANI_U8 cAllSuites, - tANI_U8 Oui[] ) -{ - return( csrIsOuiMatch( pMac, AllSuites, cAllSuites, csrWpaOui[00], Oui ) ); -} -#endif // NOT_CURRENTLY_USED - static tANI_BOOLEAN csrIsAuthWpaPsk( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_WPA_OUI_SIZE], tANI_U8 cAllSuites, tANI_U8 Oui[] ) diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index 011453c6be4e..1c6904ef0f48 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -112,10 +112,6 @@ eHalStatus sme_HandlePreChannelSwitchInd(tHalHandle hHal, void *pMsgBuf); eHalStatus sme_HandlePostChannelSwitchInd(tHalHandle hHal); -#ifdef FEATURE_WLAN_LFR -tANI_BOOLEAN csrIsScanAllowed(tpAniSirGlobal pMac); -#endif - #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) tANI_BOOLEAN csrIsSupportedChannel(tpAniSirGlobal pMac, tANI_U8 channelId); #endif @@ -2968,17 +2964,7 @@ eHalStatus sme_Close(tHalHandle hHal) return status; } -#ifdef FEATURE_WLAN_LFR -tANI_BOOLEAN csrIsScanAllowed(tpAniSirGlobal pMac) -{ - /* - * TODO: always return TRUE for now until - * we figure out why we could be stuck in - * one of the roaming states forever. - */ - return eANI_BOOLEAN_TRUE; -} -#endif + /* --------------------------------------------------------------------------- \fn sme_ScanRequest \brief a wrapper function to Request a 11d or full scan from CSR. @@ -2995,8 +2981,6 @@ eHalStatus sme_ScanRequest(tHalHandle hHal, tANI_U8 sessionId, tCsrScanRequest * { eHalStatus status = eHAL_STATUS_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT( hHal ); - tpCsrNeighborRoamControlInfo pNeighborRoamInfo = - &pMac->roam.neighborRoamInfo[sessionId]; MTRACE(vos_trace(VOS_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_REQ, sessionId, pscanReq->scanType)); smsLog(pMac, LOG2, FL("enter")); @@ -3005,38 +2989,15 @@ eHalStatus sme_ScanRequest(tHalHandle hHal, tANI_U8 sessionId, tCsrScanRequest * if(pMac->scan.fScanEnable) { status = sme_AcquireGlobalLock( &pMac->sme ); - if ( HAL_STATUS_SUCCESS( status ) ) - { - { -#ifdef FEATURE_WLAN_LFR - if(csrIsScanAllowed(pMac)) - { -#endif - status = csrScanRequest( hHal, sessionId, pscanReq, - pScanRequestID, callback, pContext ); - if ( !HAL_STATUS_SUCCESS( status ) ) - { - smsLog(pMac, LOGE, FL("csrScanRequest failed" - " SId=%d"), sessionId); - } -#ifdef FEATURE_WLAN_LFR - } - else - { - smsLog(pMac, LOGE, FL("Scan denied in state %s (sub-state %d)"), - macTraceGetNeighbourRoamState( - pNeighborRoamInfo->neighborRoamState), - pMac->roam.curSubState[sessionId]); - /*HandOff is in progress. So schedule this scan later*/ - status = eHAL_STATUS_RESOURCES; - } -#endif + if (HAL_STATUS_SUCCESS(status )) { + status = csrScanRequest(hHal, sessionId, pscanReq, + pScanRequestID, callback, pContext); + if (!HAL_STATUS_SUCCESS(status)) { + smsLog(pMac, LOGE, + FL("csrScanRequest failed sessionId(%d)"), sessionId); } - sme_ReleaseGlobalLock( &pMac->sme ); - } //sme_AcquireGlobalLock success - else - { + } else { smsLog(pMac, LOGE, FL("sme_AcquireGlobalLock failed")); } } //if(pMac->scan.fScanEnable) @@ -3314,21 +3275,6 @@ eHalStatus sme_RoamRegisterLinkQualityIndCallback(tHalHandle hHal, tANI_U8 sessi return(csrRoamRegisterLinkQualityIndCallback((tpAniSirGlobal)hHal, callback, pContext)); } -/* --------------------------------------------------------------------------- - \fn sme_RoamRegisterCallback - \brief a wrapper function to allow HDD to register a callback with CSR. - Unlike scan, roam has one callback for all the roam requests - \param callback - a callback function that roam calls upon when state changes - \param pContext - a pointer passed in for the callback - \return eHalStatus - ---------------------------------------------------------------------------*/ -eHalStatus sme_RoamRegisterCallback(tHalHandle hHal, - csrRoamCompleteCallback callback, - void *pContext) -{ - return(csrRoamRegisterCallback((tpAniSirGlobal)hHal, callback, pContext)); -} - eCsrPhyMode sme_GetPhyMode(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); diff --git a/CORE/SYS/legacy/src/platform/inc/VossWrapper.h b/CORE/SYS/legacy/src/platform/inc/VossWrapper.h index 25f4c54e1818..5ce353040a1d 100644 --- a/CORE/SYS/legacy/src/platform/inc/VossWrapper.h +++ b/CORE/SYS/legacy/src/platform/inc/VossWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -71,7 +71,6 @@ extern "C" { #include "sirTypes.h" #include "sirParams.h" #include "sysDef.h" -#include "aniDbgTest.h" #include "vos_timer.h" #include "palApi.h" #include "vos_types.h" diff --git a/CORE/SYS/legacy/src/utils/src/macTrace.c b/CORE/SYS/legacy/src/utils/src/macTrace.c index f1b0087b9e9e..b2f99b111c55 100644 --- a/CORE/SYS/legacy/src/utils/src/macTrace.c +++ b/CORE/SYS/legacy/src/utils/src/macTrace.c @@ -332,8 +332,6 @@ tANI_U8* macTraceGetSmeMsgString( tANI_U16 smeMsg ) CASE_RETURN_STRING(eWNI_SME_SETCONTEXT_RSP); CASE_RETURN_STRING(eWNI_SME_REASSOC_REQ); CASE_RETURN_STRING(eWNI_SME_REASSOC_RSP); - CASE_RETURN_STRING(eWNI_SME_AUTH_REQ); - CASE_RETURN_STRING(eWNI_SME_AUTH_RSP); CASE_RETURN_STRING(eWNI_SME_DISASSOC_REQ); CASE_RETURN_STRING(eWNI_SME_DISASSOC_RSP); CASE_RETURN_STRING(eWNI_SME_DISASSOC_IND); @@ -360,8 +358,6 @@ tANI_U8* macTraceGetSmeMsgString( tANI_U16 smeMsg ) CASE_RETURN_STRING(eWNI_SME_DEFINE_QOS_RSP); CASE_RETURN_STRING(eWNI_SME_DELETE_QOS_REQ); CASE_RETURN_STRING(eWNI_SME_DELETE_QOS_RSP); - CASE_RETURN_STRING(eWNI_SME_PROMISCUOUS_MODE_REQ); - CASE_RETURN_STRING(eWNI_SME_PROMISCUOUS_MODE_RSP); CASE_RETURN_STRING(eWNI_SME_LINK_TEST_START_REQ); CASE_RETURN_STRING(eWNI_SME_LINK_TEST_START_RSP); CASE_RETURN_STRING(eWNI_SME_LINK_TEST_STOP_REQ); @@ -684,9 +680,7 @@ tANI_U8* macTraceGetWdaMsgString( tANI_U16 wdaMsg ) CASE_RETURN_STRING(WDA_SET_TX_POWER_REQ); CASE_RETURN_STRING(WDA_SET_TX_POWER_RSP); CASE_RETURN_STRING(WDA_GET_TX_POWER_REQ); - CASE_RETURN_STRING(WDA_GET_TX_POWER_RSP); CASE_RETURN_STRING(WDA_GET_NOISE_REQ ); - CASE_RETURN_STRING(WDA_GET_NOISE_RSP); CASE_RETURN_STRING(WDA_SET_TX_PER_TRACKING_REQ); CASE_RETURN_STRING(WDA_TRANSMISSION_CONTROL_IND); @@ -697,7 +691,6 @@ tANI_U8* macTraceGetWdaMsgString( tANI_U16 wdaMsg ) CASE_RETURN_STRING(WDA_ENTER_UAPSD_RSP); CASE_RETURN_STRING(WDA_EXIT_UAPSD_REQ ); CASE_RETURN_STRING(WDA_EXIT_UAPSD_RSP ); - CASE_RETURN_STRING(WDA_LOW_RSSI_IND ); CASE_RETURN_STRING(WDA_BEACON_FILTER_IND); CASE_RETURN_STRING(WDA_WOWL_ADD_BCAST_PTRN); CASE_RETURN_STRING(WDA_WOWL_DEL_BCAST_PTRN); diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c index d76f08a86d7f..f733f20ed31e 100644 --- a/CORE/SYS/legacy/src/utils/src/parserApi.c +++ b/CORE/SYS/legacy/src/utils/src/parserApi.c @@ -3360,8 +3360,14 @@ sirParseBeaconIE(tpAniSirGlobal pMac, vos_mem_copy( &pBeaconStruct->OperatingMode, &pBies->OperatingMode, sizeof( tDot11fIEOperatingMode) ); } - #endif + + if( pBies->MobilityDomain.present) + { + pBeaconStruct->mdiePresent = 1; + vos_mem_copy( pBeaconStruct->mdie, &pBies->MobilityDomain.MDID, SIR_MDIE_SIZE); + } + pBeaconStruct->Vendor1IEPresent = pBies->Vendor1IE.present; pBeaconStruct->Vendor2IEPresent = pBies->Vendor2IE.present; pBeaconStruct->Vendor3IEPresent = pBies->Vendor3IE.present; diff --git a/CORE/UTILS/FWLOG/dbglog_host.c b/CORE/UTILS/FWLOG/dbglog_host.c index e1fa2f31d964..b8a8369a0dc9 100644 --- a/CORE/UTILS/FWLOG/dbglog_host.c +++ b/CORE/UTILS/FWLOG/dbglog_host.c @@ -145,6 +145,14 @@ const char *dbglog_get_module_str(A_UINT32 module_id) return "WoW"; case WLAN_MODULE_IBSS_PWRSAVE: return "IBSS PS"; + case WLAN_MODULE_EXTSCAN: + return "ExtScan"; + case WLAN_MODULE_UNIT_TEST: + return "UNIT_TEST"; + case WLAN_MODULE_MLME: + return "MLME"; + case WLAN_MODULE_SUPPL: + return "SUPPLICANT"; default: return "UNKNOWN"; } @@ -555,6 +563,22 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "ROAM_CANCEL_LOW_PRIO_SCAN", "ROAM_FINAL_BMISS_RECVD", "ROAM_CONFIG_SCAN_MODE", + "ROAM_BMISS_FINAL_SCAN_ENABLE", + "ROAM_SUITABLE_AP_EVENT", + "ROAM_RSN_IE_PARSE_ERROR", + "ROAM_WPA_IE_PARSE_ERROR", + "ROAM_SCAN_CMD_FROM_HOST", + "ROAM_HO_SORT_CANDIDATE", + "ROAM_HO_SAVE_CANDIDATE", + "ROAM_HO_GET_CANDIDATE", + "ROAM_HO_OFFLOAD_SET_PARAM", + "ROAM_HO_SM", + "ROAM_HO_HTT_SAVED", + "ROAM_HO_SYNC_START", + "ROAM_HO_START", + "ROAM_HO_COMPLETE", + "ROAM_HO_STOP", + "ROAM_HO_HTT_FORWARD", "ROAM_DBGID_DEFINITION_END" }, { @@ -1165,6 +1189,10 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "HIF_UART_DBGID_TXRX_BUF_DUMP", }, { + /* LPI */ + "" + }, + { /* EXTSCAN DBGIDs */ "EXTSCAN_START", "EXTSCAN_STOP", @@ -1208,6 +1236,29 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "EXTSCAN_CONFIG_HOTLIST_TABLE", "EXTSCAN_CONFIG_WLAN_CHANGE_TABLE", }, + { /* UNIT_TEST */ + "UNIT_TEST_GEN", + }, + { /* MLME */ + "MLME_DEBUG_CMN", + "MLME_IF", + "MLME_AUTH", + "MLME_REASSOC", + "MLME_DEAUTH", + "MLME_DISASSOC", + "MLME_ROAM", + "MLME_RETRY", + "MLME_TIMER", + "MLME_FRMPARSE", + }, + { /*SUPPLICANT */ + "SUPPL_INIT", + "SUPPL_RECV_EAPOL", + "SUPPL_RECV_EAPOL_TIMEOUT", + "SUPPL_SEND_EAPOL", + "SUPPL_MIC_MISMATCH", + "SUPPL_FINISH", + }, }; int dbglog_module_log_enable(wmi_unified_t wmi_handle, A_UINT32 mod_id, diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h index 00eec1cd1ea9..e45c606e4667 100644 --- a/CORE/WDA/inc/wlan_qct_wda.h +++ b/CORE/WDA/inc/wlan_qct_wda.h @@ -717,9 +717,7 @@ tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb); #define WDA_SET_TX_POWER_REQ SIR_HAL_SET_TX_POWER_REQ #define WDA_SET_TX_POWER_RSP SIR_HAL_SET_TX_POWER_RSP #define WDA_GET_TX_POWER_REQ SIR_HAL_GET_TX_POWER_REQ -#define WDA_GET_TX_POWER_RSP SIR_HAL_GET_TX_POWER_RSP #define WDA_GET_NOISE_REQ SIR_HAL_GET_NOISE_REQ -#define WDA_GET_NOISE_RSP SIR_HAL_GET_NOISE_RSP #define WDA_SET_TX_PER_TRACKING_REQ SIR_HAL_SET_TX_PER_TRACKING_REQ /* Messages to support transmit_halt and transmit_resume */ @@ -734,7 +732,6 @@ tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb); #define WDA_ENTER_UAPSD_RSP SIR_HAL_ENTER_UAPSD_RSP #define WDA_EXIT_UAPSD_REQ SIR_HAL_EXIT_UAPSD_REQ #define WDA_EXIT_UAPSD_RSP SIR_HAL_EXIT_UAPSD_RSP -#define WDA_LOW_RSSI_IND SIR_HAL_LOW_RSSI_IND #define WDA_BEACON_FILTER_IND SIR_HAL_BEACON_FILTER_IND /// PE <-> HAL WOWL messages #define WDA_WOWL_ADD_BCAST_PTRN SIR_HAL_WOWL_ADD_BCAST_PTRN @@ -455,7 +455,6 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/limAIDmgmt.o \ $(MAC_SRC_DIR)/pe/lim/limProcessCfgUpdates.o \ $(MAC_SRC_DIR)/pe/lim/limProcessDeauthFrame.o \ $(MAC_SRC_DIR)/pe/lim/limProcessDisassocFrame.o \ - $(MAC_SRC_DIR)/pe/lim/limProcessLmmMessages.o \ $(MAC_SRC_DIR)/pe/lim/limProcessMessageQueue.o \ $(MAC_SRC_DIR)/pe/lim/limProcessMlmReqMessages.o \ $(MAC_SRC_DIR)/pe/lim/limProcessMlmRspMessages.o \ diff --git a/firmware_bin/WCNSS_qcom_cfg.ini b/firmware_bin/WCNSS_qcom_cfg.ini index eebb1cdd9480..bd171d65fb61 100755 --- a/firmware_bin/WCNSS_qcom_cfg.ini +++ b/firmware_bin/WCNSS_qcom_cfg.ini @@ -394,9 +394,6 @@ gVhtTxMCS2x2=2 gSetTxChainmask1x1=1 gSetRxChainmask1x1=1 -# Enable CRDA regulatory support by settings default country code -#gCrdaDefaultCountryCode=TW - # Scan Timing Parameters # gPassiveMaxChannelTime=110 # gPassiveMinChannelTime=60 diff --git a/firmware_bin/WCNSS_qcom_cfg.usb.ini b/firmware_bin/WCNSS_qcom_cfg.usb.ini index 12ca0e6c173c..70aa00215a57 100644 --- a/firmware_bin/WCNSS_qcom_cfg.usb.ini +++ b/firmware_bin/WCNSS_qcom_cfg.usb.ini @@ -380,9 +380,6 @@ gEnable2x2=1 gVhtRxMCS2x2=0 gVhtTxMCS2x2=2 -# Enable CRDA regulatory support by settings default country code -#gCrdaDefaultCountryCode=TW - # Scan Timing Parameters # gPassiveMaxChannelTime=110 # gPassiveMinChannelTime=60 diff --git a/tools/fwdebuglog/cld-fwlog-parser.c b/tools/fwdebuglog/cld-fwlog-parser.c index b90c3445e3ac..e62469f67bd6 100644 --- a/tools/fwdebuglog/cld-fwlog-parser.c +++ b/tools/fwdebuglog/cld-fwlog-parser.c @@ -120,6 +120,18 @@ const char *dbglog_get_module_str(A_UINT32 module_id) return "TDLS"; case WLAN_MODULE_P2P: return "P2P"; + case WLAN_MODULE_WOW: + return "WoW"; + case WLAN_MODULE_IBSS_PWRSAVE: + return "IBSS PS"; + case WLAN_MODULE_EXTSCAN: + return "ExtScan"; + case WLAN_MODULE_UNIT_TEST: + return "UNIT_TEST"; + case WLAN_MODULE_MLME: + return "MLME"; + case WLAN_MODULE_SUPPL: + return "SUPPLICANT"; default: return "UNKNOWN"; } @@ -530,6 +542,22 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "ROAM_CANCEL_LOW_PRIO_SCAN", "ROAM_FINAL_BMISS_RECVD", "ROAM_CONFIG_SCAN_MODE", + "ROAM_BMISS_FINAL_SCAN_ENABLE", + "ROAM_SUITABLE_AP_EVENT", + "ROAM_RSN_IE_PARSE_ERROR", + "ROAM_WPA_IE_PARSE_ERROR", + "ROAM_SCAN_CMD_FROM_HOST", + "ROAM_HO_SORT_CANDIDATE", + "ROAM_HO_SAVE_CANDIDATE", + "ROAM_HO_GET_CANDIDATE", + "ROAM_HO_OFFLOAD_SET_PARAM", + "ROAM_HO_SM", + "ROAM_HO_HTT_SAVED", + "ROAM_HO_SYNC_START", + "ROAM_HO_START", + "ROAM_HO_COMPLETE", + "ROAM_HO_STOP", + "ROAM_HO_HTT_FORWARD", "ROAM_DBGID_DEFINITION_END" }, { @@ -1123,6 +1151,10 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "HIF_UART_DBGID_TXRX_BUF_DUMP", }, { + /* LPI */ + "" + }, + { /* EXTSCAN DBGIDs */ "EXTSCAN_START", "EXTSCAN_STOP", @@ -1166,6 +1198,29 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "EXTSCAN_CONFIG_HOTLIST_TABLE", "EXTSCAN_CONFIG_WLAN_CHANGE_TABLE", }, + { /* UNIT_TEST */ + "UNIT_TEST_GEN", + }, + { /* MLME */ + "MLME_DEBUG_CMN", + "MLME_IF", + "MLME_AUTH", + "MLME_REASSOC", + "MLME_DEAUTH", + "MLME_DISASSOC", + "MLME_ROAM", + "MLME_RETRY", + "MLME_TIMER", + "MLME_FRMPARSE", + }, + { /*SUPPLICANT */ + "SUPPL_INIT", + "SUPPL_RECV_EAPOL", + "SUPPL_RECV_EAPOL_TIMEOUT", + "SUPPL_SEND_EAPOL", + "SUPPL_MIC_MISMATCH", + "SUPPL_FINISH", + }, }; static char * diff --git a/tools/fwdebuglog/parser.c b/tools/fwdebuglog/parser.c index 3d3f42c77a2b..256955e2fef6 100644 --- a/tools/fwdebuglog/parser.c +++ b/tools/fwdebuglog/parser.c @@ -138,6 +138,18 @@ const char *dbglog_get_module_str(A_UINT32 module_id) return "TDLS"; case WLAN_MODULE_P2P: return "P2P"; + case WLAN_MODULE_WOW: + return "WoW"; + case WLAN_MODULE_IBSS_PWRSAVE: + return "IBSS PS"; + case WLAN_MODULE_EXTSCAN: + return "ExtScan"; + case WLAN_MODULE_UNIT_TEST: + return "UNIT_TEST"; + case WLAN_MODULE_MLME: + return "MLME"; + case WLAN_MODULE_SUPPL: + return "SUPPLICANT"; default: return "UNKNOWN"; } @@ -548,6 +560,22 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "ROAM_CANCEL_LOW_PRIO_SCAN", "ROAM_FINAL_BMISS_RECVD", "ROAM_CONFIG_SCAN_MODE", + "ROAM_BMISS_FINAL_SCAN_ENABLE", + "ROAM_SUITABLE_AP_EVENT", + "ROAM_RSN_IE_PARSE_ERROR", + "ROAM_WPA_IE_PARSE_ERROR", + "ROAM_SCAN_CMD_FROM_HOST", + "ROAM_HO_SORT_CANDIDATE", + "ROAM_HO_SAVE_CANDIDATE", + "ROAM_HO_GET_CANDIDATE", + "ROAM_HO_OFFLOAD_SET_PARAM", + "ROAM_HO_SM", + "ROAM_HO_HTT_SAVED", + "ROAM_HO_SYNC_START", + "ROAM_HO_START", + "ROAM_HO_COMPLETE", + "ROAM_HO_STOP", + "ROAM_HO_HTT_FORWARD", "ROAM_DBGID_DEFINITION_END" }, { @@ -1141,6 +1169,10 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "HIF_UART_DBGID_TXRX_BUF_DUMP", }, { + /* LPI */ + "" + }, + { /* EXTSCAN DBGIDs */ "EXTSCAN_START", "EXTSCAN_STOP", @@ -1184,6 +1216,29 @@ char * DBG_MSG_ARR[WLAN_MODULE_ID_MAX][MAX_DBG_MSGS] = "EXTSCAN_CONFIG_HOTLIST_TABLE", "EXTSCAN_CONFIG_WLAN_CHANGE_TABLE", }, + { /* UNIT_TEST */ + "UNIT_TEST_GEN", + }, + { /* MLME */ + "MLME_DEBUG_CMN", + "MLME_IF", + "MLME_AUTH", + "MLME_REASSOC", + "MLME_DEAUTH", + "MLME_DISASSOC", + "MLME_ROAM", + "MLME_RETRY", + "MLME_TIMER", + "MLME_FRMPARSE", + }, + { /*SUPPLICANT */ + "SUPPL_INIT", + "SUPPL_RECV_EAPOL", + "SUPPL_RECV_EAPOL_TIMEOUT", + "SUPPL_SEND_EAPOL", + "SUPPL_MIC_MISMATCH", + "SUPPL_FINISH", + }, }; static char * |