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: use ath_tx_desc in ar5416SetupTxDesc_20
[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 51326774716d9daa12b64843e7acb016002253f8..6784e3b0831ab93106cf7f1a02170936498834b2 100644
(file)
--- a/
target_firmware/wlan/ar5416_hw.c
+++ b/
target_firmware/wlan/ar5416_hw.c
@@
-99,7
+99,7
@@
void ar5416Detach(struct ath_hal *ah)
struct ath_hal *
ar5416Attach(a_uint32_t devid,HAL_SOFTC sc, adf_os_device_t dev,
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_5416 *ahp;
struct ath_hal *ah;
{
struct ath_hal_5416 *ahp;
struct ath_hal *ah;
@@
-115,7
+115,6
@@
ar5416Attach(a_uint32_t devid,HAL_SOFTC sc, adf_os_device_t dev,
ah->ah_dev = dev;
ah->ah_sc = sc;
ah->ah_dev = dev;
ah->ah_sc = sc;
- ah->ah_sh = sh;
/* If its a Owl 2.0 chip then change the hal structure to
point to the Owl 2.0 ar5416_hal_20 structure */
/* If its a Owl 2.0 chip then change the hal structure to
point to the Owl 2.0 ar5416_hal_20 structure */
@@
-459,7
+458,7
@@
void ar5416StopPcuReceive(struct ath_hal *ah)
OS_REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_DIS);
}
OS_REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_DIS);
}
-HAL_BOOL ar5416SetupRxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
+HAL_BOOL ar5416SetupRxDesc_20(struct ath_hal *ah, struct ath_
rx_
desc *ds,
a_uint32_t size, a_uint32_t flags)
{
struct ar5416_desc *ads = AR5416DESC(ds);
a_uint32_t size, a_uint32_t flags)
{
struct ar5416_desc *ads = AR5416DESC(ds);
@@
-476,7
+475,7
@@
HAL_BOOL ar5416SetupRxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
return AH_TRUE;
}
return AH_TRUE;
}
-HAL_STATUS ar5416ProcRxDescFast_20(struct ath_hal *ah, struct ath_desc *ds,
+HAL_STATUS ar5416ProcRxDescFast_20(struct ath_hal *ah, struct ath_
rx_
desc *ds,
a_uint32_t pa, struct ath_desc *nds,
struct ath_rx_status *rx_stats)
{
a_uint32_t pa, struct ath_desc *nds,
struct ath_rx_status *rx_stats)
{
@@
-748,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,
@@
-766,7
+765,6
@@
HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
#define RTSCTS (HAL_TXDESC_RTSENA|HAL_TXDESC_CTSENA)
struct ar5416_desc *ads = AR5416DESC(ds);
#define RTSCTS (HAL_TXDESC_RTSENA|HAL_TXDESC_CTSENA)
struct ar5416_desc *ads = AR5416DESC(ds);
- struct ath_hal_5416 *ahp = AH5416(ah);
(void) hdrLen;
(void) hdrLen;
@@
-817,9
+815,9
@@
HAL_BOOL ar5416SetupTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
#undef RTSCTS
}
#undef RTSCTS
}
-HAL_BOOL ar5416FillTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
+HAL_BOOL ar5416FillTxDesc_20(struct ath_hal *ah, struct ath_
tx_
desc *ds,
a_uint32_t segLen, HAL_BOOL firstSeg, HAL_BOOL lastSeg,
a_uint32_t segLen, HAL_BOOL firstSeg, HAL_BOOL lastSeg,
- const struct ath_desc *ds0)
+ const struct ath_
tx_
desc *ds0)
{
struct ar5416_desc *ads = AR5416DESC(ds);
{
struct ar5416_desc *ads = AR5416DESC(ds);
@@
-937,7
+935,6
@@
void ar5416Set11nTxDesc_20(struct ath_hal *ah, struct ath_desc *ds,
a_uint32_t flags)
{
struct ar5416_desc *ads = AR5416DESC(ds);
a_uint32_t flags)
{
struct ar5416_desc *ads = AR5416DESC(ds);
- struct ath_hal_5416 *ahp = AH5416(ah);
HALASSERT(isValidPktType(type));
HALASSERT(isValidKeyType(keyType));
HALASSERT(isValidPktType(type));
HALASSERT(isValidKeyType(keyType));
@@
-973,11
+970,7
@@
void ar5416Set11nRateScenario_20(struct ath_hal *ah, struct ath_desc *ds,
a_uint32_t flags)
{
struct ar5416_desc *ads = AR5416DESC(ds);
a_uint32_t flags)
{
struct ar5416_desc *ads = AR5416DESC(ds);
- struct ar5416_desc_20 *ads_20 = AR5416DESC_20(ds);
a_uint32_t ds_ctl0;
a_uint32_t ds_ctl0;
- a_int16_t txpower;
- a_uint32_t count;
- struct ath_hal_private *ahpriv = AH_PRIVATE(ah);
HALASSERT(nseries == 4);
(void)nseries;
HALASSERT(nseries == 4);
(void)nseries;