CVS commit: src/sys/arch/sh3/dev

[Andrius Varanavicius]

Module Name:    src
Committed By:   andvar
Date:           Sat Sep 16 15:42:01 UTC 2023

Modified Files:
        src/sys/arch/sh3/dev: scif.c

Log Message:
sh3/scif(4): redefine DPRINTF again, not all SH ports has machine/debug.h.
Those are defined for hpc only.

unbreaks build for evbsh some kernel configs and SFIC_DEBUG still builds.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sh3/dev/scif.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/arch/sh3/dev/scif.c
diff -u src/sys/arch/sh3/dev/scif.c:1.69 src/sys/arch/sh3/dev/scif.c:1.70
--- src/sys/arch/sh3/dev/scif.c:1.69	Fri Sep 15 20:59:56 2023
+++ src/sys/arch/sh3/dev/scif.c	Sat Sep 16 15:42:01 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: scif.c,v 1.69 2023/09/15 20:59:56 andvar Exp $ */
+/*	$NetBSD: scif.c,v 1.70 2023/09/16 15:42:01 andvar Exp $ */
 
 /*-
  * Copyright (C) 1999 T.Horiuchi and SAITOH Masanobu.  All rights reserved.
@@ -93,7 +93,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scif.c,v 1.69 2023/09/15 20:59:56 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scif.c,v 1.70 2023/09/16 15:42:01 andvar Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_scif.h"
@@ -177,10 +177,11 @@ struct scif_softc {
 };
 
 #ifdef SCIF_DEBUG
-#define DPRINTF_ENABLE
-#define DPRINTF_DEBUG	scif_debug
+int scif_debug = 1;
+#define DPRINTF(x)	if (scif_debug) printf x
+#else
+#define DPRINTF(x)
 #endif
-#include <machine/debug.h>
 
 static int scif_match(device_t, cfdata_t, void *);
 static void scif_attach(device_t, device_t, void *);
@@ -688,7 +689,7 @@ scifparam(struct tty *tp, struct termios
 
 	splx(s);
 
-	DPRINTF("%s: scifparam\n", device_xname(sc->sc_dev));
+	DPRINTF(("%s: scifparam\n", device_xname(sc->sc_dev)));
 
 	if (!ISSET(t->c_cflag, CHWFLOW)) {
 		if (sc->sc_tx_stopped) {
@@ -799,7 +800,7 @@ scifopen(dev_t dev, int flag, int mode, 
 		scif_hwiflow(sc);
 #endif
 
-		DPRINTF("%s: scifopen\n", device_xname(sc->sc_dev));
+		DPRINTF(("%s: scifopen\n", device_xname(sc->sc_dev)));
 
 		splx(s2);
 	}
@@ -1147,7 +1148,7 @@ scif_stsoft(struct scif_softc *sc, struc
 		}
 	}
 
-	DPRINTF("%s: scif_stsoft\n", device_xname(sc->sc_dev));
+	DPRINTF(("%s: scif_stsoft\n", device_xname(sc->sc_dev)));
 }
 #endif /* 0 */
 
@@ -1343,7 +1344,7 @@ scifintr(void *arg)
 		if (ISSET(~msr, sc->sc_msr_mask)) {
 			sc->sc_tbc = 0;
 			sc->sc_heldtbc = 0;
-			DPRINTF("%s: scifintr\n", device_xname(sc->sc_dev));
+			DPRINTF(("%s: scifintr\n", device_xname(sc->sc_dev)));
 		}
 
 		sc->sc_st_check = 1;