diff --git a/firmware/firmware.asm b/firmware/firmware.asm index 06d1432..fa5bd33 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -228,7 +228,7 @@ keytab defb $00, $7a, $78, $63, $76 ; Caps z x c v start ld bc, chrend-sdtab ldir IF recovery=0 - call loadch + call alto loadch ld a, scandbl_ctrl ld bc, zxuno_port out (c), a @@ -326,14 +326,7 @@ star33 in a, (c) add a, (hl) jr z, star37 dec a - ld h, bnames>>13 - ld l, a - add hl, hl - add hl, hl - add hl, hl - add hl, hl - add hl, hl - inc h + call cbname jr star38 star37 dec l ld l, (hl) @@ -1565,7 +1558,7 @@ tosd ld ix, cad75 ; call send1z call mmcinit - jr nz, errsd + jp nz, errsd ;sbc hl, hl ; read MBR ld hl, 0 @@ -1617,12 +1610,26 @@ tosd3 inc hl jr nc, tosd4 ldi ldi -tosd4 add $2d - ld (fileco+4), a +tosd4 sub 3 + ld hl, fileco+4 +tosd45 inc b + sub 10 + jr nc, tosd45 + add a, 10+$30 + ld (hl), a + inc l + ld (hl), ' ' + djnz tosd46 cp '1' jr nz, tosd5 dec (ix+$1c) -tosd5 ld c, SPI_PORT + jr tosd5 +tosd46 ld (hl), a + dec l + ld a, b + add a, $30 + ld (hl), a +tosd5 ld bc, SPI_PORT pop de pop af cp $0b @@ -1641,7 +1648,6 @@ twaitk jp nz, waitky ld a, (menuop+1) sub 4 jr c, twaitk - call alto readna ld ix, cad82 ld bc, $090a call_prnstr @@ -2050,7 +2056,6 @@ upgrad jr nz, upgraa upgrae call calbit push hl call prstat - call alto readna push iy upgrag ld a, (tmpbuf+$65 & $ff)*2 sub iyh @@ -2263,12 +2268,12 @@ exit3 call yesno ld a, (colcmb+1) ld b, a djnz exit4 - call loadch + call alto loadch jr exit7 exit4 djnz exit5 jp savech exit5 djnz exit6 - jp loadch + jp alto loadch exit6 call savech exit7 jp star51 @@ -3236,11 +3241,8 @@ calcu add hl, hl savena ld a, (menuop+1) sub 4 ret c - ld d, bnames>>8 - rrca - rrca - rrca - ld e, a + call cbname + ex de, hl ld hl, tmpbuf+$31 ld bc, 32 ldir @@ -3322,16 +3324,15 @@ waits6 in a, (c) wreg flash_cs, 1 ; desactivamos spi, enviando un 1 ret - IF recovery=0 -; ------------------------ -; Load flash structures from $06000 to $9000 -; ------------------------ -loadch wreg flash_cs, 1 - ld de, config - ld hl, $0060 ;old $0aa0 - ld a, $17 - jp alto rdflsh - ENDIF +cbname ld h, bnames>>13 + ld l, a + add hl, hl + add hl, hl + add hl, hl + add hl, hl + add hl, hl + inc h + ret ; ----------------------------------------------------------------------------- ; ZX7 Backwards by Einar Saukas, Antonio Villena @@ -3638,9 +3639,15 @@ easter di wreg master_conf, 1 jp $0100 -readna ld de, bnames - ld hl, $0071 - ld a, 1 + IF recovery=0 +; ------------------------ +; Load flash structures from $06000 to $9000 +; ------------------------ +loadch wreg flash_cs, 1 + ld de, config + ld hl, $0060 ;old $0aa0 + ld a, $17 + ENDIF ; ------------------------ ; Read from SPI flash diff --git a/firmware/strings.asm b/firmware/strings.asm index 47c43d1..32f5fe4 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.57', 0 + defm 'ZX-Uno BIOS v0.58', 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.57 ', $7f, '2016 ZX-Uno Team', 0 + defb ' BIOS v0.58 ', $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 @@ -265,7 +265,7 @@ cad71 defb 'Memory usually', 0 cad72 defb 'Performs a', 0 defb 'tape test', 0, 0 ENDIF -cad73 defb $1b, 0 +;cad73 defb $1b, 0 IF recovery=0 cad74 defb 'Kempston Fuller', 0 defb 'Break key to return', 0 @@ -369,17 +369,8 @@ cad195 defb 'Disable for', 0 defb 'better compa-', 0 defb 'tibility with', 0 defb 'old games', 0, 0 - ENDIF -cad116 defb '2', 0 - defb '3', 0 - defb '4', 0 - defb '5', 0 - defb '6', 0 - defb '7', 0 - defb '8', 0 - defb '9', 0, 0 -cad199 defb 'af0000 bc0000 de0000 hl0000 sp0000 ix0000 iy0000', 0 +;cad199 defb 'af0000 bc0000 de0000 hl0000 sp0000 ix0000 iy0000', 0 fincad