diff --git a/Shared_Includes b/Shared_Includes index b325c32..ccb7691 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit b325c3281f76e83037cb0019450ae6e36689db65 +Subproject commit ccb7691e3e36560b42832ea558ff038388a4598e diff --git a/src/bios/exp/FUNC_LOW_PRINT.ASM b/src/bios/exp/FUNC_LOW_PRINT.ASM index e32c884..16103e6 100644 --- a/src/bios/exp/FUNC_LOW_PRINT.ASM +++ b/src/bios/exp/FUNC_LOW_PRINT.ASM @@ -87,13 +87,13 @@ LD A,C LD (SYS_PAGE.COPY_SLOT3),A - IN A,(RGADR) + IN A,(PORT_Y) LD (SYS_PAGE.COPY_RGADR),A ENDM MACRO LP_CLOSE_PG LD A,(SYS_PAGE.COPY_RGADR) - OUT (RGADR),A + OUT (PORT_Y),A LD A,(SYS_PAGE.COPY_SLOT3) OUT (SLOT3),A ENDM @@ -104,7 +104,7 @@ EXX IN A,(SLOT3) LD C,A - IN A,(RGADR) + IN A,(PORT_Y) LD B,A LD A,SYS_PAGE @@ -120,7 +120,7 @@ LD A,E AND A RRA - OUT (RGADR),A + OUT (PORT_Y),A EXX EX AF,AF' ENDM @@ -136,7 +136,7 @@ POP BC LD A,B - OUT (RGADR),A + OUT (PORT_Y),A LD A,C OUT (SLOT3),A @@ -158,7 +158,7 @@ LP_PRINT_AL1: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A INC D LD (HL),C EXX @@ -193,7 +193,7 @@ LP_PRINT_SYM: LP_PRINT_SY1: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A LD (HL),C INC D @@ -222,7 +222,7 @@ LP_PRINT_ATR: LP_PRINT_AT1: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A INC D INC L @@ -250,7 +250,7 @@ LP_PRINT_LINE: ; LD C,A LD A,#50 OUT (SLOT3),A - LD C,RGADR + LD C,PORT_Y EXX LP_PRINT_LN1: @@ -291,7 +291,7 @@ LP_PRINT_LINE2: LD A,#50 OUT (SLOT3),A EXX - LD C,RGADR + LD C,PORT_Y EXX LP_PRINT_LN2: @@ -326,7 +326,7 @@ LP_PRINT_LINE3: LP_PRINT_LN3: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A INC D EXX @@ -374,7 +374,7 @@ LP_PRINT_LINE4: LP_PRINT_LN4: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EXX LD A,(HL) @@ -417,7 +417,7 @@ LP_PRINT_LINE5: LP_PRINT_LN5: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EXX LD A,(HL) @@ -463,7 +463,7 @@ LP_PRINT_LINE6: LP_PRINT_LN6: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EXX LD A,(HL) @@ -503,7 +503,7 @@ LP_PRINT_LINE_DIR: LP_PRINT_LN_D: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EXX LD A,(HL) @@ -699,7 +699,7 @@ LP_CLS_L1: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A LD (HL),C INC L @@ -824,7 +824,7 @@ LP_NEXT_HL: LD A,(SYS_PAGE.WIN_MAP_IX+WIN_V_BEG) LD L,A INC L - LD H,#C3 + LD H,#C3 ;!HARDCODE LP_NEXT_HL1: LD A,(SYS_PAGE.WIN_MAP_IX+WIN_H_BEG) @@ -850,7 +850,7 @@ LP_BEG_P: LD A,E AND A RRA - OUT (RGADR),A + OUT (PORT_Y),A EXX EX AF,AF' RET @@ -898,7 +898,7 @@ LP_SET_ZG1: LD B,A AND #0F ADD A,A - OUT (RGADR),A + OUT (PORT_Y),A LD A,B RRCA RRCA @@ -1307,13 +1307,13 @@ LP_MODE_LR: LP_MD_LL1: EX AF,AF' LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EX AF,AF' LD (HL),A ; режим INC D EX AF,AF' LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EX AF,AF' LD (HL),A ; режим INC D @@ -1380,7 +1380,7 @@ LP_MODE_LR2: LP_MD_LL2: EX AF,AF' LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EX AF,AF' LD (HL),A ; режим INC L @@ -1397,7 +1397,7 @@ LP_MD_LL2: lp_md_ll3x: EX AF,AF' LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EX AF,AF' LD (HL),A ; режим INC L @@ -1485,7 +1485,7 @@ LP_MD_LL3: EX AF,AF' LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EX AF,AF' LD (HL),B ; режим INC L @@ -1499,7 +1499,7 @@ LP_MD_LL3: ; EX AF,AF' ; LD A,D -; OUT (RGADR),A +; OUT (PORT_Y),A ; EX AF,AF' ; LD (HL),B ; режим ; INC L @@ -1536,10 +1536,9 @@ LP_EXIT_MODE3: RET LP_GR_640: - EX AF,AF' LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EX AF,AF' LD (HL),B ; режим 1 INC L @@ -1551,7 +1550,7 @@ LP_GR_640: EX AF,AF' LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EX AF,AF' LD (HL),0 ; режим 3 DEC L @@ -1636,11 +1635,11 @@ LP_SCROLL_UP: EXX LD A,D ; получить порт начала строки EXX -.loop1: OUT (RGADR),A +.loop1: OUT (PORT_Y),A INC A ; следующее значение порта LDI LDD - OUT (RGADR),A + OUT (PORT_Y),A INC A ; следующее значение порта LDI LDD @@ -1707,11 +1706,11 @@ LP_SCROLL_DN: EXX LD A,D EXX -.loop1: OUT (RGADR),A +.loop1: OUT (PORT_Y),A INC A LDI LDD - OUT (RGADR),A + OUT (PORT_Y),A INC A LDI LDD @@ -1745,7 +1744,7 @@ WIN_GET_SYM: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A LD A,(HL) EXX @@ -1791,7 +1790,7 @@ WIN_PUT_SYM: EXX LD A,D - OUT (RGADR),A + OUT (PORT_Y),A EXX LD A,L @@ -1892,7 +1891,7 @@ WIN_COPY_WIN1: .COPY_loop: DEC A - OUT (RGADR),A + OUT (PORT_Y),A LD E,(HL) INC L LD D,(HL) @@ -1952,7 +1951,6 @@ WIN_REST_WIN1: EXX LP_REST_L2: - LD A,L EXX LD B,A @@ -1960,8 +1958,7 @@ LP_REST_L2: LD A,C LP_REST_L1: - - OUT (RGADR),A + OUT (PORT_Y),A INC A POP DE LD (HL),E