X-Git-Url: https://jxself.org/git/?p=open-ath9k-htc-firmware.git;a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_ath.c;h=896e72b56ff8506d7658e27937150d8f04cb38af;hp=a473718e48e113e2f29fe785e60fa1fb31a69181;hb=ffd97659858ed6e9bd252ed1baa2243d8a725dd6;hpb=2b3817dd42331f38a49ba0519ea0d3e5457ce6d8

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index a473718..896e72b 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -50,13 +50,12 @@
 #include <adf_os_irq.h>
 
 #include <if_ath_pci.h>
-#include "if_ethersubr.h"
 #include "if_llc.h"
 #include "ieee80211_var.h"
-#include "ieee80211_proto.h"
 #include "if_athrate.h"
 #include "if_athvar.h"
 #include "ah_desc.h"
+#include "ah.h"
 
 static a_int32_t ath_numrxbufs = -1;
 static a_int32_t ath_numrxdescs = -1;
@@ -70,12 +69,10 @@ uint32_t *init_htc_handle = 0;
 #define UAPSDQ_NUM   9
 #define CABQ_NUM     8
 
-void wmi_event(wmi_handle_t handle, WMI_EVENT_ID evt_id, A_UINT8 *buffer, a_int32_t Length);
 void owl_tgt_tx_tasklet(TQUEUE_ARG data);
 static void ath_tgt_send_beacon(struct ath_softc_tgt *sc,adf_nbuf_t bc_hdr,adf_nbuf_t nbuf,HTC_ENDPOINT_ID EndPt);
-void wmi_cmd_rsp(void *pContext, WMI_COMMAND_ID cmd_id, A_UINT16 SeqNo, A_UINT8 *buffer, a_int32_t Length);
 static void ath_hal_reg_write_tgt(void *Context, A_UINT16 Command, A_UINT16 SeqNo, A_UINT8 *data, a_int32_t datalen);
-extern struct ath_buf * ath_tgt_tx_prepare(struct ath_softc_tgt *sc, adf_nbuf_t skb, ath_data_hdr_t *dh);
+extern struct ath_tx_buf* ath_tgt_tx_prepare(struct ath_softc_tgt *sc, adf_nbuf_t skb, ath_data_hdr_t *dh);
 extern void  ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t mgt_hdr, adf_nbuf_t skb,HTC_ENDPOINT_ID EndPt);
 extern HAL_BOOL ath_hal_wait(struct ath_hal *ah, a_uint32_t reg, a_uint32_t mask, a_uint32_t val);
 extern void owltgt_tx_processq(struct ath_softc_tgt *sc, struct ath_txq *txq,  owl_txq_state_t txqstate);
@@ -83,27 +80,17 @@ void owl_tgt_node_init(struct ath_node_target * an);
 void ath_tgt_tx_sched_normal(struct ath_softc_tgt *sc, struct ath_buf *bf);
 void ath_tgt_tx_sched_nonaggr(struct ath_softc_tgt *sc,struct ath_buf * bf_host);
 
-/*************/
-/* Utilities */
-/*************/
-
-#undef adf_os_cpu_to_le16
-
-static a_uint16_t adf_os_cpu_to_le16(a_uint16_t x)
-{
-	return ((((x) & 0xff00) >> 8) |   (((x) & 0x00ff) << 8));
-}
-
 /*
  * Extend a 32 bit TSF to 64 bit, taking wrapping into account.
  */
 static u_int64_t ath_extend_tsf(struct ath_softc_tgt *sc, u_int32_t rstamp)
 {
+	struct ath_hal *ah = sc->sc_ah;
 	u_int64_t tsf;
 	u_int32_t tsf_low;
 	u_int64_t tsf64;
 
-	tsf = ath_hal_gettsf64(sc->sc_ah);
+	tsf = ah->ah_getTsf64(ah);
 	tsf_low = tsf & 0xffffffff;
 	tsf64 = (tsf & ~0xffffffffULL) | rstamp;
 
@@ -123,10 +110,10 @@ static a_int32_t ath_rate_setup(struct ath_softc_tgt *sc, a_uint32_t mode)
 
 	switch (mode) {
 	case IEEE80211_MODE_11NA:
-		sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_11NA);
+		sc->sc_rates[mode] = ah->ah_getRateTable(ah, HAL_MODE_11NA);
 		break;
 	case IEEE80211_MODE_11NG:
-		sc->sc_rates[mode] = ath_hal_getratetable(ah, HAL_MODE_11NG);
+		sc->sc_rates[mode] = ah->ah_getRateTable(ah, HAL_MODE_11NG);
 		break;
 	default:
 		return 0;
@@ -160,7 +147,7 @@ static void ath_setcurmode(struct ath_softc_tgt *sc,
 }
 
 void wmi_event(wmi_handle_t handle, WMI_EVENT_ID evt_id,
-	       A_UINT8 *buffer, a_int32_t Length)
+	       void *buffer, a_int32_t Length)
 {
 	adf_nbuf_t netbuf = ADF_NBUF_NULL;
 	a_uint8_t *pData;
@@ -182,7 +169,7 @@ void wmi_event(wmi_handle_t handle, WMI_EVENT_ID evt_id,
 }
 
 void wmi_cmd_rsp(void *pContext, WMI_COMMAND_ID cmd_id, A_UINT16 SeqNo,
-		 A_UINT8 *buffer, a_int32_t Length)
+		 void *buffer, a_int32_t Length)
 {
 	adf_nbuf_t netbuf = ADF_NBUF_NULL;
 	A_UINT8 *pData;
@@ -268,18 +255,16 @@ static a_int32_t ath_rxdesc_init(struct ath_softc_tgt *sc, struct ath_rx_desc *d
 	ds->ds_link = 0;
 	adf_nbuf_peek_header(ds->ds_nbuf, &anbdata, &anblen);
 
-	ath_hal_setuprxdesc(ah, ds,
-			    adf_nbuf_tailroom(ds->ds_nbuf),
-			    0);
+	ah->ah_setupRxDesc(ds, adf_nbuf_tailroom(ds->ds_nbuf), 0);
 
 	if (sc->sc_rxlink == NULL) {
-		ath_hal_putrxbuf(ah, ds->ds_daddr);
+		ah->ah_setRxDP(ah, ds->ds_daddr);
 	}
 	else {
 		*sc->sc_rxlink = ds->ds_daddr;
 	}
 	sc->sc_rxlink = &ds->ds_link;
-	ath_hal_rxena(ah);
+	ah->ah_enableReceive(ah);
 
 	return 0;
 }
@@ -337,7 +322,7 @@ static void ath_uapsd_processtriggers(struct ath_softc_tgt *sc)
 	((struct ath_desc *)((caddr_t)(_sc)->sc_rxdma.dd_desc +		\
 			     ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr)))
 
-	tsf = ath_hal_gettsf64(ah);
+	tsf = ah->ah_getTsf64(ah);
 	bf = asf_tailq_first(&sc->sc_rxbuf);
 
 	ds = asf_tailq_first(&sc->sc_rxdesc);
@@ -388,7 +373,7 @@ static void ath_uapsd_processtriggers(struct ath_softc_tgt *sc)
 			continue;
 		}
 
-		retval = ath_hal_rxprocdescfast(ah, ds, ds->ds_daddr,
+		retval = ah->ah_procRxDescFast(ah, ds, ds->ds_daddr,
 						PA2DESC(sc, ds->ds_link), &bf->bf_rx_status);
 		if (HAL_EINPROGRESS == retval) {
 			break;
@@ -446,7 +431,7 @@ static void ath_uapsd_processtriggers(struct ath_softc_tgt *sc)
 
 			bf->bf_status |= ATH_BUFSTATUS_DONE;
 
-			bf = asf_tailq_next(bf, bf_list);
+			bf = (struct ath_rx_buf *)asf_tailq_next(bf, bf_list);
 		}
 		else {
 			ds = asf_tailq_next(ds, ds_list);
@@ -474,7 +459,7 @@ static a_int32_t ath_startrecv(struct ath_softc_tgt *sc)
 	}
 
 	ds = asf_tailq_first(&sc->sc_rxdesc);
-	ath_hal_putrxbuf(ah, ds->ds_daddr);
+	ah->ah_setRxDP(ah, ds->ds_daddr);
 
 	return 0;
 }
@@ -485,7 +470,6 @@ static void ath_tgt_rx_tasklet(TQUEUE_ARG data)
 	struct ath_rx_buf *bf = NULL;
 	struct ath_hal *ah = sc->sc_ah;
 	struct rx_frame_header *rxhdr;
-	struct ieee80211_frame *wh;
 	struct ath_rx_status *rxstats;
 	adf_nbuf_t skb = ADF_NBUF_NULL;
 
@@ -519,14 +503,13 @@ static void ath_tgt_rx_tasklet(TQUEUE_ARG data)
 		HTC_SendMsg(sc->tgt_htc_handle, RX_ENDPOINT_ID, skb);
 		sc->sc_rx_stats.ast_rx_send++;
 
-	next_buf:
 		bf->bf_status &= ~ATH_BUFSTATUS_DONE;
 		asf_tailq_insert_tail(&sc->sc_rxbuf, bf, bf_list);
 
 	} while(1);
 
 	sc->sc_imask |= HAL_INT_RX;
-	ath_hal_intrset(ah, sc->sc_imask);
+	ah->ah_setInterrupts(ah, sc->sc_imask);
 }
 
 /*******************/
@@ -538,13 +521,13 @@ static void ath_tgt_rx_tasklet(TQUEUE_ARG data)
  * FIXME: Short Preamble.
  */
 static void ath_beacon_setup(struct ath_softc_tgt *sc,
-			     struct ath_buf *bf,
+			     struct ath_tx_buf *bf,
 			     struct ath_vap_target *avp)
 {
 	adf_nbuf_t skb = bf->bf_skb;
 	struct ath_hal *ah = sc->sc_ah;
-	struct ath_desc *ds;
-	a_int32_t flags, antenna;
+	struct ath_tx_desc *ds;
+	a_int32_t flags;
 	const HAL_RATE_TABLE *rt;
 	a_uint8_t rix, rate;
 	HAL_11N_RATE_SERIES series[4] = {{ 0 }};
@@ -559,22 +542,18 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
 	rt  = sc->sc_currates;
 	rate = rt->info[rix].rateCode;
 
-	ath_hal_setuptxdesc(ah, ds
+	ah->ah_setupTxDesc(ds
 			    , adf_nbuf_len(skb) + IEEE80211_CRC_LEN
 			    , sizeof(struct ieee80211_frame)
 			    , HAL_PKT_TYPE_BEACON
 			    , MAX_RATE_POWER
 			    , rate, 1
 			    , HAL_TXKEYIX_INVALID
-			    , 0
 			    , flags
 			    , 0
-			    , 0
-			    , 0
-			    , 0
-			    , ATH_COMP_PROC_NO_COMP_NO_CCS);
+			    , 0);
 
-	ath_hal_filltxdesc(ah, ds
+	ah->ah_fillTxDesc(ds
 			   , asf_roundup(adf_nbuf_len(skb), 4)
 			   , AH_TRUE
 			   , AH_TRUE
@@ -584,7 +563,7 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
 	series[0].Rate = rate;
 	series[0].ChSel = sc->sc_ic.ic_tx_chainmask;
 	series[0].RateFlags = 0;
-	ath_hal_set11n_ratescenario(ah, ds, 0, 0, 0, series, 4, 0);
+	ah->ah_set11nRateScenario(ds, 0, 0, series, 4, 0);
 }
 
 static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
@@ -607,7 +586,7 @@ static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
 
 	vap_index = bhdr->vap_index;
 	adf_os_assert(vap_index < TARGET_VAP_MAX);
-	vap = &sc->sc_vap[vap_index];
+	vap = &sc->sc_vap[vap_index].av_vap;
 
 	wh = (struct ieee80211_frame *)adf_nbuf_pull_head(nbuf,
 						  sizeof(ath_beacon_hdr_t));
@@ -628,9 +607,9 @@ static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
 	adf_nbuf_dmamap_info(bf->bf_dmamap,&bf->bf_dmamap_info);
 
 	ath_beacon_setup(sc, bf, &sc->sc_vap[vap_index]);
-	ath_hal_stoptxdma(ah, sc->sc_bhalq);
-	ath_hal_puttxbuf(ah, sc->sc_bhalq, ATH_BUF_GET_DESC_PHY_ADDR(bf));
-	ath_hal_txstart(ah, sc->sc_bhalq);
+	ah->ah_stopTxDma(ah, sc->sc_bhalq);
+	ah->ah_setTxDP(ah, sc->sc_bhalq, ATH_BUF_GET_DESC_PHY_ADDR(bf));
+	ah->ah_startTxDma(ah, sc->sc_bhalq);
 }
 
 /******/
@@ -641,7 +620,7 @@ static void ath_tx_stopdma(struct ath_softc_tgt *sc, struct ath_txq *txq)
 {
 	struct ath_hal *ah = sc->sc_ah;
 
-	(void) ath_hal_stoptxdma(ah, txq->axq_qnum);
+	ah->ah_stopTxDma(ah, txq->axq_qnum);
 }
 
 static void owltgt_txq_drain(struct ath_softc_tgt *sc, struct ath_txq *txq)
@@ -664,7 +643,7 @@ static void ath_draintxq(struct ath_softc_tgt *sc, HAL_BOOL drain_softq)
 	ath_tx_status_clear(sc);
 	sc->sc_tx_draining = 1;
 
-	(void) ath_hal_stoptxdma(ah, sc->sc_bhalq);
+	ah->ah_stopTxDma(ah, sc->sc_bhalq);
 
 	for (i = 0; i < HAL_NUM_TX_QUEUES; i++)
 		if (ATH_TXQ_SETUP(sc, i))
@@ -789,7 +768,7 @@ static void tgt_HTCRecv_cabhandler(HTC_ENDPOINT_ID EndPt, adf_nbuf_t hdr_buf,
 	a_uint32_t tmp;
 
 #ifdef ATH_ENABLE_CABQ
-	tsf = ath_hal_gettsf64(ah);
+	tsf = ah->ah_getTsf64(ah);
 	tmp = tsf - sc->sc_swba_tsf;
 
 	if ( tmp > ATH_CABQ_HANDLING_THRESHOLD ) {
@@ -883,8 +862,8 @@ static void ath_descdma_cleanup(struct ath_softc_tgt *sc,
 				struct ath_descdma *dd,
 				ath_bufhead *head, a_int32_t dir)
 {
-	struct ath_tx_buf *bf;
-	struct ieee80211_node *ni;
+	struct ath_buf *bf;
+	struct ieee80211_node_target *ni;
 
 	asf_tailq_foreach(bf, head, bf_list) {
 		if (adf_nbuf_queue_len(&bf->bf_skbhead) != 0) {
@@ -928,7 +907,7 @@ static a_int32_t ath_desc_alloc(struct ath_softc_tgt *sc)
 	if (ath_numrxdescs == -1)
 		ath_numrxdescs = ATH_RXDESC;
 
-	error = ath_descdma_setup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+	error = ath_descdma_setup(sc, &sc->sc_rxdma, (ath_bufhead *)&sc->sc_rxbuf,
 				  "rx", ath_numrxdescs, 1,
 				  sizeof(struct ath_rx_buf),
 				  sizeof(struct ath_rx_desc));
@@ -937,7 +916,7 @@ static a_int32_t ath_desc_alloc(struct ath_softc_tgt *sc)
 
 	a_uint32_t i;
 	struct ath_descdma *dd = &sc->sc_rxdma;
-	struct ath_rx_desc *ds = dd->dd_desc;
+	struct ath_rx_desc *ds = (struct ath_rx_desc *)dd->dd_desc;
 	struct ath_rx_desc *ds_prev = NULL;
 
 	asf_tailq_init(&sc->sc_rxdesc);
@@ -965,24 +944,24 @@ static a_int32_t ath_desc_alloc(struct ath_softc_tgt *sc)
 		asf_tailq_insert_tail(&sc->sc_rxdesc, ds, ds_list);
 	}
 
-	error = ath_descdma_setup(sc, &sc->sc_txdma, &sc->sc_txbuf,
+	error = ath_descdma_setup(sc, &sc->sc_txdma, (ath_bufhead *)&sc->sc_txbuf,
 				  "tx", ATH_TXBUF + 1, ATH_TXDESC,
 				  sizeof(struct ath_tx_buf),
 				  sizeof(struct ath_tx_desc));
 	if (error != 0) {
-		ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+		ath_descdma_cleanup(sc, &sc->sc_rxdma, (ath_bufhead *)&sc->sc_rxbuf,
 				    ADF_OS_DMA_FROM_DEVICE);
 		return error;
 	}
 
-	error = ath_descdma_setup(sc, &sc->sc_bdma, &sc->sc_bbuf,
+	error = ath_descdma_setup(sc, &sc->sc_bdma, (ath_bufhead *)&sc->sc_bbuf,
 				  "beacon", ATH_BCBUF, 1,
 				  sizeof(struct ath_tx_buf),
 				  sizeof(struct ath_tx_desc));
 	if (error != 0) {
-		ath_descdma_cleanup(sc, &sc->sc_txdma, &sc->sc_txbuf,
+		ath_descdma_cleanup(sc, &sc->sc_txdma, (ath_bufhead *)&sc->sc_txbuf,
 				    ADF_OS_DMA_TO_DEVICE);
-		ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+		ath_descdma_cleanup(sc, &sc->sc_rxdma, (ath_bufhead *)&sc->sc_rxbuf,
 				    ADF_OS_DMA_FROM_DEVICE);
 		return error;
 	}
@@ -1005,10 +984,10 @@ static void ath_desc_free(struct ath_softc_tgt *sc)
 	sc->sc_txbuf_held = NULL;
 
 	if (sc->sc_txdma.dd_desc_len != 0)
-		ath_descdma_cleanup(sc, &sc->sc_txdma, &sc->sc_txbuf,
+		ath_descdma_cleanup(sc, &sc->sc_txdma, (ath_bufhead *)&sc->sc_txbuf,
 				    ADF_OS_DMA_TO_DEVICE);
 	if (sc->sc_rxdma.dd_desc_len != 0)
-		ath_descdma_cleanup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
+		ath_descdma_cleanup(sc, &sc->sc_rxdma, (ath_bufhead *)&sc->sc_rxbuf,
 				    ADF_OS_DMA_FROM_DEVICE);
 }
 
@@ -1020,30 +999,29 @@ adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)hdl;
 	struct ath_hal *ah = sc->sc_ah;
-	struct ieee80211com_target *ic = &sc->sc_ic;
 	HAL_INT status;
 
 	if (sc->sc_invalid)
 		return ADF_OS_IRQ_NONE;
 
-	if (!ath_hal_intrpend(ah))
+	if (!ah->ah_isInterruptPending(ah))
 		return ADF_OS_IRQ_NONE;
 
-	ath_hal_getisr(ah, &status);
+	ah->ah_getPendingInterrupts(ah, &status);
 
 	status &= sc->sc_imask;
 
 	if (status & HAL_INT_FATAL) {
-		ath_hal_intrset(ah, 0);
+		ah->ah_setInterrupts(ah, 0);
 		ATH_SCHEDULE_TQUEUE(sc->sc_dev, &sc->sc_fataltq);
 	} else {
 		if (status & HAL_INT_SWBA) {
 			WMI_SWBA_EVENT swbaEvt;
 			struct ath_txq *txq = ATH_TXQ(sc, 8);
 
-			swbaEvt.tsf = ath_hal_gettsf64(ah);
-			swbaEvt.beaconPendingCount = ath_hal_numtxpending(ah, sc->sc_bhalq);
-			sc->sc_swba_tsf = ath_hal_gettsf64(ah);
+			swbaEvt.tsf = ah->ah_getTsf64(ah);
+			swbaEvt.beaconPendingCount = ah->ah_numTxPending(ah, sc->sc_bhalq);
+			sc->sc_swba_tsf = ah->ah_getTsf64(ah);
 
 			wmi_event(sc->tgt_wmi_handle,
 				  WMI_SWBA_EVENTID,
@@ -1066,14 +1044,14 @@ adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl)
 			ath_uapsd_processtriggers(sc);
 
 			sc->sc_imask &= ~HAL_INT_RX;
-			ath_hal_intrset(ah, sc->sc_imask);
+			ah->ah_setInterrupts(ah, sc->sc_imask);
 
 			ATH_SCHEDULE_TQUEUE(sc->sc_dev, &sc->sc_rxtq);
 		}
 
 		if (status & HAL_INT_TXURN) {
 			sc->sc_int_stats.ast_txurn++;
-			ath_hal_updatetxtriglevel(ah, AH_TRUE);
+			ah->ah_updateTxTrigLevel(ah, AH_TRUE);
 		}
 
 		ATH_SCHEDULE_TQUEUE(sc->sc_dev, &sc->sc_txtq);
@@ -1132,7 +1110,7 @@ static void ath_enable_intr_tgt(void *Context, A_UINT16 Command,
 		sc->sc_imask |= HAL_INT_BMISS;
 	}
 
-	ath_hal_intrset(ah, sc->sc_imask);
+	ah->ah_setInterrupts(ah, sc->sc_imask);
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo,NULL, 0);
 }
 
@@ -1141,7 +1119,6 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
 	struct ath_hal *ah = sc->sc_ah;
-	a_uint32_t stbcsupport;
 
 	sc->sc_imask = HAL_INT_RX | HAL_INT_TX
 		| HAL_INT_RXEOL | HAL_INT_RXORN
@@ -1149,18 +1126,11 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 
 	sc->sc_imask |= HAL_INT_GTT;
 
-	if (ath_hal_htsupported(ah))
+	if (ath_hal_getcapability(ah, HAL_CAP_HT))
 		sc->sc_imask |= HAL_INT_CST;
 
-#ifdef MAGPIE_MERLIN
-	if (ath_hal_txstbcsupport(ah, &stbcsupport))
-		sc->sc_txstbcsupport = stbcsupport;
-
-	if (ath_hal_rxstbcsupport(ah, &stbcsupport))
-		sc->sc_rxstbcsupport = stbcsupport;
-#endif
 	adf_os_setup_intr(sc->sc_dev, ath_intr);
-	ath_hal_intrset(ah, sc->sc_imask);
+	ah->ah_setInterrupts(ah, sc->sc_imask);
 
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }
@@ -1455,10 +1425,7 @@ static void ath_hal_reg_write_tgt(void *Context, A_UINT16 Command,
 		t = (struct registerWrite *)(data+i);
 
 		if( t->reg > 0xffff ) {
-			a_uint32_t *pReg = (a_uint32_t *)t->reg;
-
-			*pReg = t->val;
-
+			HAL_WORD_REG_WRITE(t->reg, t->val);
 #if defined(PROJECT_K2)
 			if( t->reg == 0x50040 ) {
 				static uint8_t flg=0;
@@ -1474,20 +1441,19 @@ static void ath_hal_reg_write_tgt(void *Context, A_UINT16 Command,
 #if defined(PROJECT_K2)
 			if( t->reg == 0x7014 ) {
 				static uint8_t resetPLL = 0;
-				a_uint32_t *pReg;
 
 				if( resetPLL == 0 ) {
-					t->reg = 0x50044;
-					pReg = (a_uint32_t *)t->reg;
-					*pReg = 0;
+					/* here we write to core register */
+					HAL_WORD_REG_WRITE(MAGPIE_REG_RST_PWDN_CTRL_ADDR, 0x0);
+					/* and here to mac register */
 					ath_hal_reg_write_target(ah, 0x786c,
 						 ath_hal_reg_read_target(ah,0x786c) | 0x6000000);
 					ath_hal_reg_write_target(ah, 0x786c,
 						 ath_hal_reg_read_target(ah,0x786c) & (~0x6000000));
-					*pReg = 0x20;
+
+					HAL_WORD_REG_WRITE(MAGPIE_REG_RST_PWDN_CTRL_ADDR, 0x20);
 					resetPLL = 1;
 				}
-				t->reg = 0x7014;
 			}
 #elif defined(PROJECT_MAGPIE) && !defined (FPGA)
 			if( t->reg == 0x7014 ){
@@ -1529,7 +1495,7 @@ static void ath_disable_intr_tgt(void *Context, A_UINT16 Command,
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
 	struct ath_hal *ah = sc->sc_ah;
 
-	ath_hal_intrset(ah, 0);
+	ah->ah_setInterrupts(ah, 0);
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo,NULL, 0);
 }
 
@@ -1537,7 +1503,7 @@ static void ath_flushrecv_tgt(void *Context, A_UINT16 Command,
 			      A_UINT16 SeqNo, A_UINT8 *data, a_int32_t datalen)
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
-	struct ath_buf *bf;
+	struct ath_rx_buf *bf;
 
 	asf_tailq_foreach(bf, &sc->sc_rxbuf, bf_list)
 		if (bf->bf_skb != NULL) {
@@ -1578,8 +1544,9 @@ static void ath_aborttx_dma_tgt(void *Context, A_UINT16 Command,
 				A_UINT16 SeqNo, A_UINT8 *data, a_int32_t datalen)
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
+	struct ath_hal *ah = sc->sc_ah;
 
-	ath_hal_aborttxdma(sc->sc_ah);
+	ah->ah_abortTxDma(sc->sc_ah);
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }
 
@@ -1609,7 +1576,7 @@ static void ath_stop_tx_dma_tgt(void *Context, A_UINT16 Command,
 		q = *(a_uint32_t *)data;
 
 	q = adf_os_ntohl(q);
-	ath_hal_stoptxdma(ah, q);
+	ah->ah_stopTxDma(ah, q);
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }
 
@@ -1629,9 +1596,9 @@ static void ath_stoprecv_tgt(void *Context, A_UINT16 Command,
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
 	struct ath_hal *ah = sc->sc_ah;
 
-	ath_hal_stoppcurecv(ah);
-	ath_hal_setrxfilter(ah, 0);
-	ath_hal_stopdmarecv(ah);
+	ah->ah_stopPcuReceive(ah);
+	ah->ah_setRxFilter(ah, 0);
+	ah->ah_stopDmaReceive(ah);
 
 	sc->sc_rxlink = NULL;
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
@@ -1642,7 +1609,6 @@ static void ath_setcurmode_tgt(void *Context, A_UINT16 Command,
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
 	a_uint16_t mode;
-	struct ath_hal *ah = sc->sc_ah;
 
 	mode= *((a_uint16_t *)data);
 	mode = adf_os_ntohs(mode);
@@ -1652,14 +1618,14 @@ static void ath_setcurmode_tgt(void *Context, A_UINT16 Command,
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }
 
-static a_uint32_t ath_detach_tgt(void *Context, A_UINT16 Command, A_UINT16 SeqNo,
+static void ath_detach_tgt(void *Context, A_UINT16 Command, A_UINT16 SeqNo,
 				 A_UINT8 *data, a_int32_t datalen)
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
 	struct ath_hal *ah = sc->sc_ah;
 
 	ath_desc_free(sc);
-	ath_hal_detach(ah);
+	ah->ah_detach(ah);
 	wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 	adf_os_mem_free(sc);
 }
@@ -1889,8 +1855,7 @@ static void tgt_hif_htc_wmi_init(struct ath_softc_tgt *sc)
 	HTC_Ready(sc->tgt_htc_handle);
 }
 
-a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start,
-			 struct ath_softc_tgt *sc, adf_os_device_t osdev)
+a_int32_t ath_tgt_attach(a_uint32_t devid, struct ath_softc_tgt *sc, adf_os_device_t osdev)
 {
 	struct ath_hal *ah;
 	HAL_STATUS status;
@@ -1912,7 +1877,7 @@ a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start,
 	ATH_INIT_TQUEUE(sc->sc_dev, &sc->sc_fataltq, ath_fatal_tasklet, sc);
 
 	flags |= AH_USE_EEPROM;
-	ah = _ath_hal_attach_tgt(devid,sc,sc->sc_dev,mem_start, flags, &status);
+	ah = _ath_hal_attach_tgt(devid, sc, sc->sc_dev, flags, &status);
 	if (ah == NULL) {
 		error = ENXIO;
 		goto bad;
@@ -1945,14 +1910,14 @@ a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start,
 
 	ath_tgt_txq_setup(sc);
 	sc->sc_imask =0;
-	ath_hal_intrset(ah,0);
+	ah->ah_setInterrupts(ah, 0);
 
 	return 0;
 bad:
 bad2:
 	ath_desc_free(sc);
 	if (ah)
-		ath_hal_detach(ah);
+		ah->ah_detach(ah);
 }
 
 static void tgt_hif_htc_wmi_shutdown(struct ath_softc_tgt *sc)