Rename Debugger() into db_enter().

Using a name with the 'db_' prefix makes it invisible from the dynamic
profiler.

ok deraadt@, kettenis@, visa@

10 files changed, 28 insertions, 28 deletions

diff --git a/sys/dev/ic/aic6250.c b/sys/dev/ic/aic6250.c
index 67a2bd02e48..d438d82ee3a 100644
--- a/sys/dev/ic/aic6250.c
+++ b/sys/dev/ic/aic6250.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6250.c,v 1.2 2013/10/23 10:07:14 miod Exp $	*/
+/*	$OpenBSD: aic6250.c,v 1.3 2017/04/30 16:45:45 mpi Exp $	*/
 
 /*
  * Copyright (c) 2010, 2013 Miodrag Vallat.
@@ -126,7 +126,7 @@
 #include <dev/ic/aic6250var.h>
 
 #ifndef DDB
-#define	Debugger() panic("should call debugger here (aic6250.c)")
+#define	db_enter() panic("should call debugger here (aic6250.c)")
 #endif /* ! DDB */
 
 #ifdef AIC_DEBUG
diff --git a/sys/dev/ic/aic6250var.h b/sys/dev/ic/aic6250var.h
index f5e49a24015..73259cf434b 100644
--- a/sys/dev/ic/aic6250var.h
+++ b/sys/dev/ic/aic6250var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6250var.h,v 1.2 2013/10/23 10:07:14 miod Exp $	*/
+/*	$OpenBSD: aic6250var.h,v 1.3 2017/04/30 16:45:45 mpi Exp $	*/
 
 /*
  * Copyright (c) 2010, 2013 Miodrag Vallat.
@@ -206,13 +206,13 @@ struct aic6250_softc {
 #define AIC_DOBREAK	0x40
 #define	AIC_PRINT(b, s)	do {if ((aic6250_debug & (b)) != 0) printf s;} while (0)
 #define	AIC_BREAK() \
-	do { if ((aic6250_debug & AIC_DOBREAK) != 0) Debugger(); } while (0)
+	do { if ((aic6250_debug & AIC_DOBREAK) != 0) db_enter(); } while (0)
 #define	AIC_ASSERT(x) \
 	do { \
 		if (!(x)) { \
 			printf("%s at line %d: assertion failed\n", \
 			    sc->sc_dev.dv_xname, __LINE__); \
-			Debugger(); \
+			db_enter(); \
 		} \
 	} while (0)
 #else
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index 531b187056d..3520ea837e0 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6360.c,v 1.27 2014/09/14 14:17:24 jsg Exp $	*/
+/*	$OpenBSD: aic6360.c,v 1.28 2017/04/30 16:45:46 mpi Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 #ifdef DDB
@@ -145,7 +145,7 @@
 #include <dev/ic/aic6360var.h>
 
 #ifndef DDB
-#define	Debugger() panic("should call debugger here (aic6360.c)")
+#define	db_enter() panic("should call debugger here (aic6360.c)")
 #endif /* ! DDB */
 
 #ifdef AIC_DEBUG
diff --git a/sys/dev/ic/aic6360var.h b/sys/dev/ic/aic6360var.h
index d0c4dceb0fe..1f7a033bc2e 100644
--- a/sys/dev/ic/aic6360var.h
+++ b/sys/dev/ic/aic6360var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6360var.h,v 1.8 2011/04/06 18:14:35 miod Exp $	*/
+/*	$OpenBSD: aic6360var.h,v 1.9 2017/04/30 16:45:45 mpi Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 /*
@@ -194,13 +194,13 @@ struct aic_softc {
 #define AIC_DOBREAK	0x40
 #define	AIC_PRINT(b, s)	do {if ((aic_debug & (b)) != 0) printf s;} while (0)
 #define	AIC_BREAK() \
-	do { if ((aic_debug & AIC_DOBREAK) != 0) Debugger(); } while (0)
+	do { if ((aic_debug & AIC_DOBREAK) != 0) db_enter(); } while (0)
 #define	AIC_ASSERT(x) \
 	do { \
 		if (!(x)) { \
 			printf("%s at line %d: assertion failed\n", \
 			    sc->sc_dev.dv_xname, __LINE__); \
-			Debugger(); \
+			db_enter(); \
 		} \
 	} while (0)
 #else
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 6fa8fe9a925..ba3dfce322a 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com.c,v 1.162 2017/04/30 13:04:49 mpi Exp $	*/
+/*	$OpenBSD: com.c,v 1.163 2017/04/30 16:45:46 mpi Exp $	*/
 /*	$NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $	*/
 
 /*
@@ -1088,7 +1088,7 @@ comintr(void *arg)
 					if (ISSET(sc->sc_hwflags,
 					    COM_HW_CONSOLE)) {
 						if (db_console)
-							Debugger();
+							db_enter();
 						goto next;
 					}
 #endif
diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c
index 525f22fe552..ce030d61692 100644
--- a/sys/dev/ic/ncr5380sbc.c
+++ b/sys/dev/ic/ncr5380sbc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr5380sbc.c,v 1.32 2015/01/15 17:54:14 miod Exp $	*/
+/*	$OpenBSD: ncr5380sbc.c,v 1.33 2017/04/30 16:45:46 mpi Exp $	*/
 /*	$NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $	*/
 
 /*
@@ -122,7 +122,7 @@ void	ncr5380_cmd_timeout(void *);
 
 #ifndef DDB
 /* This is used only in recoverable places. */
-#define Debugger() printf("Debug: ncr5380.c:%d\n", __LINE__)
+#define db_enter() printf("Debug: ncr5380.c:%d\n", __LINE__)
 #endif
 
 #ifdef	NCR5380_DEBUG
@@ -133,7 +133,7 @@ int ncr5380_debug = NCR_DBG_BREAK|NCR_DBG_CMDS;
 struct ncr5380_softc *ncr5380_debug_sc;
 
 #define	NCR_BREAK() \
-	do { if (ncr5380_debug & NCR_DBG_BREAK) Debugger(); } while (0)
+	do { if (ncr5380_debug & NCR_DBG_BREAK) db_enter(); } while (0)
 
 static void ncr5380_show_scsi_cmd(struct scsi_xfer *);
 static void ncr5380_show_sense(struct scsi_xfer *);
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index 5c874e6bc19..07fa9131676 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiop.c,v 1.50 2014/12/19 07:23:57 deraadt Exp $	*/
+/*	$OpenBSD: osiop.c,v 1.51 2017/04/30 16:45:46 mpi Exp $	*/
 /*	$NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $	*/
 
 /*
@@ -596,7 +596,7 @@ osiop_scsidone(acb, status)
 	if (acb == NULL || acb->xs == NULL) {
 		printf("osiop_scsidone: NULL acb %p or scsi_xfer\n", acb);
 #if defined(OSIOP_DEBUG) && defined(DDB)
-		Debugger();
+		db_enter();
 #endif
 		return;
 	}
@@ -1126,7 +1126,7 @@ osiop_checkintr(sc, istat, dstat, sstat0, status)
 		    scraddr, scraddr + sizeof(osiop_script));
 		printf(" istat %x dstat %x sstat0 %x\n", istat, dstat, sstat0);
 #ifdef DDB
-		Debugger();
+		db_enter();
 #endif
 	}
 #endif
@@ -1294,7 +1294,7 @@ osiop_checkintr(sc, istat, dstat, sstat0, status)
 			    osiop_read_1(sc, OSIOP_SBCL),
 			    osiop_read_4(sc, OSIOP_DSP));
 #if defined(OSIOP_DEBUG) && defined(DDB)
-			/*Debugger(); XXX is*/
+			/*db_enter(); XXX is*/
 #endif
 		}
 		switch (OSIOP_PHASE(osiop_read_1(sc, OSIOP_SBCL))) {
@@ -1473,7 +1473,7 @@ osiop_checkintr(sc, istat, dstat, sstat0, status)
 				    "curaddr %lx curlen %lx i %d\n",
 				    acb->curaddr, acb->curlen, i);
 #if defined(OSIOP_DEBUG) && defined(DDB)
-				Debugger();
+				db_enter();
 #endif
 			}
 #ifdef OSIOP_DEBUG
diff --git a/sys/dev/ic/wd33c93.c b/sys/dev/ic/wd33c93.c
index b0f832aa373..0b37f8e8ff8 100644
--- a/sys/dev/ic/wd33c93.c
+++ b/sys/dev/ic/wd33c93.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd33c93.c,v 1.9 2016/12/26 17:38:14 jca Exp $	*/
+/*	$OpenBSD: wd33c93.c,v 1.10 2017/04/30 16:45:46 mpi Exp $	*/
 /*	$NetBSD: wd33c93.c,v 1.24 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*
@@ -878,7 +878,7 @@ wd33c93_wait(struct wd33c93_softc *sc, u_char until, int timeo, int line)
 			printf("wd33c93_wait: TIMEO @%d with asr=0x%x csr=0x%x\n",
 			    line, val, csr);
 #ifdef DDB
-			Debugger();
+			db_enter();
 #endif
 #endif
 			return(val); /* Maybe I should abort */
@@ -2144,7 +2144,7 @@ wd33c93_nextstate(struct wd33c93_softc *sc, struct wd33c93_acb *acb, u_char csr,
 		    sc->sc_dev.dv_xname, asr, csr);
 
 #ifdef DDB
-		Debugger();
+		db_enter();
 #endif
 
 		SET_SBIC_control(sc, SBIC_CTL_EDI | SBIC_CTL_IDI);
diff --git a/sys/dev/usb/dwc2/dwc2.c b/sys/dev/usb/dwc2/dwc2.c
index 7fb32dcb4ca..80832f45a5b 100644
--- a/sys/dev/usb/dwc2/dwc2.c
+++ b/sys/dev/usb/dwc2/dwc2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2.c,v 1.43 2017/03/10 11:18:48 mpi Exp $	*/
+/*	$OpenBSD: dwc2.c,v 1.44 2017/04/30 16:45:46 mpi Exp $	*/
 /*	$NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $	*/
 
 /*-
@@ -1361,7 +1361,7 @@ dwc2_worker(struct task *wk, void *priv)
 	struct dwc2_softc *sc = priv;
 	struct dwc2_hsotg *hsotg = sc->sc_hsotg;
 
-/* Debugger(); */
+/* db_enter(); */
 #if 0
 	struct usbd_xfer *xfer = dwork->xfer;
 	struct dwc2_xfer *dxfer = DWC2_XFER2DXFER(xfer);
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index 54342e63317..252b782aaf2 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbd.c,v 1.85 2017/03/11 11:55:03 mpi Exp $ */
+/* $OpenBSD: wskbd.c,v 1.86 2017/04/30 16:45:46 mpi Exp $ */
 /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
 
 /*
@@ -1504,7 +1504,7 @@ internal_command(struct wskbd_softc *sc, u_int *type, keysym_t ksym,
 #ifdef DDB
 	if (ksym == KS_Cmd_Debugger) {
 		if (sc->sc_isconsole && db_console)
-			Debugger();
+			db_enter();
 		/* discard this key (ddb discarded command modifiers) */
 		*type = WSCONS_EVENT_KEY_UP;
 		return (1);
@@ -1542,7 +1542,7 @@ internal_command(struct wskbd_softc *sc, u_int *type, keysym_t ksym,
 #ifdef DDB
 		case 2:
 			if (sc->sc_isconsole && db_console)
-				Debugger();
+				db_enter();
 			/* discard this key (ddb discarded command modifiers) */
 			*type = WSCONS_EVENT_KEY_UP;
 			break;