WIP Monitor ADB function with heading bytes defining stream length

assembly/os/monitor.asm

@@ -469,22 +469,47 @@ monitor_printAsciiByte:
     call Sys_Printc
     ret
 
-; Copy data from STDIN to application memory. This is tought to be used with parallel terminal, not keyboard:
+; Copy data from parallel terminal to application memory. This is tought to be used with the ADB function of the Pat80 Python Terminal.
-; 0s are not ignored and the sequence is complete when no data is available for 8 cpu cycles.
+; Uses TERM_DATA_AVAIL_REG to check if a byte is available before reading it.
+; The first two received bytes (heading bytes) defines the stream length (MSB first), the rest of the bytes are copied to memory.
+; The copy is completed when the number of bytes defined in the heading bytes are received.
+; @uses a, b, c, d, h, l
 monitor_copyTermToAppMem:
+    ; d contains the current status.
+    ; 2 = waiting for first heading byte
+    ; 1 = waiting for second heading byte
+    ; 0 = heading bytes received, now receiving binary stream
+    ld d, 2
     ld hl, APP_SPACE    ; we will write in APP_SPACE
-    ld b, 255; MON_ADB_TIMEOUT     ; the timeout counter (number cycles without available data that represent the end of stream)
     monitor_copyTermToAppMem_loop:
-    dec b   ; decrement the timeout counter
+        ; check if bytes are available
-    ret z   ; if counter is 0, timeout reached: return
+        call Term_availb
-    ; check if bytes are available
+        cp 0
-    call Term_availb
+        jp z, monitor_copyTermToAppMem     ; no bytes available, next loop
-    cp 0
+        ; bytes are available
-    jp z, monitor_copyTermToAppMem     ; no bytes available, next loop
+        ld a, d
-    ; bytes are available
+        cp 2    ; check if we are receiving first header byte
-    ld b, 255 ;MON_ADB_TIMEOUT; reset the counter
+        jp z, monitor_copyTermToAppMem_loop_rec_head_byte_1
-    ld (hl), a  ; copy byte to memory
+        ld a, d
-    inc hl  ; move to next memory position
+        cp 1    ; check if we are receiving second header byte
+        jp z, monitor_copyTermToAppMem_loop_rec_head_byte_2
+        ; we are receiving binary stream: read byte and save to memory
+        call Term_readb
+        ld (hl), a  ; copy byte to memory
+        inc hl  ; move to next memory position
     jp monitor_copyTermToAppMem_loop   ; continue loop
 
+    monitor_copyTermToAppMem_loop_rec_head_byte_1:
+        ; we are receiving first header byte: read byte and save to b
+        call Term_readb
+        ld b, a
+        dec d
+        jp monitor_copyTermToAppMem_loop   ; continue loop
+    monitor_copyTermToAppMem_loop_rec_head_byte_2:
+        ; we are receiving second header byte: read byte and save to c
+        call Term_readb
+        ld c, a
+        dec d
+        jp monitor_copyTermToAppMem_loop   ; continue loop
+
 

python/terminal_emulator.py

@@ -27,6 +27,7 @@ import serial
 import curses
 import time
 import textwrap
+import os
 
 
 class TerminalEmulator:
@@ -66,6 +67,15 @@ class TerminalEmulator:
         w.addstr(0, 0, '[ADB MODE] file to load:', curses.A_REVERSE)
         path = w.getstr()
         try:
+            size = os.path.getsize(path)
+            # Compute the two header bytes needed to declare the length of the stream
+            h1 = size & 255 # get lower 8 bits
+            size >>= 8 # shift by 8 bits
+            h0 = size & 255 # get second lower 8 bits
+            # Send the two heading bytes (most significant first)
+            ser.write(h0)
+            ser.write(h1)
+            # Send the actual binary stream
             with open(path, "rb") as f:
                 byte = f.read(1)
                 while byte: