diff options
| author | asami <asami@FreeBSD.org> | 1996-09-10 09:39:22 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-09-10 09:39:22 +0000 |
| commit | 1e04fa822e550633de8d4ba887d6866193b7b4ae (patch) | |
| tree | 33a1c45bb2e19d047747e0fac787af9c2f7a9fa0 /sys/pc98/cbus/fdcreg.h | |
| parent | 25556c3b939b3fbbe349eb8dda57f5749ec814a1 (diff) | |
| download | FreeBSD-src-1e04fa822e550633de8d4ba887d6866193b7b4ae.zip FreeBSD-src-1e04fa822e550633de8d4ba887d6866193b7b4ae.tar.gz | |
More merge. Change "pc98" to "isa" in a few places. Misc. cleanup.
Add some more devices to userconfig.c.
Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/pc98/cbus/fdcreg.h')
| -rw-r--r-- | sys/pc98/cbus/fdcreg.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/pc98/cbus/fdcreg.h b/sys/pc98/cbus/fdcreg.h index 7b10161..93a99a6 100644 --- a/sys/pc98/cbus/fdcreg.h +++ b/sys/pc98/cbus/fdcreg.h @@ -38,14 +38,13 @@ * AT floppy controller registers and bitfields */ -#ifdef PC98 /* uses NEC765 controller */ -#include <pc98/pc98/ic/nec765.h> +#include <i386/isa/ic/nec765.h> +#ifdef PC98 +/* registers */ #define FDSTS 0 /* NEC 765 Main Status Register (R) */ #define FDDATA 2 /* NEC 765 Data Register (R/W) */ - -/* registers */ #define FDOUT 4 /* Digital Output Register (W) */ #define FDO_RST 0x80 /* FDC RESET */ #define FDO_FRY 0x40 /* force READY */ @@ -69,10 +68,6 @@ #define FDP_PORTEXC 0x01 /* PORT Exchane 1:1M 0:640K */ #else - -/* uses NEC765 controller */ -#include <i386/isa/ic/nec765.h> - /* registers */ #define FDOUT 2 /* Digital Output Register (W) */ #define FDO_FDSEL 0x03 /* floppy device select */ |
