add more constants

src/include/bl602_wifi/hal/hal_desc.h

@@ -1,6 +1,8 @@
 
 #ifndef _HAL_DESC_H_
 #define _HAL_DESC_H_
+#include <blconfig.h>
+
 #include <stdint.h>
 #include <phy_rf/phy.h>
 
@@ -169,4 +171,20 @@ struct tx_agg_desc {
 /// Descriptor done bit: Set by SW for TX DMA
 #define DESC_DONE_SW_TX_BIT                CO_BIT(30)
 
+// TODO: check why tx_hw_descX are not existing in binary
+// It seems that the entire tx_swdesc is not exists in bl602
+extern struct dma_desc bcn_dwnld_desc;
+extern struct rx_dmadesc rx_dma_hdrdesc[]; // NX_RXDESC_CNT
+extern struct rx_payloaddesc rx_payload_desc[]; // NX_RX_PAYLOAD_DESC_CNT
+extern uint32_t rx_payload_desc_buffer[NX_RX_PAYLOAD_DESC_CNT][212];
+extern struct tx_hw_desc tx_hw_desc0[RW_USER_MAX * NX_TXDESC_CNT0];
+extern struct tx_hw_desc tx_hw_desc1[RW_USER_MAX * NX_TXDESC_CNT0];
+extern struct tx_hw_desc tx_hw_desc2[RW_USER_MAX * NX_TXDESC_CNT0];
+extern struct tx_hw_desc tx_hw_desc3[RW_USER_MAX * NX_TXDESC_CNT0];
+#if (NX_BEACONING)
+/// Array of HW descriptors for BCN queue
+extern struct tx_hw_desc       tx_hw_desc4[NX_TXDESC_CNT4];
+#endif
+extern struct tx_cfm_tag tx_hw_cfms[RW_USER_MAX * NX_TXDESC_CNT0];
+
 #endif

src/include/bl602_wifi/lmac/tx/txl/txl_frame.h

@@ -7,6 +7,9 @@
 #include <lmac/tx/txl/txl_buffer.h>
 #include <lmac/tx/tx_swdesc.h>
 
+#include <modules/mac/mac_frame.h>
+
+#include <blconfig.h>
 
 typedef void (*cfm_func_ptr)(void *, uint32_t);
 struct txl_frame_cfm_tag {
@@ -28,20 +31,61 @@ struct txl_frame_env_tag {
 };
 
 extern struct txl_frame_env_tag txl_frame_env;
-extern uint32_t txl_frame_pool[147];
-extern uint32_t txl_tim_ie_pool[2];
-extern uint32_t txl_tim_bitmap_pool[63];
-extern struct tx_pbd txl_tim_desc[2];
-extern uint32_t txl_bcn_pool[211];
-extern struct tx_hw_desc txl_bcn_hwdesc_pool[2];
-extern struct tx_cfm_tag txl_bcn_hwdesc_cfms[2];
-extern struct tx_pbd txl_bcn_end_desc[2];
-extern struct txl_buffer_control txl_bcn_buf_ctrl[2];
-extern struct tx_hw_desc txl_frame_hwdesc_pool[4];
-extern struct tx_cfm_tag txl_frame_hwdesc_cfms[4];
+
+/// TX frame buffer pool
+// (332 + NX_TXFRAME_LEN) / 4 == 147
+// NX_TXFRAME_LEN == 256
+extern uint32_t txl_frame_pool[NX_TXFRAME_CNT][(sizeof(struct txl_buffer_tag) + NX_TXFRAME_LEN) / 4];
+
+#if NX_BCN_AUTONOMOUS_TX
+/// Pool of TIM IE buffers
+extern uint32_t txl_tim_ie_pool[NX_VIRT_DEV_MAX][CO_ALIGN4_HI(MAC_TIM_BMP_OFT + 1)/4];
+/// Pool of TIM virtual bitmap
+extern uint32_t txl_tim_bitmap_pool[NX_VIRT_DEV_MAX][CO_ALIGN4_HI(MAC_TIM_SIZE)/4];
+/// Pool of TIM descriptors
+extern struct tx_pbd txl_tim_desc[NX_VIRT_DEV_MAX][2];
+/// Beacon buffer pool
+// 211 == (332 + NX_BCNFRAME_LEN) / 4
+extern uint32_t txl_bcn_pool[NX_VIRT_DEV_MAX][(sizeof(struct txl_buffer_tag) + NX_BCNFRAME_LEN) / 4];
+/// TX beacon header descriptor pool
+extern struct tx_hw_desc txl_bcn_hwdesc_pool[NX_VIRT_DEV_MAX];
+/// TX payload buffer descriptor for the post-TIM part of the beacon
+extern struct tx_pbd txl_bcn_end_desc[NX_VIRT_DEV_MAX];
+extern struct txl_buffer_control txl_bcn_buf_ctrl[NX_VIRT_DEV_MAX];
+
+#if (NX_P2P_GO)
+/// Pool of P2P NOA payload descriptors
+extern struct tx_pbd txl_p2p_noa_desc[NX_VIRT_DEV_MAX];
+/// Pool of P2P NOA Attributes
+extern uint16_t txl_p2p_noa_ie_pool[NX_VIRT_DEV_MAX][P2P_NOA_IE_BUFFER_LEN];
+#endif //(NX_P2P_GO)
+
+#if (RW_MESH_EN)
+// Payload Descriptor for additional IEs of Mesh Beacon
+extern struct tx_pbd txl_mesh_add_ies_desc[RW_MESH_VIF_NB];
+// Buffer containing the additional IEs of Mesh Beacon
+extern struct mesh_add_ies_tag txl_mesh_add_ies[RW_MESH_VIF_NB];
+#endif //(RW_MESH_EN)
+#endif //(NX_BCN_AUTONOMOUS_TX)
+
+/// TX frame header descriptor pool
+extern struct tx_hw_desc txl_frame_hwdesc_pool[NX_TXFRAME_CNT];
+
+/// Default policy table for 2.4GHz band
+extern struct txl_buffer_control txl_buffer_control_24G;
+/// Default policy table for 5GHz band
+extern struct txl_buffer_control txl_buffer_control_5G;
+extern struct tx_policy_tbl txl_frame_pol_24G ;
+extern struct tx_policy_tbl txl_frame_pol_5G ;
+
+extern struct txl_buffer_control txl_frame_buf_ctrl[NX_TXFRAME_CNT];
+extern struct tx_cfm_tag txl_bcn_hwdesc_cfms[NX_VIRT_DEV_MAX];
+
+extern struct tx_cfm_tag txl_frame_hwdesc_cfms[NX_TXFRAME_CNT];
+
 extern struct txl_buffer_control txl_buffer_control_24G;
 extern struct txl_buffer_control txl_buffer_control_5G;
-extern struct txl_buffer_control txl_frame_buf_ctrl[4];
+extern struct txl_buffer_control txl_frame_buf_ctrl[NX_TXFRAME_CNT];
 
 void txl_frame_init(bool reset);
 void txl_frame_init_desc(struct txl_frame_desc_tag *frame, struct txl_buffer_tag *buffer, struct tx_hw_desc *hwdesc, struct txl_buffer_control *bufctrl);

src/include/blconfig.h

@@ -1,6 +1,9 @@
 #ifndef _BLCONFIG_H_
 #define _BLCONFIG_H_
 
+// from hal_machw_init nxmac_max_rx_length_set(0x1000)
+#define CFG_AMSDU_4K 
+
 #ifndef  CFG_TXDESC
 #define CFG_TXDESC          4
 #endif
@@ -42,6 +45,54 @@
 #define RW_WAPI_EN 0
 #define NX_VHT 0
 
+/// == 13 not 17, because of the loop in rxl_hwdesc_init
+/// Number of RX descriptors (SW and Header descriptors)
+#define NX_RXDESC_CNT        13
+
+/// Maximum size of A-MSDU supported in reception
+#if defined CFG_AMSDU_4K
+#define RWNX_MAX_AMSDU_RX    4096
+#elif defined CFG_AMSDU_8K
+#define RWNX_MAX_AMSDU_RX    8192
+#elif defined CFG_AMSDU_12K
+#define RWNX_MAX_AMSDU_RX    12288
+#endif
+
+/// Beamformer support
+#if defined CFG_BFMER
+    #define RW_BFMER_EN                 1
+    #define RW_BFR_TXFRAME_CNT          CFG_MU_CNT
+#else //defined CFG_BFMER
+    #define RW_BFMER_EN                 0
+    #define RW_BFR_TXFRAME_CNT          0
+    // Disable MU-MIMO TX if Beamformer is not supported
+    #undef CFG_MU_CNT
+    #define CFG_MU_CNT                  1
+#endif //defined CFG_BFMER
+
+/// Number of users supported
+#define RW_USER_MAX                 CFG_MU_CNT
+
+#if (NX_BEACONING)
+/// Number of TX descriptors available in the system (BCN)
+#define CFG_TXDESC4       4
+#define NX_TXDESC_CNT4       CFG_TXDESC4
+#if (NX_TXDESC_CNT4 & (NX_TXDESC_CNT4 - 1))
+#error "Not a power of 2"
+#endif
+#endif
+
+#define NX_BCNFRAME_LEN 512
+
+// == 4 for some reason?
+#define NX_TXFRAME_CNT NX_VIRT_DEV_MAX + RW_BFR_TXFRAME_CNT + 2
+
+#if (NX_P2P)
+    #define NX_TXFRAME_LEN       384
+#else
+    #define NX_TXFRAME_LEN       256
+#endif //(NX_P2P)
+
 /// Wireless Mesh Networking support
 #if defined CFG_MESH
     #define RW_MESH_EN                  (1)
@@ -62,6 +113,17 @@
     #define RW_MESH_PATH_NB             (0)
     #define RW_MESH_PROXY_NB            (0)
 #endif //defined CFG_MESH
+
+/// RX Payload buffer size
+#define NX_RX_PAYLOAD_LEN 848
+
+/// Number of RX payload descriptors - defined to be twice the maximum A-MSDU size
+/// plus one extra one used for HW flow control
+// NX_RX_PAYLOAD_DESC_CNT == 13 based on sizeof rx_payload_desc 
+// RWNX_MAX_AMSDU_RX / NX_RX_PAYLOAD_LEN == 6
+// * 2 only gets 9, I guess it's *3
+#define NX_RX_PAYLOAD_DESC_CNT ((RWNX_MAX_AMSDU_RX / NX_RX_PAYLOAD_LEN) * 3 + 1)
+
 #define CFG_MODE_SWITCH 0
 #undef CONFIG_AOS_MESH