diff --git a/Shared_Includes b/Shared_Includes index cb37592..b5c7297 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit cb37592f1a06f495e0396611d9ffde0c04406c89 +Subproject commit b5c729733c85c7dd1fd52d875116d2a191c54ce7 diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm index 8aa6ecf..17303c2 100644 --- a/src/bios/exp/EXP.asm +++ b/src/bios/exp/EXP.asm @@ -1371,63 +1371,63 @@ Length EQU $-Setup_Starter.Start ;---------------------[ ЗАГЛУШКИ ДЛЯ #41 СТРАНИЦЫ]----------------------; ;-------------[RST 08] -RAM_BIOS_PROG: ; for CALL BIOS in 41h page - DISP #08 - PUSH AF - LD A,ROM.BIOS - OUT (SYS_PORT.ROM),A - POP AF - RET - ENT -.Length EQU $-RAM_BIOS_PROG -;-------------------[] +; RAM_BIOS_PROG: ; for CALL BIOS in #41 page +; DISP #08 +; PUSH AF +; LD A,ROM.BIOS +; OUT (SYS_PORT.ROM),A +; POP AF +; RET +; ENT +; .Length EQU $-RAM_BIOS_PROG +; ;-------------------[] -;-------------[RST 38] -PROG_NO_ROM: - DISP #38 - DI +; ;-------------[RST 38] +; PROG_NO_ROM: +; DISP #38 +; DI - LD A,#FF - OUT (SLOT3),A - OUT (SLOT2),A - OUT (SLOT1),A +; LD A,#FF +; OUT (SLOT3),A +; OUT (SLOT2),A +; OUT (SLOT1),A - LD SP,#BF00 +; LD SP,#BF00 - LD C,BIOS.LP_OPEN_S - LD B,3 - LD E,0 - RST ToBIOS +; LD C,BIOS.LP_OPEN_S +; LD B,3 +; LD E,0 +; RST ToBIOS - LD C,BIOS.LP_CLS_WIN - LD DE,0 - LD HL,#2050 - RST ToBIOS +; LD C,BIOS.LP_CLS_WIN +; LD DE,0 +; LD HL,#2050 +; RST ToBIOS - LD A,1 - OUT (RGMOD),A ; set scr-2 +; LD A,1 +; OUT (RGMOD),A ; set scr-2 - LD HL,MESSAGE_NR - LD DE,#A000 - LD BC,MESSAGE_NR.size - LD A,C - LDIR +; LD HL,MESSAGE_NR +; LD DE,#A000 +; LD BC,MESSAGE_NR.size +; LD A,C +; LDIR - LD HL,#A000 - LD D,0 ; delimiter - LD E,COLORS.FLASH + COLORS.PAPER.RED + COLORS.INC.CYAN - LD B,A - LD C,BIOS.LP_PRINT_LINE3 - RST ToBIOS +; LD HL,#A000 +; LD D,0 ; delimiter +; LD E,COLORS.FLASH + COLORS.INC.RED +; LD B,A +; LD C,BIOS.LP_PRINT_LINE3 +; RST ToBIOS -.loop: DI - HALT - JR .loop +; .loop: DI +; HALT +; JR .loop -MESSAGE_NR: DZ " Spectrum ROM not installed. Use spectrum.exe Press Ctrl+Alt+Del or RESET" -.size EQU $-MESSAGE_NR - ENT -PROG_NO_ROM.size EQU $-PROG_NO_ROM +; MESSAGE_NR: DZ " Spectrum ROM not installed. Use spectrum.exe Press Ctrl+Alt+Del or RESET" +; .size EQU $-MESSAGE_NR +; ENT +; PROG_NO_ROM.size EQU $-PROG_NO_ROM ;-------------------[] ;-----------------------------------------------------------------------; ;>$< >$< >$< >$< >$< >$< >$< >$< >$< >$< >$< >$< >$< >$< >$< >$< >$< >$<; diff --git a/src/bios/exp/FUNC_LOW_PRINT.ASM b/src/bios/exp/FUNC_LOW_PRINT.ASM index f67b54e..f369bb3 100644 --- a/src/bios/exp/FUNC_LOW_PRINT.ASM +++ b/src/bios/exp/FUNC_LOW_PRINT.ASM @@ -519,7 +519,7 @@ LP_CLS_WIN2: LD C,A ;JR CLS_WIN ;--------------------------------------------------------[#8D] -CLS_WIN:CALL LP_BEG_P +CLS_WIN: CALL LP_BEG_P LD (SYS_PAGE.SYS_WORK1),BC ; сохранить цвет PUSH DE diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm index aee63ed..f5aac9f 100644 --- a/src/bios/rom/SETUP/MAIN.asm +++ b/src/bios/rom/SETUP/MAIN.asm @@ -386,7 +386,7 @@ INSTALL: CALL SETLAND CALL GET_ID - LD DE,#0028 ; !HARDCODE + LD DE,#0028 ; !HARDCODE CALL LP_SET_PLACE LD HL,memBUFFER.ID LD A,COLORS.INC.LCYAN @@ -395,13 +395,13 @@ INSTALL: LD A,COLORS.INC.LCYAN CALL CPRINTZ - LD DE,#0128 ; !HARDCODE + LD DE,#0128 ; !HARDCODE CALL LP_SET_PLACE LD A,msgStrings.copyRightPeters LD E,COLORS.INC.LGREEN CALL POSTMSC - LD DE,#0228 ; !HARDCODE + LD DE,#0228 ; !HARDCODE CALL LP_SET_PLACE LD A,msgStrings.copyRightSPTeam LD E,COLORS.INC.GREEN @@ -411,7 +411,7 @@ INSTALL: LD DE,#0328 CALL LP_SET_PLACE LD A,msgStrings.testBIOSmsg - LD E,COLORS.FLASH + COLORS.INC.RED ; !HARDCODE + LD E,COLORS.FLASH + COLORS.INC.RED CALL POSTMSC ENDIF @@ -646,7 +646,6 @@ INFO_MESSAGE: ;!FIXIT CALL TSETUP - LD BC,#0710 ; !HARDCODE маска и ячейка для чтения значения кмос для основного загрузочного драйва CALL PrepareToBOOT LD A,msgStrings.bootFail @@ -864,7 +863,6 @@ RECOVERYstart: PrepareToBOOT: CALL INT_OFF CALL G_VALUE - ;LD B,A LD B,0 ; FDD OR A @@ -959,6 +957,7 @@ HDSTART: PUSH BC LD A,msgStrings.bootHdd CALL POSTMSG + POP BC POP AF CP #FF diff --git a/src/bios/rom/SETUP/SETTINGS.asm b/src/bios/rom/SETUP/SETTINGS.asm index be52514..17ffe15 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 #1F -HLTCLR: DB #1E +NORCLR: DB COLORS.PAPER.WHITE +HLTCLR: DB COLORS.PAPER.YELLOW CURCLR: DB #4F -WRMCLR: DB #1F +WRMCLR: DB COLORS.PAPER.WHITE ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[v] diff --git a/src/bios/rom/SETUP/VIDEO_IO.asm b/src/bios/rom/SETUP/VIDEO_IO.asm index e0a8eba..ca492ca 100644 --- a/src/bios/rom/SETUP/VIDEO_IO.asm +++ b/src/bios/rom/SETUP/VIDEO_IO.asm @@ -11,25 +11,15 @@ PIC_SET_PAL_FF EQU def_pal_mask*256+BIOS.PIC_SET_PAL ;; ScreenPOS: -;.GET_CUR: -; LD C,BIOS.LP_GET_PLACE -; JP_to_BIOS - .SUBNAME: - ;CALL ScreenPOS.GET_CUR CALL LP_GET_PLACE LD E,#24 -;.LOCAT: -; LD C,BIOS.LP_SET_PLACE -; JP_to_BIOS JP LP_SET_PLACE -.CRLF: ;CALL ScreenPOS.GET_CUR - CALL LP_GET_PLACE +.CRLF: CALL LP_GET_PLACE INC D LD E,#00 - ;JP ScreenPOS.LOCAT - JP LP_SET_PLACE + JP LP_SET_PLACE ;; DWPRINT: @@ -60,53 +50,30 @@ PRINTDW: RET PRINTA: LD E,A -; LD C,BIOS.LP_PRINT_ATR -; JP_to_BIOS - JP LP_PRINT_ATR + JP LP_PRINT_ATR PRINT_CHAR: -; LD BC,1*256 + BIOS.LP_PRINT_SYM -; JP_to_BIOS - LD B,1 - JP LP_PRINT_SYM + LD B,1 + JP LP_PRINT_SYM ; -TPRINTZ: - ;CALL ScreenPOS.LOCAT - CALL LP_SET_PLACE -; LD BC,0*256 + BIOS.LP_PRINT_LINE6 -PRINTZ: - LD B,0 +TPRINTZ: CALL LP_SET_PLACE +PRINTZ: LD B,0 LD D,B -; JP_to_BIOS - JP LP_PRINT_LINE6 + JP LP_PRINT_LINE6 -; PRINTZ: -; ; LD BC,0*256 + BIOS.LP_PRINT_LINE6 -; LD B,0 -; LD D,B -; ; JP_to_BIOS -; JP LP_PRINT_LINE6 - -HPRINTZ: - ;LD BC,0*256 + BIOS.LP_PRINT_LINE5 - LD B,0 +HPRINTZ: LD B,0 LD D,B - LD E,#0F - ;JP_to_BIOS - JP LP_PRINT_LINE5 + LD E,COLORS.INC.WHITE + JP LP_PRINT_LINE5 -CPRINTZ: - ;LD BC,0*256 + BIOS.LP_PRINT_LINE5 - LD B,0 +CPRINTZ: LD B,0 LD D,B - LD E,A - ;JP_to_BIOS - JP LP_PRINT_LINE5 + LD E,A + JP LP_PRINT_LINE5 ;HL - NUMBER -IZPRINT: - LD D,1 +IZPRINT: LD D,1 JR IPRIN IPRINT: LD D,0