From 60433114e7110a920bfa203d3eaa1ff635975556 Mon Sep 17 00:00:00 2001
From: antoniovillena <espineter@yahoo.com>
Date: Thu, 17 Nov 2016 23:37:13 +0100
Subject: [PATCH] En 0.57 quito bug al arrancar por defecto core de spectrum en
 slot distinto de 1

---
 firmware/firmware.asm | 23 +++++++++++++++--------
 firmware/strings.asm  |  6 +++---
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/firmware/firmware.asm b/firmware/firmware.asm
index 52e5ff0..3df9069 100644
--- a/firmware/firmware.asm
+++ b/firmware/firmware.asm
@@ -411,13 +411,16 @@ start6  ld      a, (codcnt)
 tstart5 sub     $80
         jr      c, start5
         ld      (codcnt), a
-        cp      $19
-        jr      z, start7
-        cp      $0c
-start7  jp      z, blst
-        cp      $3a
+        sub     '1'
+        cp      9
+        ld      h, a
+        jp      c, alto runbit1
         jp      z, alto easter
-        cp      $17
+        cp      $19-'1'
+        jr      z, start7
+        sub     $0c-'1'
+start7  jp      z, blst
+        cp      $17-$0c
         jr      nz, tstart5
       ELSE
         pop     af
@@ -3352,7 +3355,11 @@ finstr
 
 runbit
       IF  recovery=0
-        ld      b, h
+        ld      a, (menuop+1)
+        cp      h
+        jr      z, ccon0
+        ld      (menuop), hl
+runbit1 ld      b, h
         call    calbit
         ld      bc, zxuno_port
         ld      e, core_addr
@@ -3371,7 +3378,7 @@ conti   di
         ld      hl, (active)
         cp      h
         jr      nz, runbit
-        ld      h, active>>8
+ccon0   ld      h, active>>8
         ld      l, (hl)
         call    calcu
         push    hl
diff --git a/firmware/strings.asm b/firmware/strings.asm
index 2417087..47c43d1 100644
--- a/firmware/strings.asm
+++ b/firmware/strings.asm
@@ -1,6 +1,6 @@
 cad0    defb    'Core:             ',0
 cad1    defm    'http://zxuno.speccy.org', 0
-        defm    'ZX-Uno BIOS v0.56', 0
+        defm    'ZX-Uno BIOS v0.57', 0
         defm    'Copyleft ', 127, ' 2016 ZX-Uno Team', 0
         defm    'Processor: Z80 3.5MHz', 0
         defm    'Memory:    512K Ok', 0
@@ -37,7 +37,7 @@ cad8    defm    $10, '                         ', $10, '              ', $10, 0
 cad9    defb    $14, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11
         defb    $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $18, $11
         defb    $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $15, 0
-        defb    '   BIOS v0.56    ', $7f, '2016 ZX-Uno Team', 0
+        defb    '   BIOS v0.57    ', $7f, '2016 ZX-Uno Team', 0
       IF  recovery=0
 cad10   defb    'Hardware tests', 0
         defb    $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11
@@ -380,6 +380,6 @@ cad116  defb    '2', 0
         defb    '8', 0
         defb    '9', 0, 0
 
-;cad199  defb    'af0000 bc0000 de0000 hl0000 sp0000 ix0000 iy0000', 0
+cad199  defb    'af0000 bc0000 de0000 hl0000 sp0000 ix0000 iy0000', 0
 
 fincad