X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fah.h;h=f92aa5762621d0316085b580273f046f1d5b8fed;hb=e762f9bdb56051a28818e71754db0156ab30d61b;hp=67c32d6a44451d97e5abcf8ca9dad20c5fd1a3ff;hpb=70e04b8216232aebec9f90f3a20958bcc9d41ec3;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h
index 67c32d6..f92aa57 100755
--- a/target_firmware/wlan/ah.h
+++ b/target_firmware/wlan/ah.h
@@ -367,7 +367,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,13 +402,13 @@ 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,
@@ -430,7 +429,7 @@ struct ath_hal
 	void      __ahdecl(*ah_set11nVirtualMoreFrag)(struct ath_hal *ah,
 						      struct ath_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,9 +437,9 @@ 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 lastSeg, const struct ath_tx_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*);
 	void		__ahdecl(*ah_getTxIntrQueue)(struct ath_hal *, a_uint32_t *);
@@ -457,12 +456,12 @@ 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_desc *,
+	HAL_BOOL  __ahdecl(*ah_setupRxDesc)(struct ath_hal *, 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);
 	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 +478,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 *,