From 8032c180fba32282b475bd3c078bc2e0d4923eea Mon Sep 17 00:00:00 2001
From: sonic <sonic@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Fri, 26 Sep 2008 07:02:07 +0000
Subject: [PATCH] - Added forgotten PRF_NOTIFYONDEATH definition (Sszymczy,
 check this!) - Added separate kernel-link-mingw32 metatarget - Fixed setting
 AROSSupportBase->StdOut - Corrected some debug output

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@29539 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 arch/all-mingw32/bootstrap/mmakefile.src                         | 9 +++++++--
 arch/all-mingw32/devs/filesys/emul_handler/emul_handler_native.c | 2 +-
 arch/all-mingw32/dos/aros.c                                      | 6 +++++-
 arch/all-mingw32/dos/boot.c                                      | 4 +++-
 arch/all-mingw32/exec/exec_init.c                                | 5 -----
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/arch/all-mingw32/bootstrap/mmakefile.src b/arch/all-mingw32/bootstrap/mmakefile.src
index 96742af328..1491661e78 100644
--- a/arch/all-mingw32/bootstrap/mmakefile.src
+++ b/arch/all-mingw32/bootstrap/mmakefile.src
@@ -27,10 +27,15 @@ KOBJS := $(KOBJS_HANDLERS) $(KOBJS_LIBS) $(KOBJS_DEVICES) $(K_RES)
 #				$(KOBJSDIR)/intuition_library.o \
 
 
-#MM kernel-bootstrap-mingw32: kernel-kernel-mingw32-kobj kernel-hostlib-mingw32-kobj kernel kernel-fs-emul-mingw32-kobj
+#MM kernel-link-mingw32: kernel-kernel-mingw32-kobj kernel-hostlib-mingw32-kobj kernel kernel-fs-emul-mingw32-kobj
+
+#MM kernel-bootstrap-mingw32: kernel-link-mingw32
+
+#MM
+kernel-bootstrap-mingw32: setup-mingw32 $(BINDIR)/boot/AROSBootstrap
 
 #MM
-kernel-bootstrap-mingw32: setup-mingw32 $(BINDIR)/boot/AROSBootstrap $(BINDIR)/boot/kernel
+kernel-link-mingw32: $(BINDIR)/boot/kernel
 
 setup-mingw32 :
 	%mkdirs_q $(BINDIR)/boot $(OSGENDIR)/boot $(TARGETDIR)
diff --git a/arch/all-mingw32/devs/filesys/emul_handler/emul_handler_native.c b/arch/all-mingw32/devs/filesys/emul_handler/emul_handler_native.c
index ca45e8d851..623c645837 100644
--- a/arch/all-mingw32/devs/filesys/emul_handler/emul_handler_native.c
+++ b/arch/all-mingw32/devs/filesys/emul_handler/emul_handler_native.c
@@ -347,7 +347,7 @@ int __declspec(dllexport) EmulErrno(void)
   D(printf("[EmulHandler] Win32 error code: %lu\n", e));
   for(i=0;i<sizeof(u2a)/sizeof(u2a[0]);i++)
 	if(u2a[i][0]==e) {
-	  D(printf("[EmulHandler] Translated to AROS error code: 0x%08lX\n", u2a[i][1]));
+	  D(printf("[EmulHandler] Translated to AROS error code: %lu\n", u2a[i][1]));
 	  return u2a[i][1];
 	}
   D(printf("[EmulHandler] Unknown error code\n"));
diff --git a/arch/all-mingw32/dos/aros.c b/arch/all-mingw32/dos/aros.c
index 3334eb7ac0..2d16d1273b 100644
--- a/arch/all-mingw32/dos/aros.c
+++ b/arch/all-mingw32/dos/aros.c
@@ -5,9 +5,9 @@
     Desc: This is the "boot code" of AROS when it runs as an emulation.
     Lang: english
 */
+#define DEBUG 1
 
 #include <aros/debug.h>
-
 #include <dos/dostags.h>
 #include <dos/dos.h>
 #include <dos/dosextens.h>
@@ -24,6 +24,7 @@ int submain(struct ExecBase * SysBase, struct DosLibrary * DOSBase)
 {
     LONG            rc = RETURN_FAIL;
 
+    D(bug("[boot] Opening boot shell\n"));
     BPTR cis  = Open("CON:20/20///Boot Shell/AUTO", FMF_READ);
 
     if (cis)
@@ -43,6 +44,7 @@ int submain(struct ExecBase * SysBase, struct DosLibrary * DOSBase)
                 { TAG_DONE,       0           }
             };
 
+	D(bug("[SubMain] Boot shell opened\n"));
         if ((ExpansionBase = (struct ExpansionBase *)OpenLibrary("expansion.library", 0)) != NULL)
         {
             opensseq = !(ExpansionBase->Flags & EBF_DOSFLAG);
@@ -70,9 +72,11 @@ int submain(struct ExecBase * SysBase, struct DosLibrary * DOSBase)
     }
     else
     {
+        D(bug("[SubMain] Failed to open Boot shell\n"));
         PutStr(CANNOT_OPEN_CON);
     }
 
+    D(bug("[SubMain] Closing Boot shell\n"));
     Close(cis);
 
     return rc;
diff --git a/arch/all-mingw32/dos/boot.c b/arch/all-mingw32/dos/boot.c
index 80087ded33..ae55c1156f 100644
--- a/arch/all-mingw32/dos/boot.c
+++ b/arch/all-mingw32/dos/boot.c
@@ -104,11 +104,13 @@ AROS_UFH3(void, boot,
     if(Output())
     	Close(Output());
 
+    D(bug("[boot] Selecting input and output for DOS\n"));
     SelectInput(MKBADDR(fh_stdin));
     SelectOutput(MKBADDR(fh_stdout));
     ((struct Process *)FindTask(NULL))->pr_CES = MKBADDR(fh_stdout);
 
-    AROSSupportBase_SetStdOut (stderr);
+    D(bug("[boot] Selecting output for AROSSupport\n"));
+    ((struct AROSSupportBase *)(SysBase->DebugAROSBase))->StdOut = stderr;
 
     submain(SysBase, DOSBase);
 
diff --git a/arch/all-mingw32/exec/exec_init.c b/arch/all-mingw32/exec/exec_init.c
index 88a914e6dd..d5e7e2e0b7 100644
--- a/arch/all-mingw32/exec/exec_init.c
+++ b/arch/all-mingw32/exec/exec_init.c
@@ -87,11 +87,6 @@ struct Library * PrepareAROSSupportBase (struct ExecBase * SysBase)
 	return (struct Library *)AROSSupportBase;
 }
 
-void AROSSupportBase_SetStdOut (struct AROSSupportBase * AROSSupportBase, void * stdout)
-{
-	AROSSupportBase->StdOut = stdout;
-}
-
 void _aros_not_implemented(char *X)
 {
     kprintf("Unsupported function at offset -0x%h in %s\n",
-- 
2.11.4.GIT