From a27546ba9c41872da19b020014fd288ab4de7f01 Mon Sep 17 00:00:00 2001
From: antoniovillena <espineter@yahoo.com>
Date: Sun, 11 Feb 2018 23:52:14 +0100
Subject: [PATCH] =?UTF-8?q?Cambios:=20-Compatible=20mapas=20teclado=20EXP2?=
 =?UTF-8?q?6.=20=C2=A1=C2=A1=C2=A1ATENCI=C3=93N!!!=20Incompatible=20con=20?=
 =?UTF-8?q?cores=20anteriores.=20-Arreglado=20bug=20del=20lanzador=20de=20?=
 =?UTF-8?q?cores.=20-Detecta=202M=20de=20RAM=20si=20el=20core=20lo=20permi?=
 =?UTF-8?q?te.=20-A=C3=B1adido=20soporte=20NTSC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firmware/FIRMWARE.ZX1 | Bin 16384 -> 16384 bytes
 firmware/av.zx7b      | Bin 285 -> 196 bytes
 firmware/es.zx7b      | Bin 425 -> 306 bytes
 firmware/firmware.asm |  94 +++++++++++++++++++++++++++---------------
 firmware/strings.asm  |   9 ++--
 firmware/us.zx7b      | Bin 404 -> 291 bytes
 6 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/firmware/FIRMWARE.ZX1 b/firmware/FIRMWARE.ZX1
index 6f333fcdcc7c00b36e70618a02249700b90ed7e5..add9ad8aca3c5d40cbb5e73b96d617aa759b7d42 100644
GIT binary patch
delta 3985
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
KpFKRM>VE-n@kL$$

delta 4262
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
KOQ}P%SN=E0RLREx

diff --git a/firmware/av.zx7b b/firmware/av.zx7b
index e9049a8d1d976715b77d3e173a3b15dbee3493eb..231ca0dc610d25f3b27a88a8686db4f7c46b1c8a 100644
GIT binary patch
literal 196
zcmV;#06YJHRaO641Ob6X{}K^I&1FLc^&bU!-wbF0;uqoqu*eGkK_R6-I067703ihc
zLZ`qF2mm1j03-lJ0E=V~QV5wpC;(6Z4@dy{#2+}5&;T$146u7iPHo5ls9ncx4~OUg
zZKMFARg7&<$NwS1;-Ubd;%EVckfBM0O5(z$L^A<6|KdZ~qG1JS0Fsedf#T!<VgLc}
y82kN(;WmZD0A%9G;_v_ff@($pF%SUa5FbUV!2nVXa1-4DkRk;EgaL>ELxKPkaY*R^

literal 285
zcmV+&0pk8(Rn`Af0p<TIDglAw{|hQ80LcFn0RZLyE7;%b|Ea13%KuY9Advqj0)Wc@
zSJ3~~|5H^!mH!VS;I*w}3o2m?m4X#0V-fKi7y_UFr2+r4K}5^3fSMu$pdka4LeFBL
zGXw)wBm+cBmyu*2O5v1<C<Ccb1C&UUVjmMfH>c18RxkswO7{?6j@!b>1E@;7kc1yf
z=mV77u%rVYa)H~yD4%TqC+P>G2NTN=XlLK4p_3ql7nQ>0C}(j2|JmXQhgM+=RA>V#
zqi=y9RpbL=N&{)%YxisW;j6<E#0z8trN}hk@B=A=0HuOp<$w&<1^_^okp<#W5WpZ+
j!GOV{2qPMB1P~&v1Ox|=3vB^}0|8`+6cz#iv><>04JUac

diff --git a/firmware/es.zx7b b/firmware/es.zx7b
index 38a820454276efbbffd955c62caed8a19aae03dc..9d2adc29d66a1eeffbfe9107f103c8fcd8fe9810 100644
GIT binary patch
literal 306
zcmV-20nPqkRaO560fI#TMgWAD-^&63A^-|sLI86P^V!a0)yw&406S#=EWeFS>7Qr$
zj~{W9c)?My0FWM4<Nzrhr~o0e|BUDWF{A*Z01QF@%j97IX!9WeGXID&|49TS|DiiD
zW-CY^6@f_qMnU2v1i}^pLE>RQAp!v+0U-qeLVb(@2mu5EBmqPK;%MSzApZdnBLOG@
zPytBdZ~zhL0U_`K&;c+3u;KuaJLFOU$N{Jjnc{>G6QTjc0i*!}qT<5hf)OAB;(-Ce
z1Qns;2px$i5meCsl0n7dp=KpeCI6|aLI09eRYd<uqJkVcVGb(d6o!l`2H^mrL_1<}
z|FGghHOdMB;WiS)GRR8e@M^3gmW&UW;sB}y0OAlIMXJF7QVnnu-2spy1p$NshyX)^
E0Opx?Z2$lO

literal 425
zcmV;a0apINs;d7l0fHd^K8gTA1EjyN=*A)gO20x_17az}QpaJdeMAFj1Ev4;0960C
zo3Ky=63-U%7e6<r&;wSZ!mtC7N~@4N0{T0s11m$<{}<>3W96g+qDlh^gX{l`!#=|T
z?B~8A2h#tDm;a{($o~_>50x;Osz_9=lz|}s9~DI6B>(Y20YM*ONq?yV10n-bArC@I
z`!E3r14;w~BuW=V11V@9WF`L}0ZRk*C<9OrQb-?gN+XHr1MmY<&;u|^6R;a8kawlz
z1IS7jsOhufMuZ;{3j@RhU!)tNN&^=Q`GO-70uO-)rNS$eKMx2yz9>{9&?)~P6oU^=
zp_o-rD*sPaRYCuGs;WfF|5pG}0RMR+paB0o5di;rs;U70@)Qst<o}6)fdBGDK;-|a
zszA#BQxqF8VNt7*;wb+MAknL(Kv4qWMCFvIVh1Q7WdDoeLU6JS3#tSIR1`x>191og
z0tTfJH0|NIqr^lD3IoV%;FItK5&+gH2sVIAE<jPP3?E{u;+Kj+;t)TSRKaUC00D3(
TG69e%3ju^90|AHt6NrESE)S|=

diff --git a/firmware/firmware.asm b/firmware/firmware.asm
index c5f712e..cf083ba 100644
--- a/firmware/firmware.asm
+++ b/firmware/firmware.asm
@@ -245,10 +245,15 @@ start   ld      bc, chrend-sdtab
         inc     b
         ld      hl, (scanli)
         rrc     l
-        add     hl, hl
         ld      a, (outvid)
-;        rrca
         rrca
+        rrca
+        jr      c, start0
+        rlca
+        ld      l, a
+start0  ex      af, af'
+        add     hl, hl
+        ex      af, af'
         ld      a, h
         adc     a, a
         or      %10100000  ; $A0 - Turbo 14Mhz, COPT=1 (PAL Sync) - es $c0 en el firmware oficial
@@ -295,6 +300,16 @@ start5  in      a, (c)
         inc     hl
         ld      ix, cad0        ; imprimir cadena
         jr      nz, start5      ; si no recibimos un 0 seguimos pillando caracteres
+        call    alto tstmem
+        jr      z, star55
+        ld      hl, cadmem
+        ld      (hl), ' '
+        inc     hl
+        ld      (hl), ' '
+        inc     hl
+        inc     hl
+        ld      (hl), 'M'
+star55
       IF  vertical=0
         ld      bc, $090b
         call_prnstr             ; CoreID
@@ -394,14 +409,14 @@ star11  ld      a, (layout)
         jr      nc, star13
         ld      hl, finav-1
 star12  jr      nc, star15
-star13  ld      de, $ffff
+star13  ld      de, $cfff
         call    dzx7b
         wreg    key_map, 0
         ld      hl, $c001
 star14  inc     b
         outi
-        bit     7, h              ; compruebo si la direccion es 0000 (final)
-        jr      nz, star14        ; repito si no lo es
+        bit     4, h              ; compruebo si la direccion es D000 (final)
+        jr      z, star14         ; repito si no lo es
 star15  
     IF  recovery=0
         ld      d, 4
@@ -446,14 +461,20 @@ star17  ld      hl, (joykey)
         inc     b
         out     (c), a
         jp      conti
+
+runbit0 ld      a, l
+        cp      45
+        jr      z, bios
+runbit1 ld      (bitstr), a
+        jr      star17
+
 star18  ld      a, (codcnt)
 star19  sub     $80
         jr      c, star16
         ld      (codcnt), a
         sub     '1'
         cp      9
-        ld      h, a
-        jp      c, runbit
+        jr      c, runbit1
         jp      z, alto easter
         cp      $19-'1'
         jr      z, star20
@@ -724,13 +745,9 @@ laun2   ld      hl, $a681
         ld      ix, cad6
         call_prnstr
 
-        ld      de, codcnt
         ld      hl, (active+1)
 games   call    SELEC
-aaitky  ld      a, (de)
-        sub     $80
-        jr      c, aaitky
-        ld      (de), a
+        call    waitky
         cp      $0d
         jr      z, gamen
         cp      $20
@@ -738,7 +755,7 @@ gamen   jp      z, runbit0
         ld      bc, games
         push    bc
         call    SELEC
-        ld      a, (de)
+        ld      a, (codcnt)
         sub     $1c
         jr      z, gamup
         dec     a
@@ -882,15 +899,29 @@ conti   di
         xor     a
         ld      hl, (active)
         cp      h
-        jr      nz, runbit
+        jr      z, ccon0
+runbit  ld      b, h
+        call    calbit
+        ld      bc, zxuno_port
+        ld      e, core_addr
+        out     (c), e
+        inc     b
+        out     (c), h
+        out     (c), l
+        out     (c), 0
+        wreg    core_boot, 1
 ccon0   ld      h, active>>8
         ld      l, (hl)
         call    calcu
         push    hl
         pop     ix
-        ld      d, (ix+2)
         ld      hl, timing
+        ld      a, (outvid)
+        rrca
         ld      a, 3
+        ld      b, a
+        jr      c, ccon1
+        ld      d, (ix+2)
         cp      (hl)            ; timing
         ld      b, (hl)
         jr      nz, ccon1
@@ -934,20 +965,6 @@ conti2  adc     a, a            ; 0 0 MODE1 /DISCONT MODE0 /I2KB /DISNMI DIVEN
         xor     %10101100       ; LOCK MODE1 DISCONT MODE0 I2KB DISNMI DIVEN 0
         ld      (alto conti9+1), a
         jp      alto micont
-runbit0 ld      a, 45
-        cp      l
-        jp      z, bios
-        ld      h, l
-runbit  ld      b, h
-        call    calbit
-        ld      bc, zxuno_port
-        ld      e, core_addr
-        out     (c), e
-        inc     b
-        out     (c), h
-        out     (c), l
-        out     (c), 0
-        wreg    core_boot, 1
 
 ;****  Main Menu  ****
 ;*********************
@@ -2608,7 +2625,7 @@ advan1  call    showop
         ld      c, $0b
         call    showop
         defw    cad96
-;        defw    cad97
+        defw    cad97
         defw    cad98
         defw    $ffff
         call    showop
@@ -2629,7 +2646,7 @@ advan1  call    showop
         defw    cad110
         defw    cad111
         defw    cad112
-;        defw    cad113
+        defw    cad113
         defw    $ffff
         ld      de, $1201
         call    listas
@@ -2695,12 +2712,12 @@ advan5  djnz    advan6
         defw    cad110
         defw    cad111
         defw    cad112
-;        defw    cad113
+        defw    cad113
         defw    $ffff
         ret
 advan6  call    popupw
         defw    cad96
-;        defw    cad97
+        defw    cad97
         defw    cad98
         defw    $ffff
         ret
@@ -4292,6 +4309,17 @@ contia  out     (c), a
         rst     0
       ENDIF
 ; -------------------------------------
+; Detect memory size
+;      Zero flag: 0-> 512K, 1-> 2M
+; -------------------------------------
+tstmem  wreg    master_conf, 1
+        wreg    master_mapper, $28
+        ld      a, ($c000)
+        wreg    master_conf, 0
+        cp      $31
+        ret
+        
+; -------------------------------------
 ; Put page A in mode 1 and copies from 4000 to C000
 ;      A: page number
 ; -------------------------------------
diff --git a/firmware/strings.asm b/firmware/strings.asm
index 6bae293..3cffe9c 100644
--- a/firmware/strings.asm
+++ b/firmware/strings.asm
@@ -1,9 +1,10 @@
 cad0    defb    'Core:             ',0
 cad1    defb    'http://zxuno.speccy.org', 0
-        defb    'ZX-Uno BIOS v0.65', 0
+        defb    'ZX-Uno BIOS v0.70', 0
         defb    'Copyleft ', 127, ' 2017 ZX-Uno Team', 0
         defb    'Processor: Z80 3.5MHz', 0
-        defb    'Memory:    512K Ok', 0
+        defb    'Memory:    '
+cadmem  defb    '512K Ok', 0
         defb    'Graphics:  normal, hi-color', 0
         defb    'hi-res, ULAplus', 0
         defb    'Booting:', 0
@@ -36,7 +37,7 @@ cad8    defb    $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.65    ', $7f, '2017 ZX-Uno Team', 0
+        defb    '   BIOS v0.70    ', $7f, '2017 ZX-Uno Team', 0
       ELSE
         defb    'Press <Edit> to Setup',0
         defb    '      <Break> Boot Menu', 0
@@ -67,7 +68,7 @@ cad8    defb    $10, '                              ', $10, 0
 cad9    defb    $14, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11
         defb    $11, $11, $11, $11
         defb    $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $15, 0
-        defb    ' BIOS v0.65 ', $7f, '2017 ZX1 Team', 0
+        defb    ' BIOS v0.70 ', $7f, '2017 ZX1 Team', 0
         defs    $66
       ENDIF
 cad10   defb    'Hardware tests', 0
diff --git a/firmware/us.zx7b b/firmware/us.zx7b
index 4d4ab3a561a7db0d2e8b942857287a169ea53ceb..a501bff1d14c7a31f91e312dfe146071d473fc25 100644
GIT binary patch
literal 291
zcmV+;0o?vrRsWR%0fPUr6hQ#rkpch}gCPJy8US++2wngL0CPkDXcz!w|5!gL06I_r
zNB|J|ALEnog)jiH01S{#<Wc}7Jt_W=8R!6QqyP_@L4pw%<o|;Il%fEkSuup9h!Il3
z!Y2QzBp(8SB>#&d0YTznKSE<70XiW8LgI5D@KFQ-BmoXY;%MSzK>q<o5CJFwPytBd
z0B{lLLILmr&;c+3umIxFcckP2$N{M0kb8jQNC6SV0i*$<;)3D;gb`3e;s^o4;sODo
z0OEm!K%o&TC`T>-gW{++A|(Gw08tzqVGb4I3Wi201K|KsqB~+Z|40<+R^c`k#4^ZA
p;_zy$B9@E~nBoAc1OVa?A4RIc08$Nb6WsxjA_W120f+!Yf&dbAYAFB!

literal 404
zcmV;F0c-w%RaO6A0YHNPd=vmd14+MM=#3%+l_3K{15#qdiqxc7=R{ZoXagz#Jpg~z
zC<9PR14siY^Kn0Mr(=tMFavw#0+5@7JJbS8d*4&tpI_($l-sbR10QmOVS*zi<o~kN
z|Dp$1|N6+(s)$r0se{5V|4$?pttEjV{~uID0YM*ONq?!wup$E?4^l!KVoE=Wqp$=6
zBo|Ud187PgWXb<W0T2TyNdt2a`A;8kBQNL!Q7;1v{sS-*uuB`zsohfK1IQPpdjpVs
z_pl#{NCQg)@}wK01Eqosl!PM^PzMMHrNRf40xJ^_@`2P<p(Cm&6pyU`kK(9rNFvJr
zR|HW2<^PF*0RQqt0ObFvssPIWQ$Qe)|0e=~%KsBUk^iTvKq~)FQ5(QSVXH-=;{Pll
zM5~uTQ3?>@<x!$y2cjU5|BVa_sssa66hle_aR>tf2Bi=*?cuni#6$}U1ITOOlkfx*
y0M;l7Hh@bmKvAv?A7ZNFmx@8+5I>Yu!D}@D0dOZW0gxyQ0fZw10f+z-h=2eaAE5*Q