X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fah.c;h=71deb5ec646eda573320ef1ab78623a2141d279c;hb=246c1039d7c3ab53180a634181918f19ea4d2f8b;hp=53993f535dafac3cad69d80d818a134fceca34c5;hpb=eaacae6cedaf752150758b9baa0917e1deb1a99f;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ah.c b/target_firmware/wlan/ah.c
index 53993f5..71deb5e 100755
--- a/target_firmware/wlan/ah.c
+++ b/target_firmware/wlan/ah.c
@@ -33,23 +33,22 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_ah.h"
 #include "ah.h"
 #include "ah_internal.h"
 #include <asf_bitmap.h>
 
 extern struct ath_hal *ar5416Attach(a_uint32_t devid,HAL_SOFTC sc, adf_os_device_t dev,
-				    HAL_BUS_HANDLE sh, a_uint32_t flags, HAL_STATUS *status);
+				    a_uint32_t flags, HAL_STATUS *status);
 
 struct ath_hal*
 ath_hal_attach_tgt(a_uint32_t devid,HAL_SOFTC sc,
-		   adf_os_device_t dev, HAL_BUS_HANDLE sh,
+		   adf_os_device_t dev,
 		   a_uint32_t flags, HAL_STATUS *error)
 {
 	struct ath_hal *ah = AH_NULL;
 
 	devid = AR5416_DEVID_PCIE;
-	ah = ar5416Attach(devid, sc, dev, sh, flags, error);
+	ah = ar5416Attach(devid, sc, dev, flags, error);
 
 	return ah;
 }
@@ -67,40 +66,11 @@ ath_hal_getcapability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type,
 		return pCap->halBssIdMaskSupport ? HAL_OK : HAL_ENOTSUPP;
 	case HAL_CAP_VEOL:
 		return pCap->halVEOLSupport ? HAL_OK : HAL_ENOTSUPP;
-#ifdef MAGPIE_MERLIN
-	case HAL_CAP_RX_STBC:
-		return HAL_ENOTSUPP;
-	case HAL_CAP_TX_STBC:
-		return HAL_ENOTSUPP;
-#endif
 	default:
 		return HAL_EINVAL;
 	}
 }
 
-void
-ath_hal_setupratetable(struct ath_hal *ah, HAL_RATE_TABLE *rt)
-{
-	a_int32_t i;
-
-	if (rt->rateCodeToIndex[0] != 0)
-		return;
-
-	for (i = 0; i < 32; i++)
-		rt->rateCodeToIndex[i] = (a_uint8_t) -1;
-	for (i = 0; i < rt->rateCount; i++) {
-		a_uint8_t code = rt->info[i].rateCode;
-		a_uint8_t cix = rt->info[i].controlRate;
-
-		rt->rateCodeToIndex[code] = i;
-		rt->rateCodeToIndex[code | rt->info[i].shortPreamble] = i;
-		rt->info[i].lpAckDuration = ath_hal_computetxtime(ah, rt,
-					  WLAN_CTRL_FRAME_SIZE, cix, AH_FALSE);
-		rt->info[i].spAckDuration = ath_hal_computetxtime(ah, rt,
-					  WLAN_CTRL_FRAME_SIZE, cix, AH_TRUE);
-	}
-}
-
 #define CCK_SIFS_TIME        10
 #define CCK_PREAMBLE_BITS   144
 #define CCK_PLCP_BITS        48