diff options
| author | yokota <yokota@FreeBSD.org> | 1999-01-06 05:40:01 +0000 |
|---|---|---|
| committer | yokota <yokota@FreeBSD.org> | 1999-01-06 05:40:01 +0000 |
| commit | 4546265cab593a2575a5272d69b582c6cc52c98c (patch) | |
| tree | 18957ea6ebd3897135cfc705c6dc09fac65c04db /sys/i386 | |
| parent | 5ca24859b5604690a763ca302ea270af79567b80 (diff) | |
| download | FreeBSD-src-4546265cab593a2575a5272d69b582c6cc52c98c.zip FreeBSD-src-4546265cab593a2575a5272d69b582c6cc52c98c.tar.gz | |
Move IO_PSMSIZE from kbdio.h to isa.h. I thought I did this a long time
ago...
While I am here, correct the values for IO_MDASIZE and IO_CGASIZE; they
should be 12 rather than 16.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/isa/isa.h | 7 | ||||
| -rw-r--r-- | sys/i386/isa/kbdio.h | 5 | ||||
| -rw-r--r-- | sys/i386/isa/psm.c | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h index 6ec3ae2..ea25f20 100644 --- a/sys/i386/isa/isa.h +++ b/sys/i386/isa/isa.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 - * $Id$ + * $Id: isa.h,v 1.21 1997/02/22 09:36:41 peter 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/i386/isa/kbdio.h b/sys/i386/isa/kbdio.h index b544681..961ea81 100644 --- a/sys/i386/isa/kbdio.h +++ b/sys/i386/isa/kbdio.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kbdio.h,v 1.7 1997/12/07 08:09:15 yokota Exp $ + * $Id: kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp $ */ #ifndef _I386_ISA_KBDIO_H_ @@ -51,9 +51,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 diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c index 1c937ca..4cee984 100644 --- a/sys/i386/isa/psm.c +++ b/sys/i386/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.56 1998/10/22 05:58:40 bde Exp $ + * $Id: psm.c,v 1.57 1998/11/20 11:46:43 yokota Exp $ */ /* @@ -86,6 +86,7 @@ #include <machine/limits.h> #include <machine/mouse.h> +#include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/kbdio.h> |
