diff --git a/Shared_Includes b/Shared_Includes index 8f5b42b..cf19a28 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 8f5b42bcd1fe8c04bbee99835dca2b00b5686d86 +Subproject commit cf19a287a2cfe1946de5c1d50a255c43ae4fc390 diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm index 17303c2..7b2a10d 100644 --- a/src/bios/exp/EXP.asm +++ b/src/bios/exp/EXP.asm @@ -1415,7 +1415,7 @@ Length EQU $-Setup_Starter.Start ; LD HL,#A000 ; LD D,0 ; delimiter -; LD E,COLORS.FLASH + COLORS.INC.RED +; LD E,COLORS.CGA.FLASH + COLORS.CGA.INC.RED ; LD B,A ; LD C,BIOS.LP_PRINT_LINE3 ; RST ToBIOS diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm index f5aac9f..7a78adb 100644 --- a/src/bios/rom/SETUP/MAIN.asm +++ b/src/bios/rom/SETUP/MAIN.asm @@ -389,29 +389,29 @@ INSTALL: LD DE,#0028 ; !HARDCODE CALL LP_SET_PLACE LD HL,memBUFFER.ID - LD A,COLORS.INC.LCYAN + LD A,COLORS.CGA.INC.LCYAN CALL CPRINTZ LD HL,BUILD - LD A,COLORS.INC.LCYAN + LD A,COLORS.CGA.INC.LCYAN CALL CPRINTZ LD DE,#0128 ; !HARDCODE CALL LP_SET_PLACE LD A,msgStrings.copyRightPeters - LD E,COLORS.INC.LGREEN + LD E,COLORS.CGA.INC.LGREEN CALL POSTMSC LD DE,#0228 ; !HARDCODE CALL LP_SET_PLACE LD A,msgStrings.copyRightSPTeam - LD E,COLORS.INC.GREEN + LD E,COLORS.CGA.INC.GREEN CALL POSTMSC IF DEBUG LD DE,#0328 CALL LP_SET_PLACE LD A,msgStrings.testBIOSmsg - LD E,COLORS.FLASH + COLORS.INC.RED + LD E,COLORS.CGA.FLASH + COLORS.CGA.INC.RED CALL POSTMSC ENDIF @@ -546,7 +546,7 @@ QIGNORE: ;CALL ScreenPOS.LOCAT CALL LP_SET_PLACE LD A,msgStrings.toSetupButton - LD E,COLORS.FLASH + COLORS.INC.WHITE + LD E,COLORS.CGA.FLASH + COLORS.CGA.INC.WHITE CALL POSTMSC LD DE,#0900 @@ -559,7 +559,7 @@ ERRSUM+1: XOR A ld (.ErrDateTime+1),a ; если контрольная сумма слетела, то сообщение о кривых дате/времени в кмос не выводим LD A,msgStrings.cmosChecksumErr - LD E,COLORS.INC.RED + LD E,COLORS.CGA.INC.RED CALL POSTMSC CALL ScreenPOS.CRLF CALL ScreenPOS.CRLF @@ -570,7 +570,7 @@ ERRSUM+1: OR A JR Z,CHEKOK LD A,msgStrings.cmosDateTimeErr - LD E,COLORS.INC.RED + LD E,COLORS.CGA.INC.RED CALL POSTMSC CALL ScreenPOS.CRLF CALL ScreenPOS.CRLF @@ -626,14 +626,12 @@ CMOS_ABSENT: CALL POSTMSG INFO_MESSAGE: ;!FIXIT название неправильное LD DE,#0528 - ;CALL ScreenPOS.LOCAT CALL LP_SET_PLACE LD A,msgStrings.forAltBootButton - LD E,COLORS.INC.WHITE + LD E,COLORS.CGA.INC.WHITE CALL POSTMSC POP DE - ;CALL ScreenPOS.LOCAT CALL LP_SET_PLACE CALL TSETUP ;!TODO может пихнуть её на прерывания? @@ -669,7 +667,7 @@ ABOOT: LD A,msgStrings.bootAltDrv CALL ScreenPOS.CRLF LD A,msgStrings.afterBootFail - LD E,COLORS.INC.RED + LD E,COLORS.CGA.INC.RED CALL POSTMSC ;EI @@ -908,6 +906,10 @@ CDSTART: PUSH BC LD A,msgStrings.bootCd CALL POSTMSG + POP AF + PUSH AF + CALL PRINT_CHANEL + POP BC SET 6,B SCF @@ -957,6 +959,9 @@ HDSTART: PUSH BC LD A,msgStrings.bootHdd CALL POSTMSG + POP AF + PUSH AF + CALL PRINT_CHANEL POP BC POP AF @@ -1531,7 +1536,28 @@ SETLAND: LDIR RET ; - +; print boot drive number +PRINT_CHANEL: + AND #0F + ; + LD A,msgStrings.parPriIdeMA + JR Z,.print_chanel + ; + LD C,A + LD A,msgStrings.parPriIdeSl + DEC C + JR Z,.print_chanel + ; + LD A,msgStrings.parSecIdeMA + DEC C + JR Z,.print_chanel + ; + LD A,msgStrings.parSecIdeSl +.print_chanel: + CALL FindStringAddr + LD B,0 + LD D,':' ; !HARDCODE стоп символ для строки в messages.z80 + JP LP_PRINT_LINE6 ; ;--------------------------------------- INCLUDE 'src/bios/ROM/SETUP/messages.z80' diff --git a/src/bios/rom/SETUP/SETTINGS.asm b/src/bios/rom/SETUP/SETTINGS.asm index 17ffe15..6334a7e 100644 --- a/src/bios/rom/SETUP/SETTINGS.asm +++ b/src/bios/rom/SETUP/SETTINGS.asm @@ -386,10 +386,10 @@ FSC1: ITEM: DB #00 ITEM_Restore: DB #00 -NORCLR: DB COLORS.PAPER.WHITE -HLTCLR: DB COLORS.PAPER.YELLOW -CURCLR: DB #4F -WRMCLR: DB COLORS.PAPER.WHITE +NORCLR: DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INC.WHITE +HLTCLR: DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INC.YELLOW +CURCLR: DB COLORS.CGA.PAPER.RED + COLORS.CGA.INC.WHITE +WRMCLR: DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INC.WHITE ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[v] @@ -800,7 +800,7 @@ SetTime: push de CALL LP_SET_PLACE ; печать атрибутов - LD E,COLORS.INC.RED + LD E,COLORS.CGA.INC.RED LD B,#0E CALL LP_PRINT_ATR @@ -930,85 +930,85 @@ HDDWP EQU #01 STYLES: ; Color Style 0 - DB COLORS.PAPER.BLUE + COLORS.INC.WHITE - DB COLORS.PAPER.BLUE + COLORS.INC.YELLOW - DB COLORS.PAPER.RED + COLORS.INC.WHITE - DB COLORS.PAPER.BLUE + COLORS.INC.WHITE + DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INC.YELLOW + DB COLORS.CGA.PAPER.RED + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INC.WHITE ; Color Style 1 - DB COLORS.PAPER.BLUE + COLORS.INC.LGREEN - DB COLORS.PAPER.BLUE + COLORS.INC.LMAGENT - DB COLORS.PAPER.MAGENTA + COLORS.INC.WHITE - DB COLORS.PAPER.BLUE + COLORS.INC.WHITE + DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INC.LGREEN + DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INC.LMAGENT + DB COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INC.WHITE ; Color Style 2 - DB COLORS.PAPER.GREEN + COLORS.INC.LCYAN - DB COLORS.PAPER.GREEN + COLORS.INC.YELLOW - DB COLORS.PAPER.CYAN + COLORS.INC.BLACK - DB COLORS.PAPER.GREEN + COLORS.INC.BLACK + DB COLORS.CGA.PAPER.GREEN + COLORS.CGA.INC.LCYAN + DB COLORS.CGA.PAPER.GREEN + COLORS.CGA.INC.YELLOW + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.BLACK + DB COLORS.CGA.PAPER.GREEN + COLORS.CGA.INC.BLACK ; Color Style 3 - DB COLORS.PAPER.CYAN + COLORS.INC.BLACK - DB COLORS.PAPER.CYAN + COLORS.INC.YELLOW - DB COLORS.PAPER.GREEN + COLORS.INC.BLACK - DB COLORS.PAPER.CYAN + COLORS.INC.LGREEN + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.BLACK + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.YELLOW + DB COLORS.CGA.PAPER.GREEN + COLORS.CGA.INC.BLACK + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.LGREEN ; Color Style 4 - DB COLORS.PAPER.CYAN + COLORS.INC.WHITE - DB COLORS.PAPER.CYAN + COLORS.INC.BLACK - DB COLORS.PAPER.LGRAY + COLORS.INC.BLUE - DB COLORS.PAPER.CYAN + COLORS.INC.YELLOW + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.BLACK + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.BLUE + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.YELLOW ; Color Style 5 - DB COLORS.PAPER.CYAN + COLORS.INC.BLACK - DB COLORS.PAPER.CYAN + COLORS.INC.BROWN - DB COLORS.PAPER.BROWN + COLORS.INC.LGRAY - DB COLORS.PAPER.CYAN + COLORS.INC.WHITE + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.BLACK + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.BROWN + DB COLORS.CGA.PAPER.BROWN + COLORS.CGA.INC.LGRAY + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.WHITE ; Color Style 6 - DB COLORS.PAPER.RED + COLORS.INC.YELLOW - DB COLORS.PAPER.RED + COLORS.INC.WHITE - DB COLORS.PAPER.BLACK + COLORS.INC.GREEN - DB COLORS.PAPER.RED + COLORS.INC.GREEN + DB COLORS.CGA.PAPER.RED + COLORS.CGA.INC.YELLOW + DB COLORS.CGA.PAPER.RED + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.BLACK + COLORS.CGA.INC.GREEN + DB COLORS.CGA.PAPER.RED + COLORS.CGA.INC.GREEN ; Color Style 7 - DB COLORS.PAPER.RED + COLORS.INC.LGRAY - DB COLORS.PAPER.RED + COLORS.INC.WHITE - DB COLORS.PAPER.BLUE + COLORS.INC.WHITE - DB COLORS.PAPER.RED + COLORS.INC.WHITE + DB COLORS.CGA.PAPER.RED + COLORS.CGA.INC.LGRAY + DB COLORS.CGA.PAPER.RED + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.RED + COLORS.CGA.INC.WHITE ; Color Style 8 - DB COLORS.PAPER.MAGENTA + COLORS.INC.LCYAN - DB COLORS.PAPER.MAGENTA + COLORS.INC.LGREEN - DB COLORS.PAPER.LGRAY + COLORS.INC.BLACK - DB COLORS.PAPER.MAGENTA + COLORS.INC.WHITE + DB COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INC.LCYAN + DB COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INC.LGREEN + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.BLACK + DB COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INC.WHITE ; Color Style 9 - DB COLORS.PAPER.MAGENTA + COLORS.INC.WHITE - DB COLORS.PAPER.MAGENTA + COLORS.INC.YELLOW - DB COLORS.PAPER.GREEN + COLORS.INC.BLUE - DB COLORS.PAPER.MAGENTA + COLORS.INC.LRED + DB COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INC.YELLOW + DB COLORS.CGA.PAPER.GREEN + COLORS.CGA.INC.BLUE + DB COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INC.LRED ; Color Style 10 - DB COLORS.PAPER.LGRAY + COLORS.INC.BLACK - DB COLORS.PAPER.LGRAY + COLORS.INC.RED - DB COLORS.PAPER.CYAN + COLORS.INC.WHITE - DB COLORS.PAPER.LGRAY + COLORS.INC.WHITE + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.BLACK + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.RED + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.WHITE ; Color Style 11 - DB COLORS.PAPER.LGRAY + COLORS.INC.BLUE - DB COLORS.PAPER.LGRAY + COLORS.INC.YELLOW - DB COLORS.PAPER.MAGENTA + COLORS.INC.WHITE - DB COLORS.PAPER.LGRAY + COLORS.INC.WHITE + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.BLUE + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.YELLOW + DB COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.WHITE ; Color Style 12 - DB COLORS.PAPER.LGRAY + COLORS.INC.LGREEN - DB COLORS.PAPER.LGRAY + COLORS.INC.LCYAN - DB COLORS.PAPER.GREEN + COLORS.INC.WHITE - DB COLORS.PAPER.LGRAY + COLORS.INC.WHITE + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.LGREEN + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.LCYAN + DB COLORS.CGA.PAPER.GREEN + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.WHITE ; Color Style 13 - DB COLORS.PAPER.BLACK + COLORS.INC.LGREEN - DB COLORS.PAPER.BLACK + COLORS.INC.LCYAN - DB COLORS.PAPER.CYAN + COLORS.INC.YELLOW - DB COLORS.PAPER.BLACK + COLORS.INC.YELLOW + DB COLORS.CGA.PAPER.BLACK + COLORS.CGA.INC.LGREEN + DB COLORS.CGA.PAPER.BLACK + COLORS.CGA.INC.LCYAN + DB COLORS.CGA.PAPER.CYAN + COLORS.CGA.INC.YELLOW + DB COLORS.CGA.PAPER.BLACK + COLORS.CGA.INC.YELLOW ; Color Style 14 (Mono) - DB COLORS.PAPER.BLACK + COLORS.INC.LGRAY - DB COLORS.PAPER.BLACK + COLORS.INC.WHITE - DB COLORS.PAPER.LGRAY + COLORS.INC.BLACK - DB COLORS.PAPER.BLACK + COLORS.INC.LGRAY + DB COLORS.CGA.PAPER.BLACK + COLORS.CGA.INC.LGRAY + DB COLORS.CGA.PAPER.BLACK + COLORS.CGA.INC.WHITE + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.BLACK + DB COLORS.CGA.PAPER.BLACK + COLORS.CGA.INC.LGRAY ; Color Style 15 - DB COLORS.PAPER.BLACK + COLORS.INC.LMAGENT - DB COLORS.PAPER.BLACK + COLORS.INC.LGREEN - DB COLORS.PAPER.LGRAY + COLORS.INC.RED - DB COLORS.PAPER.BLACK + COLORS.INC.RED + DB COLORS.CGA.PAPER.BLACK + COLORS.CGA.INC.LMAGENT + DB COLORS.CGA.PAPER.BLACK + COLORS.CGA.INC.LGREEN + DB COLORS.CGA.PAPER.LGRAY + COLORS.CGA.INC.RED + DB COLORS.CGA.PAPER.BLACK + COLORS.CGA.INC.RED DEFVAL: DB SAVERAM+EXTBIOS+SDELAY1 ;X0E - OPTIONS DB TDL250+TRATE30 ;X0F - KEYBOARD diff --git a/src/bios/rom/SETUP/VIDEO_IO.asm b/src/bios/rom/SETUP/VIDEO_IO.asm index ca492ca..e05f3f2 100644 --- a/src/bios/rom/SETUP/VIDEO_IO.asm +++ b/src/bios/rom/SETUP/VIDEO_IO.asm @@ -64,7 +64,7 @@ PRINTZ: LD B,0 HPRINTZ: LD B,0 LD D,B - LD E,COLORS.INC.WHITE + LD E,COLORS.CGA.INC.WHITE JP LP_PRINT_LINE5 CPRINTZ: LD B,0 @@ -368,7 +368,7 @@ FADE: XOR A _mFADE ; A = 0 LD HL,memBUFFER.Shared - ; !HARDCODE & CURSOR COLORS. LD DE,#0000 + ; LD DE,#0000 LD D,A LD E,A ; @@ -522,7 +522,7 @@ SETPAL4: LD DE,memBUFFER.Shared LD C,#08 -DCR0: LD B,#10 ;!HARDCODE number of colors in CGA pallete +DCR0: LD B,COLORS.CGA.PALETTE.ColNum PUSH HL ; DCR1: POP HL diff --git a/src/bios/rom/SETUP/messages.z80 b/src/bios/rom/SETUP/messages.z80 index 9831d58..c19d86e 100644 --- a/src/bios/rom/SETUP/messages.z80 +++ b/src/bios/rom/SETUP/messages.z80 @@ -543,8 +543,9 @@ msgStrings: ; _mSetStr unknownSTR2, tmp_Counter : DZ "8" _mSetStr boardID, tmp_Counter : DZ 'Board ID : ' _mSetStr bootFdd, tmp_Counter : DZ 'Start from Diskette... ' - _mSetStr bootHdd, tmp_Counter : DZ 'Start from Hard disk... ' - _mSetStr bootCd, tmp_Counter : DZ 'Start from CD-ROM... ' +; _mSetStr bootHdd, tmp_Counter : DZ 'Start from Hard disk... ' + _mSetStr bootHdd, tmp_Counter : DZ 'Start from Hard disk at ' + _mSetStr bootCd, tmp_Counter : DZ 'Start from CD-ROM at ' _mSetStr bootRamDrv, tmp_Counter : DZ 'Start from RAM disk... ' _mSetStr bootRecovery, tmp_Counter : DZ 'Starting recovery...' _mSetStr bootAltDrv, tmp_Counter : DZ 'Alternative ' @@ -691,8 +692,8 @@ msgRusStrings: ; _mSetStrRus unknownSTR2, tmp_Counter : DZ '8" _mSetStrRus boardID, tmp_Counter : DZ 'ID платы : ' _mSetStrRus bootFdd, tmp_Counter : DZ 'Запуск с дискеты... ' - _mSetStrRus bootHdd, tmp_Counter : DZ 'Запуск с жесткого диска... ' - _mSetStrRus bootCd, tmp_Counter : DZ 'Запуск с CD-ROM... ' + _mSetStrRus bootHdd, tmp_Counter : DZ 'Запуск с жесткого диска на ' + _mSetStrRus bootCd, tmp_Counter : DZ 'Запуск с CD-ROM на ' _mSetStrRus bootRamDrv, tmp_Counter : DZ 'Запуск с RAM диска... ' _mSetStrRus bootRecovery, tmp_Counter : DZ 'Запуск восстановления... ' _mSetStrRus bootAltDrv, tmp_Counter : DZ 'Альтернативный '