From a8b004abacfe0a0f326ba9747fff98f32aaefcc1 Mon Sep 17 00:00:00 2001
From: antoniovillena <>
Date: Wed, 26 Jul 2023 21:07:08 +0200
Subject: [PATCH] actualizo plugin ZX3

---
 SD/BIN/BPLUGINS/ZX3 | Bin 545 -> 642 bytes
 utils/zx3.asm       |  49 +++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/SD/BIN/BPLUGINS/ZX3 b/SD/BIN/BPLUGINS/ZX3
index 5c9e5735555ee6aea16acf01145c26720dbf01fe..76c907cda32e88ae4b56ee68feb3b07c858c38ab 100644
GIT binary patch
delta 408
zcmZ3;(!@H!SpQOEkiV}&UVe!}QGR|&Y6`>2v*k_93_yZu{@V%&1c@+SlhhDDdud{l
z9pj~m3*|#?8x4fdUTSp9%t;07PRlRN18P=mYC6AAtFy_fyGc|0ZI-wOqs_lJ7D6zU
zCHeUZIr(|%K!v)E|CU&=m>rd1`xj%uWOn^-{@F{Dc^UQUfi6l-Oi^$xD#|ZnIB5~4
z7}#iLz-ax)PT*}N%iD@)4-^D}#)al(=jE5@DJ16?r2<X+cV95+!aoHKPQhe>e-0W<
zVhI8uRi1fei8+}mP*pn0I(0g`6`t1ZQg~?RpvZ9G=Gohg!Z+{g9@1|FTA-!VX!qys
z<U~ek2UrlWfxQk75k))3x0P=L-$uSIgh<3U!R1htPTs?)Zw3lA4qFXw4w>p_{0b`-
h?=(Jzt7Zj->@!A%Utn`iGFtzA_;xYdzqgBD0ss<qs!jj^

delta 307
zcmZo-UC1)QSii6_$lq5XFTX^gC_ld>HHG2iS+OQ&1|Y#S|7`^Xf<zdvNot6nEu5HS
z$5=RVp}enYqk-_*!bZ2uoK&#xwEWUMpk_tIrt=H6G@7imnl#1VW{GPs+WcE$Ap}!d
zlAo`Tlb@H)aPnV_1*@WJquKSl`DY6!i!$md0bP=sn4;iXRFq%DaMI2}k>SA2vsI14
zH}C2yoM*KDqop!=AEUej%yn#FSHT^tXvg@r@@?ST$hU<MiGPi7ITWRnWtsHNKpx_-
r)!^okseZ<<uu`$Q@hMz2E6CH&7!`hj%{j?v{rBP9#ccoHE`A9B1nhM7

diff --git a/utils/zx3.asm b/utils/zx3.asm
index 23afc90..8961980 100644
--- a/utils/zx3.asm
+++ b/utils/zx3.asm
@@ -89,14 +89,18 @@ FileFound       ld      hl, Stat
                 rla
                 jr      z, Inc1
                 inc     a
-Inc1            cp      $a4
+Inc1            cp      $ec
                 jr      c, LengthOk
                 call    Print
                 dz      'File too long'
                 ret
-LengthOk        cp      $5c
+LengthOk        ld      hl, Slot+2
+                cp      $a4
+                jr      c, PenUlt
+                ld      (hl), $c5
+                jr      UltSlot
+PenUlt          cp      $5c
                 jr      c, UltSlot
-                ld      hl, Slot+2
                 ld      (hl), $d7
 UltSlot         ld      ixl, a
                 call    Print
@@ -118,14 +122,49 @@ Handle          ld      a, 0
                 call    Print
                 dz      'Read Error'
                 ret
-ReadOK          ld      a, $40
+ReadOK          jr      c, Comprob
+                ld      hl, ReadOK
+                ld      (hl), $30
+                ld      bc, zxuno_port
+                ld      a, newreg
+                out     (c), a
+                inc     b
+                in      a, (c)
+                and     %11100000
+                jr      nz, ReadId
+                call    Print
+                dz      'Unknown core'
+                ret
+ReadId          ld      hl, $dffe
+                ld      de, $d062
+                cp      %00100000
+                jr      z, Strcmp
+                ld      de, $1063
+                cp      %01000000
+                jr      z, Strcmp
+                ld      d, $60
+Strcmp          djnz    Listo
+                call    Print
+                dz      'Invalid core'
+                ret
+Listo           inc     l
+                inc     hl
+                inc     l
+                ld      a, (hl)
+                inc     l
+                cp      e
+                jr      nz, Strcmp
+                ld      a, (hl)
+                cp      d
+                jr      nz, Strcmp
+Comprob         ld      a, $40
                 ld      hl, $c000
                 exx
                 call    wrflsh
                 inc     de
                 exx
                 dec     ixl
-                jr      nz, Bucle
+                jp      nz, Bucle
                 ld      bc, zxuno_port
                 ld      hl, (Slot+1)
                 ld      a, core_addr