diff --git a/firmware/av.zx7b b/firmware/av.zx7b index 79d71e8..e9049a8 100644 Binary files a/firmware/av.zx7b and b/firmware/av.zx7b differ diff --git a/firmware/firmware.asm b/firmware/firmware.asm index fa5bd33..732e046 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -628,10 +628,14 @@ 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 -runbit ld a, (menuop+1) - cp h - jr z, ccon0 - ld (menuop), hl +runbit ;ld bc, zxuno_port +; ld e, core_addr +; out (c), e +; inc b +; in l, (c) +; in a, (c) +; or l +; jr nz, ccon0 ; descomentar cuando esté implementada lectura coreaddr runbit1 ld b, h call calbit ld bc, zxuno_port @@ -705,7 +709,7 @@ main4 call showop defw cad71 defw cad18 defw cad19 - defw cad195 + defw cad116 jr c, main9 ld (menuop+1), a cp 4 @@ -875,12 +879,13 @@ tkeys10 dec hl ld a, ($5a21) add a, e ret m - in a, ($7f) - add a, $80 - inc b - call tkeys12 - ld b, 4 - call tkeys11 + ld l, $6b +; in a, ($7f) +; add a, $80 +; inc b +; call tkeys12 +; ld b, 4 +; call tkeys11 in a, ($1f) cpl ld b, 5 @@ -1494,21 +1499,32 @@ upgr34 ld (hl), a ld a, (hl) inc hl call deixl - cp ' ' - jr z, upgra3 - ld (ix-3), $ff + or a + jr nz, upgra3 + ld hl, (menuop) + dec l + dec l + ld a, (alto fllen+1) + or l ld a, ixl rra + jr nz, upgr35 + cp 45+5 + jr z, upgr35 + inc a + ld (ix-4), cad117 & $ff + ld (ix-3), cad117 >> 8 + call deixl1 +upgr35 ld (ix-3), $ff + dec a dec a cp 20 jr c, upgr38 ld a, 20 upgr38 ld e, a - ld hl, (menuop) - dec l dec l ld a, h - jr z, upgra4 + jr nz, upgra4 ld a, (bitstr) upgra4 ld hl, $0102 ld d, $18 @@ -3209,7 +3225,7 @@ bomain ld ix, cad65 ld bc, $0209 call_prnstr ; Performing... inc c - ld iyh, 7 + ld iyh, 8 ramts1 ld ixl, cad66&$ff call_prnstr dec iyh diff --git a/firmware/strings.asm b/firmware/strings.asm index 32f5fe4..d0513d2 100644 --- a/firmware/strings.asm +++ b/firmware/strings.asm @@ -1,6 +1,6 @@ cad0 defb 'Core: ',0 cad1 defm 'http://zxuno.speccy.org', 0 - defm 'ZX-Uno BIOS v0.58', 0 + defm 'ZX-Uno BIOS v0.59', 0 defm 'Copyleft ', 127, ' 2016 ZX-Uno Team', 0 defm 'Processor: Z80 3.5MHz', 0 defm 'Memory: 512K Ok', 0 @@ -37,7 +37,7 @@ cad8 defm $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.58 ', $7f, '2016 ZX-Uno Team', 0 + defb ' BIOS v0.59 ', $7f, '2016 ZX-Uno Team', 0 IF recovery=0 cad10 defb 'Hardware tests', 0 defb $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11 @@ -267,13 +267,13 @@ cad72 defb 'Performs a', 0 ENDIF ;cad73 defb $1b, 0 IF recovery=0 -cad74 defb 'Kempston Fuller', 0 +cad74 defb 'Kempston', 0 defb 'Break key to return', 0 defb '234567890' defb 'Q'+$80, 'WERTYUIOP' defb 'A'+$80, 'SDFGHJKLe' defb 'c'+$80, 'ZXCVBNMsb' - defb 'o'+$80, $1c, $1d, $1e, $1f, $1f, $1e, $1d, $1c, 'o', $80 + defb 'o'+$80, $1c, $1d, $1e, $1f, $80 ENDIF cad75 defb 'Insert SD with', 0 defb 'the file on', 0 @@ -365,10 +365,11 @@ cad114 defb 'Break to exit', 0 cad115 defb 'Slot occupied, select', 0 defb 'another or delete a', 0 defb 'ROM to free it', 0 -cad195 defb 'Disable for', 0 +cad116 defb 'Disable for', 0 defb 'better compa-', 0 defb 'tibility with', 0 defb 'old games', 0, 0 +cad117 defb ' Add new core', 0 ENDIF ;cad199 defb 'af0000 bc0000 de0000 hl0000 sp0000 ix0000 iy0000', 0