carl9170 firmware: merge CARL9170FW_PSM with the standard RF code

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

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 1965674c2b866a7c19882372248cf493a9a087a2..72bd6118a34029673d8d1946d0f9c59722f78b47 100644 (file)
--- 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,11 +76,13 @@ enum carl9170_mac_reset_state {
 
 struct firmware_context_struct {
        /* timer / clocks */
+       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 */
@@ -85,13 +93,11 @@ 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];
@@ -106,6 +112,9 @@ struct firmware_context_struct {
                unsigned int rx_total;
                unsigned int rx_overruns;
 
+               /* tx sequence control counters */
+               unsigned int sequence[CARL9170_INTF_NUM];
+
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
                /* CAB */
                struct dma_queue cab_queue[CARL9170_INTF_NUM];
@@ -133,7 +142,8 @@ struct firmware_context_struct {
        struct {
                unsigned int config,
                             interface_setting,
-                            alternate_interface_setting;
+                            alternate_interface_setting,
+                            device_feature;
                enum carl9170_ep0_action ep0_action;
 
                void *ep0_txrx_buffer;
@@ -172,9 +182,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;