Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/adb make this compile again without ddb



details:   https://anonhg.NetBSD.org/src/rev/d087ac943bd2
branches:  trunk
changeset: 451870:d087ac943bd2
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jun 09 14:18:29 2019 +0000

description:
make this compile again without ddb

diffstat:

 sys/dev/adb/adb_kbd.c |  19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r b823ebc13b8a -r d087ac943bd2 sys/dev/adb/adb_kbd.c
--- a/sys/dev/adb/adb_kbd.c     Sun Jun 09 13:35:47 2019 +0000
+++ b/sys/dev/adb/adb_kbd.c     Sun Jun 09 14:18:29 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adb_kbd.c,v 1.28 2019/06/06 20:59:58 macallan Exp $    */
+/*     $NetBSD: adb_kbd.c,v 1.29 2019/06/09 14:18:29 christos Exp $    */
 
 /*
  * Copyright (C) 1998  Colin Wood
@@ -32,7 +32,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.28 2019/06/06 20:59:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.29 2019/06/09 14:18:29 christos Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_ddb.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -465,14 +469,15 @@
                sc->sc_timestamp = now;
                if (((diff > 1) && (diff < 5)) ||
                     (sc->sc_power_button_delay == 0)) {
-
-                       /* power button, report to sysmon */
+#ifdef DDB
                        if (sc->sc_power_dbg) {
                                Debugger();
-                       } else {
-                               sc->sc_pe = k1;
-                               sysmon_task_queue_sched(0, adbkbd_powerbutton, sc);
+                               return;
                        }
+#endif
+                       /* power button, report to sysmon */
+                       sc->sc_pe = k1;
+                       sysmon_task_queue_sched(0, adbkbd_powerbutton, sc);
                }
        } else {
 



Home | Main Index | Thread Index | Old Index