X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Finclude%2Fcarl9170.h;h=6e8a3e16b722c972da05af1ff6e5109cc4ea7b52;hb=HEAD;hp=1a5c6cb8bd3eb039cf9938808b918b724f12195f;hpb=12d3f1ba6ba522cd1ef11483d813fe2c2e64f04b;p=carl9170fw.git

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 1a5c6cb..6e8a3e1 100644
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __CARL9170FW_CARL9170_H
@@ -39,16 +38,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,
@@ -69,6 +65,13 @@ enum carl9170_suspend_mode {
 	CARL9170_AWAKE_HOST,
 };
 
+enum carl9170_phy_state {
+	CARL9170_PHY_OFF		= 0,
+	CARL9170_PHY_ON
+};
+
+typedef void (*fw_desc_callback_t)(void *, const bool);
+
 /*
  * This platform - being an odd 32-bit architecture - prefers to
  * have 32-Bit variables.
@@ -76,7 +79,7 @@ enum carl9170_suspend_mode {
 
 struct firmware_context_struct {
 	/* timer / clocks */
-	unsigned int ticks_per_msec;
+	unsigned int ticks_per_usec;
 	unsigned int counter;			/* main() cycles */
 
 	/* misc */
@@ -93,42 +96,29 @@ 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;
-
 		/* tx sequence control counters */
 		unsigned int sequence[CARL9170_INTF_NUM];
 
-#ifdef CONFIG_CARL9170FW_TX_AMPDU
-		/* tx aggregate scheduling */
-		struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
-#endif /* CONFIG_CARL9170FW_TX_AMPDU */
-
-#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,
@@ -136,14 +126,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
+		/* internal descriptor for use within the service routines */
+		struct dma_desc *fw_desc;
+		unsigned int fw_desc_available;
+		void *fw_desc_data;
+		fw_desc_callback_t fw_desc_callback;
+
 		/* 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 */
+		unsigned int ba_tail_idx,
+			     ba_head_idx,
+			     queued_ba;
+
+		unsigned int queued_bar;
 	} wlan;
 
 	struct {
@@ -189,12 +184,25 @@ struct firmware_context_struct {
 		unsigned int frequency;
 		unsigned int ht_settings;
 
-#ifdef CONFIG_CARL9170FW_PSM
+		enum carl9170_phy_state state;
 		struct carl9170_psm psm;
-#endif /* CONFIG_CARL9170FW_PSM */
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 	} phy;
 
+	unsigned int tally_clock;
+	struct carl9170_tally_rsp tally;
+	unsigned int tx_time;
+
+#ifdef CONFIG_CARL9170FW_WOL
+	struct {
+		struct carl9170_wol_cmd cmd;
+		unsigned int last_beacon;
+		unsigned int lost_null;
+		unsigned int last_null;
+		bool wake_up;
+	} wol;
+#endif /* CONFIG_CARL9170FW_WOL */
+
 #ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
 	struct carl9170_gpio cached_gpio_state;
 #endif /*CONFIG_CARL9170FW_GPIO_INTERRUPT */