X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Finclude%2Fcarl9170.h;h=cbfa611b7e761ec2c6ae67b11ad6f668afac440e;hb=cdced53c2ede33a9fe9004db4d93cfc984ad4243;hp=c85a4f31c529ce737e7da8fdefe284ae5196b65e;hpb=1dbab55a460484fd655c44c99fc192b9e3702485;p=carl9170fw.git

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index c85a4f3..cbfa611 100644
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -3,7 +3,7 @@
  *
  * Firmware context definition
  *
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,6 +63,12 @@ enum carl9170_mac_reset_state {
 	CARL9170_MAC_RESET_FORCE,
 };
 
+enum carl9170_suspend_mode {
+	CARL9170_HOST_AWAKE			= 0,
+	CARL9170_HOST_SUSPENDED,
+	CARL9170_AWAKE_HOST,
+};
+
 /*
  * This platform - being an odd 32-bit architecture - prefers to
  * have 32-Bit variables.
@@ -70,12 +76,13 @@ enum carl9170_mac_reset_state {
 
 struct firmware_context_struct {
 	/* timer / clocks */
-	unsigned int bogoclock;			/* supposed to be CPU clock in KHz */
+	unsigned int ticks_per_msec;
 	unsigned int counter;			/* main() cycles */
 
 	/* misc */
 	unsigned int watchdog_enable;
 	unsigned int reboot;
+	unsigned int suspend_mode;
 
 	struct {
 		/* Host Interface DMA queues */
@@ -86,27 +93,34 @@ struct firmware_context_struct {
 	struct {
 		/* Hardware DMA queues */
 		struct dma_queue tx_queue[__AR9170_NUM_TX_QUEUES];	/* wlan tx queue */
+		struct dma_queue tx_retry;
 		struct dma_queue rx_queue;				/* wlan rx queue */
 
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
-		struct dma_queue tx_delay[__AR9170_NUM_TX_QUEUES];
-		struct dma_queue tx_retry;
-		unsigned int tx_trigger;
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
+		/* tx aggregate scheduling */
+		struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
 
 		/* Hardware DMA queue unstuck/fix detection */
-		unsigned int last_tx_desc_num[__AR9170_NUM_TX_QUEUES];
-		struct dma_desc *last_tx_desc[__AR9170_NUM_TX_QUEUES];
+		unsigned int last_super_num[__AR9170_NUM_TX_QUEUES];
+		struct carl9170_tx_superframe *last_super[__AR9170_NUM_TX_QUEUES];
+		unsigned int mac_reset;
+		unsigned int soft_int;
+
+		/* rx filter */
+		unsigned int rx_filter;
+
+		/* rx statistics */
 		unsigned int rx_total;
 		unsigned int rx_overruns;
-		unsigned int mac_reset;
+
+		/* tx sequence control counters */
+		unsigned int sequence[CARL9170_INTF_NUM];
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
 		/* CAB */
-		struct dma_queue cab_queue;
-		unsigned int cab_queue_len,
-			     cab_flush_time;
-		enum carl9170_cab_trigger cab_flush_trigger;
+		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 */
@@ -115,20 +129,19 @@ struct firmware_context_struct {
 			     tx_status_tail_idx;
 		struct carl9170_tx_status tx_status_cache[CARL9170_TX_STATUS_NUM];
 
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
 		/* BA(R) Request Handler */
 		struct dma_desc *ba_desc;
 		struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
 		unsigned int ba_desc_available,
 			     ba_tail_idx,
 			     ba_head_idx;
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
 	} wlan;
 
 	struct {
 		unsigned int config,
 			     interface_setting,
-			     alternate_interface_setting;
+			     alternate_interface_setting,
+			     device_feature;
 		enum carl9170_ep0_action ep0_action;
 
 		void *ep0_txrx_buffer;
@@ -157,9 +170,6 @@ struct firmware_context_struct {
 		uint8_t put_buffer[CARL9170_MAX_CMD_PAYLOAD_LEN];
 #endif /* CONFIG_CARL9170FW_DEBUG_USB */
 
-#ifdef CONFIG_CARL9170FW_USB_WATCHDOG
-		struct carl9170_watchdog_cmd watchdog;
-#endif /* CONFIG CARL9170FW_USB_WATCHDOG */
 	} usb;
 
 	struct {
@@ -170,9 +180,7 @@ struct firmware_context_struct {
 		unsigned int frequency;
 		unsigned int ht_settings;
 
-#ifdef CONFIG_CARL9170FW_PSM
 		struct carl9170_psm psm;
-#endif /* CONFIG_CARL9170FW_PSM */
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 	} phy;