From 5620c6fe99da38d3ff78d909e225b75a4fb94c1d Mon Sep 17 00:00:00 2001
From: antoniovillena <espineter@yahoo.com>
Date: Thu, 12 May 2016 17:43:04 +0200
Subject: [PATCH] =?UTF-8?q?Cambios=20por=20actualizaci=C3=B3n=20de=20fpoke?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firmware/firmware.asm  | 47 ++++++++++++++++++------------------------
 firmware/generamcs.bat | 12 ++++++-----
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/firmware/firmware.asm b/firmware/firmware.asm
index 6a691e7..1726cbd 100644
--- a/firmware/firmware.asm
+++ b/firmware/firmware.asm
@@ -935,9 +935,26 @@ romsb   sub     $1e-$16
         call    atoi
         ld      b, (ix-$3f)
 romsb6  ld      e, 0
-        call    isbusy
-        jr      nz, romsb7
-        ld      bc, $090a
+isbusy  ld      h, indexe>>8
+        ld      l, e
+        inc     e
+        ld      l, (hl)
+        inc     l
+        jr      z, romsb7
+        dec     l
+        call    calcu
+        inc     l
+        ld      c, (hl)
+        dec     l
+isbus1  cp      (hl)
+        jr      z, isbus2
+        dec     a
+        dec     c
+        jr      nz, isbus1
+        inc     l
+        add     a, (hl)
+        jr      isbusy
+isbus2  ld      bc, $090a
         ld      ix, cad115
         call_prnstr
         call_prnstr
@@ -970,8 +987,6 @@ romsd   dec     iyh
         jr      nz, romsc
         ei
         call    romcyb
-
-
         call    newent
         call    atoi
         ld      (items), a
@@ -1257,28 +1272,6 @@ roms27  ld      hl, $0104
         ld      a, (codcnt)
         jp      main13
 
-; input E=0, A=slot to test
-; output flagZ=found
-isbusy  ld      h, indexe>>8
-        ld      l, e
-        inc     e
-        ld      l, (hl)
-        inc     l
-        dec     l
-        ret     m
-        call    calcu
-        inc     l
-        ld      c, (hl)
-        dec     l
-isbus1  cp      (hl)
-        ret     z
-        dec     a
-        dec     c
-        jr      nz, isbus1
-        inc     l
-        add     a, (hl)
-        jr      isbusy
-
 ;*** Upgrade Menu ***
 ;*********************
 upgra   ld      bc, (menuop)
diff --git a/firmware/generamcs.bat b/firmware/generamcs.bat
index 644cff0..53f703d 100644
--- a/firmware/generamcs.bat
+++ b/firmware/generamcs.bat
@@ -1,11 +1,13 @@
 echo  define version %1 > version.asm
 call  make.bat
 Bit2Bin ..\cores\Spectrum\tld_zxuno.%2.bit tmp.bin
-fpad 2000 00 tmp0.bin
-fpad 4c000 00 tmp1.bin
-fpad 354000 00 tmp2.bin
-copy /b /y header.bin+rom_binaries\esxdos.rom+tmp0.bin+firmware.rom+tmp1.bin+tmp.bin+tmp2.bin FLASH.ZX1
-fpoke FLASH.ZX1 007000 000040xFF 007044 g0203020202
+fpad 400000 00 FLASH.ZX1
+fpoke FLASH.ZX1 00000 file:header.bin      ^
+                04000 file:esxdos.rom      ^
+                07000 40xFF                ^
+                07044 g0203020202          ^
+                08000 file:..\firmware.rom ^
+                58000 file:tmp.bin
 fcut tmp.bin 0 53f00 sd_binaries\SPECTRUM.%3
 GenRom 0 sf1ta Machine tmp.bin core_taps\SPECTRUM.TAP
 rem CgLeches core_taps\SPECTRUM.TAP core_wavs\SPECTRUM.WAV 4