projects
/
open-ath9k-htc-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build fix: pSib used only with MAGPIE_MERLIN
[open-ath9k-htc-firmware.git]
/
target_firmware
/
wlan
/
ar5416_hw.c
diff --git
a/target_firmware/wlan/ar5416_hw.c
b/target_firmware/wlan/ar5416_hw.c
index 20ecbce3b2185db130c6413eb454fccd216b567a..8da2ee636e01ec2f07ba421c7b40828cb1b453ef 100644
(file)
--- a/
target_firmware/wlan/ar5416_hw.c
+++ b/
target_firmware/wlan/ar5416_hw.c
@@
-747,7
+747,7
@@
void ar5416IntrReqTxDesc_20(struct ath_hal *ah, struct ath_desc *ds)
ads->ds_ctl0 |= AR_TxIntrReq;
}
ads->ds_ctl0 |= AR_TxIntrReq;
}
-HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
+HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_
tx_
desc *ds,
a_uint32_t pktLen,
a_uint32_t hdrLen,
HAL_PKT_TYPE type,
a_uint32_t pktLen,
a_uint32_t hdrLen,
HAL_PKT_TYPE type,
@@
-853,7
+853,7
@@
HAL_BOOL ar5416FillTxDesc_20(struct ath_hal *ah, struct ath_tx_desc *ds,
return AH_TRUE;
}
return AH_TRUE;
}
-HAL_BOOL ar5416FillKeyTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
+HAL_BOOL ar5416FillKeyTxDesc_20(struct ath_hal *ah, struct ath_
tx_
desc *ds,
HAL_KEY_TYPE keyType)
{
struct ar5416_desc *ads = AR5416DESC(ds);
HAL_KEY_TYPE keyType)
{
struct ar5416_desc *ads = AR5416DESC(ds);
@@
-862,7
+862,7
@@
HAL_BOOL ar5416FillKeyTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
return AH_TRUE;
}
return AH_TRUE;
}
-HAL_STATUS ar5416ProcTxDesc_20(struct ath_hal *ah, struct ath_desc *gds)
+HAL_STATUS ar5416ProcTxDesc_20(struct ath_hal *ah, struct ath_
tx_
desc *gds)
{
struct ar5416_desc *ads = AR5416DESC(gds);
struct ath_tx_desc *ds = (struct ath_tx_desc *)gds;
{
struct ar5416_desc *ads = AR5416DESC(gds);
struct ath_tx_desc *ds = (struct ath_tx_desc *)gds;
@@
-929,7
+929,7
@@
HAL_STATUS ar5416ProcTxDesc_20(struct ath_hal *ah, struct ath_desc *gds)
return HAL_OK;
}
return HAL_OK;
}
-void ar5416Set11nTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
+void ar5416Set11nTxDesc_20(struct ath_hal *ah, 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)
a_uint32_t pktLen, HAL_PKT_TYPE type, a_uint32_t txPower,
a_uint32_t keyIx, HAL_KEY_TYPE keyType,
a_uint32_t flags)
@@
-963,7
+963,7
@@
void ar5416Set11nTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
#ifdef MAGPIE_MERLIN
#ifdef MAGPIE_MERLIN
-void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_
desc *ds,
+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 durUpdateEn, a_uint32_t rtsctsRate,
a_uint32_t rtsctsDuration,
HAL_11N_RATE_SERIES series[], a_uint32_t nseries,
@@
-1020,7
+1020,7
@@
void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_desc *ds,
#else
#else
-void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_
desc *ds,
+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 durUpdateEn, a_uint32_t rtsctsRate,
a_uint32_t rtsctsDuration,
HAL_11N_RATE_SERIES series[], a_uint32_t nseries,
@@
-1075,7
+1075,7
@@
void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_desc *ds,
#endif
#endif
-void ar5416Set11nAggrFirst_20(struct ath_hal *ah, struct ath_desc *ds, a_uint32_t aggrLen,
+void ar5416Set11nAggrFirst_20(struct ath_hal *ah, struct ath_
tx_
desc *ds, a_uint32_t aggrLen,
a_uint32_t numDelims)
{
struct ar5416_desc *ads = AR5416DESC(ds);
a_uint32_t numDelims)
{
struct ar5416_desc *ads = AR5416DESC(ds);
@@
-1087,7
+1087,7
@@
void ar5416Set11nAggrFirst_20(struct ath_hal *ah, struct ath_desc *ds, a_uint32_
SM(numDelims, AR_PadDelim);
}
SM(numDelims, AR_PadDelim);
}
-void ar5416Set11nAggrMiddle_20(struct ath_hal *ah, struct ath_desc *ds, a_uint32_t numDelims)
+void ar5416Set11nAggrMiddle_20(struct ath_hal *ah, struct ath_
tx_
desc *ds, a_uint32_t numDelims)
{
struct ar5416_desc *ads = AR5416DESC(ds);
a_uint32_t ctl6;
{
struct ar5416_desc *ads = AR5416DESC(ds);
a_uint32_t ctl6;
@@
-1104,7
+1104,7
@@
void ar5416Set11nAggrMiddle_20(struct ath_hal *ah, struct ath_desc *ds, a_uint32
ads->ds_ctl6 = ctl6;
}
ads->ds_ctl6 = ctl6;
}
-void ar5416Set11nAggrLast_20(struct ath_hal *ah, struct ath_desc *ds)
+void ar5416Set11nAggrLast_20(struct ath_hal *ah, struct ath_
tx_
desc *ds)
{
struct ar5416_desc *ads = AR5416DESC(ds);
{
struct ar5416_desc *ads = AR5416DESC(ds);
@@
-1113,14
+1113,14
@@
void ar5416Set11nAggrLast_20(struct ath_hal *ah, struct ath_desc *ds)
ads->ds_ctl6 &= ~AR_PadDelim;
}
ads->ds_ctl6 &= ~AR_PadDelim;
}
-void ar5416Clr11nAggr_20(struct ath_hal *ah, struct ath_desc *ds)
+void ar5416Clr11nAggr_20(struct ath_hal *ah, struct ath_
tx_
desc *ds)
{
struct ar5416_desc *ads = AR5416DESC(ds);
ads->ds_ctl1 &= (~AR_IsAggr & ~AR_MoreAggr);
}
{
struct ar5416_desc *ads = AR5416DESC(ds);
ads->ds_ctl1 &= (~AR_IsAggr & ~AR_MoreAggr);
}
-void ar5416Set11nBurstDuration_20(struct ath_hal *ah, struct ath_desc *ds,
+void ar5416Set11nBurstDuration_20(struct ath_hal *ah, struct ath_
tx_
desc *ds,
a_uint32_t burstDuration)
{
struct ar5416_desc *ads = AR5416DESC(ds);
a_uint32_t burstDuration)
{
struct ar5416_desc *ads = AR5416DESC(ds);
@@
-1129,7
+1129,7
@@
void ar5416Set11nBurstDuration_20(struct ath_hal *ah, struct ath_desc *ds,
ads->ds_ctl2 |= SM(burstDuration, AR_BurstDur);
}
ads->ds_ctl2 |= SM(burstDuration, AR_BurstDur);
}
-void ar5416Set11nVirtualMoreFrag_20(struct ath_hal *ah, struct ath_desc *ds,
+void ar5416Set11nVirtualMoreFrag_20(struct ath_hal *ah, struct ath_
tx_
desc *ds,
a_uint32_t vmf)
{
struct ar5416_desc *ads = AR5416DESC(ds);
a_uint32_t vmf)
{
struct ar5416_desc *ads = AR5416DESC(ds);