Enable 32-Byte Memory Alignment

Author: WDrijver

arch/m68k-all/include/aros/cpu.h

@@ -23,7 +23,7 @@
 #define AROS_PTRALIGN              2 /* Alignment for PTR */
 #define AROS_IPTRALIGN             2 /* Alignment for IPTR */
 #define AROS_DOUBLEALIGN           2 /* Alignment for double */
-#define AROS_WORSTALIGN            4 /* Worst case alignment */
+#define AROS_WORSTALIGN            32 /* Worst case alignment - ApolloOS = 32 Bytes */
 
 #define AROS_SLOWSTACKFORMAT 1
 

arch/m68k-amiga/boot/romlog.txt

@@ -1,3 +1,3 @@
 Idx Name          Size      VMA       LMA       File off  Algn
-  0 .rom          0007a270  00f80000  00f80000  00082000  2**2
-  1 .ext          0007e89e  00e00000  00e00000  00002000  2**2
+  0 .rom          00078d28  00f80000  00f80000  0007c000  2**2
+  1 .ext          0007824a  00e00000  00e00000  00002000  2**2

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

@@ -938,7 +938,7 @@ static void SAGASD_IOTask(struct Library *SysBase)
 
         if (io)
         {
-            debug("io_Command received: %d", io->io_Command);
+            //debug("io_Command received: %d", io->io_Command);
 
             io->io_Error = SAGASD_PerformIO(io);
             io->io_Message.mn_Node.ln_Type=NT_MESSAGE;

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

@@ -858,12 +858,11 @@ BOOL sdcmd_sw_detect_full(struct sdcmd *sd)
 
 exit:
 
-    speed = SDCMD_CLKDIV_FAST;
-
+    //speed = SDCMD_CLKDIV_FAST;
     // Try setting the card into high speed mode.  It's possible to check first, but just trying to set is enough?
     // First nibble is Function Group 1 - Access mode / Bus Speed mode; the only thing that applies to us in SPI mode. 
 
-    sdcmd_send(sd, SDCMD_SWITCH_FUNCTION, 0x80fffff1);
+    /*sdcmd_send(sd, SDCMD_SWITCH_FUNCTION, 0x80fffff1);
     r1 = sdcmd_r1a(sd);
     debug("r1=0x%lx", r1);
     if (!r1)
@@ -876,12 +875,12 @@ BOOL sdcmd_sw_detect_full(struct sdcmd *sd)
 
         f1_sel = bits(&cmd6[63], 376, 4);
 
-        /* Out of all of the above, just check f1_sel to see if it is what we set it to.*/
+        // Out of all of the above, just check f1_sel to see if it is what we set it to
         if (f1_sel == 1) speed = SDCMD_CLKDIV_FASTER;
-    }
+    } */
 
     /* Switch to high speed mode */
-    sdcmd_clkdiv(sd, speed);
+    sdcmd_clkdiv(sd, SDCMD_CLKDIV_FASTER);
 
     sdcmd_select(sd, FALSE);
 

compiler/include/aros/cpu.h

@@ -50,7 +50,7 @@
 #define AROS_PTRALIGN              8 /* Alignment for PTR */
 #define AROS_IPTRALIGN             8 /* Alignment for IPTR */
 #define AROS_DOUBLEALIGN           8 /* Alignment for double */
-#define AROS_WORSTALIGN           16 /* Worst case alignment */
+#define AROS_WORSTALIGN           32 /* Worst case alignment */
 #define AROS_STACKALIGN           16 /* Clean stack alignment */
 #elif defined __arm__
 #   if defined __thumb2__

compiler/include/exec/memory.h

@@ -2,7 +2,7 @@
 #define EXEC_MEMORY_H
 
 /*
-    Copyright © 1995-2012, The AROS Development Team. All rights reserved.
+    Copyright � 1995-2012, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: Memory handling
@@ -30,7 +30,7 @@ struct MemChunk
 };
 
 /* Total size of struct MemChunk, including padding */
-#define MEMCHUNK_TOTAL  (AROS_WORSTALIGN > sizeof(struct MemChunk) ? AROS_WORSTALIGN : sizeof(struct MemChunk))
+#define MEMCHUNK_TOTAL  32  //[WD] ApolloOS is set to 32 Byte Memory Boundary from Core 11350+ | (AROS_WORSTALIGN > sizeof(struct MemChunk) ? AROS_WORSTALIGN : sizeof(struct MemChunk))
 /* Total size of struct MemHeader, including padding */
 #define MEMHEADER_TOTAL (AROS_ROUNDUP2(sizeof(struct MemHeader), MEMCHUNK_TOTAL))
 

rom/filesys/fat/fat_fs.h

@@ -23,7 +23,7 @@
 #define DEBUG_DIRENTRY      0
 #define DEBUG_FILE          0
 #define DEBUG_DUMP          0
-#define DEBUG_LOCK          1
+#define DEBUG_LOCK          0
 #define DEBUG_NAMES         0
 #define DEBUG_NOTIFY        0
 #define DEBUG_OPS           0