From adb347b94d20ce280b39d16860f8eaf8de73861b Mon Sep 17 00:00:00 2001
From: antoniovillena <espineter@yahoo.com>
Date: Tue, 7 Jun 2016 21:20:52 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1ado=20bin2hex.c?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firmware/bin2hex.c           | 31 +++++++++++++++++++++++++++++++
 firmware/firmloader.bat      |  2 ++
 firmware/firmware.asm        |  9 +++++++--
 firmware/generamcs_multi.bat |  3 ++-
 firmware/sd.asm              | 11 +++++++++++
 5 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 firmware/bin2hex.c

diff --git a/firmware/bin2hex.c b/firmware/bin2hex.c
new file mode 100644
index 0000000..2bc5e5b
--- /dev/null
+++ b/firmware/bin2hex.c
@@ -0,0 +1,31 @@
+#include <stdio.h>
+#include <string.h>
+
+int main (int argc, char *argv[]){
+  FILE *f;
+  unsigned char *scr;
+  char nombre[256];
+  int i,leido;
+
+  if (argc<2)
+    return 1;
+
+  scr = (unsigned char *) malloc(65536);
+  f = fopen (argv[1],"rb");
+  if (!f)
+    return 1;
+
+  leido = fread (scr, 1, 65536, f);
+  fclose (f);
+
+  strcpy (nombre, argv[1]);
+  nombre[strlen(nombre)-3]=0;
+  strcat (nombre, "hex");
+
+  f = fopen (nombre, "wt");
+  for (i=0;i<leido;i++)
+    fprintf (f, "%.2X\n", scr[i]);
+  fclose(f);
+
+  return 0;
+}
diff --git a/firmware/firmloader.bat b/firmware/firmloader.bat
index e322bca..4254081 100644
--- a/firmware/firmloader.bat
+++ b/firmware/firmloader.bat
@@ -1,3 +1,5 @@
 sjasmplus firmware.asm
 zx7b firmware_strings.rom firmware.rom.zx7b 
 sjasmplus firmloader.asm
+bin2hex firmloader.rom
+copy /y firmloader.hex ..\cores\Spectrum\firmloader_hex.txt
\ No newline at end of file
diff --git a/firmware/firmware.asm b/firmware/firmware.asm
index fdb1e88..d6c3de0 100644
--- a/firmware/firmware.asm
+++ b/firmware/firmware.asm
@@ -1,4 +1,5 @@
         include version.asm
+        define  w25q80          0
         define  recovery        0
         output  firmware_strings.rom
       macro wreg  dir, dato
@@ -1797,8 +1798,12 @@ putc0   inc     hl
 
 sdtab   defw    $0020, $0040
         defw    $0040, $0080
-        defw    $4000, $0000
-        defw    $0540;, $0580
+      IF  w25q80=0
+        defw    $4000
+      ELSE
+        defw    $1000
+      ENDIF
+        defw    $0000, $0540
 
         include sd.asm
 
diff --git a/firmware/generamcs_multi.bat b/firmware/generamcs_multi.bat
index 02c66ae..77e3266 100644
--- a/firmware/generamcs_multi.bat
+++ b/firmware/generamcs_multi.bat
@@ -22,11 +22,12 @@ call :CreateMachine CORE9 "NES (VGA)"        NES\xilinx\nes_zxuno.%2.bit 0 %3
 copy /y rom_binaries\esxdos.rom sd_binaries\ESXDOS.%3
 copy /y firmware.rom sd_binaries\FIRMWARE.%3
 GenRom 0 sm1t BIOS firmware.rom core_taps\FIRMWARE.TAP
+rem CgLeches core_taps\FIRMWARE.TAP core_wavs\FIRMWARE.WAV 4
 GenRom 0 0    ESXDOS rom_binaries\esxdos.rom core_taps\ESXDOS.TAP
 call :CreateRom 0  "ZX Spectrum 48K"               48               dn   lh17
 call :CreateRom 1  "ZX +2A 4.1"                    plus3en41        t    0
 call :CreateRom 5  "SE Basic IV 4.0 Anya"          se               d    h1
-call :CreateRom 7  "ZX Spectrum 48K Cargando Leches" leches         dn   lh
+call :CreateRom 7  "ZX Spectrum 48K Cargando Leches" leches         d    lh
 AddItem ROM     8   rom_taps\rooted.tap
 call :CreateRom 9  "Inves Spectrum+"               inves            0    lh17
 call :CreateRom 10 "Zx Spectrum +2"                plus2en          t    h1
diff --git a/firmware/sd.asm b/firmware/sd.asm
index 1cd95ca..0f01a4f 100644
--- a/firmware/sd.asm
+++ b/firmware/sd.asm
@@ -3,6 +3,17 @@
 inirea  push    hl
         push    bc
 reinit  call    mmcinit
+;        push    af
+;        ld      a, SET_BLOCKLEN
+;        call    cs_low
+;        out     (c), a
+;        out     (c), 0
+;        out     (c), 0
+;        ld      a, 2
+;        out     (c), a
+;        call    send1z
+;        call    cs_high
+;        pop     af
         pop     bc
         pop     hl
         ret     nz