Module Name: src
Committed By: christos
Date: Sun Jun 9 14:18:30 UTC 2019
Modified Files:
src/sys/dev/adb: adb_kbd.c
Log Message:
make this compile again without ddb
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/adb/adb_kbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/adb/adb_kbd.c
diff -u src/sys/dev/adb/adb_kbd.c:1.28 src/sys/dev/adb/adb_kbd.c:1.29
--- src/sys/dev/adb/adb_kbd.c:1.28 Thu Jun 6 16:59:58 2019
+++ src/sys/dev/adb/adb_kbd.c Sun Jun 9 10:18:29 2019
@@ -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 @@ adbkbd_keys(struct adbkbd_softc *sc, uin
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 {
