From 976e3ef1ad24a3e892cf36b67506df76e52ed8c1 Mon Sep 17 00:00:00 2001
From: antoniovillena <>
Date: Sat, 25 Mar 2023 15:41:25 +0100
Subject: [PATCH] empiezo plugin ZX3

---
 SD/BIN/BPLUGINS/ZX1 | Bin 540 -> 529 bytes
 utils/Makefile      |   9 ++++
 utils/zx1.asm       |  42 +------------------
 utils/zx3.asm       | 100 +++-----------------------------------------
 4 files changed, 17 insertions(+), 134 deletions(-)

diff --git a/SD/BIN/BPLUGINS/ZX1 b/SD/BIN/BPLUGINS/ZX1
index 8a7abaeeffdbd5a37a3920eaf6a1a50d76cc9eb5..89c27b279c48d38a8ed686b552d12896a94bbd89 100644
GIT binary patch
delta 397
zcmbQkGLfZTLdhwB0SKZZ3>6A;O4Bp*6m%65^GfpbGV{wab8=Gi5*d_^HZWTMd0WWx
zw&0U%!`bx4Ab($ly!;Y{qWt`l)D(u3XW5#V8Gr=S{I?Yl2ohnuCZVCI*r2Z@-DqQ@
zAr92%nU|bjRFs-rqL7x8Se&8Y={&KAH+){hw*zl0&n^L3V#ocqlEseUZKWOi$@S+u
z4J3iOf?X7n6N^&7HfH7(rxt<jWMfohU^qX^NT<<27^uiCGba_SA}zl(59FluiSL~C
z7!EKpIM^|qpKHJma&~HBih^rVQGOA_NjnEch66Xx7BmXqysN8l9%!|e^yGL(c^jBl
z*uY+Z`%K|&;M+)`D?$D``>qi#j-qVxE=C<QkO~f44Q>vZ>Sz24YZQwbpTbqMf<osR
Wqrxw+IVTyd|2}-XnC;)&#V-LQ6_y(S

delta 373
zcmbQpGKYmrLeVLJ0SJ7ZCvr=M3Cc9pZP(!Vr(nVIc7eo~^+Jr+f8JKIye;??)Nr<_
zG05LnAuqo~p(sDUBsGQM<XOQcW(FX^H2-Y{1cF2uuSsYqDmLgVsWsZzXo#OJnwX;?
zySm}qfwz@s*Eax7wBrVvX~*!k^5pvSod%LX1*@gxWSY*;GBR&85C+=gmYI_ZwkR#X
zG!JA?(Zt8j^$YqL864~w&d)XA2e~CRF-5_(s3^aP;iR2|;)4F0XR8~9Z{F2aI1jW!
zORdok=yDsDw~22v-xjihJW=`3?s}c_c7<OrIo88n&IWcdoU8CQ@NFc}ogi<V{n-c?
z2P)$N2|+wOc|D_!8Au6-tp+!TO!YH<g*A$`jZfjqSwW%kj8Wki*r1b))_)(qUCj3H
H?c$dJy~vj6

diff --git a/utils/Makefile b/utils/Makefile
index c0480af..d434363 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -50,6 +50,7 @@ BINS=\
  CORCLEAN\
  COREBIOS\
  ZX1\
+ ZX3\
  DATE\
  RTCST\
  RTC.SYS\
@@ -200,6 +201,14 @@ build/ZX1: $(srcdir)/zx1.asm\
  | build
 	$(AS) $(AFLAGS) --raw=$@ $<
 
+build/ZX3: $(srcdir)/zx3.asm\
+ $(INCLUDEDIR)/zxuno.def\
+ $(INCLUDEDIR)/esxdos.def\
+ $(INCLUDEDIR)/Print.inc\
+ $(INCLUDEDIR)/rst28.inc\
+ | build
+	$(AS) $(AFLAGS) --raw=$@ $<
+
 build/DATE: $(srcdir)/date.asm\
  $(INCLUDEDIR)/zxuno.def\
  $(INCLUDEDIR)/esxdos.def\
diff --git a/utils/zx1.asm b/utils/zx1.asm
index 46ec895..21e3001 100644
--- a/utils/zx1.asm
+++ b/utils/zx1.asm
@@ -20,37 +20,6 @@
 
 ;               output  ZX1
 
-        define  romtbl  $d000
-        define  indexe  $e000
-        define  active  $e040
-
-        define  bitstr  active+1
-        define  quietb  bitstr+1
-        define  checkc  quietb+1
-        define  keyiss  checkc+1
-        define  timing  keyiss+1
-        define  conten  timing+1
-        define  divmap  conten+1
-        define  nmidiv  divmap+1
-        define  grapmo  nmidiv+1
-        define  layout  grapmo+1
-        define  joykey  layout+1
-        define  joydb9  joykey+1
-        define  split   joydb9+1
-        define  outvid  split+1
-        define  scanli  outvid+1
-        define  freque  scanli+1
-        define  cpuspd  freque+1
-        define  copt    cpuspd+1
-        define  cburst  copt+1
-
-        define  cmbpnt  $e100
-        define  cmbcor  $e1d0   ;lo: Y coord          hi: X coord
-        define  items   $e1d2   ;lo: totales          hi: en pantalla
-        define  offsel  $e1d4   ;lo: offset visible   hi: seleccionado
-        define  empstr  $e1d6
-        define  tmpbuf  $e200
-
                 include zxuno.def
                 include esxdos.def
 
@@ -101,19 +70,13 @@ Normal          ld      a, 0
                 out     (c), a
                 ld      a, 7            ;PLUGIN_OK|PLUGIN_RESTORE_SCREEN|PLUGIN_RESTORE_BUFFERS
                 ret
-Init            wreg    flash_cs, 1
-                ld      de, indexe
-                ld      hl, $0070
-                ld      a, 1
-                call    rdflsh
-                xor     a
+Init            xor     a
                 esxdos  M_GETSETDRV     ; A = unidad actual
                 jr      nc, SDCard
                 call    Print
                 dz      'SD card not inserted'
                 ret
-SDCard          ld      (Drive+1), a
-                ld      b, FA_READ      ; B = modo de apertura
+SDCard          ld      b, FA_READ      ; B = modo de apertura
 FileName        ld      hl, 0
                 esxdos  F_OPEN
                 ld      (Handle+1), a
@@ -163,6 +126,5 @@ ReadOK          ld      a, $40
                 inc     b
                 out     (c), a
                 include Print.inc
-                include rdflsh.inc
                 include wrflsh.inc
                 include rst28.inc
diff --git a/utils/zx3.asm b/utils/zx3.asm
index 90d37ef..d0848f6 100644
--- a/utils/zx3.asm
+++ b/utils/zx3.asm
@@ -20,37 +20,6 @@
 
 ;               output  ZX3
 
-        define  romtbl  $d000
-        define  indexe  $e000
-        define  active  $e040
-
-        define  bitstr  active+1
-        define  quietb  bitstr+1
-        define  checkc  quietb+1
-        define  keyiss  checkc+1
-        define  timing  keyiss+1
-        define  conten  timing+1
-        define  divmap  conten+1
-        define  nmidiv  divmap+1
-        define  grapmo  nmidiv+1
-        define  layout  grapmo+1
-        define  joykey  layout+1
-        define  joydb9  joykey+1
-        define  split   joydb9+1
-        define  outvid  split+1
-        define  scanli  outvid+1
-        define  freque  scanli+1
-        define  cpuspd  freque+1
-        define  copt    cpuspd+1
-        define  cburst  copt+1
-
-        define  cmbpnt  $e100
-        define  cmbcor  $e1d0   ;lo: Y coord          hi: X coord
-        define  items   $e1d2   ;lo: totales          hi: en pantalla
-        define  offsel  $e1d4   ;lo: offset visible   hi: seleccionado
-        define  empstr  $e1d6
-        define  tmpbuf  $e200
-
                 include zxuno.def
                 include esxdos.def
 
@@ -96,19 +65,13 @@ Normal          ld      a, 0
                 out     (c), a
                 ld      a, 7            ;PLUGIN_OK|PLUGIN_RESTORE_SCREEN|PLUGIN_RESTORE_BUFFERS
                 ret
-Init            wreg    flash_cs, 1
-                ld      de, indexe
-                ld      hl, $0070
-                ld      a, 1
-                call    rdflsh
-                xor     a
+Init            xor     a
                 esxdos  M_GETSETDRV     ; A = unidad actual
                 jr      nc, SDCard
                 call    Print
                 dz      'SD card not inserted'
                 ret
-SDCard          ld      (Drive+1), a
-                ld      b, FA_READ      ; B = modo de apertura
+SDCard          ld      b, FA_READ      ; B = modo de apertura
 FileName        ld      hl, 0
                 esxdos  F_OPEN
                 ld      (Handle+1), a
@@ -120,17 +83,15 @@ FileFound       ld      hl, Stat
                 esxdos  F_FSTAT
                 ld      a, (Stat+9)
                 cp      $29
-                jr      c, Lengthok
+                jr      c, LengthOk
                 call    Print
                 dz      'File too long'
                 ret
-
-Lengthok
-                call    Print
+LengthOk        call    Print
                 db      13, 'Writing SPI flash', 13
                 dz      '[', 6, '      ]', 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8
                 ld      ixl, $15
-Slot            ld      de, $f7c0
+Slot            ld      de, $d700 ; $e900
                 exx
 Bucle           ld      a, 'o'
                 exx
@@ -168,55 +129,6 @@ ReadOK          ld      a, $40
                 inc     b
                 out     (c), a
                 include Print.inc
-; ------------------------
-; Read from SPI flash
-; Parameters:
-;   DE: destination address
-;   HL: source address without last byte
-;    A: number of pages (256 bytes) to read
-; ------------------------
-rdflsh          ex      af, af'
-                xor     a
-                push    hl
-                wreg    flash_cs, 0     ; activamos spi, enviando un 0
-
-                wreg    flash_spi, $13  ; envio flash_spi un $13, orden de lectura
-highb           ld      a, 0
-                out     (c), a
-                pop     hl
-                push    hl
-                xor     a
-                out     (c), h
-                out     (c), l
-                out     (c), a
-                ex      af, af'
-                ex      de, hl
-                in      f, (c)
-rdfls1          ld      e, $20
-rdfls2          ini
-                inc     b
-                ini
-                inc     b
-                ini
-                inc     b
-                ini
-                inc     b
-                ini
-                inc     b
-                ini
-                inc     b
-                ini
-                inc     b
-                ini
-                inc     b
-                dec     e
-                jr      nz, rdfls2
-                dec     a
-                jr      nz, rdfls1
-                wreg    flash_cs, 1
-                pop     hl
-                ret
-
 wrflsh          ex      af, af'
                 xor     a
 wrfls1          wreg    flash_cs, 0     ; activamos spi, enviando un 0
@@ -224,7 +136,7 @@ wrfls1          wreg    flash_cs, 0     ; activamos spi, enviando un 0
                 wreg    flash_cs, 1     ; desactivamos spi, enviando un 1
                 wreg    flash_cs, 0     ; activamos spi, enviando un 0
                 wreg    flash_spi, $21  ; envío sector erase
-                ld      hl, (highb)
+                ld      h, 1
                 out     (c), h
                 out     (c), d
                 out     (c), e