Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mac68k/dev Since interrupts are now enabled during ...



details:   https://anonhg.NetBSD.org/src/rev/3f60c9a29daa
branches:  trunk
changeset: 487700:3f60c9a29daa
user:      scottr <scottr%NetBSD.org@localhost>
date:      Sun Jun 11 17:26:47 2000 +0000

description:
Since interrupts are now enabled during ADB autoconfig, it's possible
to get a mouse event before wsmouse is attached. Make sure we've done
that before passing an event to wsmouse_input().

diffstat:

 sys/arch/mac68k/dev/ams.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r a1059107879d -r 3f60c9a29daa sys/arch/mac68k/dev/ams.c
--- a/sys/arch/mac68k/dev/ams.c Sun Jun 11 17:09:34 2000 +0000
+++ b/sys/arch/mac68k/dev/ams.c Sun Jun 11 17:26:47 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ams.c,v 1.7 2000/03/19 07:37:58 scottr Exp $   */
+/*     $NetBSD: ams.c,v 1.8 2000/06/11 17:26:47 scottr Exp $   */
 
 /*
  * Copyright (C) 1998  Colin Wood
@@ -548,8 +548,10 @@
        if (!aed_input(&new_event))
 #endif
 #if NWSMOUSE > 0
-               wsmouse_input(amsc->sc_wsmousedev, new_event.u.m.buttons,
-                   new_event.u.m.dx, new_event.u.m.dy, 0, 0);
+               if (amsc->sc_wsmousedev != NULL) /* wsmouse is attached? */
+                       wsmouse_input(amsc->sc_wsmousedev,
+                           new_event.u.m.buttons,
+                           new_event.u.m.dx, new_event.u.m.dy, 0, 0);
 #else
                /* do nothing */ ;
 #endif



Home | Main Index | Thread Index | Old Index