X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Far5416_hw.c;h=2cf28927c70349bec7e24ee4eb419de98b9e498a;hb=ce5eeea521f4e1f3958af176fdf7caee12c84e66;hp=076c1afe51b2a427f08f5e7ddf93d298ad776ce2;hpb=ab9f19bc924b01eb0f9be5b99e388d39d96fd0d4;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ar5416_hw.c b/target_firmware/wlan/ar5416_hw.c
index 076c1af..2cf2892 100644
--- a/target_firmware/wlan/ar5416_hw.c
+++ b/target_firmware/wlan/ar5416_hw.c
@@ -33,12 +33,10 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_ah.h"
 #include "ah.h"
 #include "ah_internal.h"
 #include "ar5416.h"
 #include "ar5416reg.h"
-#include "ar5416phy.h"
 #include "ar5416desc.h"
 
 #define N(a) (sizeof(a)/sizeof(a[0]))
@@ -69,7 +67,6 @@ static const struct ath_hal_private ar5416hal_10 = {{
 		.ah_abortTxDma          = ar5416AbortTxDma,
 
 		/* Misc Functions */
-		.ah_getCapability       = ar5416GetCapability,
 		.ah_getTsf32            = ar5416GetTsf32,
 		.ah_getTsf64            = ar5416GetTsf64,
 		.ah_resetTsf            = ar5416ResetTsf,
@@ -290,41 +287,6 @@ ar5416SetInterrupts(struct ath_hal *ah, HAL_INT ints)
 	return omask;
 }
 
-/****************/
-/* Capabilities */
-/****************/
-
-HAL_STATUS ar5416GetCapability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type,
-			       a_uint32_t capability, a_uint32_t *result)
-
-{
-        HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps;
-#ifndef MAGPIE_MERLIN // K2
-        pCap->halRxStbcSupport = 1;  /* K2 supports STBC Rx only */
-        pCap->halTxStbcSupport = 0;
-#else
-        pCap->halRxStbcSupport = 1;  /* number of streams for STBC recieve. */
-        pCap->halTxStbcSupport = 1;
-#endif
-
-	switch (type) {
-#ifdef MAGPIE_MERLIN
-	case HAL_CAP_RX_STBC:
-	{
-		*result = pCap->halRxStbcSupport;
-		return HAL_OK;
-	}
-	case HAL_CAP_TX_STBC:
-	{
-		*result = pCap->halTxStbcSupport;
-		return HAL_OK;
-	}
-#endif
-        default:
-                return ath_hal_getcapability(ah, type, capability, result);
-	}
-}
-
 /****************/
 /* TSF Handling */
 /****************/
@@ -853,7 +815,7 @@ HAL_BOOL ar5416FillTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
         return AH_TRUE;
 }
 
-HAL_BOOL ar5416FillKeyTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
+HAL_BOOL ar5416FillKeyTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 				HAL_KEY_TYPE keyType)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
@@ -1075,7 +1037,7 @@ void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 
 #endif
 
-void ar5416Set11nAggrFirst_20(struct ath_hal *ah, struct ath_desc *ds, a_uint32_t aggrLen,
+void ar5416Set11nAggrFirst_20(struct ath_hal *ah, struct ath_tx_desc *ds, a_uint32_t aggrLen,
 			      a_uint32_t numDelims)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
@@ -1087,7 +1049,7 @@ void ar5416Set11nAggrFirst_20(struct ath_hal *ah, struct ath_desc *ds, a_uint32_
 		SM(numDelims, AR_PadDelim);
 }
 
-void ar5416Set11nAggrMiddle_20(struct ath_hal *ah, struct ath_desc *ds, a_uint32_t numDelims)
+void ar5416Set11nAggrMiddle_20(struct ath_hal *ah, struct ath_tx_desc *ds, a_uint32_t numDelims)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
 	a_uint32_t ctl6;
@@ -1104,7 +1066,7 @@ void ar5416Set11nAggrMiddle_20(struct ath_hal *ah, struct ath_desc *ds, a_uint32
 	ads->ds_ctl6 = ctl6;
 }
 
-void ar5416Set11nAggrLast_20(struct ath_hal *ah, struct ath_desc *ds)
+void ar5416Set11nAggrLast_20(struct ath_hal *ah, struct ath_tx_desc *ds)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
 
@@ -1113,14 +1075,14 @@ void ar5416Set11nAggrLast_20(struct ath_hal *ah, struct ath_desc *ds)
 	ads->ds_ctl6 &= ~AR_PadDelim;
 }
 
-void ar5416Clr11nAggr_20(struct ath_hal *ah, struct ath_desc *ds)
+void ar5416Clr11nAggr_20(struct ath_hal *ah, struct ath_tx_desc *ds)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
 
 	ads->ds_ctl1 &= (~AR_IsAggr & ~AR_MoreAggr);
 }
 
-void ar5416Set11nBurstDuration_20(struct ath_hal *ah, struct ath_desc *ds,
+void ar5416Set11nBurstDuration_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 				  a_uint32_t burstDuration)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
@@ -1129,7 +1091,7 @@ void ar5416Set11nBurstDuration_20(struct ath_hal *ah, struct ath_desc *ds,
 	ads->ds_ctl2 |= SM(burstDuration, AR_BurstDur);
 }
 
-void ar5416Set11nVirtualMoreFrag_20(struct ath_hal *ah, struct ath_desc *ds,
+void ar5416Set11nVirtualMoreFrag_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 				    a_uint32_t vmf)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);