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

diff --git a/target_firmware/wlan/ar5416_hw.c b/target_firmware/wlan/ar5416_hw.c
index 7c271ce..78882ff 100644
--- a/target_firmware/wlan/ar5416_hw.c
+++ b/target_firmware/wlan/ar5416_hw.c
@@ -77,7 +77,6 @@ static const struct ath_hal_private ar5416hal_10 = {{
 		/* Interrupt Functions */
 		.ah_isInterruptPending   = ar5416IsInterruptPending,
 		.ah_getPendingInterrupts = ar5416GetPendingInterrupts,
-		.ah_getInterrupts        = ar5416GetInterrupts,
 		.ah_setInterrupts        = ar5416SetInterrupts,
 	},
 };
@@ -106,27 +105,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_updateCTSForBursting = NULL;
-		ah->ah_setupTxDesc         = ar5416SetupTxDesc_20;
-		ah->ah_reqTxIntrDesc       = ar5416IntrReqTxDesc_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;
 }
@@ -222,11 +215,6 @@ HAL_BOOL ar5416GetPendingInterrupts(struct ath_hal *ah, HAL_INT *masked)
 	return AH_TRUE;
 }
 
-HAL_INT ar5416GetInterrupts(struct ath_hal *ah)
-{
-	return AH5416(ah)->ah_maskReg;
-}
-
 HAL_INT
 ar5416SetInterrupts(struct ath_hal *ah, HAL_INT ints)
 {
@@ -650,12 +638,6 @@ HAL_BOOL ar5416StopTxDma(struct ath_hal*ah, a_uint32_t q)
         return (i != 0);
 }
 
-void ar5416IntrReqTxDesc_20(struct ath_hal *ah, struct ath_desc *ds)
-{
-	struct ar5416_desc *ads = AR5416DESC(ds);
-	ads->ds_ctl0 |= AR_TxIntrReq;
-}
-
 HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
 			      a_uint32_t pktLen,
 			      a_uint32_t hdrLen,