From cee724942303ae88c9d3bda6143a47bce9489e43 Mon Sep 17 00:00:00 2001 From: scottr Date: Sat, 17 Jun 2000 18:00:47 +0000 Subject: [PATCH] Since interrupts are now enabled during ADB autoconfig, it's possible to get a keyboard event before wskbd is attached. Make sure we've done that before passing an event to kbd_intr(), which in turn hands off to wskbd_input(). This is another part of the fix for PR 10086. --- sys/arch/mac68k/dev/akbd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/arch/mac68k/dev/akbd.c b/sys/arch/mac68k/dev/akbd.c index e0c353801b5d..55716c7da70a 100644 --- a/sys/arch/mac68k/dev/akbd.c +++ b/sys/arch/mac68k/dev/akbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: akbd.c,v 1.8 2000/06/17 17:46:40 scottr Exp $ */ +/* $NetBSD: akbd.c,v 1.9 2000/06/17 18:00:47 scottr Exp $ */ /* * Copyright (C) 1998 Colin Wood @@ -336,7 +336,8 @@ kbd_processevent(event, ksc) if (adb_polling || !aed_input(&new_event)) #endif #if NWSKBD > 0 - kbd_intr(&new_event); + if (ksc->sc_wskbddev != NULL) /* wskbd is attached? */ + kbd_intr(&new_event); #else /* do nothing */ ; #endif @@ -348,7 +349,8 @@ kbd_processevent(event, ksc) if (adb_polling || !aed_input(&new_event)) #endif #if NWSKBD > 0 - kbd_intr(&new_event); + if (ksc->sc_wskbddev != NULL) /* wskbd is attached? */ + kbd_intr(&new_event); #else /* do nothing */ ; #endif