Module Name: src
Committed By: tsutsui
Date: Thu Feb 9 15:20:40 UTC 2023
Modified Files:
src/sys/arch/next68k/stand/boot: Makefile scsi.c sd.c
Log Message:
Disable DEBUG options properly.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/next68k/stand/boot/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/next68k/stand/boot/scsi.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/next68k/stand/boot/sd.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/next68k/stand/boot/Makefile
diff -u src/sys/arch/next68k/stand/boot/Makefile:1.30 src/sys/arch/next68k/stand/boot/Makefile:1.31
--- src/sys/arch/next68k/stand/boot/Makefile:1.30 Sat Feb 4 14:38:09 2023
+++ src/sys/arch/next68k/stand/boot/Makefile Thu Feb 9 15:20:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2023/02/04 14:38:09 tsutsui Exp $
+# $NetBSD: Makefile,v 1.31 2023/02/09 15:20:40 tsutsui Exp $
NOMAN= # defined
@@ -24,10 +24,13 @@ RELOC= 4380000
# XXX make defs arch-indep.
INCLUDES+= -I${.OBJDIR} -I${S}/arch -I${S} -I${S}/lib/libsa
-DEFS+= -D_STANDALONE -DMC68040 -DSUPPORT_BOOTP -DSUPPORT_DHCP -DDEBUG -DSD_DEBUG -DSCSI_DEBUG # -DEN_DEBUG -DNETIF_DEBUG
-SAMISCCPPFLAGS= -DSUPPORT_DHCP -DSUPPORT_BOOTP -DSA_EXEC_ANYOWNER # -DBOOTP_DEBUG -DETHER_DEBUG -DNET_DEBUG # -DNETIF_DEBUG -DNFS_DEBUG -DARP_DEBUG
+DEFS+= -D_STANDALONE -DMC68040 -DSUPPORT_BOOTP -DSUPPORT_DHCP
+#DEFS+= -DDEBUG -DSD_DEBUG -DSCSI_DEBUG -DEN_DEBUG -DNETIF_DEBUG
+SAMISCCPPFLAGS= -DSUPPORT_DHCP -DSUPPORT_BOOTP -DSA_EXEC_ANYOWNER
+#SAMISCCPPFLAGS+= -DBOOTP_DEBUG -DETHER_DEBUG -DNET_DEBUG-DNETIF_DEBUG
+#SAMISCCPPFLAGS+= -DNFS_DEBUG -DARP_DEBUG
WARNS=1
-CFLAGS+= -ffreestanding -nostdinc ${INCLUDES} ${DEFS}
+CFLAGS+= -ffreestanding -nostdinc ${INCLUDES} ${DEFS}
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
AFLAGS+= ${INCLUDES}
# XXX SHOULD NOT NEED TO DEFINE THESE!
Index: src/sys/arch/next68k/stand/boot/scsi.c
diff -u src/sys/arch/next68k/stand/boot/scsi.c:1.11 src/sys/arch/next68k/stand/boot/scsi.c:1.12
--- src/sys/arch/next68k/stand/boot/scsi.c:1.11 Sat Feb 4 14:38:09 2023
+++ src/sys/arch/next68k/stand/boot/scsi.c Thu Feb 9 15:20:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi.c,v 1.11 2023/02/04 14:38:09 tsutsui Exp $ */
+/* $NetBSD: scsi.c,v 1.12 2023/02/09 15:20:40 tsutsui Exp $ */
/*
* Copyright (c) 1994, 1997 Rolf Grossmann
* All rights reserved.
@@ -61,7 +61,7 @@ int scsiicmd(char target, char lun,
#define NDPRINTF(x)
#define PRINTF(x)
/* printf x; */
-#ifdef xSCSI_DEBUG
+#ifdef SCSI_DEBUG
#define DPRINTF(x) printf x;
#else
#define DPRINTF(x)
Index: src/sys/arch/next68k/stand/boot/sd.c
diff -u src/sys/arch/next68k/stand/boot/sd.c:1.15 src/sys/arch/next68k/stand/boot/sd.c:1.16
--- src/sys/arch/next68k/stand/boot/sd.c:1.15 Thu Feb 9 15:00:56 2023
+++ src/sys/arch/next68k/stand/boot/sd.c Thu Feb 9 15:20:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.15 2023/02/09 15:00:56 tsutsui Exp $ */
+/* $NetBSD: sd.c,v 1.16 2023/02/09 15:20:40 tsutsui Exp $ */
/*
* Copyright (c) 1994 Rolf Grossmann
* All rights reserved.
@@ -40,7 +40,7 @@
#include <lib/libkern/libkern.h> /* for bzero() */
#include "dmareg.h"
-#ifdef xSD_DEBUG
+#ifdef SD_DEBUG
#define DPRINTF(x) printf x;
#else
#define DPRINTF(x)