diff options
| author | asami <asami@FreeBSD.org> | 1996-10-30 22:41:46 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-10-30 22:41:46 +0000 |
| commit | 95ac832055c11e8031e18bcc9759b2d12b654e9b (patch) | |
| tree | 37f74d6fdf54e31c6c6d69a11d50e299cd0a1118 /sys/i386/isa/timerreg.h | |
| parent | e1b78916a4b8d96475ebaa0033860c706702fe49 (diff) | |
| download | FreeBSD-src-95ac832055c11e8031e18bcc9759b2d12b654e9b.zip FreeBSD-src-95ac832055c11e8031e18bcc9759b2d12b654e9b.tar.gz | |
More merge and update.
(1) deleted #if 0
pc98/pc98/mse.c
(2) hold per-unit I/O ports in ed_softc
pc98/pc98/if_ed.c
pc98/pc98/if_ed98.h
(3) merge more files by segregating changes into headers.
new file (moved from pc98/pc98):
i386/isa/aic_98.h
deleted:
well, it's already in the commit message so I won't repeat the
long list here ;)
Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/i386/isa/timerreg.h')
| -rw-r--r-- | sys/i386/isa/timerreg.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/sys/i386/isa/timerreg.h b/sys/i386/isa/timerreg.h index 5742f66..16fbc0b 100644 --- a/sys/i386/isa/timerreg.h +++ b/sys/i386/isa/timerreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp - * $Id$ + * $Id: timerreg.h,v 1.2 1993/10/16 13:46:26 rgrimes Exp $ */ /* @@ -59,6 +59,7 @@ * in undefined behavior (but hopefully not fry the chip). * Reading in this manner has no side effects. * + * [IBM-PC] * The outputs of the three timers are connected as follows: * * timer 0 -> irq 0 @@ -67,15 +68,31 @@ * * Timer 0 is used to call hardclock. * Timer 2 is used to generate console beeps. + * + * [PC-9801] + * The outputs of the three timers are connected as follows: + * + * timer 0 -> irq 0 + * timer 1 -> speaker (via keyboard controller) + * timer 2 -> RS232C + * + * Timer 0 is used to call hardclock. + * Timer 1 is used to generate console beeps. */ /* * Macros for specifying values to be written into a mode register. */ #define TIMER_CNTR0 (IO_TIMER1 + 0) /* timer 0 counter port */ +#ifdef PC98 +#define TIMER_CNTR1 0x3fdb /* timer 1 counter port */ +#define TIMER_CNTR2 (IO_TIMER1 + 4) /* timer 2 counter port */ +#define TIMER_MODE (IO_TIMER1 + 6) /* timer mode port */ +#else #define TIMER_CNTR1 (IO_TIMER1 + 1) /* timer 1 counter port */ #define TIMER_CNTR2 (IO_TIMER1 + 2) /* timer 2 counter port */ #define TIMER_MODE (IO_TIMER1 + 3) /* timer mode port */ +#endif #define TIMER_SEL0 0x00 /* select counter 0 */ #define TIMER_SEL1 0x40 /* select counter 1 */ #define TIMER_SEL2 0x80 /* select counter 2 */ |
