Add initial P04 write to kernel

LegacyNsfw · Aug 2, 2023 · f8ecf80 · f8ecf80
1 parent d9600e8
commit f8ecf80
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/Kernels/BuildAll.cmd b/Kernels/BuildAll.cmd
@@ -54,7 +54,7 @@ REM   "-pP04 -aFF9090 -lFF9890 -x",
 
 for %%A in (
   "-pP01 -aFF8000 -x",
-  "-pP04 -aFF9090 -lFF9890 -x",
+  "-pP04 -aFF8000 -lFF9890 -x",
   "-pP08 -aFFAC00 -x",
   "-pP10 -aFFB800 -x",
   "-pP12 -aFF2000 -x",

diff --git a/Kernels/Kernel.S b/Kernels/Kernel.S
@@ -112,6 +112,14 @@ Wait01:
     bsr.w   WasteTime                  | Twiddle thumbs
 #endif
 
+    movea.l #Ping, %a0                 | Reply Success to mode 3680, only P12 needs this.
+    move.l  #6, %d0                    | It's 6 bytes long
+    bsr.w   VPWSend                    | Send message
+
+    movea.l #Ping, %a0                 | Reply Success to mode 3680, only P12 needs this.
+    move.l  #6, %d0                    | It's 6 bytes long
+    bsr.w   VPWSend                    | Send message
+
 MainLoop:
     movea.l #MessageBuffer, %a0        | Pointer to MessageBuffer buffer
     clr.w   3(%a0)                     | Clear last command, prevent repeating it
@@ -605,7 +613,7 @@ AMDWriteSector:
     lea     AMD_CMD_ADDRESS_B, %a3     | (0x0554) Pointer to the command address
 
 AMDWriteSectorLoop:
-    move.w  #2346, %d2                 | FlashNotReady Loop Timeout index
+    move.l  #2346, %d2                 | FlashNotReady Loop Timeout index
 
     | We cannot write by bytes, we must write by word, all data has been forced off word boundries, see NOTE in data section at EOF
     | So we make words out of bytes ...
@@ -625,7 +633,7 @@ AMDWriteSectorNotReady:
     move.w  (%a1), %d1                 | Read what was written
     cmp.w   %d3, %d1                   | Compare to what was written
     beq.s   AMDWriteSectorSuccess      | Jump for next byte if match
-    dbeq    %d2, AMDWriteSectorNotReady | Retry reading back written value
+    dbeq    %d2, AMDWriteSectorNotReady| Retry reading back written value
 
     move.w  (%a1), %d1                 | One last chance
     cmp.w   %d1, %d3                   | Compare to whats written
@@ -680,13 +688,17 @@ IntelFlashUnlock:
     bsr.w   LongWaitWithWatchdog
     rts
 
+ShortWaitWithWatchdog:
+    movem.l %d5, -(%sp)                | Save d5
+    move.l  #0x5, %d1                  | 5 loops
+    bra.s   LongWaitLoop               | Re-use the long wait loop
 LongWaitWithWatchdog:
     movem.l %d5, -(%sp)                | Save d5
-    move.w  #0x8000, %d1               | 32768 loops
+    move.l  #0x8000, %d1               | 32768 loops
 LongWaitLoop:
     bsr.w   ResetWatchdog              | Scratch the dog
     bsr.w   WasteTime                  | Twiddle thumbs
-    dbf     %d1, LongWaitLoop | If False Decrement and Branch
+    dbf     %d1, LongWaitLoop          | If False Decrement and Branch
     movem.l (%sp)+, %d5                | Restore d5
     rts
 
@@ -789,7 +801,7 @@ IntelWriteSector:
     bsr.w   IntelFlashUnlock
 
 IntelWriteSectorLoop:
-    move.w  #0x92A, %d2                | FlashNotReady Loop Timeout index (2346)
+    move.l  #0x92A, %d2                | FlashNotReady Loop Timeout index (2346)
 
     | We cannot write by bytes, we must write by word, all data has been forced off word boundries, see NOTE in data section at EOF
     | So we make words out of bytes ...
@@ -1097,6 +1109,10 @@ VPWSendBlockWaitForBuffer2:
     move.b  #0xC, (J1850_Command).l    | BTAD ...0 11.. "Load as last byte of transmit data"
     move.b  %d1, (J1850_TX_FIFO).l     | Move the Second checksum byte  to the TX FIFO
     rts
+
+HaltNoReboot:
+    bsr.w   ResetWatchdog
+    bra.s   HaltNoReboot
 
 | ---------------------------------------------------------------------------
 .data
@@ -1144,6 +1160,9 @@ Mode60Reply:    .byte  0x6C, toolid, pcmid, 0x60, 0xAA
 | Erase Sector Reply, 7 bytes
 EraseSectorReply:   .byte  0x6C, toolid, pcmid, 0x7D, 0x05, 0x00, 0x00
 
+|used for debugging
+Ping:   .byte  0x6C, 0xFF, pcmid, 0x3F, 0x01, 0x02
+
 .byte 0xAA
 | Global buffer, it's at the end and it's not transported, thus length is irrelevant!
   .globl   MessageBuffer

diff --git a/Kernels/Loader.S b/Kernels/Loader.S
@@ -22,6 +22,10 @@
 start:
     ori     #0x700, %sr                | Disable Interrupts
 
+#if defined P04
+    movea.l #0xFFA000, %sp             | P04: Relocate the stack
+#endif
+
 #if defined P12
     movea.l #Mode36Reply, %a0          | Reply Success to mode 3680, only P12 needs this.
     move.l  #6, %d0                    | It's 6 bytes long
@@ -271,7 +275,7 @@ KernelIDReply:  .byte  0x6C, toolid, pcmid, 0x7D, 0x00, 0x69, 0x00, 0x01, 0x00,
 Mode34Reply:    .byte  0x6C, toolid, pcmid, 0x74, 0x00, 0x44
 
 | Mode36 Reply, 6 bytes - 6C F0 10 76 00 00
-Mode36Reply:    .byte  0x6C, toolid, pcmid, 0x76, 0x00, 0x00
+Mode36Reply:    .byte  0x6C, toolid, pcmid, 0x76, 0x00, 0x01
 
 | Halt Kernel Reply, 4 bytes
 Mode60Reply:   .byte  0x6C, toolid, pcmid, 0x60