X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2Finclude%2Fdma.h;h=51d0db4442aef7c3765a9083cc6f344dee345004;hp=11a760dfc98139cb68c921d188d1cc19c8b71941;hb=af915846d44d23adc02c7ded807282d607b46faa;hpb=bf38ae52cd2ec91f5abeadc00c4e17fc647c2bc0

diff --git a/carlfw/include/dma.h b/carlfw/include/dma.h
index 11a760d..51d0db4 100644
--- a/carlfw/include/dma.h
+++ b/carlfw/include/dma.h
@@ -46,8 +46,8 @@ struct dma_desc {
 	struct dma_desc *nextAddr;	/* Next TD address */
 } __packed __aligned(4);
 
-/* Up, Dn, 5x Tx, retry, Rx, [USB Int], (CAB), (BA) */
-#define AR9170_TERMINATOR_NUMBER_B	9
+/* Up, Dn, 5x Tx, retry, Rx, [USB Int], (CAB), FW */
+#define AR9170_TERMINATOR_NUMBER_B	10
 
 #define AR9170_TERMINATOR_NUMBER_INT	1
 
@@ -57,15 +57,9 @@ struct dma_desc {
 #define AR9170_TERMINATOR_NUMBER_CAB	0
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
-#define AR9170_TERMINATOR_NUMBER_BA	1
-#else
-#define AR9170_TERMINATOR_NUMBER_BA	0
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
 #define AR9170_TERMINATOR_NUMBER (AR9170_TERMINATOR_NUMBER_B + \
 				  AR9170_TERMINATOR_NUMBER_INT + \
-				  AR9170_TERMINATOR_NUMBER_CAB + \
-				  AR9170_TERMINATOR_NUMBER_BA)
+				  AR9170_TERMINATOR_NUMBER_CAB)
 
 #define AR9170_BLOCK_SIZE           (256 + 64)
 
@@ -81,19 +75,32 @@ struct carl9170_tx_ba_superframe {
 	struct ar9170_tx_ba_frame f;
 } __packed;
 
+struct ar9170_tx_null_frame {
+	struct ar9170_tx_hwdesc hdr;
+	struct ieee80211_hdr null;
+} __packed;
+
+struct carl9170_tx_null_superframe {
+	struct carl9170_tx_superdesc s;
+	struct ar9170_tx_null_frame f;
+} __packed;
+
 #define CARL9170_BA_BUFFER_LEN	(__roundup(sizeof(struct carl9170_tx_ba_superframe), 16))
 #define CARL9170_RSP_BUFFER_LEN	AR9170_BLOCK_SIZE
 
 struct carl9170_sram_reserved {
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
 	union {
 		uint32_t buf[CARL9170_BA_BUFFER_LEN / sizeof(uint32_t)];
 		struct carl9170_tx_ba_superframe ba;
 	} ba;
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
+
 	union {
 		uint32_t buf[CARL9170_MAX_CMD_LEN / sizeof(uint32_t)];
 		struct carl9170_cmd cmd;
+
+#ifdef CONFIG_CARL9170FW_WOL
+		struct carl9170_tx_null_superframe null;
+#endif /* CONFIG_CARL9170FW_WOL */
 	} cmd;
 
 	union {
@@ -130,6 +137,7 @@ struct carl9170_sram_reserved {
  *				| BA buffer (128 bytes)
  *				+--
  *				| CMD buffer (128 bytes)
+ *				| - used as NULLFRAME buffer (128 bytes) for WOL
  *				+--
  *				| RSP buffer (320 bytes)
  *				+--
@@ -331,12 +339,11 @@ static inline void __check_desc(void)
 
 	BUILD_BUG_ON(sizeof(mem) > AR9170_SRAM_SIZE);
 
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
 	BUILD_BUG_ON(offsetof(struct carl9170_sram_reserved, ba.buf) & (BLOCK_ALIGNMENT - 1));
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
 	BUILD_BUG_ON(offsetof(struct carl9170_sram_reserved, cmd.buf) & (BLOCK_ALIGNMENT - 1));
 	BUILD_BUG_ON(offsetof(struct carl9170_sram_reserved, rsp.buf) & (BLOCK_ALIGNMENT - 1));
 	BUILD_BUG_ON(offsetof(struct carl9170_sram_reserved, bcn.buf) & (BLOCK_ALIGNMENT - 1));
+	BUILD_BUG_ON(sizeof(struct carl9170_tx_null_superframe) > CARL9170_MAX_CMD_LEN);
 }
 
 #endif /* __CARL9170FW_DMA_H */