From ef1a3cf9f5ebcfda6a80b51dd0e2b781a7086a95 Mon Sep 17 00:00:00 2001
From: antoniovillena <info@antoniovillena.es>
Date: Wed, 15 Mar 2023 20:00:02 +0100
Subject: [PATCH] cambio bootloader.asm para que se pueda compilar

---
 firmware/bootloader.asm | 49 ++++++++++-------------------------------
 firmware/firmware.asm   |  2 ++
 2 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/firmware/bootloader.asm b/firmware/bootloader.asm
index 91d95c6..916f492 100644
--- a/firmware/bootloader.asm
+++ b/firmware/bootloader.asm
@@ -1,42 +1,17 @@
-; bootloader.asm
-;
-; Copyright (C) 2016-2021 Antonio Villena
-; Contributors:
-;   2015 Einar Saukas (ZX7 Backwards)
-;   2021 Ivan Tatarinov <ivan-tat@ya.ru>
-;
-; This program is free software: you can redistribute it and/or modify
-; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation, version 3.
-;
-; This program is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-; GNU General Public License for more details.
-;
-; You should have received a copy of the GNU General Public License
-; along with this program. If not, see <https://www.gnu.org/licenses/>.
-;
-; SPDX-FileCopyrightText: Copyright (C) 2016-2021 Antonio Villena
-;
-; SPDX-FileContributor: 2015 Einar Saukas (ZX7 Backwards)
-; SPDX-FileContributor: 2021 Ivan Tatarinov <ivan-tat@ya.ru>
-;
-; SPDX-License-Identifier: GPL-3.0-only
-
-; Compatible compilers:
-;   SJAsmPlus, <https://github.com/sjasmplus/sjasmplus/>
-;   SJAsmPlus by aprisobal, <https://github.com/z00m128/sjasmplus/>
-
-        output  bootloader.rom
-
-        include zxuno.def
-
       macro wreg  dir, dato
         rst     $28
         defb    dir, dato
       endm
 
+        output  bootloader.rom
+        define  zxuno_port      $fc3b
+        define  master_conf     0
+        define  master_mapper   1
+        define  flash_spi       2
+        define  flash_cs        3
+        define  joyconf         6
+        define  scandbl_ctrl    11
+
         di
         ld      sp, $bfff-ini+6
         wreg    flash_cs, 1     ; desactivamos spi, enviando un 0
@@ -76,7 +51,7 @@ nmi66   jp      $c003
         retn
 
 cont    wreg    flash_cs, 1     ; desactivamos spi, enviando un 1
-        wreg    joy_conf, %00010000
+        wreg    joyconf, %00010000
         wreg    master_mapper, 8  ; paginamos la ROM en $c000
 lee     in      a, ($1f)
         djnz    lee
@@ -110,10 +85,10 @@ recov   ld      hl, firmware-1
         block   $0100 - $
         include scroll/define.asm
         ld      sp, 0
-        ld      de, filestart+filesize-1
+        ld      de, $5e6d+filesize-1
         ld      hl, scroll-1
         call    dzx7b
-        jp      start
+        jp      $7be4
 
 ; -----------------------------------------------------------------------------
 ; ZX7 Backwards by Einar Saukas, Antonio Villena
diff --git a/firmware/firmware.asm b/firmware/firmware.asm
index 275d29d..ae665a7 100644
--- a/firmware/firmware.asm
+++ b/firmware/firmware.asm
@@ -2435,7 +2435,9 @@ enbur
         xor     a
         ld      (alto highb+1), a
       ENDIF
+      IF  recovery=0
         call    alto loadch
+      ENDIF
       IF  vertical=0
         ld      bc, $090a
       ELSE