From af0f403f7f01adb984acc869f39d2ae091ab8f91 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Sat, 25 May 1996 22:18:01 +0000 Subject: sync --- sys/arch/i386/isa/pcvt/pcvt_kbd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/arch/i386/isa/pcvt/pcvt_kbd.c') diff --git a/sys/arch/i386/isa/pcvt/pcvt_kbd.c b/sys/arch/i386/isa/pcvt/pcvt_kbd.c index e307429fcf1..1822a2f4af5 100644 --- a/sys/arch/i386/isa/pcvt/pcvt_kbd.c +++ b/sys/arch/i386/isa/pcvt/pcvt_kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcvt_kbd.c,v 1.5 1996/05/07 07:22:30 deraadt Exp $ */ +/* $OpenBSD: pcvt_kbd.c,v 1.6 1996/05/25 22:17:58 deraadt Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. @@ -963,7 +963,7 @@ sgetc(int noblock) u_char key; u_short type; -#if PCVT_KBD_FIFO && PCVT_SLOW_INTERRUPT +#if PCVT_KBD_FIFO int s; #endif @@ -1003,9 +1003,9 @@ loop: else /* source = keyboard fifo */ { dt = pcvt_kbd_fifo[pcvt_kbd_rptr++]; - PCVT_DISABLE_INTR(); + s = spltty(); pcvt_kbd_count--; - PCVT_ENABLE_INTR(); + splx(s); if (pcvt_kbd_rptr >= PCVT_KBD_FIFO_SZ) pcvt_kbd_rptr = 0; } @@ -1289,9 +1289,9 @@ no_mouse_event: else /* source = keyboard fifo */ { dt = pcvt_kbd_fifo[pcvt_kbd_rptr++]; /* yes, get it ! */ - PCVT_DISABLE_INTR(); + s = spltty(); pcvt_kbd_count--; - PCVT_ENABLE_INTR(); + splx(s); if (pcvt_kbd_rptr >= PCVT_KBD_FIFO_SZ) pcvt_kbd_rptr = 0; } -- cgit v1.2.3