diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2007-11-03 14:10:38 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2007-11-03 14:10:38 +0000 |
| commit | b1c67c8850d5f5e35e1f4fdfb3b73b0bad2bdb57 (patch) | |
| tree | 3e393f7b760515646675325363a1487109d1ddb5 /sys/dev/usb/if_zydreg.h | |
| parent | 0a92a05758622cc6774cc6d9742220aee6e4cf9a (diff) | |
two fixes from FreeBSD:
- fix an incorrect setting of `retry times' in case of zd1211b
- increase max rx size so there's room for multi-frame transactions
(slightly modified version)
from the Linux zd1211rw driver:
- patch registers CR47 and CR157 on devices that require it
- fix power calibration setting on ZD1211B
Diffstat (limited to 'sys/dev/usb/if_zydreg.h')
| -rw-r--r-- | sys/dev/usb/if_zydreg.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/usb/if_zydreg.h b/sys/dev/usb/if_zydreg.h index 49fa600d5be..cd0f48de076 100644 --- a/sys/dev/usb/if_zydreg.h +++ b/sys/dev/usb/if_zydreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zydreg.h,v 1.20 2007/06/06 19:25:49 mk Exp $ */ +/* $OpenBSD: if_zydreg.h,v 1.21 2007/11/03 14:10:37 damien Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -1081,8 +1081,10 @@ struct zyd_notif_retry { (sizeof (struct zyd_plcphdr) + IEEE80211_MIN_LEN + \ sizeof (struct zyd_rx_stat)) #define ZYD_MIN_RXBUFSZ ZYD_MIN_FRAGSZ -#define ZYX_MAX_RXBUFSZ \ - (sizeof (struct zyd_plcphdr) + MCLBYTES + sizeof (struct zyd_rx_desc)) +#define ZYX_MAX_RXBUFSZ \ + ((sizeof (struct zyd_plcphdr) + IEEE80211_MAX_LEN + \ + sizeof (struct zyd_rx_stat)) * ZYD_MAX_RXFRAMECNT + \ + sizeof (struct zyd_rx_desc)) #define ZYD_CMD_FLAG_READ (1 << 0) @@ -1187,6 +1189,8 @@ struct zyd_softc { uint16_t fw_rev; uint8_t rf_rev; uint8_t pa_rev; + uint8_t fix_cr47; + uint8_t fix_cr157; uint8_t pwr_cal[14]; uint8_t pwr_int[14]; uint8_t ofdm36_cal[14]; |