Disabled AROSMonDrvs from ROM

Author: WDrijver

arch/m68k-amiga/boot/romlog.txt

@@ -1,3 +1,3 @@
 Idx Name          Size      VMA       LMA       File off  Algn
-  0 .rom          00078354  00f80000  00f80000  0007c000  2**2
-  1 .ext          00078c92  00e00000  00e00000  00002000  2**2
+  0 .rom          0007805c  00f80000  00f80000  0007c000  2**2
+  1 .ext          00078c96  00e00000  00e00000  00002000  2**2

rom/bootloader/bootloader_intern.h

@@ -1,5 +1,5 @@
 /*
-    Copyright © 1995-2010, The AROS Development Team. All rights reserved.
+    Copyright � 1995-2010, The AROS Development Team. All rights reserved.
     $Id$
 
     Internal data structures for bootloader.resource
@@ -35,4 +35,16 @@ struct BootLoaderBase
 #define BL_FLAGS_CMDLINE 0x01
 #define BL_FLAGS_DRIVES  0x02
 
+#if APOLLO_DEBUG
+#define DEBUG 1
+#else
+#define DEBUG 0
+#endif
+
+#if DEBUG
+#define D(x) x
+#else
+#define D(x)
+#endif
+
 #endif //BOOTLOADER_INTERN_H

rom/dos/boot.c

@@ -95,10 +95,10 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
      * In fact the system must have at least one resident driver,
      * which will be used for bootmenu etc. However, it we somehow happen
      * not to have it, this will be our last chance.
-     */
+     
     if ((BootFlags & (BF_NO_DISPLAY_DRIVERS | BF_NO_COMPOSITION)) != (BF_NO_DISPLAY_DRIVERS | BF_NO_COMPOSITION))
     {
-        /* Check that it exists first... */
+        // Check that it exists first...
         BPTR seg;
 
         DD(bug("[DOS] %s: initialising displays\n", __func__);)
@@ -108,30 +108,26 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
             STRPTR args = "";
             BPTR oldin, oldout;
 
-            /*
-             * Argument strings MUST contain terminating LF because of ReadItem() bugs.
-             * Their absence causes ReadArgs() crash.
-             */
+            // Argument strings MUST contain terminating LF because of ReadItem() bugs.
+            // Their absence causes ReadArgs() crash.
             if (BootFlags & BF_NO_COMPOSITION)
                 args = "NOCOMPOSITION\n";
             else if (BootFlags & BF_NO_DISPLAY_DRIVERS)
                 args = "ONLYCOMPOSITION\n";
 
             DD(bug("[DOS] %s: Running AROSMonDrvs %s\n", __func__, args);)
 
-            /* RunCommand needs a valid Input() handle
-             * for passing in its arguments.
-             */
+            // RunCommand needs a valid Input() handle for passing in its arguments.
             oldin = SelectInput(Open("NIL:", MODE_OLDFILE));
             oldout= SelectOutput(Open("NIL:", MODE_NEWFILE));
             RunCommand(seg, AROS_STACKSIZE, args, strlen(args));
             SelectInput(oldin);
             SelectOutput(oldout);
 
-            /* We don't care about the return code */
+            // We don't care about the return code
             UnLoadSeg(seg);
         }
-    }
+    } */
 
     DD(bug("[DOS] %s: preparing console\n", __func__);)
 

rom/dos/dos_intern.h

@@ -22,7 +22,7 @@
 #include "fs_driver.h"
 
 #if APOLLO_DEBUG
-#define DEBUG 0
+#define DEBUG 1
 #else
 #define DEBUG 0
 #endif

workbench/network/stacks/AROSTCP/bsdsocket/conf.h

@@ -216,7 +216,7 @@ extern struct ExecBase *SysBase;
 #include <stddef.h>
 
 #if APOLLO_DEBUG
-#define DEBUG 0
+#define DEBUG 1
 #else
 #define DEBUG 0
 #endif

workbench/network/stacks/AROSTCP/bsdsocket/net/if_sana.c

@@ -777,7 +777,7 @@ D(bug("[ATCP-SANA] sana_up('%s%d')\n", ssc->ss_if.if_name, ssc->ss_if.if_unit));
       sana2perror("S2_ONLINE", req);
       gui_set_interface_state(&ssc->ss_if, MIAMIPANELV_AddInterface_State_Offline);
     } else {
-      //__log(LOG_NOTICE, "%s%d is now online.", ssc->ss_name, ssc->ss_if.if_unit);
+      DSANA(__log(LOG_NOTICE, "%s%d is now online.", ssc->ss_name, ssc->ss_if.if_unit));
       sana_restore(ssc);
     }
     DeleteIOSana2Req(req);