Tolik-Trek/Sprinter-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

рюшечки с цветами и выравниванием при детекте ide и загрузке

Browse Source
This commit is contained in:
Anatoliy Belyanskiy 2023-09-17 06:45:03 +10:00
parent cdd18a6c88
commit ef85cfad4c
3 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/bios/rom/SETUP/MAIN.asm
View File

@ -647,7 +647,9 @@ INFO_MESSAGE: ;!FIXIT
LD BC,#0710 ; !HARDCODE ¬ áª  ¨ ï祩ª  ¤«ï ç⥭¨ï §­ ç¥­¨ï ª¬®á ¤«ï ®á­®¢­®£® § £à㧮筮£® ¤à ©¢ 
CALL PrepareToBOOT
LD A,msgStrings.bootFail
CALL C,POSTMSG
LD E,COLORS.CGA.INC.LRED
;CALL C,POSTMSG
CALL C,POSTMSC
CALL ScreenPOS.CRLF
ABOOT: LD A,msgStrings.bootAltDrv
@ -994,21 +996,21 @@ OS_LOAD:
EX AF,AF'
PUSH AF
LD A,msgStrings.bootOk
CALL POSTMSG
LD E,COLORS.CGA.INC.LGREEN
;CALL POSTMSG
CALL POSTMSC
CALL ScreenPOS.CRLF
POP AF
POP HL
; JP MOVE0
MOVE0:
DI
MOVE0: DI
IM 1
LD HL,MOVE1
LD DE,#7C00 ; !HARDCODE
LD BC,MOVE1.length
LDIR
JP #7C00
MOVE1:
LD SP,#7FFF ; !HARDCODE
MOVE1: LD SP,#7FFF ; !HARDCODE
LD HL,TEMP
LD DE,#8000 ; !HARDCODE
LD BC,#0200 ; !HARDCODE
@ -1554,11 +1556,26 @@ PRINT_CHANEL:
;
LD A,msgStrings.parSecIdeSl
.print_chanel:
CALL FindStringAddr
CALL FindStringAddr
;CALL LP_GET_PLACE
;LD A,ScreenPOS.SUBNAME.POS
;SUB E
;LD B,A
LD B,0
LD D,':' ; !HARDCODE á⮯ ᨬ¢®« ¤«ï áâப¨ ¢ messages.z80
LD D,#FF
JP LP_PRINT_LINE6
;
/*
Detecting IDE Primary Master ... [Press F4 to skip]
Ž¯à¥¤¥«ï¥¬ <EFBFBD>¥à¢¨ç­ë© IDE Master ... [F4 ¤«ï ¯à®¯ã᪠]
Boot from HDD Primary IDE Master OK
Boot from HDD Primary IDE Slave OK
Boot from HDD Secondary IDE Master OK
Boot from HDD Secondary IDE Slave OK
‡ ¯ã᪠á HDD Secondary IDE Master OK
‡ ¯ã᪠á CD-ROM Secondary IDE Master OK
Boot from ATAPI Secondary IDE Master OK
*/
;---------------------------------------
INCLUDE 'src/bios/ROM/SETUP/messages.z80'
;---------------------------------------

7
src/bios/rom/SETUP/VIDEO_IO.asm
View File

@ -1,7 +1,7 @@
def_pal_mask EQU #FF
PIC_SET_PAL_FF EQU def_pal_mask*256+BIOS.PIC_SET_PAL
ScreenPOS.SUBNAME.POS EQU 37
IF NEW_FEATURE
@ -13,7 +13,7 @@ PIC_SET_PAL_FF EQU def_pal_mask*256+BIOS.PIC_SET_PAL
ScreenPOS:
.SUBNAME:
CALL LP_GET_PLACE
LD E,#24
LD E,.SUBNAME.POS ;!HARDCODE autodetected hdd/cdrom info
JP LP_SET_PLACE
.CRLF: CALL LP_GET_PLACE
@ -22,6 +22,7 @@ ScreenPOS:
JP LP_SET_PLACE
;;
;!TODO ¯¥à¥¤¥« âì,   â® ªà¨¢® ª ª-â®
DWPRINT:
LD A,(HL)
CP ' '
@ -35,7 +36,7 @@ DWPRINT:
INC HL
DJNZ DWPRINT
RET
;!TODO ¯¥à¥¤¥« âì,   â® ªà¨¢® ª ª-â®
PRINTDW:
PUSH BC
LD E,(HL)

62
src/bios/rom/SETUP/messages.z80
View File

@ -526,10 +526,10 @@ msgStrings:
_mSetStr forAltBootButton, tmp_Counter : DZ '<ALT> for Alternative boot'
_mSetStr cmosChecksumErr, tmp_Counter : DZ 'WARNING! CMOS CHECKSUM ERROR, DEFAULT VALUES SET!'
_mSetStr cmosDateTimeErr, tmp_Counter : DZ 'WARNING! CMOS DATE/TIME ERROR, DEFAULT VALUES SET!'
_mSetStr detectIdePrMA, tmp_Counter : DZ ' Detecting IDE Primary Master ... [Press F4 to skip]'
_mSetStr detectIdePrSL, tmp_Counter : DZ ' Detecting IDE Primary Slave ... [Press F4 to skip]'
_mSetStr detectIdeSecMA, tmp_Counter : DZ ' Detecting IDE Secondary Master ... [Press F4 to skip]'
_mSetStr detectIdeSecSL, tmp_Counter : DZ ' Detecting IDE Secondary Slave ... [Press F4 to skip]'
_mSetStr detectIdePrMA, tmp_Counter : DZ ' Detecting IDE Primary Master ... [Press F4 to skip]'
_mSetStr detectIdePrSL, tmp_Counter : DZ ' Detecting IDE Primary Slave ... [Press F4 to skip]'
_mSetStr detectIdeSecMA, tmp_Counter : DZ ' Detecting IDE Secondary Master ... [Press F4 to skip]'
_mSetStr detectIdeSecSL, tmp_Counter : DZ ' Detecting IDE Secondary Slave ... [Press F4 to skip]'
_mSetStr ideUnknown, tmp_Counter : DZ 'Unknown '
_mSetStr ideNone, tmp_Counter : DZ 'None '
_mSetStr ideSkiped, tmp_Counter : DZ 'Skipped '
@ -542,15 +542,15 @@ msgStrings:
; _mSetStr unknownSTR1, tmp_Counter : DZ "7"
; _mSetStr unknownSTR2, tmp_Counter : DZ "8"
_mSetStr boardID, tmp_Counter : DZ 'Board ID : '
_mSetStr bootFdd, tmp_Counter : DZ 'Boot from Diskette... '
; _mSetStr bootHdd, tmp_Counter : DZ 'Boot from Hard disk... '
_mSetStr bootHdd, tmp_Counter : DZ 'Boot from HDD at '
_mSetStr bootCd, tmp_Counter : DZ 'Boot from CD-ROM at '
_mSetStr bootRamDrv, tmp_Counter : DZ 'Boot from RAM disk... '
_mSetStr bootRecovery, tmp_Counter : DZ 'Starting recovery...'
_mSetStr bootFdd, tmp_Counter : DZ 'Boot from Diskette'
; _mSetStr bootHdd, tmp_Counter : DZ 'Boot from Hard disk '
_mSetStr bootHdd, tmp_Counter : DZ 'Boot from HDD '
_mSetStr bootCd, tmp_Counter : DZ 'Boot from CD-ROM '
_mSetStr bootRamDrv, tmp_Counter : DZ 'Boot from RAM disk'
_mSetStr bootRecovery, tmp_Counter : DZ 'Starting recovery'
_mSetStr bootAltDrv, tmp_Counter : DZ 'Alternative '
_mSetStr bootFail, tmp_Counter : DZ 'fail' ; !FIXIT strFail
_mSetStr bootOk, tmp_Counter : DZ 'OK'
_mSetStr bootFail, tmp_Counter : DZ ' fail' ; !FIXIT strFail
_mSetStr bootOk, tmp_Counter : DZ ' OK'
_mSetStr afterBootFail, tmp_Counter : DZ 'PRESS <ENTER> TO REBOOT, <DEL> TO ENTER SETUP OR <ESC> TO ZX-MODE . . .'
;
_mSetStr parLang, tmp_Counter : DZ 'Language (Ÿ§ëª) : '
@ -594,12 +594,12 @@ msgStrings:
; _mSetStr val1440, tmp_Counter : DZ '1.44M '
_mSetStr valDash6, tmp_Counter : DZ '------'
_mSetStr parFddSecond, tmp_Counter : DZ 'FDD Second : '
_mSetStr parPriIdeMA, tmp_Counter : DZ 'Primary IDE Master : '
_mSetStr parPriIdeMA, tmp_Counter : DZ 'Primary IDE Master',#FF,' : '
_mSetStr valSetup, tmp_Counter : DZ 'Setup '
_mSetStr valCdRom, tmp_Counter : DZ 'CD-ROM'
_mSetStr parPriIdeSl, tmp_Counter : DZ 'Primary IDE Slave : '
_mSetStr parSecIdeMA, tmp_Counter : DZ 'Secondary IDE Master : '
_mSetStr parSecIdeSl, tmp_Counter : DZ 'Secondary IDE Slave : '
_mSetStr parPriIdeSl, tmp_Counter : DZ 'Primary IDE Slave',#FF,' : '
_mSetStr parSecIdeMA, tmp_Counter : DZ 'Secondary IDE Master',#FF,' : '
_mSetStr parSecIdeSl, tmp_Counter : DZ 'Secondary IDE Slave',#FF,' : '
IF HDDwriteProtect
_mSetStr parHddWrPr, tmp_Counter : DZ 'HDD Write protect : '
ENDIF
@ -675,10 +675,10 @@ msgRusStrings:
_mSetStrRus forAltBootButton, tmp_Counter : DZ '<ALT> ¤«ï €«ìâ¥à­ â¨¢­®© § £à㧪¨'
_mSetStrRus cmosChecksumErr, tmp_Counter : DZ '‚<EFBFBD>ˆŒ€<EFBFBD>ˆ…! Ž˜ˆ<EFBFBD>Š€ ŠŽ<EFBFBD>’<EFBFBD>Ž‹œ<EFBFBD>Ž‰ ‘“ŒŒ› CMOS, “‘’€<EFBFBD>Ž‚‹…<EFBFBD>› ‡<EFBFBD>€—…<EFBFBD>ˆŸ <EFBFBD>Ž “ŒŽ‹—€<EFBFBD>ˆž'
_mSetStrRus cmosDateTimeErr, tmp_Counter : DZ '‚<EFBFBD>ˆŒ€<EFBFBD>ˆ…! Ž˜ˆ<EFBFBD>Š€ „€’›/‚<EFBFBD>…Œ…<EFBFBD>ˆ CMOS, “‘’€<EFBFBD>Ž‚‹…<EFBFBD>› ‡<EFBFBD>€—…<EFBFBD>ˆŸ <EFBFBD>Ž “ŒŽ‹—€<EFBFBD>ˆž'
_mSetStrRus detectIdePrMA, tmp_Counter : DZ 'Ž¯à¥¤¥«ï¥¬ <EFBFBD>¥à¢¨ç­ë© IDE Master ... [F4 ¤«ï ¯à®¯ã᪠] '
_mSetStrRus detectIdePrSL, tmp_Counter : DZ 'Ž¯à¥¤¥«ï¥¬ <EFBFBD>¥à¢¨ç­ë© IDE Slave ... [F4 ¤«ï ¯à®¯ã᪠] '
_mSetStrRus detectIdeSecMA, tmp_Counter : DZ 'Ž¯à¥¤¥«ï¥¬ ‚â®à¨ç­ë© IDE Master ... [F4 ¤«ï ¯à®¯ã᪠] '
_mSetStrRus detectIdeSecSL, tmp_Counter : DZ 'Ž¯à¥¤¥«ï¥¬ ‚â®à¨ç­ë© IDE Slave ... [F4 ¤«ï ¯à®¯ã᪠] '
_mSetStrRus detectIdePrMA, tmp_Counter : DZ ' Ž¯à¥¤¥«ï¥¬ <EFBFBD>¥à¢¨ç­ë© IDE Master ... [F4 ¤«ï ¯à®¯ã᪠] '
_mSetStrRus detectIdePrSL, tmp_Counter : DZ ' Ž¯à¥¤¥«ï¥¬ <EFBFBD>¥à¢¨ç­ë© IDE Slave ... [F4 ¤«ï ¯à®¯ã᪠]'
_mSetStrRus detectIdeSecMA, tmp_Counter : DZ ' Ž¯à¥¤¥«ï¥¬ ‚â®à¨ç­ë© IDE Master ... [F4 ¤«ï ¯à®¯ã᪠]'
_mSetStrRus detectIdeSecSL, tmp_Counter : DZ ' Ž¯à¥¤¥«ï¥¬ ‚â®à¨ç­ë© IDE Slave ... [F4 ¤«ï ¯à®¯ã᪠]'
_mSetStrRus ideUnknown, tmp_Counter : DZ '<EFBFBD>¥¨§¢¥áâ­ë© '
_mSetStrRus ideNone, tmp_Counter : DZ '<EFBFBD>¥â '
_mSetStrRus ideSkiped, tmp_Counter : DZ '<EFBFBD>யã饭 '
@ -691,14 +691,14 @@ msgRusStrings:
; _mSetStrRus unknownSTR1, tmp_Counter : DZ '7"
; _mSetStrRus unknownSTR2, tmp_Counter : DZ '8"
_mSetStrRus boardID, tmp_Counter : DZ 'ID ¯« âë : '
_mSetStrRus bootFdd, tmp_Counter : DZ '‡ ¯ãáª á ¤¨áª¥âë... '
_mSetStrRus bootHdd, tmp_Counter : DZ '‡ ¯ã᪠á HDD ­  '
_mSetStrRus bootCd, tmp_Counter : DZ '‡ ¯ã᪠á CD-ROM ­  '
_mSetStrRus bootRamDrv, tmp_Counter : DZ '‡ ¯ã᪠á RAM ¤¨áª ... '
_mSetStrRus bootRecovery, tmp_Counter : DZ '‡ ¯ã᪠¢®ááâ ­®¢«¥­¨ï... '
_mSetStrRus bootFdd, tmp_Counter : DZ '‡ ¯ãáª á ¤¨áª¥âë'
_mSetStrRus bootHdd, tmp_Counter : DZ '‡ ¯ã᪠á HDD '
_mSetStrRus bootCd, tmp_Counter : DZ '‡ ¯ã᪠á CD-ROM '
_mSetStrRus bootRamDrv, tmp_Counter : DZ '‡ ¯ã᪠á RAM ¤¨áª '
_mSetStrRus bootRecovery, tmp_Counter : DZ '‡ ¯ã᪠¢®ááâ ­®¢«¥­¨ï'
_mSetStrRus bootAltDrv, tmp_Counter : DZ '€«ìâ¥à­ â¨¢­ë© '
_mSetStrRus bootFail, tmp_Counter : DZ '­¥¢®§¬®¦¥­'
_mSetStrRus bootOk, tmp_Counter : DZ 'OK'
_mSetStrRus bootFail, tmp_Counter : DZ ' ­¥¢®§¬®¦¥­'
_mSetStrRus bootOk, tmp_Counter : DZ ' OK'
_mSetStrRus afterBootFail, tmp_Counter : DZ '<EFBFBD>€†Œˆ’… <ENTER> „‹Ÿ <EFBFBD>…<EFBFBD>…‡€ƒ<EFBFBD>“‡Šˆ, <DEL> „‹Ÿ <EFBFBD>€‘’<EFBFBD>Ž…Š ˆ‹ˆ <ESC> „‹Ÿ ZX-MODE . . .'
;
_mSetStrRus parLang, tmp_Counter : DZ 'Ÿ§ëª (Language) : '
@ -742,12 +742,12 @@ msgRusStrings:
; _mSetStrRus val1440, tmp_Counter : DZ '1.44M '
_mSetStrRus valDash6, tmp_Counter : DZ '------'
_mSetStrRus parFddSecond, tmp_Counter : DZ 'FDD ¢â®à®© : '
_mSetStrRus parPriIdeMA, tmp_Counter : DZ 'Primary IDE Master : '
_mSetStrRus parPriIdeMA, tmp_Counter : DZ 'Primary IDE Master',#FF,' : '
_mSetStrRus valSetup, tmp_Counter : DZ 'Setup '
_mSetStrRus valCdRom, tmp_Counter : DZ 'CD-ROM'
_mSetStrRus parPriIdeSl, tmp_Counter : DZ 'Primary IDE Slave : '
_mSetStrRus parSecIdeMA, tmp_Counter : DZ 'Secondary IDE Master : '
_mSetStrRus parSecIdeSl, tmp_Counter : DZ 'Secondary IDE Slave : '
_mSetStrRus parPriIdeSl, tmp_Counter : DZ 'Primary IDE Slave',#FF,' : '
_mSetStrRus parSecIdeMA, tmp_Counter : DZ 'Secondary IDE Master',#FF,' : '
_mSetStrRus parSecIdeSl, tmp_Counter : DZ 'Secondary IDE Slave',#FF,' : '
IF HDDwriteProtect
_mSetStrRus parHddWrPr, tmp_Counter : DZ '‡ é¨â  § ¯¨á¨ ­  HDD : '
ENDIF