Cleaner MKSYSDEBUG option

diff --git a/kernel/Makefile b/kernel/Makefile
index b652ebc1b42c7759e2f879a7e382f1b4faf01171..7c7f7916c68930f0e422d8f1bec7cd0e5d8fe50f 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -70,6 +70,7 @@ SRCS+=        breakpoints.c debugreg.S
 # Extra debugging routines
 .if ${USE_SYSDEBUG} != "no"
 SRCS+=         debug.c
+CPPFLAGS+= -DUSE_SYSDEBUG
 .endif
 
 # These come last, so the profiling buffer is at the end of the data segment

diff --git a/kernel/arch/i386/arch_system.c b/kernel/arch/i386/arch_system.c
index a94c3a4a059b159a839978f12935fb8c33db165a..882ae7f2369c17d9e4586d83cb5cd4cbd48cde0c 100644 (file)
--- a/kernel/arch/i386/arch_system.c
+++ b/kernel/arch/i386/arch_system.c
@@ -395,7 +395,7 @@ PUBLIC void arch_init(void)
 #endif
 }
 
-#if DEBUG_SERIAL
+#ifdef DEBUG_SERIAL
 PUBLIC void ser_putc(char c)
 {
         int i;

diff --git a/kernel/clock.c b/kernel/clock.c
index 074dba884f5fa013dba4b7a53c21b0407a88d23c..afc8857900f2cb56883c115b3549ad5907008421 100644 (file)
--- a/kernel/clock.c
+++ b/kernel/clock.c
@@ -140,7 +140,7 @@ PUBLIC int timer_int_handler(void)
                                TMR_NEVER : clock_timers->tmr_exp_time;
                }
 
-#if DEBUG_SERIAL
+#ifdef DEBUG_SERIAL
                if (do_serial_debug)
                        do_ser_debug();
 #endif

diff --git a/kernel/debug.h b/kernel/debug.h
index 58921db7c937e7ca9942374e09b114b22abcae0d..7cb7e7e84930016b9e07f74fcfb4968029cc7b19 100644 (file)
--- a/kernel/debug.h
+++ b/kernel/debug.h
@@ -50,7 +50,7 @@
 /* DEBUG_IPCSTATS collects information on who sends messages to whom. */
 #define DEBUG_IPCSTATS                 0
 
-#if USE_SMALL
+#if !USE_SYSDEBUG
 #undef DEBUG_SERIAL
 #undef DEBUG_ENABLE_IPC_WARNINGS
 #endif

diff --git a/kernel/start.c b/kernel/start.c
index ba25c665e3c9984d8da1056845b2e15a878634e3..6f122cdaef3ca5f10c3b162fc9c60460be0f962a 100644 (file)
--- a/kernel/start.c
+++ b/kernel/start.c
@@ -84,7 +84,7 @@ PUBLIC void cstart(
   if(!value || system_hz < 2 || system_hz > 50000)     /* sanity check */
        system_hz = DEFAULT_HZ;
 
-#if DEBUG_SERIAL
+#ifdef DEBUG_SERIAL
   /* Intitialize serial debugging */
   value = env_get(SERVARNAME);
   if(value && atoi(value) == 0) {

diff --git a/kernel/utility.c b/kernel/utility.c
index 15a043c586d3ff5e30ffe6cfc709a592e07964a4..0de0d5bd7efc806846cac1bac2a87d009394eaed 100644 (file)
--- a/kernel/utility.c
+++ b/kernel/utility.c
@@ -50,7 +50,7 @@ int c;                                        /* character to append */
  * to the output driver if an END_OF_KMESS is encountered. 
  */
   if (c != END_OF_KMESS) {
-#if DEBUG_SERIAL
+#ifdef DEBUG_SERIAL
       if (do_serial_debug) {
        if(c == '\n')
                ser_putc('\r');

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 28a396fc89cc5b0d2c066ebcad5ce81ac4dbcc36..dd8c634a20e461e10eea45abe6a711f165bb55b9 100644 (file)
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -247,5 +247,5 @@ NBSD_LIBC=  yes
 
 .if ${COMPILER_TYPE} == "gnu" && defined(MKSMALL) && ${MKSMALL} == "yes"
 DBG=   -Os
-CFLAGS+= -DNDEBUG=1 -DUSE_SMALL=1
+CFLAGS+= -DNDEBUG
 .endif