ApolloOS R9.5 Release

WDrijver · WDrijver · commit 78ab29ab22c6 · 2025-06-05T16:24:49.000+02:00
diff --git a/arch/m68k-amiga/boot/debug.c b/arch/m68k-amiga/boot/debug.c
@@ -51,7 +51,7 @@ int DebugMayGetChar(void)
 	return c;
 }
 
-#if APOLLO_DEBUG2
+#if APOLLO_DEBUG
 
 void DebugPutStr(register const char *buff)
 {
diff --git a/arch/m68k-amiga/boot/debug.h b/arch/m68k-amiga/boot/debug.h
@@ -18,7 +18,7 @@ void DebugInit(void);
 int DebugPutChar(register int chr);
 int DebugMayGetChar(void);
 
-#if APOLLO_DEBUG2
+#if APOLLO_DEBUG
 void DebugPutStr(register const char *buff);
 void DebugPutHex(const char *what, ULONG val);
 void DebugPutDec(const char *what, ULONG val);
diff --git a/arch/m68k-amiga/boot/romlog.txt b/arch/m68k-amiga/boot/romlog.txt
@@ -1,3 +1,3 @@
 Idx Name          Size      VMA       LMA       File off  Algn
-  0 .rom          00077adc  00f80000  00f80000  0007c000  2**2
-  1 .ext          000783ea  00e00000  00e00000  00002000  2**2
+  0 .rom          0007e5f4  00f80000  00f80000  00082000  2**2
+  1 .ext          0007eba6  00e00000  00e00000  00002000  2**2
diff --git a/arch/m68k-amiga/devs/sagasd/sagasd_device.c b/arch/m68k-amiga/devs/sagasd/sagasd_device.c
@@ -749,6 +749,8 @@ static void SAGASD_IOTask(struct Library *SysBase)
     BOOL sdpin = FALSE;
     ULONG detectcounter = 0;
 
+    if (sdu->sdu_SDCmd.unitnumber > 0) sdpin = TRUE;           //hardware pin enable for SD-Cards Slots #1 and higher
+
     debug("Starting SAGASD_IOTask");
 
     status.mn_Length = 1;   // Failed?
diff --git a/configure b/configure
@@ -8942,7 +8942,7 @@ aros_cxx_libs=
 aros_target_genmap="-Wl,-Map -Xlinker"
 
 # Native flavour stuff
-apollo_debug="0"
+# apollo_debug="1"
 
 # Palm native flavour stuff
 aros_palm_debug_hack="0"
@@ -16665,9 +16665,9 @@ printf %s "checking whether serial debug is enabled... " >&6; }
 # Check whether --with-serial-debug was given.
 if test ${with_serial_debug+y}
 then :
-  withval=$with_serial_debug; serial_debug=$withval
+  serial_debug="yes"
 else $as_nop
-  serial_debug=none
+  serial_debug="no"
 fi
 
 if test "$serial_debug" = "yes" ; then
diff --git a/configure.in b/configure.in
@@ -3000,7 +3000,7 @@ fi
 
 dnl See if the user wants the serial debug output for native flavour
 AC_MSG_CHECKING([whether serial debug is enabled])
-AC_ARG_WITH(serial-debug,AC_HELP_STRING([--with-serialdebug],[Enable serial debug output in native (default=no)]),serial_debug=$withval,serial_debug=none)
+AC_ARG_WITH(serial-debug,AC_HELP_STRING([--with-serialdebug],[Enable serial debug output in native (default=no)]),serial_debug="yes",serial_debug="no")
 
 if test "$serial_debug" = "yes" ; then
     apollo_serial_debug="1"
diff --git a/rebuild_all.sh b/rebuild_all.sh
@@ -19,7 +19,7 @@ then
 	echo "Options are:"
 	echo "-h				prints this help text"
 	echo "--with-nonvampire-support	building for non-vampire platforms"
-	echo "--with-serialdebug for enabling serial debug output"
+	echo "--with-serial-debug for enabling serial debug output"
 	exit
 fi
 
diff --git a/rom/dos/boot.c b/rom/dos/boot.c
@@ -39,8 +39,6 @@ extern char *generate_banner(void);
 
 #include <proto/intuition.h>
 
-#define DEBUG 1
-
 static void load_system_configuration(struct DosLibrary *DOSBase)
 {
     BPTR fh;
@@ -76,7 +74,7 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
     /*  We have been created as a process by DOS, we should now
         try and boot the system. */
 
-    D(
+    DD(
         bug("[DOS] %s: ** boot delayed by 1000ms\n", __func__);
         bug("[DOS] %s: ** starting generic boot sequence\n", __func__);
         bug("[DOS] %s: BootFlags 0x%08X Flags 0x%02X\n", __func__, BootFlags, Flags);
@@ -90,7 +88,7 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
      */
     load_system_configuration(DOSBase);
 
-    D(bug("[DOS] %s: system config loaded\n", __func__);)
+    DD(bug("[DOS] %s: system config loaded\n", __func__);)
 
     /*
      * If needed, run the display drivers loader.
@@ -103,7 +101,7 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
         /* Check that it exists first... */
         BPTR seg;
 
-        D(bug("[DOS] %s: initialising displays\n", __func__);)
+        DD(bug("[DOS] %s: initialising displays\n", __func__);)
 
         if ((seg = LoadSeg("C:AROSMonDrvs")) != BNULL)
         {
@@ -119,7 +117,7 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
             else if (BootFlags & BF_NO_DISPLAY_DRIVERS)
                 args = "ONLYCOMPOSITION\n";
 
-            D(bug("[DOS] %s: Running AROSMonDrvs %s\n", __func__, args);)
+            DD(bug("[DOS] %s: Running AROSMonDrvs %s\n", __func__, args);)
 
             /* RunCommand needs a valid Input() handle
              * for passing in its arguments.
@@ -135,10 +133,10 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
         }
     }
 
-    D(bug("[DOS] %s: preparing console\n", __func__);)
+    DD(bug("[DOS] %s: preparing console\n", __func__);)
 
     if (BootFlags & BF_EMERGENCY_CONSOLE) {
-        D(bug("[DOS] %s:     (emergency console)\n", __func__);)
+        DD(bug("[DOS] %s:     (emergency console)\n", __func__);)
         BootFlags |= BF_NO_STARTUP_SEQUENCE;
         cis = Open("ECON:", MODE_OLDFILE);
     }
@@ -155,7 +153,7 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
         BPTR cos = OpenFromLock(DupLockFromFH(cis));
         BYTE *C = generate_banner();
 
-        D(bug("[DOS] %s:  handle @ 0x%p (0x%p)\n", __func__, cis, cos);)
+        DD(bug("[DOS] %s:  handle @ 0x%p (0x%p)\n", __func__, cis, cos);)
 
         if (cos) {
             BPTR cas = BNULL;
@@ -173,7 +171,7 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
                 FPuts(cos, C);
             }
 
-            D(bug("[DOS] %s: initialising CLI\n", __func__);)
+            DD(bug("[DOS] %s: initialising CLI\n", __func__);)
 
             if (SystemTags(NULL,
                            NP_Name, "Initial CLI",
@@ -183,7 +181,7 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
                            SYS_Output, cos,
                            SYS_ScriptInput, cas,
                            TAG_END) == -1) {
-                D(bug("[DOS] %s:  .. failed!\n", __func__);)
+                DD(bug("[DOS] %s:  .. failed!\n", __func__);)
                 Alert(AT_DeadEnd | AN_BootStrap);
             }
 
@@ -203,7 +201,7 @@ void __dos_Boot(struct DosLibrary *DOSBase, ULONG BootFlags, UBYTE Flags)
         }
         FreeVec(C);
     } else {
-        D(bug("[DOS] %s:  .. failed!\n", __func__);)
+        DD(bug("[DOS] %s:  .. failed!\n", __func__);)
         Alert(AN_NoWindow);
     }
 }
diff --git a/rom/dos/dos_intern.h b/rom/dos/dos_intern.h
@@ -28,8 +28,8 @@
 #endif
 
 #if DEBUG
-#define D(x) x
-#define DD(x)
+#define DD(x) x
+#define D(x)
 #define bug kprintf
 #else
 #define D(x)
diff --git a/rom/dosboot/bootanim.c b/rom/dosboot/bootanim.c
@@ -14,10 +14,10 @@
 #include <proto/graphics.h>
 
 #include "dosboot_intern.h"
-//#include "nomedia_image.h"
+#include "nomedia_image.h"
 #include "nomedia_anim.h"
 
-/*
+
 
 struct AnimData
 {
@@ -131,4 +131,3 @@ void anim_Stop(struct DOSBootBase *DOSBootBase)
     }
 }
 
-*/
diff --git a/rom/dosboot/bootscreen.c b/rom/dosboot/bootscreen.c
@@ -85,7 +85,7 @@ struct Screen *OpenBootScreen(struct DOSBootBase *DOSBootBase)
     return OpenBootScreenType(DOSBootBase, 2, FALSE);
 }
 
-/*
+
 struct Screen *NoBootMediaScreen(struct DOSBootBase *DOSBootBase)
 {
     // Boot anim requires 16+ color screen and 1:1 pixels
@@ -99,7 +99,7 @@ struct Screen *NoBootMediaScreen(struct DOSBootBase *DOSBootBase)
     }
 
     return scr;
-}*/
+}
 
 void CloseBootScreen(struct Screen *scr, struct DOSBootBase *DOSBootBase)
 {
diff --git a/rom/dosboot/cleanup.c b/rom/dosboot/cleanup.c
@@ -57,7 +57,7 @@ AROS_UFH3(static APTR, dosboot_Cleanup,
     	CloseBootScreen(base->bm_Screen, base);
     }
     
-    //anim_Stop(base);
+    anim_Stop(base);
 
     /* Well, since we are here, let's completely expunge. :) */
     CloseLibrary(&base->bm_ExpansionBase->LibNode);
diff --git a/rom/dosboot/dosboot_init.c b/rom/dosboot/dosboot_init.c
@@ -287,8 +287,8 @@ int dosboot_Init(LIBBASETYPEPTR DOSBootBase)
     {
         dosboot_BootStrap(DOSBootBase);
 
-        if (!DOSBootBase->bm_Screen) Alert(0x0700000a);
-        	//DOSBootBase->bm_Screen = NoBootMediaScreen(DOSBootBase);
+        //if (!DOSBootBase->bm_Screen) Alert(0x0700000a);
+        if (!DOSBootBase->bm_Screen) DOSBootBase->bm_Screen = NoBootMediaScreen(DOSBootBase);
 
         D(bug("No bootable disk was found.\n"));
         D(bug("Please insert a bootable disk in any drive.\n"));
diff --git a/rom/dosboot/dosboot_intern.h b/rom/dosboot/dosboot_intern.h
@@ -64,13 +64,13 @@ void InitBootConfig(struct BootConfig *bootcfg);
 LONG dosboot_BootStrap(struct DOSBootBase *DOSBootBase);
 void dosboot_BootScan(struct DOSBootBase *DOSBootBase);
 
-//struct Screen *NoBootMediaScreen(struct DOSBootBase *DOSBootBase);
+struct Screen *NoBootMediaScreen(struct DOSBootBase *DOSBootBase);
 struct Screen *OpenBootScreen(struct DOSBootBase *DOSBootBase);
 void CloseBootScreen(struct Screen *scr, struct DOSBootBase *DOSBootBase);
 
-//APTR anim_Init(struct Screen *scr, struct DOSBootBase *DOSBootBase);
-//void anim_Stop(struct DOSBootBase *DOSBootBase);
-//void anim_Animate(struct Screen *scr, struct DOSBootBase *DOSBootBase);
+APTR anim_Init(struct Screen *scr, struct DOSBootBase *DOSBootBase);
+void anim_Stop(struct DOSBootBase *DOSBootBase);
+void anim_Animate(struct Screen *scr, struct DOSBootBase *DOSBootBase);
 
 #define IntuitionBase DOSBootBase->bm_IntuitionBase
 #define GadToolsBase DOSBootBase->bm_GadToolsBase
diff --git a/rom/dosboot/menu.c b/rom/dosboot/menu.c
@@ -118,14 +118,14 @@ static BOOL populateGadgets_PageMain(LIBBASETYPEPTR DOSBootBase, struct Gadget *
 		gadget = CreateGadgetA(BUTTON_KIND, gadget, &ng, NULL);
     }
 
-    if (gadget != NULL)
+    /*if (gadget != NULL)
     {
 		ng.ng_GadgetText = "ApolloFloppy";
 		ng.ng_GadgetID = BUTTON_APOLLOFLOPPY;
 		ng.ng_LeftEdge = cx;
 		ng.ng_TopEdge = 105;
 		gadget = CreateGadgetA(BUTTON_KIND, gadget, &ng, NULL);
-	}
+	}*/
 
     return (gadget != NULL);
 }
@@ -431,7 +431,7 @@ static BOOL populateGadgets(LIBBASETYPEPTR DOSBootBase, struct Gadget *gadget, W
 	{
         case PAGE_MAIN:			populateGadgets_PageMain(DOSBootBase, gadget); break;
         case PAGE_BOOT:			populateGadgets_PageBoot(DOSBootBase, gadget); break;
-        case PAGE_APOLLOFLOPPY: populateGadgets_PageApolloFloppy(DOSBootBase, gadget); break;
+        //case PAGE_APOLLOFLOPPY: populateGadgets_PageApolloFloppy(DOSBootBase, gadget); break;
 	}
 
 	return (gadget != NULL);
@@ -523,17 +523,17 @@ static UWORD msgLoop(LIBBASETYPEPTR DOSBootBase, struct Window *win, WORD page)
                         exit = PAGE_BOOT;
                         break;
 
-                    case BUTTON_APOLLOFLOPPY:
-                        exit = PAGE_APOLLOFLOPPY;
-                        break;
+                    //case BUTTON_APOLLOFLOPPY:
+                    //    exit = PAGE_APOLLOFLOPPY;
+                    //    break;
 
-                    case BUTTON_APOLLOFLOPPY_DF0:
-                    ApolloFloppy(BUTTON_APOLLOFLOPPY_DF0);
-                    break;    
+                    //case BUTTON_APOLLOFLOPPY_DF0:
+                    //ApolloFloppy(BUTTON_APOLLOFLOPPY_DF0);
+                    //break;    
 
-                    case BUTTON_APOLLOFLOPPY_DF1:
-                    ApolloFloppy(BUTTON_APOLLOFLOPPY_DF1);
-                    break;
+                    //case BUTTON_APOLLOFLOPPY_DF1:
+                    //ApolloFloppy(BUTTON_APOLLOFLOPPY_DF1);
+                    //break;
 
                     case BUTTONLIST_BOOT:
                     {
@@ -637,7 +637,7 @@ static void initPage(LIBBASETYPEPTR DOSBootBase, WORD page)
     char ApolloCore_Release[80];
 
     if (page == PAGE_BOOT) text = "Boot Options";
-    else if (page == PAGE_APOLLOFLOPPY) text = "ApolloFloppy Options";
+    //else if (page == PAGE_APOLLOFLOPPY) text = "ApolloFloppy Options";
     else text = __DISTRONAME__ " Boot Menu";
     centertext(DOSBootBase, 2, 10, text);
 
diff --git a/rom/dosboot/mmakefile.src b/rom/dosboot/mmakefile.src
@@ -21,4 +21,10 @@ USER_LDFLAGS := -static
   modname=dosboot modtype=resource \
   files="$(FILES)" uselibs="hiddstubs"
 
+$(GENDIR)/$(CURDIR)/dosboot/bootanim.d : $(GENDIR)/$(CURDIR)/dosboot/nomedia_image.h
+
+$(GENDIR)/$(CURDIR)/dosboot/nomedia_image.h : $(NOMEDIA_IMAGE).ilbm
+	@$(ECHO) "Creating   $@..."
+	@$(ILBMTOC) $< >$@
+
 %common
diff --git a/rom/filesys/SFS/FS/filesystemmain.c b/rom/filesys/SFS/FS/filesystemmain.c
@@ -3840,8 +3840,8 @@ static void fillinfodata(struct InfoData *id)
         id->id_InUse = DOSFALSE;
     }
 
-    DD(bug("[SFS] fillinfodata: VolumeNode = %12s (0x%8lx) | DiskType = 0x%08lx | DiskState = %d | LockList = %s\n",
-        AROS_BSTR_ADDR(globals->volumenode->dl_Name), id->id_VolumeNode, id->id_DiskType,  id->id_DiskState, (id->id_InUse == DOSTRUE)? "DOSTRUE":"DOSFALSE"));
+    D(bug("[SFS] fillinfodata: VolumeNode = %12s (0x%8lx) | DiskType = 0x%08lx | DiskState = %d | LockList = %s\n",
+        AROS_BSTR_ADDR(globals->volumenode->dl_Name), TOBADDR(globals->volumenode), id->id_DiskType,  id->id_DiskState, (id->id_InUse == DOSTRUE)? "DOSTRUE":"DOSFALSE"));
 
 }
 
diff --git a/rom/filesys/fat/debug.h b/rom/filesys/fat/debug.h
@@ -5,7 +5,9 @@
 
 #if DEBUG
 #define D(x) x
+#define DD(x)
 #define bug kprintf
 #else
 #define D(x)
+#define DD(x)
 #endif
diff --git a/rom/filesys/fat/volume.c b/rom/filesys/fat/volume.c
@@ -928,8 +928,8 @@ void FillDiskInfo(struct InfoData *id, struct Globals *glob)
         id->id_InUse = DOSFALSE;
     }
 
-        D(bug("[FAT] fillinfodata: VolumeNode = %12s (0x%8lx) | DiskType = 0x%08lx | DiskState = %d | LockList = %s\n",
-            AROS_BSTR_ADDR(glob->devnode->dol_Name), id->id_VolumeNode, id->id_DiskType,  id->id_DiskState, (id->id_InUse == DOSTRUE)? "DOSTRUE":"DOSFALSE"));
+        DD(bug("[FAT] fillinfodata: VolumeNode = %12s (0x%8lx) | DiskType = 0x%08lx | DiskState = %d | LockList = %s\n",
+            AROS_BSTR_ADDR(glob->devnode->dol_Name), MKBADDR(glob->sb->doslist), id->id_DiskType,  id->id_DiskState, (id->id_InUse == DOSTRUE)? "DOSTRUE":"DOSFALSE"));
 
 }
 
@@ -1002,11 +1002,28 @@ void DoDiskInsert(struct Globals *glob)
         return;
     }
 
-    // Then we check if disk inserted is a Amiga Partitioned RDB Disk (BYTE 0x200=512 = Sector#1/LONG#0x0 | ID=0x5244534b=RDSK). IN the case of a hybrid disk (RDB + MBR) we give priority to RDB
+    // Then we check if disk inserted is a Amiga Partitioned RDB Disk (BYTE 0x200=512 = Sector#0 or #1/LONG#0x0 | ID=0x5244534b=RDSK). IN the case of a hybrid disk (RDB + MBR) we give priority to RDB
     // if RDB is found then we cannot do anything and we present user with a requester to inform that inserted disk is Amiga RDB and a reboot is required to perform DosBoot process to Mount RDB  
     
     UBYTE read_buffer[0x200];
 
+    err = RawDiskSectorRead(0, geometry.dg_SectorSize, (UBYTE*)&read_buffer[0], glob);
+    if (err)
+    {
+        D(bug("[FAT] [%s] Read Error = %d on BootSector #1 (RDB Check)\n",__FUNCTION__, err ));
+        return;
+    } else {
+        ULONG RDB_ID = ((read_buffer[0]<<24) + (read_buffer[1]<<16) + (read_buffer[2]<<8) + read_buffer[3]);
+        D(kprintf("[FAT] [%s] RDB = %4d|%08x\n", __FUNCTION__, 0x200, RDB_ID)); 
+        if(RDB_ID == 0x5244534b)
+        {
+            glob->diskioreq->iotd_Req.io_Command = 0xffff;
+            glob->diskioreq->iotd_Req.io_Length = 1;
+            DoIO((struct IORequest *)glob->diskioreq);
+            return;
+        }
+    }
+
     err = RawDiskSectorRead(1, geometry.dg_SectorSize, (UBYTE*)&read_buffer[0], glob);
     if (err)
     {
diff --git a/version b/version
@@ -1 +1 @@
-Release 9.5-RC01
+Release 9.5 Final

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ int DebugMayGetChar(void)`
`51`	`51`	`return c;`
`52`	`52`	`}`
`53`	`53`
`54`		`-#if APOLLO_DEBUG2`
	`54`	`+#if APOLLO_DEBUG`
`55`	`55`
`56`	`56`	`void DebugPutStr(register const char *buff)`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@`
`14`	`14`	`#include <proto/graphics.h>`
`15`	`15`
`16`	`16`	`#include "dosboot_intern.h"`
`17`		`-//#include "nomedia_image.h"`
	`17`	`+#include "nomedia_image.h"`
`18`	`18`	`#include "nomedia_anim.h"`
`19`	`19`
`20`		`-/*`
	`20`	`+`
`21`	`21`
`22`	`22`	`struct AnimData`
`23`	`23`	`{`
`@@ -131,4 +131,3 @@ void anim_Stop(struct DOSBootBase *DOSBootBase)`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`-*/`