diff options
| author | yokota <yokota@FreeBSD.org> | 1999-01-06 05:49:30 +0000 |
|---|---|---|
| committer | yokota <yokota@FreeBSD.org> | 1999-01-06 05:49:30 +0000 |
| commit | a617215e8a5903bc5e51080484adec2f7ee93ade (patch) | |
| tree | 66a9d07401f907a26599de8ff5609096ff79f788 /sys | |
| parent | 4546265cab593a2575a5272d69b582c6cc52c98c (diff) | |
| download | FreeBSD-src-a617215e8a5903bc5e51080484adec2f7ee93ade.zip FreeBSD-src-a617215e8a5903bc5e51080484adec2f7ee93ade.tar.gz | |
Move IO_PSMSIZE from kbdio.h to isareg.h.
While I am here, correct the values for IO_MDASIZE and IO_CGASIZE; they
should be 12 rather than 16.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/isa/isareg.h | 7 | ||||
| -rw-r--r-- | sys/isa/kbdio.h | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h index 8739e3c..644755a 100644 --- a/sys/isa/isareg.h +++ b/sys/isa/isareg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 - * $Id: isa.h,v 1.21 1997/02/22 09:36:41 peter Exp $ + * $Id: isareg.h,v 1.1 1998/08/06 08:49:09 dfr Exp $ */ #ifdef PC98 @@ -147,7 +147,7 @@ #define IO_ISASIZES #define IO_ASCSIZE 5 /* AmiScan GI1904-based hand scanner */ -#define IO_CGASIZE 16 /* CGA controllers */ +#define IO_CGASIZE 12 /* CGA controllers */ #define IO_COMSIZE 8 /* 8250, 16x50 com controllers */ #define IO_DMASIZE 16 /* 8237 DMA controllers */ #define IO_DPGSIZE 32 /* 74LS612 DMA page registers */ @@ -158,9 +158,10 @@ #define IO_ICUSIZE 16 /* 8259A interrupt controllers */ #define IO_KBDSIZE 16 /* 8042 Keyboard controllers */ #define IO_LPTSIZE 8 /* LPT controllers, some use only 4 */ -#define IO_MDASIZE 16 /* Monochrome display controllers */ +#define IO_MDASIZE 12 /* Monochrome display controllers */ #define IO_NPXSIZE 16 /* 80387/80487 NPX registers */ #define IO_PMPSIZE 2 /* 82347 power management peripheral */ +#define IO_PSMSIZE 5 /* 8042 Keyboard controllers */ #define IO_RTCSIZE 16 /* CMOS real time clock, NMI control */ #define IO_TMRSIZE 16 /* 8253 programmable timers */ #define IO_VGASIZE 16 /* VGA controllers */ diff --git a/sys/isa/kbdio.h b/sys/isa/kbdio.h index 5bdb5be..85ebba4 100644 --- a/sys/isa/kbdio.h +++ b/sys/isa/kbdio.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: kbdio.h,v 1.8 1998/08/06 09:15:53 dfr Exp $ * from: i386/isa kbdio.h,v 1.7 */ @@ -52,9 +52,6 @@ */ #endif /* PC98 */ -/* FIXME: `IO_PSMSIZE' should really be in `isa.h'. */ -#define IO_PSMSIZE (KBD_COMMAND_PORT - KBD_DATA_PORT + 1) /* 5 */ - /* controller commands (sent to KBD_COMMAND_PORT) */ #define KBDC_SET_COMMAND_BYTE 0x0060 #define KBDC_GET_COMMAND_BYTE 0x0020 |
