X-Git-Url: https://jxself.org/git/?p=open-ath9k-htc-firmware.git;a=blobdiff_plain;f=target_firmware%2Fwlan%2Far5416_hw.c;h=a67ce1781e13c0e659e67fbdab3a3233f89b7e1b;hp=78882ff9b064570361d65f66510f8766657f0761;hb=40d4865c8791184b3b30f62be5fe606e55e1c246;hpb=0056916c5ac6d4d5b8fa151c010fc2874906a61d

diff --git a/target_firmware/wlan/ar5416_hw.c b/target_firmware/wlan/ar5416_hw.c
index 78882ff..a67ce17 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;
@@ -292,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 */
@@ -324,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;
@@ -368,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);
@@ -638,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)
 
@@ -706,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)
 {
@@ -744,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);
@@ -820,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)
@@ -852,26 +809,23 @@ void ar5416Set11nTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
         ads->ds_ctl6 = SM(keyType, AR_EncrType);
 }
 
-#ifdef MAGPIE_MERLIN
-
-void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_tx_desc *ds,
+void ar5416Set11nRateScenario_20(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)
 {
-        struct ar5416_desc *ads = AR5416DESC(ds);
-        a_uint32_t ds_ctl0;
+	struct ar5416_desc *ads = AR5416DESC(ds);
+	a_uint32_t ds_ctl0;
 
-        HALASSERT(nseries == 4);
-        (void)nseries;
+	HALASSERT(nseries == 4);
+	(void)nseries;
 
-        /*
-         * Rate control settings override
-         */
+	/*
+	* Rate control settings override
+	*/
 	ds_ctl0 = ads->ds_ctl0;
 
-        if (flags & (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA)) {
+	if (flags & (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA)) {
 		if (flags & HAL_TXDESC_RTSENA) {
 			ds_ctl0 &= ~AR_CTSEnable;
 			ds_ctl0 |= AR_RTSEnable;
@@ -879,94 +833,39 @@ void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 			ds_ctl0 &= ~AR_RTSEnable;
 			ds_ctl0 |= AR_CTSEnable;
 		}
-        } else {
+	} else {
+		/* this line is only difference between merlin and k2
+		 * Current one is for merlin */
 		ds_ctl0 = (ds_ctl0 & ~(AR_RTSEnable | AR_CTSEnable));
-        }
+	}
 
 	ads->ds_ctl0 = ds_ctl0;
 
-        ads->ds_ctl2 = set11nTries(series, 0)
-		|  set11nTries(series, 1)
-		|  set11nTries(series, 2)
-		|  set11nTries(series, 3)
-		|  (durUpdateEn ? AR_DurUpdateEn : 0);
+	ads->ds_ctl2 = set11nTries(series, 0)
+				   | set11nTries(series, 1)
+				   | set11nTries(series, 2)
+				   | set11nTries(series, 3)
+				   | (durUpdateEn ? AR_DurUpdateEn : 0);
 
-        ads->ds_ctl3 = set11nRate(series, 0)
-		|  set11nRate(series, 1)
-		|  set11nRate(series, 2)
-		|  set11nRate(series, 3);
+	ads->ds_ctl3 = set11nRate(series, 0)
+				   | set11nRate(series, 1)
+				   | set11nRate(series, 2)
+				   | set11nRate(series, 3);
 
-        ads->ds_ctl4 = set11nPktDurRTSCTS(series, 0)
-		|  set11nPktDurRTSCTS(series, 1);
+	ads->ds_ctl4 = set11nPktDurRTSCTS(series, 0)
+				   | set11nPktDurRTSCTS(series, 1);
 
-        ads->ds_ctl5 = set11nPktDurRTSCTS(series, 2)
-		|  set11nPktDurRTSCTS(series, 3);
+	ads->ds_ctl5 = set11nPktDurRTSCTS(series, 2)
+				   | set11nPktDurRTSCTS(series, 3);
 
-        ads->ds_ctl7 = set11nRateFlags(series, 0)
-		|  set11nRateFlags(series, 1)
-		|  set11nRateFlags(series, 2)
-		|  set11nRateFlags(series, 3)
-		| SM(rtsctsRate, AR_RTSCTSRate);
+	ads->ds_ctl7 = set11nRateFlags(series, 0)
+				   | set11nRateFlags(series, 1)
+				   | set11nRateFlags(series, 2)
+				   | set11nRateFlags(series, 3)
+				   | SM(rtsctsRate, AR_RTSCTSRate);
 }
 
-#else
-
-void ar5416Set11nRateScenario_20(struct ath_hal *ah, 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)
-{
-        struct ar5416_desc *ads = AR5416DESC(ds);
-        a_uint32_t ds_ctl0;
-
-        HALASSERT(nseries == 4);
-        (void)nseries;
-
-        /*
-         * Rate control settings override
-         */
-        if (flags & (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA)) {
-		ds_ctl0 = ads->ds_ctl0;
-
-		if (flags & HAL_TXDESC_RTSENA) {
-			ds_ctl0 &= ~AR_CTSEnable;
-			ds_ctl0 |= AR_RTSEnable;
-		} else {
-			ds_ctl0 &= ~AR_RTSEnable;
-			ds_ctl0 |= AR_CTSEnable;
-		}
-
-		ads->ds_ctl0 = ds_ctl0;
-        }
-
-        ads->ds_ctl2 = set11nTries(series, 0)
-		|  set11nTries(series, 1)
-		|  set11nTries(series, 2)
-		|  set11nTries(series, 3)
-		|  (durUpdateEn ? AR_DurUpdateEn : 0);
-
-        ads->ds_ctl3 = set11nRate(series, 0)
-		|  set11nRate(series, 1)
-		|  set11nRate(series, 2)
-		|  set11nRate(series, 3);
-
-        ads->ds_ctl4 = set11nPktDurRTSCTS(series, 0)
-		|  set11nPktDurRTSCTS(series, 1);
-
-        ads->ds_ctl5 = set11nPktDurRTSCTS(series, 2)
-		|  set11nPktDurRTSCTS(series, 3);
-
-        ads->ds_ctl7 = set11nRateFlags(series, 0)
-		|  set11nRateFlags(series, 1)
-		|  set11nRateFlags(series, 2)
-		|  set11nRateFlags(series, 3)
-		| SM(rtsctsRate, AR_RTSCTSRate);
-}
-
-#endif
-
-void ar5416Set11nAggrFirst_20(struct ath_hal *ah, struct ath_tx_desc *ds, a_uint32_t aggrLen,
+void ar5416Set11nAggrFirst_20(struct ath_tx_desc *ds, a_uint32_t aggrLen,
 			      a_uint32_t numDelims)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
@@ -978,7 +877,7 @@ void ar5416Set11nAggrFirst_20(struct ath_hal *ah, struct ath_tx_desc *ds, a_uint
 		SM(numDelims, AR_PadDelim);
 }
 
-void ar5416Set11nAggrMiddle_20(struct ath_hal *ah, struct ath_tx_desc *ds, a_uint32_t numDelims)
+void ar5416Set11nAggrMiddle_20(struct ath_tx_desc *ds, a_uint32_t numDelims)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
 	a_uint32_t ctl6;
@@ -995,7 +894,7 @@ void ar5416Set11nAggrMiddle_20(struct ath_hal *ah, struct ath_tx_desc *ds, a_uin
 	ads->ds_ctl6 = ctl6;
 }
 
-void ar5416Set11nAggrLast_20(struct ath_hal *ah, struct ath_tx_desc *ds)
+void ar5416Set11nAggrLast_20(struct ath_tx_desc *ds)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
 
@@ -1004,14 +903,14 @@ void ar5416Set11nAggrLast_20(struct ath_hal *ah, struct ath_tx_desc *ds)
 	ads->ds_ctl6 &= ~AR_PadDelim;
 }
 
-void ar5416Clr11nAggr_20(struct ath_hal *ah, struct ath_tx_desc *ds)
+void ar5416Clr11nAggr_20(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_tx_desc *ds,
+void ar5416Set11nBurstDuration_20(struct ath_tx_desc *ds,
 				  a_uint32_t burstDuration)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);
@@ -1020,7 +919,7 @@ void ar5416Set11nBurstDuration_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 	ads->ds_ctl2 |= SM(burstDuration, AR_BurstDur);
 }
 
-void ar5416Set11nVirtualMoreFrag_20(struct ath_hal *ah, struct ath_tx_desc *ds,
+void ar5416Set11nVirtualMoreFrag_20(struct ath_tx_desc *ds,
 				    a_uint32_t vmf)
 {
 	struct ar5416_desc *ads = AR5416DESC(ds);