From b1d6122c593a4ddc9334a8b4a7d034ea930002c1 Mon Sep 17 00:00:00 2001 From: antoniovillena <_@antoniovillena.es> Date: Tue, 12 Jan 2021 17:53:30 +0100 Subject: [PATCH] Arreglo bug que permite acceder a slots > 41 en ZXDOS+ --- firmware/FIRMWARE.ZX2 | Bin 16384 -> 16384 bytes firmware/FIRMWARE.ZX3 | Bin 16384 -> 16384 bytes firmware/FIRMWARE.ZXD | Bin 16384 -> 16384 bytes firmware/firmware.asm | 21 ++++++++++++++++----- firmware/strings.asm | 6 +++--- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/firmware/FIRMWARE.ZX2 b/firmware/FIRMWARE.ZX2 index 322757d30e997fea1688aff62e2d231d6f2461a9..751c319112653e0780340f8982e5d4908ac4658c 100644 GIT binary patch delta 299 zcmV+`0o4A0fB}Gj0TVH>sy+k(JN)f=1nqG3Ay6g}>9G?Q0R|Td?Xb;3lP>{^0m75I z0rwIztp4aI0@mBgmJ-$x%AW%vm$SnHSpo@_tHb)L6lKk%lO+Yw0im<^1^og6AG7rc zU;zQ7lU53T0rHd83atUyC0r#{24gLWE36uU0K>-GnKoD>N?US(( z9|0JX(GVp8q_g)BJ^=xwlQt4e4MD6J4G;svP8bja!$Gr;650g;RFi5L9|BaYvx^v| z1_3j(F&{$*0Zfy1CMF>ttv&$-?RfK0wV(tU5!WJs>~b<;Begle{Jw x2a2rW9_P)9liVhb0S1$6C%plTlPM@x0SuFXC>I5vJTg_RvzI6%6SKcNK?Icaas&VX delta 297 zcmV+^0oMM2fB}Gj0TVH>sy+k(JN)f=1nqG3Ay6g}?y(aV0R|EY?Xb;8lP>{^0mqZN z0rwI&tp4aI0@mBgmJ-$x%AW%voU_9MSpo@~tHb}Q6lKkylO+Yw0j9I}1^og6B(wDh zU;zQ2lU53T0r!*D3atU^vx5sH0Rcv{s0>yC0sOQ74gLWE4wL>5K>-VsKoD>N@{_R; z9|0Yc(GVp8pR@N6J^=xrlQt4e4MwaO4G;svP8bja!$z}@650g;S(9oQ9|F54vx^v| z1_3g&F&{$*0a256CMF>ytv&$-?RfK0wV;tU5!WJs>~b<;Belle{Jw v2al}b9_P)EliVhb0Sl9BC%plYlPM@x0TGjcC>OJwC?gY-fGY*FzdJz$=YVmN diff --git a/firmware/FIRMWARE.ZX3 b/firmware/FIRMWARE.ZX3 index 2282fba1fa7d964d3f99eed38f39c95556459bb0..d151cbccedaa8d959a5c3e6bcedad4b86d813477 100644 GIT binary patch delta 24 fcmZo@U~Fh$+|VY$l(=Sdhs0_&M&r#U@@EtPZYv0i delta 24 fcmZo@U~Fh$+|VY$v`>9=hs0_&Mx)Ip@@EtPYsy+k(JN)f=1nqG3Ayp<3>#-9S0R|Nb?Xb;5lP>{^0mPHK z0rwI#tp4aI0@mBgmJ-$x%AW%vnX|(JSpo@{tHb=N6lKk)lO+Yw0i(0`1^og6A+z-e zU;zQAlU53T0rZpA3atU>vx5sH0Rcm^s0>yC0r|844gLWE3zPm2K>-MpKoD>N?~}0* z9|0PZ(GVp8r?dAEJ^=xzlQt4e4MVIL4G;svP8bja!$Y%=650g;R+DNN9|Bgavx^w3 z1_3j(Hy=U=0Zx;8CME$Plc6RP4Nj~&L!dn%Ki%cU%?OjhCK(5etl=K#&5V=bCXN9J zlW-@!0gjU{C{`N|tt24tU&#>z0B`0$V*V*O1lB2UTAw^JSFE#|C?FHFzdJz$R;hAN delta 300 zcmV+{0n`3~fB}Gj0TVH>sy+k(JN)f=1nqG3Ayp<3@UasX0R|8W?Xb;AlP>{^0m+lP z0rwI)tp4aI0@mBgmJ-$x%AW%vp0mROSpo^1tHS}S6lKk#lO+Yw0jRV01^og6CbRVj zU;zQ5lU53T0r`{F3atU`vx5sH0Rc#}s0>yC0sgc94gLWE5R?87K>-buKoD>N^pmj= z9|0ee(GVp8qOmCK(5jtl=K#&5@JgCXN9O ylW-@!0h5z1C{`8|tt24tU&#>z0B`0$VsHK_I0M!xTC<-hAQO{-D+RN^J3$0E^Kjk( diff --git a/firmware/firmware.asm b/firmware/firmware.asm index 605f8ad..5498e83 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -4229,7 +4229,7 @@ wrfls2 call waits5 wreg flash_cs, 0 ; activamos spi, enviando un 0 IF version>1 wreg flash_spi, $12 ; envío page program - ld hl, (highb) + ld hl, (alto highb) out (c), h ELSE wreg flash_spi, 2 ; envío page program @@ -4465,10 +4465,15 @@ finav finlog incbin strings.bin.zx7b ELSE incbin bezel.rcs.zx7b +finbez IF version=1 -finbez incbin logo192x256.rcs.zx7b + incbin logo192x256.rcs.zx7b ELSE -finbez incbin logo192x256d.rcs.zx7b + IF version=2 + incbin logo192x256d.rcs.zx7b + ELSE + incbin logo192x256dp.rcs.zx7b + ENDIF ENDIF finlog incbin strings.bin.zx7b ENDIF @@ -4879,15 +4884,21 @@ sloti ld l, a ELSE and $3f ld h, d - ld l, a cp 41 jr c, slot2b sub 41 + ld l, a ld e, d ENDIF ENDIF ENDIF -slot2b add hl, de ; $00c0 y 2f80 +slot2b + IF version=2 OR version=3 + sbc a, a + inc a + ld (alto highb+1), a + ENDIF + add hl, de ; $00c0 y 2f80 add hl, hl add hl, hl slot2c add hl, hl diff --git a/firmware/strings.asm b/firmware/strings.asm index 8548c4c..9ddb651 100644 --- a/firmware/strings.asm +++ b/firmware/strings.asm @@ -4,7 +4,7 @@ cad1 defb 'http://zxuno.speccy.org', 0 ELSE cad1 defb 'http://zxdos.forofpga.es', 0 ENDIF - defb 'ZX-Uno BIOS v0.82', 0 + defb 'ZX-Uno BIOS v0.83', 0 defb 'Copyleft ', 127, ' 2020 ZX-Uno Team', 0 defb 'Processor: Z80 3.5MHz', 0 defb 'Memory: ' @@ -41,7 +41,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.82 ', $7f, '2020 ZX-Uno Team', 0 + defb ' BIOS v0.83 ', $7f, '2020 ZX-Uno Team', 0 ELSE defb 'Press to Setup',0 defb ' Boot Menu', 0 @@ -72,7 +72,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.82 ', $7f, '2020 ZX1 Team', 0 + defb ' BIOS v0.83 ', $7f, '2020 ZX1 Team', 0 defs $66 ENDIF cad10 defb 'Hardware tests', 0