X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Finclude%2Fcarl9170.h;h=26d247bb6d752f634345b1b7f2420a00b7499f6f;hb=1f52b1617d72cfa6909ebbfbdf7c264d487b28d8;hp=a319b2a4cb65069fe4f53d936e347f6d55851a1c;hpb=42f3ffb244e5cabba181fe6c59042caa61b650cb;p=carl9170fw.git

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index a319b2a..26d247b 100644
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -39,16 +39,13 @@ struct carl9170_bar_ctx {
 	uint8_t ra[6];
 	__le16 start_seq_num;
 	__le16 control;
-	__le32 phy;
 };
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
 enum carl9170_cab_trigger {
 	CARL9170_CAB_TRIGGER_EMPTY	= 0,
 	CARL9170_CAB_TRIGGER_ARMED	= BIT(0),
 	CARL9170_CAB_TRIGGER_DEFER	= BIT(1),
 };
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 enum carl9170_ep0_action {
 	CARL9170_EP0_NO_ACTION		= 0,
@@ -118,13 +115,11 @@ struct firmware_context_struct {
 		/* tx sequence control counters */
 		unsigned int sequence[CARL9170_INTF_NUM];
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
 		/* CAB */
 		struct dma_queue cab_queue[CARL9170_INTF_NUM];
 		unsigned int cab_queue_len[CARL9170_INTF_NUM];
 		unsigned int cab_flush_time;
 		enum carl9170_cab_trigger cab_flush_trigger[CARL9170_INTF_NUM];
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 		/* tx status */
 		unsigned int tx_status_pending,
@@ -141,7 +136,10 @@ struct firmware_context_struct {
 		/* BA(R) Request Handler */
 		struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
 		unsigned int ba_tail_idx,
-			     ba_head_idx;
+			     ba_head_idx,
+			     queued_ba;
+
+		unsigned int queued_bar;
 	} wlan;
 
 	struct {
@@ -185,7 +183,7 @@ struct firmware_context_struct {
 
 		/* PHY/RF state */
 		unsigned int frequency;
-		unsigned int ht_settings;
+		unsigned int settings;
 
 		enum carl9170_phy_state state;
 		struct carl9170_psm psm;