carl9170 firmware: initial WoWLAN support

[carl9170fw.git] / carlfw / include / carl9170.h

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index b05d8beaec22ee3a70ae31078d1d0b72310e94f7..4b0738d651a3fd0bdc93552284c3ed4e63652b85 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -69,6 +69,8 @@ enum carl9170_suspend_mode {
        CARL9170_AWAKE_HOST,
 };
 
+typedef void (*fw_desc_callback_t)(void *, const bool);
+
 /*
  * This platform - being an odd 32-bit architecture - prefers to
  * have 32-Bit variables.
@@ -100,8 +102,8 @@ struct firmware_context_struct {
                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;
 
@@ -129,14 +131,26 @@ 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,
+               unsigned int ba_tail_idx,
                             ba_head_idx;
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
+
+#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 */
        } wlan;
 
        struct {
@@ -182,9 +196,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;