X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Far5416_hw.c;h=089f4f62a63f3661c994f069e5873d0329edaaff;hb=d73a8abece816d9a3d89444a0564982d8c2a6da2;hp=f1f88a982df4a1d292e25a2d15930b9be9dd3485;hpb=3dc46485fbada8f035ff0ca7fab9f99c882cb822;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ar5416_hw.c b/target_firmware/wlan/ar5416_hw.c
index f1f88a9..089f4f6 100644
--- a/target_firmware/wlan/ar5416_hw.c
+++ b/target_firmware/wlan/ar5416_hw.c
@@ -88,8 +88,7 @@ void ar5416Detach(struct ath_hal *ah)
 }
 
 struct ath_hal *
-ar5416Attach(a_uint32_t devid,HAL_SOFTC sc, adf_os_device_t dev,
-	     a_uint32_t flags, HAL_STATUS *status)
+ar5416Attach(HAL_SOFTC sc, adf_os_device_t dev, HAL_STATUS *status)
 {
 	struct ath_hal_5416 *ahp;
 	struct ath_hal *ah;
@@ -105,25 +104,21 @@ ar5416Attach(a_uint32_t devid,HAL_SOFTC sc, adf_os_device_t dev,
 
 	ah->ah_dev = dev;
 	ah->ah_sc = sc;
-	
-	/* If its a Owl 2.0 chip then change the hal structure to
-	   point to the Owl 2.0 ar5416_hal_20 structure */
-	if(1) {
-		ah->ah_set11nTxDesc        = ar5416Set11nTxDesc_20;
-		ah->ah_set11nRateScenario  = ar5416Set11nRateScenario_20;
-		ah->ah_set11nAggrFirst     = ar5416Set11nAggrFirst_20;
-		ah->ah_set11nAggrMiddle    = ar5416Set11nAggrMiddle_20;
-		ah->ah_set11nAggrLast      = ar5416Set11nAggrLast_20;
-		ah->ah_clr11nAggr          = ar5416Clr11nAggr_20;
-		ah->ah_set11nBurstDuration = ar5416Set11nBurstDuration_20;
-		ah->ah_setupRxDesc         = ar5416SetupRxDesc_20;
-		ah->ah_procRxDescFast      = ar5416ProcRxDescFast_20;
-		ah->ah_setupTxDesc         = ar5416SetupTxDesc_20;
-		ah->ah_fillTxDesc          = ar5416FillTxDesc_20;
-		ah->ah_fillKeyTxDesc       = ar5416FillKeyTxDesc_20;
-		ah->ah_procTxDesc          = ar5416ProcTxDesc_20;
-		ah->ah_set11nVirtualMoreFrag = ar5416Set11nVirtualMoreFrag_20;
-	}
+
+	ah->ah_set11nTxDesc        = ar5416Set11nTxDesc_20;
+	ah->ah_set11nRateScenario  = ar5416Set11nRateScenario_20;
+	ah->ah_set11nAggrFirst     = ar5416Set11nAggrFirst_20;
+	ah->ah_set11nAggrMiddle    = ar5416Set11nAggrMiddle_20;
+	ah->ah_set11nAggrLast      = ar5416Set11nAggrLast_20;
+	ah->ah_clr11nAggr          = ar5416Clr11nAggr_20;
+	ah->ah_set11nBurstDuration = ar5416Set11nBurstDuration_20;
+	ah->ah_setupRxDesc         = ar5416SetupRxDesc_20;
+	ah->ah_procRxDescFast      = ar5416ProcRxDescFast_20;
+	ah->ah_setupTxDesc         = ar5416SetupTxDesc_20;
+	ah->ah_fillTxDesc          = ar5416FillTxDesc_20;
+	ah->ah_fillKeyTxDesc       = ar5416FillKeyTxDesc_20;
+	ah->ah_procTxDesc          = ar5416ProcTxDesc_20;
+	ah->ah_set11nVirtualMoreFrag = ar5416Set11nVirtualMoreFrag_20;
 
 	return ah;
 }
@@ -296,28 +291,6 @@ void ar5416SetRxDP(struct ath_hal *ah, a_uint32_t rxdp)
 	HALASSERT(OS_REG_READ(ah, AR_RXDP) == rxdp);
 }
 
-void ar5416SetMulticastFilter(struct ath_hal *ah, a_uint32_t filter0, a_uint32_t filter1)
-{
-	OS_REG_WRITE(ah, AR_MCAST_FIL0, filter0);
-	OS_REG_WRITE(ah, AR_MCAST_FIL1, filter1);
-}
-
-HAL_BOOL ar5416ClrMulticastFilterIndex(struct ath_hal *ah, a_uint32_t ix)
-{
-	a_uint32_t val;
-
-	if (ix >= 64)
-		return AH_FALSE;
-	if (ix >= 32) {
-		val = OS_REG_READ(ah, AR_MCAST_FIL1);
-		OS_REG_WRITE(ah, AR_MCAST_FIL1, (val &~ (1<<(ix-32))));
-	} else {
-		val = OS_REG_READ(ah, AR_MCAST_FIL0);
-		OS_REG_WRITE(ah, AR_MCAST_FIL0, (val &~ (1<<ix)));
-	}
-	return AH_TRUE;
-}
-
 HAL_BOOL ar5416StopDmaReceive(struct ath_hal *ah)
 {
 	OS_REG_WRITE(ah, AR_CR, AR_CR_RXD); /* Set receive disable bit */
@@ -328,22 +301,6 @@ HAL_BOOL ar5416StopDmaReceive(struct ath_hal *ah)
 	}
 }
 
-HAL_BOOL ar5416SetMulticastFilterIndex(struct ath_hal *ah, a_uint32_t ix)
-{
-	a_uint32_t val;
-
-	if (ix >= 64)
-		return AH_FALSE;
-	if (ix >= 32) {
-		val = OS_REG_READ(ah, AR_MCAST_FIL1);
-		OS_REG_WRITE(ah, AR_MCAST_FIL1, (val | (1<<(ix-32))));
-	} else {
-		val = OS_REG_READ(ah, AR_MCAST_FIL0);
-		OS_REG_WRITE(ah, AR_MCAST_FIL0, (val | (1<<ix)));
-	}
-	return AH_TRUE;
-}
-
 void ar5416SetRxFilter(struct ath_hal *ah, a_uint32_t bits)
 {
 	a_uint32_t phybits;
@@ -372,7 +329,7 @@ void ar5416StopPcuReceive(struct ath_hal *ah)
 	OS_REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_DIS);
 }
 
-HAL_BOOL ar5416SetupRxDesc_20(struct ath_hal *ah, struct ath_rx_desc *ds,
+HAL_BOOL ar5416SetupRxDesc_20(struct ath_rx_desc *ds,
 			      a_uint32_t size, a_uint32_t flags)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
@@ -642,20 +599,16 @@ HAL_BOOL ar5416StopTxDma(struct ath_hal*ah, a_uint32_t q)
         return (i != 0);
 }
 
-HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
+HAL_BOOL ar5416SetupTxDesc_20(struct ath_tx_desc *ds,
 			      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)
+			      a_uint32_t rtsctsDuration)
 {
 #define RTSCTS  (HAL_TXDESC_RTSENA|HAL_TXDESC_CTSENA)
 
@@ -710,7 +663,7 @@ HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 #undef RTSCTS
 }
 
-HAL_BOOL ar5416FillTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
+HAL_BOOL ar5416FillTxDesc_20(struct ath_tx_desc *ds,
 			     a_uint32_t segLen, HAL_BOOL firstSeg, HAL_BOOL lastSeg,
 			     const struct ath_tx_desc *ds0)
 {
@@ -748,7 +701,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_tx_desc *ds,
+HAL_BOOL ar5416FillKeyTxDesc_20(struct ath_tx_desc *ds,
 				HAL_KEY_TYPE keyType)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
@@ -824,7 +777,7 @@ HAL_STATUS ar5416ProcTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *gds)
         return HAL_OK;
 }
 
-void ar5416Set11nTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
+void ar5416Set11nTxDesc_20(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)