diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2003-04-07 19:43:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-07 19:43:30 -0700 |
| commit | c06e130bc0e062007e7f08222663379afa4bab99 (patch) | |
| tree | d10cb152b450fcca4e81491bdb288cd52fa416c3 | |
| parent | 808048f59f088aa94e10ac70fcbf7b7370242be6 (diff) | |
[PATCH] possible way to clean up fdreg.h
| -rw-r--r-- | include/linux/fdreg.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/include/linux/fdreg.h b/include/linux/fdreg.h index 1d9026eed978..c2eeb63b72db 100644 --- a/include/linux/fdreg.h +++ b/include/linux/fdreg.h @@ -7,8 +7,12 @@ */ #ifdef FDPATCHES - #define FD_IOPORT fdc_state[fdc].address +#else +/* It would be a lot saner just to force fdc_state[fdc].address to always + be set ! FIXME */ +#define FD_IOPORT 0x3f0 +#endif /* Fd controller regs. S&C, about page 340 */ #define FD_STATUS (4 + FD_IOPORT ) @@ -23,16 +27,6 @@ /* Diskette Control Register (write)*/ #define FD_DCR (7 + FD_IOPORT ) -#else - -#define FD_STATUS 0x3f4 -#define FD_DATA 0x3f5 -#define FD_DOR 0x3f2 /* Digital Output Register */ -#define FD_DIR 0x3f7 /* Digital Input Register (read) */ -#define FD_DCR 0x3f7 /* Diskette Control Register (write)*/ - -#endif - /* Bits of main status register */ #define STATUS_BUSYMASK 0x0F /* drive busy mask */ #define STATUS_BUSY 0x10 /* FDC busy */ |