From 9aa999d8ae3de747743710077a60a6dd3dd43cb1 Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Mon, 16 Apr 2018 16:54:20 +0200 Subject: [PATCH] Muestra texto en el recovery.bit --- firmware/FIRMWARE.ZX1 | Bin 16384 -> 16384 bytes firmware/firmloader.bat | 6 +++--- firmware/firmware.asm | 19 ++++++++++++++++--- firmware/header.bin | Bin 16384 -> 16384 bytes firmware/make.bat | 1 + firmware/strings.asm | 4 +++- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/firmware/FIRMWARE.ZX1 b/firmware/FIRMWARE.ZX1 index 749cd31c30eff9e40d380ae0305f8a1bade4a468..8de6254425029bc2cc9ad9ed6a76bd72584348d1 100644 GIT binary patch delta 2113 zcmV-H2)_4#fB}Gj0T3~;sy+k(JN)f=1nqG3A=R-EOaTP(jv>^uU;%{z0hzPr0x1Fk z9J3Gw90dU!lPwC40pzp13i|~C9J9C(CIJB)v)>W83x5EsszW89j?5zzim1+TIxjDJ zcy$30E_0*9V|gw(iN+!8k&+U$D{y(rftGuWAR3FUrs`u`5y}!;I53CVE;UU^4tfBW z&W+ihVX=Mwp4kY?W801@$A zkK$kCQsvIRm({=S1?H%+2|;9b1DqG(fSwXpQGcKr00xaa4%D{Q004{Opcs*A3^hVY zPg7y1oc}j8iHUzQFflj0RUrC7Wghb^;;7R&I8G)il z92+2`@oxW}36>TV@2zezJ za}9CoGegaJUDA-SwBP=7ngH`OC8w_@0Do$41(9h=^O{bq$H|qA1N*VH5pNe`Z+q*S z{6h2u0Cz)z9%V1X(z-~bL1j(sZUEqEawqO~O-;|xhheK(p<1ji2IXHTigLU{VI&B9 z0Q14R&^3Fk9R6eL@{fj_Tj?ci1bMfz34AC*VV~_|AW0lnIYMP8=FxImjkIFcB!4#P zVa;Z8jhZAzMKR^S$L5~qvifMJ%Xdkm1@mc~U;x0`PiU$jM#q+FgDVveO8EzPPiJgH z=b2yESGNxYFx@RlK!`bw|}hz7sr?!oN*S*he2cE#01vk_AB{B_3Y!jnH+P^ zj7nuOcgt?dj{o|L%FCG|y6PY+n4s#7tu2{dE$$$wI_&(O-bnfg%>XOS7-N_34NjM7 zIy4|UH2^vqFggG_Um!YY%AGAx0I_CdA{3o({rt0;u(pMkyYik_X?*~1aDM@u>&ZxE zNx^bDB}&l8S21Wl+~-Q!QBidRS*2vd=V@HFmr6tXNX9YYOz9Q*LXh1ZE)#AZS|A?{Y`&V~ zh|&&lbUU+{jER+Fs!8e=1-JnhBq&bPO#lW-x`+@{p410IZXs*bVygo&c>{1aMj%E5 zzZ#4rP7naCAP_Uk6aZEc6$Ohh)&ODv{So0MPaYseO^Pru45w!8vGbjC3#2p)6f_KV z2l`Zhuf=9GO;SoVRzLK0VN8qUlQQho3GgnUYGeh84*Tb4B&;z=GB`^WP+{1Lm2GqD zP`JXN81l<%@WhdVwar^RpQUTHVw-YWS+_%i(lazQHa9pqFaXh4MN(8*RY?F(P{AKY zM@Se-OH5_s0Lw#GLQYKvb7Jot9UdQm0H1SzL$FCNpT5TSNrwyAfF*KHcm2IAxt+&p z#w=v%c5gF*DDiUEVqhF!&~gFT)UhDIa%SX{PM}HVux?>wvu0vpE_0cfWi)hbnz6z< zTL8>&T_6C{bzt{0zH?>_{A>(_Vit@cKg1?A|BzW6Q$#X?rq2{hhakUWU}%pZCv(Yv znV~14Q)5^}Pg4{M@JUilS3w+t3Pwyp6H`bPj8jlWLsU{#O#li*Pf|q*03cdeF$qa- zGAsZOVoD%PVR-<{3K>gfc|xr~N^;(+LOC!2AOKGZuowUlR{&O-z$6Z=fkwa}5XB%< z62(}?7+(WWQ!g?AZD9d$aC~PB_7b6gNpg1SK5=PnMiugtkQ^(!#$CO~Z+UYKV`~5y zzmaBXXLWL6K#M~%{K3K?L}g}SbpmV*c4-E}T5kg0aCLMQMQ#|+64)?f9iD6~hwFwN zR!2uc04;K9dKmGLVQc`MfN=!u7I^?+&t+mmP*nhP2F_vd6hl*aZet(=vt#goZ)Cv0 zbx;5T+Asn!1Tzk{1T_u>_ctyy05v%-H2?%L1U5@EE;s-&0y1C%Gy*tS02@L+VQV#J zWq3GKNo*AuV`Ft5aA{>^EFg0cfMX(IZZvO1EpJXLWMyn24dY=!PfZ|9jSpZ7A^!kG zX>(y>YymN5PXJw3XJBD%Wpf)+WiV}T rc4Z)Hb!`A}WpZ->bZ-)XZggpGbp#FoAVFkgAOo|#CG-`uzdJz$qwaqT delta 2103 zcmV-72*~$agU;%{z0gJQd0x1Fk z4zmyi90dUmlPwC40m!qw3i|~C4zsurCIJBsv)>W83xBMtLnS((%#KisIH+(sFE4rr zcy$pjbBx1dc_uD6#;zepl1j9!aCrpEmhOxoX^XU~rej+x5fWNBFdx}2H9Ad5dH_I| zBd>%t(MxorYdNDE)^lx|kZ$rU;t>4^W7D~foC$(07A#BpOhGYl%KXJCdAlj%d;d?} z5=DGu`+pPSzTw6gSv*(cg+9?@O+=S<+=~?AV-?{-I_2k!+xh_Nsw5yBE9)K|A#GaJ zXm~2D%lm_x@cBhj&6G>#f`OOeW&(x6PzUPjdX8*Y;siX~g>7Ny z8z97^a95L!%OHr-lExIO27oh|D?)=w%K9LR9m@bzDQRukmjFe$4!cvqPF8^rc5Ni$nZ zp`nJQ07r6>&}h3|CJ89Xcj44d5%*tifdh;1kcc_m(R z4XAN556yLX(m}A&`rmVF0Q1r%yr(7rYJV1Qktk{NX-*!j$ybf;1F_c;Zx>_kZ|iCN z(n16PcMpOdWxc~lx+A2OK~3zr0Hxq^xhHl_O+(LzhpT0wX{;_8LF1!<=KF>FdxG8K)pZHM@tM)&6#(CNfcL340TJA*+?q4`u(LjYDsK>^U6yyjHi z$OoG;mBO2E&ofNfb+_|K{@#Y(t$z*|9GG*QaahY7L1Pl(1drDC=PN|@v*YiX9L_P% zN@X$L%el%q>i;W?%V&zHx`QiVg6cM{EoNQ1ErY1AI{bUy>PREatN_hmV_feII+vw7 z(I7h106J(eIskk+AUdIS%0evwv6*Bd6m@U?^0Q~K+J#!Xdh%Ck_5g2i1%I5Z$w*}< z!Ig44N*vHvF{3_l=VwYsQFQ}lr43}~r(9jON)G!W#>L^JOjr2`LER2N1^F>MP%&Co zF)Hn@uqeumaE)TiK8;0Q;dMUJKM;Hj7OI<4N?cju!3H7!O1>1LvK2}%cdLX(Gh^QY zK6!lObuN3QKS~lA)+nlk7=IF>o(aZb;$64i19PsEs06GRSWZkRf7Z*!vLIzqgbb|+fJu1-?Z4Gm6B z2i#I(9suvVCs1;wp_wUed9k5&-yd~$y)odFO_MVsV1J{s{&r&=@5eNY6K)!ydPD<000D(y^5K|(a2X#VjYlzfXs{=6u-f%ZY zAVz?{jD{o-Qvj%iZC!kr)K-HJe_k3DKra( zGz@hIRDXW2W;C%)O4K!05A=0m6N@>MGCR}>F1(;xWQoBJKIdl%tT8e;5=#|OVRnjb zb0zDPxUirYJj-f)#AJdk&09~OYpJ!En{rv!w~&G}G&D6fH#j*k(N_RPQdC)0Nl#D! z!5>CPNJ>ivOl9NCfJ0V7PEB)S0q-0g9v^@JpMP^hN$fAar*ZZYhYNOqa!F2iKfSrj zooO+~EZOOHZ%lzGa=g}H*c=zoashVKAgsW0+2l^7phb0(N&G;~{< zEW$cl05fl000`4{nD-36b7lklY=nbijKv|u&n7iLkXeUQM1stw6!S|UA-`j27>_4N zbAPSop~<0BSVS04QxpokNm5N$K^zL;Mod9dNCXvAP$NY{R8mz<3P3|oQbhnlAX->4 zNp1o%ivSN|AWRZrdCNcwhD&96t&l)UayP0%IRQ){08aw20LBpjRu!4BB&JTK51=6$rY1B9IjGjUC1D6Z+UYK zV_<6lV+m$yXBc&IVT*`EGGDrN$Vnb|DRRD8vWnsV+LsNNfV}Bq6 zvt#gYWB@&NNKgO*Fap~#1Tzi<_B9R!H!d_D05v%-H3TtW1U54+I0*nT0x|+LYyvn~ z075>)VQV#Icq}+mY!%5EV`Fu2X=MXsEFg0ckYgfYZf``!EpIAhX=Q974PgL0Qcq1F zbZ-y9L<%7QL_cYBVPb4$AZ7qF04`!>baZ6{awu(ZVG=C>bZKH~Yy^OLAa`kWXaE6k hYzt>$ZDkB|001CCWMm)!v&$v)6_fBP4zs^IK?D?dZR`L5 diff --git a/firmware/firmloader.bat b/firmware/firmloader.bat index 4254081..3807e56 100644 --- a/firmware/firmloader.bat +++ b/firmware/firmloader.bat @@ -1,5 +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 +sjasmplus bootloader.asm +bin2hex bootloader.rom +copy /y bootloader.hex ..\cores\Spectrum\bootloader_hex.txt \ No newline at end of file diff --git a/firmware/firmware.asm b/firmware/firmware.asm index 3ccebb7..cb51413 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -536,7 +536,9 @@ star21 wreg flash_cs, 0 ; activamos spi, enviando un 0 in a, (c) wreg flash_cs, 1 ; desactivamos spi, enviando un 1 and 2 + IF zesarux=0 jr z, star21 + ENDIF xor a ENDIF @@ -1945,7 +1947,18 @@ roms27 ld hl, $0104 ;*** Upgrade Menu *** ;********************* -upgra ld bc, (menuop) +upgra + IF recovery=1 + ld ix, cad117 + ex af, af' + call prnhel +upgra0 in a, ($1f) + jr nz, upgra0 + ld de, $0401 + ld a, %01111001 ; fondo blanco tinta azul + ld l, 0 + ENDIF + ld bc, (menuop) IF vertical=0 ld h, 16 dec c @@ -2051,8 +2064,8 @@ upgr34 ld (hl), a ENDIF jr z, upgr35 inc a - ld (ix-4), cad117 & $ff - ld (ix-3), cad117 >> 8 + ld (ix-4), cad119 & $ff + ld (ix-3), cad119 >> 8 call deixl1 upgr35 ld (ix-3), $ff dec a diff --git a/firmware/header.bin b/firmware/header.bin index d178650acb9ef549bb3a769cb605804ace338b1c..15b9384e3b6fd90e493fbc6848876ce718d38a06 100644 GIT binary patch delta 19 acmZo@U~Fh$oFK;Lz+iMRTWh1t6MFzWmIh}4 delta 19 acmZo@U~Fh$oFK;5z+iMRn{}hi6MFzYT?T>x diff --git a/firmware/make.bat b/firmware/make.bat index aa492b9..0a73493 100644 --- a/firmware/make.bat +++ b/firmware/make.bat @@ -5,6 +5,7 @@ fcut firmware_strings.rom 7e00 -7e00 strings.bin zx7b strings.bin strings.bin.zx7b sjasmplus firmware.asm fcut firmware_strings.rom 0000 4000 firmware.rom +copy /y firmware.rom FIRMWARE.ZX1 rem GenRom sm12 BIOS firmware.rom firm.TAP rem cgleches firm.tap firm.wav 3 rem firm.wav diff --git a/firmware/strings.asm b/firmware/strings.asm index fe1835c..982d7f9 100644 --- a/firmware/strings.asm +++ b/firmware/strings.asm @@ -406,7 +406,9 @@ cad116 defb 'Disable for', 0 defb 'better compa-', 0 defb 'tibility with', 0 defb 'old games', 0, 0 -cad117 defb ' Add new core', 0 +cad117 defb 'Remove jumpers', 0 + defb 'to continue', 0, 0 +cad119 defb ' Add new core', 0 ;cad199 defb 'af0000 bc0000 de0000 hl0000 sp0000 ix0000 iy0000', 0