From: Oleksij Rempel Date: Sun, 23 Jun 2013 20:14:36 +0000 (+0200) Subject: Merge branch 'clean' into clean_2 X-Git-Tag: 1.4.0~12^2 X-Git-Url: https://jxself.org/git/?p=open-ath9k-htc-firmware.git;a=commitdiff_plain;h=8e43241eb3301d14b3bae25b580fb32c156dfbae;hp=-c Merge branch 'clean' into clean_2 --- 8e43241eb3301d14b3bae25b580fb32c156dfbae diff --combined target_firmware/wlan/ah.h index 33613e8,b11d058..5bdc818 --- a/target_firmware/wlan/ah.h +++ b/target_firmware/wlan/ah.h @@@ -79,6 -79,13 +79,6 @@@ typedef enum 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, @@@ -370,21 -377,11 +370,11 @@@ struct ath_ha HAL_BOOL incTrigLevel); /* Misc Functions */ - HAL_STATUS __ahdecl(*ah_getCapability)(struct ath_hal *, - HAL_CAPABILITY_TYPE, a_uint32_t capability, - a_uint32_t *result); void __ahdecl(*ah_setDefAntenna)(struct ath_hal*, a_uint32_t); - - HAL_BOOL __ahdecl(*ah_updateCTSForBursting)(struct ath_hal *, - struct ath_desc *, struct ath_desc *, - struct ath_desc *, struct ath_desc *, - a_uint32_t, a_uint32_t); void __ahdecl(*ah_setRxFilter)(struct ath_hal*, a_uint32_t); /* Target Transmit Functions */ - - a_uint32_t __ahdecl(*ah_getTxDP)(struct ath_hal*, a_uint32_t); HAL_BOOL __ahdecl(*ah_setTxDP)(struct ath_hal*, a_uint32_t, a_uint32_t txdp); a_uint32_t __ahdecl(*ah_numTxPending)(struct ath_hal *, a_uint32_t q); HAL_BOOL __ahdecl(*ah_startTxDma)(struct ath_hal*, a_uint32_t); @@@ -392,62 -389,46 +382,46 @@@ HAL_BOOL __ahdecl(*ah_abortTxDma)(struct ath_hal *); - void __ahdecl(*ah_set11nTxDesc)(struct ath_hal *ah, - struct ath_tx_desc *ds, + void __ahdecl(*ah_set11nTxDesc)(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_tx_desc *ds, + void __ahdecl(*ah_set11nRateScenario)(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_tx_desc *ds, a_uint32_t aggrLen, + void __ahdecl(*ah_set11nAggrFirst)(struct ath_tx_desc *ds, a_uint32_t aggrLen, a_uint32_t numDelims); - void __ahdecl(*ah_set11nAggrMiddle)(struct ath_hal *ah, - struct ath_tx_desc *ds, a_uint32_t numDelims); - void __ahdecl(*ah_set11nAggrLast)(struct ath_hal *ah, - struct ath_tx_desc *ds); - void __ahdecl(*ah_clr11nAggr)(struct ath_hal *ah, - struct ath_tx_desc *ds); - void __ahdecl(*ah_set11nBurstDuration)(struct ath_hal *ah, - struct ath_tx_desc *ds, + void __ahdecl(*ah_set11nAggrMiddle)(struct ath_tx_desc *ds, a_uint32_t numDelims); + void __ahdecl(*ah_set11nAggrLast)(struct ath_tx_desc *ds); + void __ahdecl(*ah_clr11nAggr)(struct ath_tx_desc *ds); + void __ahdecl(*ah_set11nBurstDuration)(struct ath_tx_desc *ds, a_uint32_t burstDuration); - void __ahdecl(*ah_set11nVirtualMoreFrag)(struct ath_hal *ah, - struct ath_tx_desc *ds, a_uint32_t vmf); + void __ahdecl(*ah_set11nVirtualMoreFrag)(struct ath_tx_desc *ds, a_uint32_t vmf); - HAL_BOOL __ahdecl(*ah_setupTxDesc)(struct ath_hal *, struct ath_tx_desc *, + HAL_BOOL __ahdecl(*ah_setupTxDesc)(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, - a_uint32_t keyIx, a_uint32_t antMode, a_uint32_t flags, - 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_tx_desc *, + a_uint32_t keyIx, a_uint32_t flags, + a_uint32_t rtsctsRate, a_uint32_t rtsctsDuration); + HAL_BOOL __ahdecl(*ah_fillTxDesc)(struct ath_tx_desc *, a_uint32_t segLen, HAL_BOOL firstSeg, HAL_BOOL lastSeg, const struct ath_tx_desc *); - HAL_BOOL __ahdecl (*ah_fillKeyTxDesc) (struct ath_hal *, struct ath_tx_desc *, HAL_KEY_TYPE); + HAL_BOOL __ahdecl (*ah_fillKeyTxDesc) (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*); void __ahdecl(*ah_setPCUConfig)(struct ath_hal *); void __ahdecl(*ah_setMulticastFilter)(struct ath_hal*, a_uint32_t filter0, a_uint32_t filter1); - - a_uint32_t __ahdecl(*ah_getTsf32)(struct ath_hal*); + u_int64_t __ahdecl(*ah_getTsf64)(struct ath_hal*); - void __ahdecl(*ah_resetTsf)(struct ath_hal*); /* Target receive Functions */ - a_uint32_t __ahdecl(*ah_getRxDP)(struct ath_hal*); void __ahdecl(*ah_setRxDP)(struct ath_hal*, a_uint32_t rxdp); - HAL_BOOL __ahdecl(*ah_setupRxDesc)(struct ath_hal *, struct ath_rx_desc *, + HAL_BOOL __ahdecl(*ah_setupRxDesc)(struct ath_rx_desc *, a_uint32_t size, a_uint32_t flags); HAL_STATUS __ahdecl(*ah_procRxDesc)(struct ath_hal *, struct ath_desc *, a_uint32_t phyAddr, struct ath_desc *next, u_int64_t tsf); @@@ -456,14 -437,12 +430,12 @@@ struct ath_desc *nds, struct ath_rx_status *rx_stats); HAL_BOOL __ahdecl(*ah_stopDmaReceive)(struct ath_hal*); - void __ahdecl(*ah_startPcuReceive)(struct ath_hal*); void __ahdecl(*ah_stopPcuReceive)(struct ath_hal*); void __ahdecl(*ah_enableReceive)(struct ath_hal*); /* Interrupt functions */ HAL_BOOL __ahdecl(*ah_isInterruptPending)(struct ath_hal*); HAL_BOOL __ahdecl(*ah_getPendingInterrupts)(struct ath_hal*, HAL_INT*); - HAL_INT __ahdecl(*ah_getInterrupts)(struct ath_hal*); HAL_INT __ahdecl(*ah_setInterrupts)(struct ath_hal*, HAL_INT); }; @@@ -472,9 -451,6 +444,6 @@@ extern struct ath_hal * __ahdecl ath_ha adf_os_device_t dev, a_uint32_t flags, HAL_STATUS* status); - extern const HAL_RATE_TABLE * __ahdecl ath_hal_getratetable(struct ath_hal *, - a_uint32_t mode); - extern a_uint16_t __ahdecl ath_hal_computetxtime(struct ath_hal *, const HAL_RATE_TABLE *rates, a_uint32_t frameLen,