diff options
| author | joerg <joerg@FreeBSD.org> | 1995-04-01 17:16:40 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 1995-04-01 17:16:40 +0000 |
| commit | 496532df2284189ba4f9a41dbb9c99e7bfe8dc04 (patch) | |
| tree | fc89c15b2818467678f15490b5868f157675d332 /sys/i386/isa/pcvt/pcvt_drv.c | |
| parent | 8befbf76145df5fc0818e4b312878684f567f2cc (diff) | |
| download | FreeBSD-src-496532df2284189ba4f9a41dbb9c99e7bfe8dc04.zip FreeBSD-src-496532df2284189ba4f9a41dbb9c99e7bfe8dc04.tar.gz | |
Update pcvt to 3.20b23
Submitted by: Hellmuth Michaelis <hm@altona.hamburg.com>
Diffstat (limited to 'sys/i386/isa/pcvt/pcvt_drv.c')
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_drv.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c index c01ff20..83770a0 100644 --- a/sys/i386/isa/pcvt/pcvt_drv.c +++ b/sys/i386/isa/pcvt/pcvt_drv.c @@ -41,7 +41,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * - * @(#)pcvt_drv.c, 3.20, Last Edit-Date: [Sun Feb 26 12:58:03 1995] + * @(#)pcvt_drv.c, 3.20, Last Edit-Date: [Thu Mar 23 20:37:05 1995] * */ @@ -70,6 +70,8 @@ * -hm patch from Rafael Boni/Lon Willett for NetBSD-current * -hm bell patch from Thomas Eberhardt for NetBSD * -hm multiple X server bugfixes from Lon Willett + * -hm patch from joerg - pcdevtotty for FreeBSD pre-2.1 + * -hm delay patch from Martin Husemann after port-i386 ml-discussion * *---------------------------------------------------------------------------*/ @@ -297,7 +299,7 @@ pcattach(struct isa_device *dev) vthand.ih_arg = 0; vthand.ih_level = IPL_TTY; -#if PCVT_NETBSD > 100 +#if (PCVT_NETBSD > 100) && defined(IST_EDGE) intr_establish(ia->ia_irq, IST_EDGE, &vthand); #else /* PCVT_NETBSD > 100 */ intr_establish(ia->ia_irq, &vthand); @@ -803,6 +805,12 @@ pcrint(void) { ret = 1; /* got something */ +#if PCVT_NETBSD > 9 + delay(6); /* Gateway 2000 fix */ +#elif PCVT_FREEBSD || (PCVT_NETBSD <= 9) + DELAY(6); /* Gateway 2000 fix */ +#endif + dt = inb(CONTROLLER_DATA); /* get it 8042 data */ if (pcvt_kbd_count >= PCVT_KBD_FIFO_SZ) /* fifo overflow ? */ |
