carl9170 firmware: remove BAR->BA clutter

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

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index cbfa611b7e761ec2c6ae67b11ad6f668afac440e..d10a74e8064448eebbb60502a53b23c1bc7744ad 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -39,7 +39,6 @@ struct carl9170_bar_ctx {
        uint8_t ra[6];
        __le16 start_seq_num;
        __le16 control;
-       __le32 phy;
 };
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
@@ -69,6 +68,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 +82,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 */
@@ -108,10 +114,6 @@ struct firmware_context_struct {
                /* 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];
 
@@ -129,12 +131,17 @@ struct firmware_context_struct {
                             tx_status_tail_idx;
                struct carl9170_tx_status tx_status_cache[CARL9170_TX_STATUS_NUM];
 
+               /* 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;
+               unsigned int ba_tail_idx,
+                            ba_head_idx,
+                            queued_ba;
        } wlan;
 
        struct {
@@ -180,10 +187,25 @@ struct firmware_context_struct {
                unsigned int frequency;
                unsigned int ht_settings;
 
+               enum carl9170_phy_state state;
                struct carl9170_psm 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 */