From 04073f59fc95b7a96e714ae5e2eceb05a9004a92 Mon Sep 17 00:00:00 2001 From: antoniovillena <_@antoniovillena.es> Date: Tue, 25 Aug 2020 14:57:21 +0200 Subject: [PATCH] Optimizo cambios de spark2k06 y compilo las 4 versiones --- firmware/FIRMWARE.ZX1 | Bin 16384 -> 16384 bytes firmware/FIRMWARE.ZX2 | Bin 16384 -> 16384 bytes firmware/FIRMWARE.ZX3 | Bin 16384 -> 16384 bytes firmware/FIRMWARE.ZXD | Bin 16384 -> 16384 bytes firmware/firmware.asm | 83 +++++++++++++++--------------------------- firmware/strings.asm | 8 +--- 6 files changed, 31 insertions(+), 60 deletions(-) diff --git a/firmware/FIRMWARE.ZX1 b/firmware/FIRMWARE.ZX1 index 9081fa01830f58f6671b742f55a565bb019efeaf..3aaea34c7123e856d6c850df5e41d8a08d0ab8a5 100644 GIT binary patch delta 4053 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 delta 3917 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 delta 3959 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 ZL~c*N)Y9WCw%o#cv?vIX%%3MO{(s#mZ6N>v diff --git a/firmware/FIRMWARE.ZXD b/firmware/FIRMWARE.ZXD index 9aef91dc33c5389eb67277bf8a914c25cad6a6ac..eac42946dbc867b4a965e5fedb4d916aa6610f63 100644 GIT binary patch delta 4054 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 delta 3873 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 G;{O0eu}4|} diff --git a/firmware/firmware.asm b/firmware/firmware.asm index a91070c..0b79e9f 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -299,17 +299,18 @@ start2 ld a, (hl) jr nc, start1 dec e IF recovery=0 - ld a, 0 + ld a, 1 out ($fe), a - ld a, (quietb) - cp 1 + ld a, (quietb) + or a jr nz, start3 - out ($fe), a ld h, l ld d, $20 call window jr start8 -start3 ld hl, finlog-1 +start3 xor a + out ($fe), a + ld hl, finlog-1 ld d, $7a call dzx7b ; descomprimir call drcs @@ -438,17 +439,15 @@ star13 ld de, $cfff star14 inc b outi bit 4, h ; compruebo si la direccion es D000 (final) - jr z, star14 ; repito si no lo es -star15 ld d, 4 ; temporizador general (1-2 seg en 1X) - call chktmo ; aplicamos multiplicador -start25 pop af + jr z, star14 ; repito si no lo es +star15 ld a, (quietb) + or 1 + rlca + rlca + ld d, a + pop af jr nz, star16 - ld d, 16 ; temporizador inicial (2-3 seg en 1X) - call chktmo ; aplicamos multiplicador - ld a, d - cp 33 - jr c, star16 - ld d, 32 ; timeout inicial maximo (7-8 segundos) + ld d, 16 star16 djnz star18 dec de ld a, d @@ -1156,16 +1155,15 @@ main ld iy, quietb ld bc, $0f0b main1 call showop - defw cad120 - defw cad29 - defw cad122 - defw cad123 - defw cad124 - defw $ffff -main1b call showop defw cad28 - defw cad29 + defw cad110 + defw cad111 + defw cad112 + defw cad113 defw $ffff + ld a, iyl + rrca + jr c, main1 main2 call showop defw cad30 defw cad31 @@ -1213,30 +1211,21 @@ main4 call showop defw cad19 defw cad116 jr c, main9 - ld (menuop+1), a - cp 4 + ld (menuop+1), a + cp 4 + ld h, active >> 8 jr c, main8 ; c->tests, nc->options - ld e, a - add hl, de - jr nz, main44 - ld hl, quietb - call popupw ; Boot timeout - defw cad120 - defw cad29 - defw cad122 - defw cad123 - defw cad124 - defw $ffff - ret -main44 ld h, active >> 8 - add a, bitstr-3&$ff + add a, bitstr-3&$ff ld l, a sub keyiss&$ff jr z, main5 jr nc, main6 call popupw ; quiet or crc (enabled or disabled) defw cad28 - defw cad29 + defw cad110 + defw cad111 + defw cad112 + defw cad113 defw $ffff ret main5 call popupw ; keyboard issue @@ -3780,20 +3769,6 @@ comboa ld a, h pop de pop hl ret - -; -------------------------------------- -; Bitshift left 'D' according to timeout -; -------------------------------------- -chktmo push af - ld a, (quietb) - cp 2 - jr c, chk2 - dec a -chk1 sla d - dec a - jr nz, chk1 -chk2 pop af - ret ; ------------------------------------- ; Show a normal list only in attribute area width elements diff --git a/firmware/strings.asm b/firmware/strings.asm index f768de3..5fae148 100644 --- a/firmware/strings.asm +++ b/firmware/strings.asm @@ -85,7 +85,7 @@ cad10 defb 'Hardware tests', 0 defb ' ', 0 defb 'Options', 0 defb $11, $11, $11, $11, $11, $11, $11, $11, $11, 0 - defb 'Quiet Boot', 0 + defb 'Boot Timer', 0 defb 'Check CRC', 0 defb 'Keyboard', 0 defb 'Timing', 0 @@ -129,7 +129,7 @@ cad16 defb 'Performs a', 0 defb 'joystick test', 0, 0 cad17 defb 'Hide the whole', 0 defb 'boot screen', 0 - defb 'when enabled', 0, 0 + defb 'when disabled', 0, 0 cad18 defb 'Enable RAM and', 0 defb 'ROM on DivMMC ', 0 defb 'interface.', 0 @@ -173,10 +173,6 @@ cad33 defb 'Set Active', 0 cad34 defb 'Move Down a', 0 cad35 defb 'Rename', 0 cad36 defb 'Delete', 0 -cad120 defb 'Timeout 1X', 0 -cad122 defb 'Timeout 2X', 0 -cad123 defb 'Timeout 4X', 0 -cad124 defb 'Timeout 8X', 0 IF vertical=0 defb ' ', $12, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11 defb ' Rename ', $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $13, 0