RC04 - SD-Card RDB Boot and sagasd.device 2.18 (#156)

Author: WDrijver

arch/m68k-amiga/boot/mmakefile.src

@@ -88,7 +88,6 @@ include $(SRCDIR)/config/aros.cfg
 #MM     compiler-stdc \
 #MM     compiler-stdcio \
 #MM     kernel-sagasd-device-kobj \
-#MM     sagasd-device \
 #MM     compiler-posixc
 
 #MM- kernel-workbench-devs-amiga-m68k : workbench-devs-amiga-m68k

arch/m68k-amiga/boot/romlog.txt

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

arch/m68k-amiga/devs/sagasd/mmakefile

@@ -28,7 +28,7 @@ USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/\
                  -I$(SRCDIR)/$(CURDIR)/../include
 
 USER_CFLAGS := -D__NOLIBBASE__ -O2 -DSIMULATE=0 \
-               -DADATE="\"$(shell date "+%d.%m.%Y")\"" -fdata-sections -ffunction-sections -fno-zero-initialized-in-bss -fno-common
+               -DADATE="\"$(shell date "+%d.%m.%Y")\"" -fdata-sections -ffunction-sections -fno-common -fno-zero-initialized-in-bss
 
 USER_LDFLAGS := -static
 

arch/m68k-amiga/devs/sagasd/mmakefile.src

@@ -1,6 +1,6 @@
 ##begin config
 basename SAGASD
-version  2.17
+version  2.18
 libbasetype struct SAGASDBase
 sysbase_field sd_ExecBase
 seglist_field sd_SegList

arch/m68k-amiga/devs/sagasd/sagasd.conf

@@ -1109,8 +1109,8 @@ static void SAGASD_BootNode(struct SAGASDBase *SAGASDBase, struct Library *Expan
     pp[DE_BUFMEMTYPE + 4] = MEMF_PUBLIC;
     pp[DE_MAXTRANSFER + 4] = 0x00200000;
     pp[DE_MASK + 4] = 0xFFFFFFFE;
-    pp[DE_BOOTPRI + 4] = -5;                        //Default Prio (-5) is lower than primary HDD (0)
-    pp[DE_DOSTYPE + 4] = 0x46415402;                //FAT2 (FAT32) Default DosType for file-transfer
+    pp[DE_BOOTPRI + 4] = -5;                         //SD-Card Prio 2 is higher than ata.device to allow booting from SD-Card in case of both devices present
+    pp[DE_DOSTYPE + 4] = 0x46415402;                //FAT32 by default, but it will be changed by AddPartitionVolume for RDB (e.g. OFS, FFS, SFS, PFS)
     pp[DE_BOOTBLOCKS + 4] = 2;
     devnode = MakeDosNode(pp);
 

arch/m68k-amiga/devs/sagasd/sagasd.device

@@ -101,7 +101,7 @@ static VOID AddPartitionVolume(struct ExpansionBase *ExpansionBase, struct Libra
         tags[8] = TAG_DONE;
         GetPartitionAttrs(pn, (struct TagItem *)tags);
 
-        D(bug("[BOOT] Partition name: %s | Bootable: %d | Automount: %d\n", name, bootable, automount));
+        D(bug("[BOOT] Partition name: %s | Bootable: %d | Automount: %d \n", name, bootable, automount));
 
         if (automount == FALSE)
         {
@@ -121,9 +121,10 @@ static VOID AddPartitionVolume(struct ExpansionBase *ExpansionBase, struct Libra
         tags[4] = TAG_DONE;
         GetPartitionAttrs(pn, (struct TagItem *)tags);
 
-        // Default behaviour is to give BOOT priority to RDB disks (user can choose in Early Startup)
+        // [WD] Default behaviour is to give BOOT priority to RDB disks (user can choose to boot from FAT in Early Startup)
+        //pp[4 + DE_BOOTPRI] = -5;
+
         bootable = TRUE;
-        pp[4 + DE_BOOTPRI] = -1;
 
         /* make the name */
         devname = AROS_BSTR_ADDR(fssm->fssm_Device);
@@ -242,6 +243,34 @@ static VOID AddPartitionVolume(struct ExpansionBase *ExpansionBase, struct Libra
         AddBootFileSystem(fsnode);
     }
 
+    D(bug("\n[BOOT] dosName         pp[0] = %s\n", pp[0]));
+    D(bug("[BOOT] devName           pp[1] = %s\n", pp[1]));
+    D(bug("[BOOT] unitNum           pp[2] = %d\n", pp[2]));
+    D(bug("[BOOT] flags             pp[3] = %d\n", pp[3]));
+    D(bug("[BOOT] tableSize         pp[4] = %d\n", pp[4 + DE_TABLESIZE]));
+    D(bug("[BOOT] sizeBlock         pp[5] = %d\n", pp[4 + DE_SIZEBLOCK]));
+    D(bug("[BOOT] secOrg            pp[6] = %d\n", pp[4 + DE_BLOCKSIZE]));
+    D(bug("[BOOT] surfaces          pp[7] = %d\n", pp[4 + DE_NUMHEADS]));
+    D(bug("[BOOT] secPerBlock       pp[8] = %d\n", pp[4 + DE_SECSPERBLOCK]));
+    D(bug("[BOOT] blocksPerTrack    pp[9] = %d\n", pp[4 + DE_BLKSPERTRACK]));
+    D(bug("[BOOT] reservedBlks      pp[10] = %d\n", pp[4 + DE_RESERVEDBLKS]));
+    D(bug("[BOOT] preAlloc          pp[11] = %d\n", pp[4 + DE_PREFAC]));
+    D(bug("[BOOT] interleave        pp[12] = %d\n", pp[4 + DE_INTERLEAVE]));
+    D(bug("[BOOT] lowCyl            pp[13] = %d\n", pp[4 + DE_LOWCYL]));     
+    D(bug("[BOOT] highCyl           pp[14] = %d\n", pp[4 + DE_HIGHCYL]));
+    D(bug("[BOOT] numBuffers        pp[15] = %d\n", pp[4 + DE_NUMBUFFERS]));
+    D(bug("[BOOT] bufMemType        pp[16] = %d\n", pp[4 + DE_BUFMEMTYPE]));
+    D(bug("[BOOT] maxTransfer       pp[17] = %d\n", pp[4 + DE_MAXTRANSFER]));
+    D(bug("[BOOT] mask              pp[18] = %d\n", pp[4 + DE_MASK]));
+    D(bug("[BOOT] bootPri           pp[19] = %d\n", pp[4 + DE_BOOTPRI]));
+    D(bug("[BOOT] dosType           pp[20] = %d\n", pp[4 + DE_DOSTYPE]));
+
+    if (strcmp((char*)pp[1], "sagasd.device") == 0)
+    {
+        //pp[4 + DE_BOOTPRI] = pp[4 + DE_BOOTPRI] + 5;
+        D(bug("[BOOT] sagasd.device detected, increasing boot priority to %d\n", pp[4 + DE_BOOTPRI]));
+    }
+
     devnode = MakeDosNode(pp);
 
     struct FileSysStartupMsg *fssm_devnode = BADDR(devnode->dn_Startup);
@@ -254,7 +283,6 @@ static VOID AddPartitionVolume(struct ExpansionBase *ExpansionBase, struct Libra
     D(bug("[BOOT] [%s] dg_LowCyl         : %d\n",__FUNCTION__ ,  de_devnode->de_LowCyl));
     D(bug("[BOOT] [%s] dg_HighCyl        : %d\n\n",__FUNCTION__ ,  de_devnode->de_HighCyl));
 
-
     if (devnode != NULL) {
         AddBootNode(bootable ? pp[4 + DE_BOOTPRI] : -128, ADNF_STARTPROC, devnode, NULL);
         D(bug("[BOOT] AddBootNode(%b, 0, 0x%p, NULL)\n",  devnode->dn_Name, pp[4 + DE_DOSTYPE]));

arch/m68k-amiga/devs/sagasd/sagasd_device.c

@@ -1 +1 @@
-Release 9.6
+Release 9.6 - RC04