carl9170 firmware: reorganize wlan context members

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

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 6c19c32d742ca333d6830216a3a6e9e721f2e10c..1965674c2b866a7c19882372248cf493a9a087a2 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -70,11 +70,11 @@ enum carl9170_mac_reset_state {
 
 struct firmware_context_struct {
        /* timer / clocks */
-       unsigned int bogoclock;                 /* supposed to be CPU clock in KHz */
        unsigned int counter;                   /* main() cycles */
 
        /* misc */
        unsigned int watchdog_enable;
+       unsigned int reboot;
 
        struct {
                /* Host Interface DMA queues */
@@ -96,16 +96,22 @@ struct firmware_context_struct {
                /* 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 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;
 
 #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 */
@@ -156,9 +162,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 {