X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fah.h;h=6cf9354d1598a39bd406c26b29b1dfd523b956e8;hb=e4cdb5e9803b91e157f3db293facac50349b53ac;hp=714df752abac2412c066a58063c40f50de731edb;hpb=2c9d0b027ee2170505ab4f148fcb764442c0f640;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h
index 714df75..6cf9354 100755
--- a/target_firmware/wlan/ah.h
+++ b/target_firmware/wlan/ah.h
@@ -75,8 +75,6 @@ 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;
@@ -379,9 +377,6 @@ struct ath_hal
 						  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 *,
@@ -392,8 +387,6 @@ struct ath_hal
            
                       
 	/* 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);
@@ -402,34 +395,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,
@@ -437,11 +430,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*);
@@ -481,9 +474,6 @@ extern struct ath_hal * __ahdecl ath_hal_attach_tgt(a_uint32_t devid, HAL_SOFTC,
 						    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,