Additional sagssd debug lines

Author: WDrijver

.gitignore

@@ -2154,3 +2154,4 @@ workbench/tools/BoingIconBar/strings.h
 workbench/tools/InstallAROS/strings.h
 workbench/tools/SysExplorer/strings.h
 workbench/tools/WiMP/strings.h
+arch/m68k-amiga/boot/romlog.txt

arch/m68k-amiga/boot/romlog.txt

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

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

@@ -868,9 +868,6 @@ static void SAGASD_IOTask(struct Library *SysBase)
                             Permit();
                         }
 
-                        debug("SD-Card Change Detection: unit = %d | Detect Mode = %s | sdu_Present = %s | detect = %s",
-                        sdu->sdu_SDCmd.unitnumber, sdpin ? "HW":"SW", sdu->sdu_Present ? "TRUE":"FALSE", present ? "TRUE":"FALSE");
-
                         if (present)                                 
                         {
                             // SD-Card is Inserted
@@ -879,6 +876,7 @@ static void SAGASD_IOTask(struct Library *SysBase)
                             sdu->sdu_Present = TRUE;
                             sdu->sdu_ChangeNum++;
                             sdu->sdu_Valid = TRUE;
+                            debug("SD-Card Change Detection: unit = %d | Detect Mode = %s | sdu_Present = %s | detect = %s", sdu->sdu_SDCmd.unitnumber, sdpin ? "HW":"SW", sdu->sdu_Present ? "TRUE":"FALSE", present ? "TRUE":"FALSE");
                             debug("\t sdu_Valid: %s", sdu->sdu_Valid ? "TRUE" : "FALSE");
                             debug("\t Blocks: %ld", sdu->sdu_SDCmd.info.blocks);
 
@@ -903,16 +901,14 @@ static void SAGASD_IOTask(struct Library *SysBase)
                             Permit();
                         }
 
-                        debug("SD-Card Change Detection: unit = %d | Detect Mode = %s | sdu_Present = %s | detect = %s",
-                        sdu->sdu_SDCmd.unitnumber, sdpin ? "HW":"SW", sdu->sdu_Present ? "TRUE":"FALSE", present ? "TRUE":"FALSE");
-
                         if (!present)                                       
                         {
                             // SD-Card is Removed
                             Forbid();
                             sdu->sdu_Present = FALSE;
                             sdu->sdu_Valid = FALSE;
-                            
+                            debug("SD-Card Change Detection: unit = %d | Detect Mode = %s | sdu_Present = %s | detect = %s", sdu->sdu_SDCmd.unitnumber, sdpin ? "HW":"SW", sdu->sdu_Present ? "TRUE":"FALSE", present ? "TRUE":"FALSE");
+
                             for (int i=sdu->sdu_AddChangeListItems; i>0; i--)
                             {
                                 if (sdu->sdu_AddChangeList[i])
@@ -942,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

@@ -241,6 +241,7 @@ static UBYTE sdcmd_r1a(struct sdcmd *sd)
         if (!(r1 & SDERRF_TIMEOUT)) return r1;
     }
 
+    debug("r1=0x%08lx", r1);
     return SDERRF_TIMEOUT;
 }
 
@@ -348,6 +349,7 @@ UBYTE sdcmd_read_packet(struct sdcmd *sd, UBYTE *buff, int len)
     if (i == SDCMD_TIMEOUT)
     {
         sdcmd_select(sd, FALSE);
+        debug("SDERRF_TIMEOUT");
         return SDERRF_TIMEOUT;
     }
 
@@ -400,7 +402,7 @@ UBYTE sdcmd_stop_transmission(struct sdcmd *sd)
 
 exit:
     sdcmd_select(sd, FALSE);
-
+    debug("SDERRF_CRC");
     return (i == SDCMD_TIMEOUT) ? SDERRF_TIMEOUT : r1;
 }
 
@@ -433,6 +435,7 @@ UBYTE sdcmd_write_packet(struct sdcmd *sd, UBYTE token, CONST UBYTE *buff, int l
     if ((byte & SDDRS_VALID_MASK) != SDDRS_VALID) {
         /* Terminate the read early */
         sdcmd_stop_transmission(sd);
+        debug("SDERRF_CRC");
         return SDERRF_CRC;
     }
 
@@ -521,7 +524,7 @@ UBYTE sdcmd_read_blocks(struct sdcmd *sd, ULONG addr, UBYTE *buff, int blocks)
         for (; blocks > 0; addr++, blocks--, buff += SDSIZ_BLOCK) {
             r1 = sdcmd_read_packet(sd, buff, SDSIZ_BLOCK);
             if (r1) {
-                //debug("r1=$%02lx", r1);
+                debug("r1=$%02lx", r1);
                 /* Terminate the read early */
                 sdcmd_stop_transmission(sd);
                 break;

rebuild_all.sh

@@ -38,7 +38,6 @@ DISTOPTVER="--enable-dist-version=${DISTROVERSION}"
 
 ./configure "${DISTOPTNAME}" "${DISTOPTVER}" --target=amiga-m68k --with-optimization="-O2" --enable-ccache --with-aros-prefs=classic --with-resolution=640x256x4 --with-cpu=68040 --disable-mmu $@
 
-make -j${THREADS} compiler
 make -j${THREADS}
 make -j${THREADS} distfiles