remove unused HAL_OPMODE

[open-ath9k-htc-firmware.git] / target_firmware / wlan / ah.h

diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h
index 36758ef89074fc710d66214b22d5dd42bcec859c..33613e863958e5a3de60fe78ceea4eacbccfb9ec 100755 (executable)
--- a/target_firmware/wlan/ah.h
+++ b/target_firmware/wlan/ah.h
@@ -75,19 +75,10 @@ typedef enum {
        HAL_CAP_VEOL        = 0,
        HAL_CAP_BSSIDMASK   = 1,
        HAL_CAP_TSF_ADJUST  = 2,
-       HAL_CAP_RX_STBC     = 3,
-       HAL_CAP_TX_STBC     = 4,
        HAL_CAP_HT          = 5,
        HAL_CAP_RTS_AGGR_LIMIT = 6,
 } HAL_CAPABILITY_TYPE;
 
-typedef enum {
-       HAL_M_STA       = 1,
-       HAL_M_IBSS      = 0,
-       HAL_M_HOSTAP    = 6,
-       HAL_M_MONITOR   = 8,
-} HAL_OPMODE;
-
 typedef enum {
        HAL_TX_QUEUE_INACTIVE   = 0,
        HAL_TX_QUEUE_DATA   = 1,
@@ -367,7 +358,6 @@ struct ath_hal
 {
        a_uint32_t ah_magic;
        HAL_SOFTC ah_sc;
-       HAL_BUS_HANDLE ah_sh;
        adf_os_device_t ah_dev;
            
        a_uint32_t ah_macVersion;
@@ -403,34 +393,34 @@ struct ath_hal
        HAL_BOOL  __ahdecl(*ah_abortTxDma)(struct ath_hal *);
            
        void      __ahdecl(*ah_set11nTxDesc)(struct ath_hal *ah,
-                                            struct ath_desc *ds,
+                                            struct ath_tx_desc *ds,
                                             a_uint32_t pktLen, HAL_PKT_TYPE type,
                                             a_uint32_t txPower, a_uint32_t keyIx,
                                             HAL_KEY_TYPE keyType,
                                             a_uint32_t flags);
        void      __ahdecl(*ah_set11nRateScenario)(struct ath_hal *ah,
-                                                  struct ath_desc *ds,
+                                                  struct ath_tx_desc *ds,
                                                   a_uint32_t durUpdateEn,
                                                   a_uint32_t rtsctsRate,
                                                   a_uint32_t rtsctsDuration,
                                                   HAL_11N_RATE_SERIES series[],
                                                   a_uint32_t nseries, a_uint32_t flags);
        void      __ahdecl(*ah_set11nAggrFirst)(struct ath_hal *ah,
-                                               struct ath_desc *ds, a_uint32_t aggrLen,
+                                               struct ath_tx_desc *ds, a_uint32_t aggrLen,
                                                a_uint32_t numDelims);
        void      __ahdecl(*ah_set11nAggrMiddle)(struct ath_hal *ah,
-                                                struct ath_desc *ds, a_uint32_t numDelims);
+                                                struct ath_tx_desc *ds, a_uint32_t numDelims);
        void      __ahdecl(*ah_set11nAggrLast)(struct ath_hal *ah,
-                                              struct ath_desc *ds);
+                                              struct ath_tx_desc *ds);
        void      __ahdecl(*ah_clr11nAggr)(struct ath_hal *ah,
-                                          struct ath_desc *ds);
+                                          struct ath_tx_desc *ds);
        void      __ahdecl(*ah_set11nBurstDuration)(struct ath_hal *ah,
-                                                   struct ath_desc *ds,
+                                                   struct ath_tx_desc *ds,
                                                    a_uint32_t burstDuration);
        void      __ahdecl(*ah_set11nVirtualMoreFrag)(struct ath_hal *ah,
-                                                     struct ath_desc *ds, a_uint32_t vmf);
+                                                     struct ath_tx_desc *ds, a_uint32_t vmf);
            
-       HAL_BOOL  __ahdecl(*ah_setupTxDesc)(struct ath_hal *, struct ath_desc *,
+       HAL_BOOL  __ahdecl(*ah_setupTxDesc)(struct ath_hal *, struct ath_tx_desc *,
                                            a_uint32_t pktLen, a_uint32_t hdrLen,
                                            HAL_PKT_TYPE type, a_uint32_t txPower,
                                            a_uint32_t txRate0, a_uint32_t txTries0,
@@ -438,11 +428,11 @@ struct ath_hal
                                            a_uint32_t rtsctsRate, a_uint32_t rtsctsDuration,
                                            a_uint32_t compicvLen, a_uint32_t compivLen,
                                            a_uint32_t comp);
-       HAL_BOOL  __ahdecl(*ah_fillTxDesc)(struct ath_hal *, struct ath_desc *,
+       HAL_BOOL  __ahdecl(*ah_fillTxDesc)(struct ath_hal *, struct ath_tx_desc *,
                                           a_uint32_t segLen, HAL_BOOL firstSeg,
-                                          HAL_BOOL lastSeg, const struct ath_desc *);
-       HAL_BOOL  __ahdecl (*ah_fillKeyTxDesc) (struct ath_hal *, struct ath_desc *, HAL_KEY_TYPE);
-       HAL_STATUS __ahdecl(*ah_procTxDesc)(struct ath_hal *, struct ath_desc*);
+                                          HAL_BOOL lastSeg, const struct ath_tx_desc *);
+       HAL_BOOL  __ahdecl (*ah_fillKeyTxDesc) (struct ath_hal *, struct ath_tx_desc *, HAL_KEY_TYPE);
+       HAL_STATUS __ahdecl(*ah_procTxDesc)(struct ath_hal *, struct ath_tx_desc *);
        void            __ahdecl(*ah_getTxIntrQueue)(struct ath_hal *, a_uint32_t *);
        void       __ahdecl(*ah_reqTxIntrDesc)(struct ath_hal *, struct ath_desc*);    
        HAL_BOOL  __ahdecl(*ah_setBssIdMask)(struct ath_hal *, const a_uint8_t*);
@@ -462,7 +452,7 @@ struct ath_hal
        HAL_STATUS __ahdecl(*ah_procRxDesc)(struct ath_hal *, struct ath_desc *,
                                            a_uint32_t phyAddr, struct ath_desc *next, u_int64_t tsf);
        HAL_STATUS __ahdecl(*ah_procRxDescFast)(struct ath_hal *ah, 
-                                               struct ath_desc *ds, a_uint32_t pa, 
+                                               struct ath_rx_desc *ds, a_uint32_t pa,
                                                struct ath_desc *nds, 
                                                struct ath_rx_status *rx_stats);
        HAL_BOOL  __ahdecl(*ah_stopDmaReceive)(struct ath_hal*);
@@ -479,7 +469,7 @@ struct ath_hal
 
 
 extern struct ath_hal * __ahdecl ath_hal_attach_tgt(a_uint32_t devid, HAL_SOFTC,
-                                                   adf_os_device_t dev, HAL_BUS_HANDLE sh,
+                                                   adf_os_device_t dev,
                                                    a_uint32_t flags, HAL_STATUS* status);
 
 extern const HAL_RATE_TABLE * __ahdecl ath_hal_getratetable(struct ath_hal *,