diff options
author | jhay <jhay@FreeBSD.org> | 2003-04-16 17:29:00 +0000 |
---|---|---|
committer | jhay <jhay@FreeBSD.org> | 2003-04-16 17:29:00 +0000 |
commit | 10e2a694f93a42f22d2e04eb6d87dc416fde609b (patch) | |
tree | 1f745856177ccd1255a1562a644a10ee79960997 /sys/dev/wl/if_wl.h | |
parent | cdd9ff99e325aa0924a102893bb3fef030e0b7dd (diff) | |
download | FreeBSD-src-10e2a694f93a42f22d2e04eb6d87dc416fde609b.zip FreeBSD-src-10e2a694f93a42f22d2e04eb6d87dc416fde609b.tar.gz |
Get rid of COMPAT_OLDISA and move in the direction of newbus.
Diffstat (limited to 'sys/dev/wl/if_wl.h')
-rw-r--r-- | sys/dev/wl/if_wl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/wl/if_wl.h b/sys/dev/wl/if_wl.h index b851fb2..7f9c227 100644 --- a/sys/dev/wl/if_wl.h +++ b/sys/dev/wl/if_wl.h @@ -96,9 +96,9 @@ typedef struct { #define HACR_DEFAULT (HACR_OUT1 | HACR_OUT2 | HACR_16BITS | PIOM(STATIC_PIO, 0) | PIOM(AUTOINCR_PIO, 1) | PIOM(PARAM_ACCESS_PIO, 2)) #define HACR_INTRON (HACR_MASK_82586 | HACR_MASK_MMC | HACR_INTR_CLEN) -#define CMD(unit) \ +#define CMD(sc) \ { \ - outw(HACR(WLSOFTC(unit)->base),WLSOFTC(unit)->hacr); \ + outw(HACR(sc->base),sc->hacr); \ /* delay for 50 us, might only be needed sometimes */ \ DELAY(DELAYCONST); \ } @@ -106,15 +106,15 @@ typedef struct { /* macro for setting the channel attention bit. No delays here since * it is used in critical sections */ -#define SET_CHAN_ATTN(unit) \ +#define SET_CHAN_ATTN(sc) \ { \ - outw(HACR(WLSOFTC(unit)->base),WLSOFTC(unit)->hacr | HACR_CA); \ + outw(HACR(sc->base),sc->hacr | HACR_CA); \ } #define MMC_WRITE(cmd,val) \ - while(inw(HASR(WLSOFTC(unit)->base)) & HASR_MMC_BUSY) ; \ - outw(MMCR(WLSOFTC(unit)->base), \ + while(inw(HASR(sc->base)) & HASR_MMC_BUSY) ; \ + outw(MMCR(sc->base), \ (u_short)(((u_short)(val) << 8) | ((cmd) << 1) | 1)) #endif /* _IF_WL_H */ |