diff options
| author | adrian <adrian@FreeBSD.org> | 2012-11-03 04:55:43 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2012-11-03 04:55:43 +0000 |
| commit | decc80f72a65eea0994819190e728b05d0c22869 (patch) | |
| tree | f58688ab4ef76c97b04e832b246a5e0f94f95b9a | |
| parent | 87c36b9b3e9601fb483fab2c599276adbdabf746 (diff) | |
| download | FreeBSD-src-decc80f72a65eea0994819190e728b05d0c22869.zip FreeBSD-src-decc80f72a65eea0994819190e728b05d0c22869.tar.gz | |
HAL API changes!
* introduce a new HAL API method to pull out the TX status descriptor
contents.
* Add num_delims to the 11n first aggr method. This isn't used by the
driver at the moment so it won't affect anything.
| -rw-r--r-- | sys/dev/ath/ath_hal/ah.h | 12 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416.h | 2 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h index a8a7b58..bce46c9 100644 --- a/sys/dev/ath/ath_hal/ah.h +++ b/sys/dev/ath/ath_hal/ah.h @@ -570,6 +570,15 @@ typedef enum { HAL_GPIO_INTR_DISABLE = 2 } HAL_GPIO_INTR_TYPE; +typedef struct halCounters { + u_int32_t tx_frame_count; + u_int32_t rx_frame_count; + u_int32_t rx_clear_count; + u_int32_t cycle_count; + u_int8_t is_rx_active; // true (1) or false (0) + u_int8_t is_tx_active; // true (1) or false (0) +} HAL_COUNTERS; + typedef enum { HAL_RFGAIN_INACTIVE = 0, HAL_RFGAIN_READ_REQUESTED = 1, @@ -1314,6 +1323,7 @@ struct ath_hal { void __ahdecl(*ah_setupTxStatusRing)(struct ath_hal *, void *ts_start, uint32_t ts_paddr_start, uint16_t size); + void __ahdecl(*ah_getTxRawTxDesc)(struct ath_hal *, u_int32_t *); /* Receive Functions */ uint32_t __ahdecl(*ah_getRxDP)(struct ath_hal*, HAL_RX_QUEUE); @@ -1469,7 +1479,7 @@ struct ath_hal { void *, u_int, HAL_PKT_TYPE, u_int, u_int, u_int); void __ahdecl(*ah_set11nAggrFirst)(struct ath_hal *, - struct ath_desc *, u_int); + struct ath_desc *, u_int, u_int); void __ahdecl(*ah_set11nAggrMiddle)(struct ath_hal *, struct ath_desc *, u_int); void __ahdecl(*ah_set11nAggrLast)(struct ath_hal *, diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416.h b/sys/dev/ath/ath_hal/ar5416/ar5416.h index d379ad0..4920922 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416.h +++ b/sys/dev/ath/ath_hal/ar5416/ar5416.h @@ -391,7 +391,7 @@ extern void ar5416Set11nRateScenario(struct ath_hal *ah, struct ath_desc *ds, u_int nseries, u_int flags); extern void ar5416Set11nAggrFirst(struct ath_hal *ah, struct ath_desc *ds, - u_int aggrLen); + u_int aggrLen, u_int numDelims); extern void ar5416Set11nAggrMiddle(struct ath_hal *ah, struct ath_desc *ds, u_int numDelims); extern void ar5416Set11nAggrLast(struct ath_hal *ah, struct ath_desc *ds); diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c b/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c index 7832ebf..0a226ff 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c @@ -735,7 +735,8 @@ ar5416Set11nRateScenario(struct ath_hal *ah, struct ath_desc *ds, } void -ar5416Set11nAggrFirst(struct ath_hal *ah, struct ath_desc *ds, u_int aggrLen) +ar5416Set11nAggrFirst(struct ath_hal *ah, struct ath_desc *ds, u_int aggrLen, + u_int numDelims) { struct ar5416_desc *ads = AR5416DESC(ds); @@ -743,6 +744,7 @@ ar5416Set11nAggrFirst(struct ath_hal *ah, struct ath_desc *ds, u_int aggrLen) ads->ds_ctl6 &= ~(AR_AggrLen | AR_PadDelim); ads->ds_ctl6 |= SM(aggrLen, AR_AggrLen); + ads->ds_ctl6 |= SM(numDelims, AR_PadDelim); } void |
