From 4af65d11f81ce6576f40834c6324d1f44633de54 Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Mon, 15 Jan 2018 20:15:00 +0100 Subject: [PATCH] Mejoras de Uto: el CSYNC (COPT)=1, y arranque en rooted pulsando / --- firmware/FIRMWARE.ZX1 | Bin 16384 -> 16384 bytes firmware/firmware.asm | 26 ++++++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/firmware/FIRMWARE.ZX1 b/firmware/FIRMWARE.ZX1 index d59413676f2736e6aa0830cf8bf6851c5121cd45..8626de1559af9d5b0934fe33f26fa0a60c99aae3 100644 GIT binary patch delta 3137 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 G*Zdda#2v~2 delta 3020 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 RYlVxNNjpFf!#^&q`!8Se(0Bj< diff --git a/firmware/firmware.asm b/firmware/firmware.asm index bdd995a..c5f712e 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -75,6 +75,7 @@ define scanli outvid+1 define freque scanli+1 define cpuspd freque+1 + define roboot cpuspd+1 ; boot as root define tmpbuf $7800 define tmpbu2 $7880 @@ -250,7 +251,7 @@ start ld bc, chrend-sdtab rrca ld a, h adc a, a - or $80 + or %10100000 ; $A0 - Turbo 14Mhz, COPT=1 (PAL Sync) - es $c0 en el firmware oficial ld (scnbak), a ; lo pongo a 14Mhz out (c), a ld de, fincad-1 ; descomprimo cadenas @@ -460,9 +461,19 @@ star19 sub $80 star20 jp z, blst sub $1d-$0c jp z, launch - cp $17-$1d + cp $2f-$1d ;'/' + jr nz, star20a + push af + ld a,1 + ld (roboot), a ; set boot as root + out (254), a + halt + xor a + out (254), a + pop af +star20a cp $17-$1d ; 'Edit' jr nz, star19 - ELSE +ELSE pop af star21 wreg flash_cs, 0 ; activamos spi, enviando un 0 wreg flash_spi, 6 ; envĂ­o write enable @@ -4249,6 +4260,14 @@ conti7 pop bc conti8 dec (ix+1) jr nz, conti5 conti9 ld a, 0 + push af + ld a, (roboot) ; Apply root boot + cp 1 + jr nz, conti9a + pop af + and %01111111 + push af +conti9a pop af dec b out (c), 0;d inc b @@ -4272,7 +4291,6 @@ conti9 ld a, 0 contia out (c), a rst 0 ENDIF - ; ------------------------------------- ; Put page A in mode 1 and copies from 4000 to C000 ; A: page number