diff --git a/Shared_Includes b/Shared_Includes index 899a6c3..3744776 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 899a6c3af85b80ef2e629f108999747104680ba5 +Subproject commit 374477690571809e7318bd4279bc7da120b6c492 diff --git a/src/bios/exp/DCP.ASM b/src/bios/exp/DCP.ASM index e0c636b..b8d0ba2 100644 --- a/src/bios/exp/DCP.ASM +++ b/src/bios/exp/DCP.ASM @@ -19,435 +19,434 @@ ; BYTE ACEX.Border_FE ; - порт ; DCP END MARKER -; DW 0,0,0 +; DW 0,0,0 ;-----------------------------------------------------------------------; ; - ; ;-----------------------------------------------------------------------; - DW %00'000'0'0000'0111 - DW %00'010'0'0110'1111 - DB ACEX.VG93_1F - DW %11'010'0'0000'0111 - DW %11'010'0'0110'1111 - DB ACEX.VG93_1F + DW %00'000'0'0000'0111 + DW %00'010'0'0110'1111 + DB ACEX.VG93_1F + DW %11'010'0'0000'0111 + DW %11'010'0'0110'1111 + DB ACEX.VG93_1F - DW %00'000'0'0010'0111 - DW %00'010'0'0110'1111 - DB ACEX.VG93_3F - DW %11'010'0'0010'0111 - DW %11'010'0'0110'1111 - DB ACEX.VG93_3F + DW %00'000'0'0010'0111 + DW %00'010'0'0110'1111 + DB ACEX.VG93_3F + DW %11'010'0'0010'0111 + DW %11'010'0'0110'1111 + DB ACEX.VG93_3F - DW %00'000'0'0100'0111 - DW %00'010'0'0110'1111 - DB ACEX.VG93_5F - DW %11'010'0'0100'0111 - DW %11'010'0'0110'1111 - DB ACEX.VG93_5F + DW %00'000'0'0100'0111 + DW %00'010'0'0110'1111 + DB ACEX.VG93_5F + DW %11'010'0'0100'0111 + DW %11'010'0'0110'1111 + DB ACEX.VG93_5F - DW %00'000'0'0110'0111 - DW %00'010'0'0110'1111 - DB ACEX.VG93_7F - DW %11'010'0'0110'0111 - DW %11'010'0'0110'1111 - DB ACEX.VG93_7F + DW %00'000'0'0110'0111 + DW %00'010'0'0110'1111 + DB ACEX.VG93_7F + DW %11'010'0'0110'0111 + DW %11'010'0'0110'1111 + DB ACEX.VG93_7F - DW %00'000'0'0110'1111 - DW %00'011'0'0110'1111 - DB ACEX.VG93_State - DW %11'010'0'0110'1111 - DW %11'011'0'0110'1111 - DB ACEX.VG93_State + DW %00'000'0'0110'1111 + DW %00'011'0'0110'1111 + DB ACEX.VG93_State + DW %11'010'0'0110'1111 + DW %11'011'0'0110'1111 + DB ACEX.VG93_State ; For joystick - DW %00'011'0'0000'0111 - DW %10'011'0'0110'1111 - DB ACEX.JOY_VG93 - DW %10'011'0'0000'0111 - DW %11'011'0'0110'1111 - DB ACEX.JOY_VG93 + DW %00'011'0'0000'0111 + DW %10'011'0'0110'1111 + DB ACEX.JOY_VG93 + DW %10'011'0'0000'0111 + DW %11'011'0'0110'1111 + DB ACEX.JOY_VG93 ; For VG93 with dos on - DW %00'001'0'0110'1111 - DW %00'011'0'0110'1111 - DB ACEX.JOY_VG93 + DW %00'001'0'0110'1111 + DW %00'011'0'0110'1111 + DB ACEX.JOY_VG93 ; For VG93 with dos off - DW %11'011'0'0110'1111 - DW %11'011'0'0110'1111 - DB ACEX.JOY_VG93 + DW %11'011'0'0110'1111 + DW %11'011'0'0110'1111 + DB ACEX.JOY_VG93 - DW %00'000'0'0010'1101 - DW %11'011'1'1111'1111 - DB ACEX.FDD720 - DW %11'000'0'0010'1101 - DW %11'001'1'1111'1111 - DB ACEX.FDD720 + DW %00'000'0'0010'1101 + DW %11'011'1'1111'1111 + DB ACEX.FDD720 + DW %11'000'0'0010'1101 + DW %11'001'1'1111'1111 + DB ACEX.FDD720 - DW %00'000'0'0011'1101 - DW %11'011'1'1111'1111 - DB ACEX.FDD144 - DW %11'000'0'0011'1101 - DW %11'001'1'1111'1111 - DB ACEX.FDD144 + DW %00'000'0'0011'1101 + DW %11'011'1'1111'1111 + DB ACEX.FDD144 + DW %11'000'0'0011'1101 + DW %11'001'1'1111'1111 + DB ACEX.FDD144 ;!FIXIT UNKNOWN PORTS--------------------------------------------------; dos on, только через BC, чтение/запись - DW %10'000'1'0010'1101 - DW %11'010'1'1111'1111 - DB #18 + DW %10'000'1'0010'1101 + DW %11'010'1'1111'1111 + DB #18 - DW %10'000'1'0011'1101 - DW %11'010'1'1111'1111 - DB #19 + DW %10'000'1'0011'1101 + DW %11'010'1'1111'1111 + DB #19 - DW %10'000'1'1010'1101 - DW %11'010'1'1111'1111 - DB #1A + DW %10'000'1'1010'1101 + DW %11'010'1'1111'1111 + DB #1A ;----------------------------------------------------------------------; - DW %00'000'1'0010'1101 - DW %11'001'1'1111'1111 - DB ACEX.ISA_CTRL - DW %10'000'1'1011'1101 - DW %11'010'1'1111'1111 - DB ACEX.ISA_CTRL - DW %11'000'1'0010'1101 - DW %11'001'1'1111'1111 - DB ACEX.ISA_CTRL + DW %00'000'1'0010'1101 + DW %11'001'1'1111'1111 + DB ACEX.ISA_CTRL + DW %10'000'1'1011'1101 + DW %11'010'1'1111'1111 + DB ACEX.ISA_CTRL + DW %11'000'1'0010'1101 + DW %11'001'1'1111'1111 + DB ACEX.ISA_CTRL - DW %00'001'1'0011'1101 - DW %11'001'1'0111'1111 - DB ACEX.CMOS_DATA.READ - DW %11'001'1'0011'1101 - DW %11'001'1'0111'1111 - DB ACEX.CMOS_DATA.READ + DW %00'001'1'0011'1101 + DW %11'001'1'0111'1111 + DB ACEX.CMOS_DATA.READ + DW %11'001'1'0011'1101 + DW %11'001'1'0111'1111 + DB ACEX.CMOS_DATA.READ - DW %00'000'1'1010'1101 - DW %11'001'1'1111'1111 - DB ACEX.CMOS_ADDR.WRITE - DW %11'000'1'1010'1101 - DW %11'001'1'1111'1111 - DB ACEX.CMOS_ADDR.WRITE + DW %00'000'1'1010'1101 + DW %11'001'1'1111'1111 + DB ACEX.CMOS_ADDR.WRITE + DW %11'000'1'1010'1101 + DW %11'001'1'1111'1111 + DB ACEX.CMOS_ADDR.WRITE - DW %00'000'1'0011'1101 - DW %11'001'1'0111'1111 - DB ACEX.CMOS_DATA.WRITE - DW %11'000'1'0011'1101 - DW %11'001'1'0111'1111 - DB ACEX.CMOS_DATA.WRITE + DW %00'000'1'0011'1101 + DW %11'001'1'0111'1111 + DB ACEX.CMOS_DATA.WRITE + DW %11'000'1'0011'1101 + DW %11'001'1'0111'1111 + DB ACEX.CMOS_DATA.WRITE ; ;---------HDD[v] - DW %00'000'0'0100'0000 - DW %11'000'0'0110'1111 - DB #20 - DW %01'000'0'0100'0000 - DW %11'010'0'0110'1111 - DB #20 + DW %00'000'0'0100'0000 + DW %11'000'0'0110'1111 + DB #20 + DW %01'000'0'0100'0000 + DW %11'010'0'0110'1111 + DB #20 - DW %10'000'0'0100'0000 - DW %11'010'0'0110'1111 - DB #20 - DW %11'000'0'0100'0000 - DW %11'000'0'0110'1111 - DB #20 + DW %10'000'0'0100'0000 + DW %11'010'0'0110'1111 + DB #20 + DW %11'000'0'0100'0000 + DW %11'000'0'0110'1111 + DB #20 - DW %00'000'0'0100'0001 - DW %00'010'1'1110'1111 - DB #21 - DW %00'010'0'0100'0001 - DW %11'010'1'1110'1111 - DB #21 - DW %11'010'0'0100'0001 - DW %11'010'1'1110'1111 - DB #21 + DW %00'000'0'0100'0001 + DW %00'010'1'1110'1111 + DB #21 + DW %00'010'0'0100'0001 + DW %11'010'1'1110'1111 + DB #21 + DW %11'010'0'0100'0001 + DW %11'010'1'1110'1111 + DB #21 - DW %00'000'0'0100'0010 - DW %00'010'1'1110'1111 - DB #22 - DW %00'010'0'0100'0010 - DW %11'010'1'1110'1111 - DB #22 - DW %11'010'0'0100'0010 - DW %11'010'1'1110'1111 - DB #22 + DW %00'000'0'0100'0010 + DW %00'010'1'1110'1111 + DB #22 + DW %00'010'0'0100'0010 + DW %11'010'1'1110'1111 + DB #22 + DW %11'010'0'0100'0010 + DW %11'010'1'1110'1111 + DB #22 - DW %00'000'0'0100'0011 - DW %00'010'1'1110'1111 - DB #23 - DW %00'010'0'0100'0011 - DW %11'010'1'1110'1111 - DB #23 - DW %11'010'0'0100'0011 - DW %11'010'1'1110'1111 - DB #23 + DW %00'000'0'0100'0011 + DW %00'010'1'1110'1111 + DB #23 + DW %00'010'0'0100'0011 + DW %11'010'1'1110'1111 + DB #23 + DW %11'010'0'0100'0011 + DW %11'010'1'1110'1111 + DB #23 - DW %00'000'0'0100'0100 - DW %00'010'1'1110'1111 - DB #24 - DW %00'010'0'0100'0100 - DW %11'010'1'1110'1111 - DB #24 - DW %11'010'0'0100'0100 - DW %11'010'1'1110'1111 - DB #24 + DW %00'000'0'0100'0100 + DW %00'010'1'1110'1111 + DB #24 + DW %00'010'0'0100'0100 + DW %11'010'1'1110'1111 + DB #24 + DW %11'010'0'0100'0100 + DW %11'010'1'1110'1111 + DB #24 - DW %00'000'0'0100'0101 - DW %00'010'1'1110'1111 - DB #25 - DW %00'010'0'0100'0101 - DW %11'010'1'1110'1111 - DB #25 - DW %11'010'0'0100'0101 - DW %11'010'1'1110'1111 - DB #25 + DW %00'000'0'0100'0101 + DW %00'010'1'1110'1111 + DB #25 + DW %00'010'0'0100'0101 + DW %11'010'1'1110'1111 + DB #25 + DW %11'010'0'0100'0101 + DW %11'010'1'1110'1111 + DB #25 - DW %00'000'0'1100'0010 - DW %00'010'1'1110'1111 - DB #26 - DW %00'010'0'1100'0010 - DW %11'010'1'1110'1111 - DB #26 - DW %11'010'0'1100'0010 - DW %11'010'1'1110'1111 - DB #26 + DW %00'000'0'1100'0010 + DW %00'010'1'1110'1111 + DB #26 + DW %00'010'0'1100'0010 + DW %11'010'1'1110'1111 + DB #26 + DW %11'010'0'1100'0010 + DW %11'010'1'1110'1111 + DB #26 - DW %00'000'0'1100'0011 - DW %00'010'1'1110'1111 - DB #27 - DW %00'010'0'1100'0011 - DW %11'010'1'1110'1111 - DB #27 - DW %11'010'0'1100'0011 - DW %11'010'1'1110'1111 - DB #27 + DW %00'000'0'1100'0011 + DW %00'010'1'1110'1111 + DB #27 + DW %00'010'0'1100'0011 + DW %11'010'1'1110'1111 + DB #27 + DW %11'010'0'1100'0011 + DW %11'010'1'1110'1111 + DB #27 ;---------HDD[^] ; - DW %00'000'0'1100'0100 - DW %00'010'1'1110'1111 - DB ACEX.IDE_CONTROL_3F6 - DW %00'010'0'1100'0100 - DW %11'010'1'1110'1111 - DB ACEX.IDE_CONTROL_3F6 - DW %11'010'0'1100'0100 - DW %11'010'1'1110'1111 - DB ACEX.IDE_CONTROL_3F6 + DW %00'000'0'1100'0100 + DW %00'010'1'1110'1111 + DB ACEX.IDE_CONTROL_3F6 + DW %00'010'0'1100'0100 + DW %11'010'1'1110'1111 + DB ACEX.IDE_CONTROL_3F6 + DW %11'010'0'1100'0100 + DW %11'010'1'1110'1111 + DB ACEX.IDE_CONTROL_3F6 - DW %00'000'0'1100'0101 - DW %00'010'1'1110'1111 - DB ACEX.IDE_STATUS_3F7 - DW %00'010'0'1100'0101 - DW %11'010'1'1110'1111 - DB ACEX.IDE_STATUS_3F7 - DW %11'010'0'1100'0101 - DW %11'010'1'1110'1111 - DB ACEX.IDE_STATUS_3F7 + DW %00'000'0'1100'0101 + DW %00'010'1'1110'1111 + DB ACEX.IDE_STATUS_3F7 + DW %00'010'0'1100'0101 + DW %11'010'1'1110'1111 + DB ACEX.IDE_STATUS_3F7 + DW %11'010'0'1100'0101 + DW %11'010'1'1110'1111 + DB ACEX.IDE_STATUS_3F7 - DW %00'000'0'0010'1100 - DW %11'001'1'1111'1111 - DB ACEX.IDE_CHANEL_1 - DW %11'000'0'0010'1100 - DW %11'001'1'1111'1111 - DB ACEX.IDE_CHANEL_1 + DW %00'000'0'0010'1100 + DW %11'001'1'1111'1111 + DB ACEX.IDE_CHANEL_1 + DW %11'000'0'0010'1100 + DW %11'001'1'1111'1111 + DB ACEX.IDE_CHANEL_1 - DW %00'000'0'0011'1100 - DW %11'001'1'1111'1111 - DB ACEX.IDE_CHANEL_2 - DW %11'000'0'0011'1100 - DW %11'001'1'1111'1111 - DB ACEX.IDE_CHANEL_2 + DW %00'000'0'0011'1100 + DW %11'001'1'1111'1111 + DB ACEX.IDE_CHANEL_2 + DW %11'000'0'0011'1100 + DW %11'001'1'1111'1111 + DB ACEX.IDE_CHANEL_2 - DW %00'000'0'1010'1101 - DW %11'001'1'1111'1111 - DB ACEX.VSYNC320 - DW %11'000'0'1010'1101 - DW %11'001'1'1111'1111 - DB ACEX.VSYNC320 + DW %00'000'0'1010'1101 + DW %11'001'1'1111'1111 + DB ACEX.VSYNC320 + DW %11'000'0'1010'1101 + DW %11'001'1'1111'1111 + DB ACEX.VSYNC320 - DW %00'000'0'1011'1101 - DW %11'001'1'1111'1111 - DB ACEX.VSYNC312 - DW %11'000'0'1011'1101 - DW %11'001'1'1111'1111 - DB ACEX.VSYNC312 + DW %00'000'0'1011'1101 + DW %11'001'1'1111'1111 + DB ACEX.VSYNC312 + DW %11'000'0'1011'1101 + DW %11'001'1'1111'1111 + DB ACEX.VSYNC312 - DW %00'000'0'1010'1100 - DW %11'001'1'1111'1111 - DB ACEX.RESET - DW %11'000'0'1010'1100 - DW %11'001'1'1111'1111 - DB ACEX.RESET + DW %00'000'0'1010'1100 + DW %11'001'1'1111'1111 + DB ACEX.RESET + DW %11'000'0'1010'1100 + DW %11'001'1'1111'1111 + DB ACEX.RESET - DW %00'000'0'1011'1100 - DW %11'001'1'1111'1111 - DB ACEX.UNKNOWN ;!FIXIT можно пока убрать - DW %11'000'0'1011'1100 - DW %11'001'1'1111'1111 - DB ACEX.UNKNOWN ;!FIXIT можно пока убрать + DW %00'000'0'1011'1100 + DW %11'001'1'1111'1111 + DB ACEX.UNKNOWN ;!FIXIT можно пока убрать + DW %11'000'0'1011'1100 + DW %11'001'1'1111'1111 + DB ACEX.UNKNOWN ;!FIXIT можно пока убрать - DW %00'010'0'0010'1011 - DW %11'010'0'0110'1011 - DB ACEX.ISA_Control ;!FIXIT можно пока убрать ??? + DW %00'010'0'0010'1011 + DW %11'010'0'0110'1011 + DB ACEX.ISA_Control ;!FIXIT можно пока убрать ??? - DW %00'011'0'0110'1110 - DW %10'011'0'0110'1111 - DB ACEX.ZX_Keyboard - DW %10'011'0'0110'1110 - DW %11'011'0'0110'1111 - DB ACEX.ZX_Keyboard + DW %00'011'0'0110'1110 + DW %10'011'0'0110'1111 + DB ACEX.ZX_Keyboard + DW %10'011'0'0110'1110 + DW %11'011'0'0110'1111 + DB ACEX.ZX_Keyboard - DW %00'001'1'1111'1101 - DW %00'001'1'1111'1111 - DB ACEX.AY_FFFD_READ + DW %00'001'1'1111'1101 + DW %00'001'1'1111'1111 + DB ACEX.AY_FFFD_READ - DW %00'001'1'1101'1111 - DW %11'001'1'1111'1111 - DB ACEX.Kempston_Mouse - DW %11'001'1'1101'1111 - DW %11'001'1'1111'1111 - DB ACEX.Kempston_Mouse + DW %00'001'1'1101'1111 + DW %11'001'1'1111'1111 + DB ACEX.Kempston_Mouse + DW %11'001'1'1101'1111 + DW %11'001'1'1111'1111 + DB ACEX.Kempston_Mouse - DW %00'011'0'0110'0011 - DW %11'011'0'0110'1111 - DB ACEX.CBL_OUT - DW %01'010'0'0110'0011 - DW %11'010'0'0110'1111 - DB ACEX.CBL_OUT - DW %10'010'0'0110'0011 - DW %11'010'0'0110'1111 - DB ACEX.CBL_OUT - DW %00'010'0'0000'0111 - DW %11'011'0'0000'1111 - DB ACEX.CBL_OUT - DW %00'011'0'0000'1000 - DW %11'011'0'0110'1111 - DB ACEX.CBL_OUT - DW %00'010'0'0110'1011 - DW %10'010'0'0110'1111 - DB ACEX.CBL_OUT - DW %10'010'0'0110'1011 - DW %11'010'0'0110'1111 - DB ACEX.CBL_OUT + DW %00'011'0'0110'0011 + DW %11'011'0'0110'1111 + DB ACEX.CBL_OUT + DW %01'010'0'0110'0011 + DW %11'010'0'0110'1111 + DB ACEX.CBL_OUT + DW %10'010'0'0110'0011 + DW %11'010'0'0110'1111 + DB ACEX.CBL_OUT + DW %00'010'0'0000'0111 + DW %11'011'0'0000'1111 + DB ACEX.CBL_OUT + DW %00'011'0'0000'1000 + DW %11'011'0'0110'1111 + DB ACEX.CBL_OUT + DW %00'010'0'0110'1011 + DW %10'010'0'0110'1111 + DB ACEX.CBL_OUT + DW %10'010'0'0110'1011 + DW %11'010'0'0110'1111 + DB ACEX.CBL_OUT - DW %00'000'0'0100'0110 - DW %11'001'1'1111'1111 - DB ACEX.CBL_SYS_PORT - DW %11'000'0'0100'0110 - DW %11'001'1'1111'1111 - DB ACEX.CBL_SYS_PORT + DW %00'000'0'0100'0110 + DW %11'001'1'1111'1111 + DB ACEX.CBL_SYS_PORT + DW %11'000'0'0100'0110 + DW %11'001'1'1111'1111 + DB ACEX.CBL_SYS_PORT - DW %00'000'1'1111'1101 - DW %00'001'1'1111'1111 - DB ACEX.AY_FFFD_WRITE + DW %00'000'1'1111'1101 + DW %00'001'1'1111'1111 + DB ACEX.AY_FFFD_WRITE - DW %00'000'1'0111'1101 - DW %00'001'1'1111'1111 - DB ACEX.AY_BFFD + DW %00'000'1'0111'1101 + DW %00'001'1'1111'1111 + DB ACEX.AY_BFFD - DW %00'000'0'0110'1101 - DW %10'000'1'1111'1111 - DB ACEX.Scorp_1FFD - DW %11'000'0'0110'1101 - DW %11'000'1'1111'1111 - DB ACEX.Scorp_1FFD + DW %00'000'0'0110'1101 + DW %10'000'1'1111'1111 + DB ACEX.Scorp_1FFD + DW %11'000'0'0110'1101 + DW %11'000'1'1111'1111 + DB ACEX.Scorp_1FFD - DW %00'000'0'1110'1101 - DW %00'100'1'1110'1111 - DB ACEX.Pent_7FFD - DW %00'100'0'1110'1101 - DW %11'110'1'1110'1111 - DB ACEX.Pent_7FFD - DW %11'100'0'1110'1101 - DW %11'100'1'1110'1111 - DB ACEX.Pent_7FFD - DW %10'000'0'0110'1101 - DW %11'100'1'1110'1111 - DB ACEX.Pent_7FFD + DW %00'000'0'1110'1101 + DW %00'100'1'1110'1111 + DB ACEX.Pent_7FFD + DW %00'100'0'1110'1101 + DW %11'110'1'1110'1111 + DB ACEX.Pent_7FFD + DW %11'100'0'1110'1101 + DW %11'100'1'1110'1111 + DB ACEX.Pent_7FFD + DW %10'000'0'0110'1101 + DW %11'100'1'1110'1111 + DB ACEX.Pent_7FFD - DW %00'000'0'0110'1110 - DW %00'001'0'0110'1111 - DB ACEX.Border_FE + DW %00'000'0'0110'1110 + DW %00'001'0'0110'1111 + DB ACEX.Border_FE - DW %00'000'0'0101'0110 - DW %11'001'1'1111'1111 - DB ACEX.ALL_MODE - DW %11'000'0'0101'0110 - DW %11'001'1'1111'1111 - DB ACEX.ALL_MODE + DW %00'000'0'0101'0110 + DW %11'001'1'1111'1111 + DB ACEX.ALL_MODE + DW %11'000'0'0101'0110 + DW %11'001'1'1111'1111 + DB ACEX.ALL_MODE - DW %00'000'0'0000'1001 - DW %00'010'0'0110'1111 - DB ACEX.PORT_Y - DW %00'010'0'0000'1001 - DW %11'010'0'0110'1111 - DB ACEX.PORT_Y - DW %11'010'0'0000'1001 - DW %11'010'0'0110'1111 - DB ACEX.PORT_Y + DW %00'000'0'0000'1001 + DW %00'010'0'0110'1111 + DB ACEX.PORT_Y + DW %00'010'0'0000'1001 + DW %11'010'0'0110'1111 + DB ACEX.PORT_Y + DW %11'010'0'0000'1001 + DW %11'010'0'0110'1111 + DB ACEX.PORT_Y - DW %00'000'0'0100'1001 - DW %00'010'0'0110'1111 - DB ACEX.RGMOD - DW %00'010'0'0100'1001 - DW %11'010'0'0110'1111 - DB ACEX.RGMOD - DW %11'010'0'0100'1001 - DW %11'010'0'0110'1111 - DB ACEX.RGMOD + DW %00'000'0'0100'1001 + DW %00'010'0'0110'1111 + DB ACEX.RGMOD + DW %00'010'0'0100'1001 + DW %11'010'0'0110'1111 + DB ACEX.RGMOD + DW %11'010'0'0100'1001 + DW %11'010'0'0110'1111 + DB ACEX.RGMOD - DW %00'000'0'0010'0100 - DW %00'000'0'0010'1111 - DB ACEX.CNF_PORT + DW %00'000'0'0010'0100 + DW %00'000'0'0010'1111 + DB ACEX.CNF_PORT ;!FIXIT можно убрать - DW %00'000'0'0110'1100 - DW %11'001'0'0110'1111 - DB ACEX.SCALE - DW %11'000'0'0110'1100 - DW %11'001'0'0110'1111 - DB ACEX.SCALE + DW %00'000'0'0110'1100 + DW %11'001'0'0110'1111 + DB ACEX.SCALE + DW %11'000'0'0110'1100 + DW %11'001'0'0110'1111 + DB ACEX.SCALE - DW %00'000'0'0000'1010 - DW %00'010'0'0110'1111 - DB ACEX.SLOT0 - DW %00'010'0'0000'1010 - DW %11'010'0'0110'1111 - DB ACEX.SLOT0 - DW %11'010'0'0000'1010 - DW %11'010'0'0110'1111 - DB ACEX.SLOT0 + DW %00'000'0'0000'1010 + DW %00'010'0'0110'1111 + DB ACEX.SLOT0 + DW %00'010'0'0000'1010 + DW %11'010'0'0110'1111 + DB ACEX.SLOT0 + DW %11'010'0'0000'1010 + DW %11'010'0'0110'1111 + DB ACEX.SLOT0 - DW %00'000'0'0010'1010 - DW %00'010'0'0110'1111 - DB ACEX.SLOT1 - DW %00'010'0'0010'1010 - DW %11'010'0'0110'1111 - DB ACEX.SLOT1 - DW %11'010'0'0010'1010 - DW %11'010'0'0110'1111 - DB ACEX.SLOT1 + DW %00'000'0'0010'1010 + DW %00'010'0'0110'1111 + DB ACEX.SLOT1 + DW %00'010'0'0010'1010 + DW %11'010'0'0110'1111 + DB ACEX.SLOT1 + DW %11'010'0'0010'1010 + DW %11'010'0'0110'1111 + DB ACEX.SLOT1 - DW %00'000'0'0100'1010 - DW %00'010'0'0110'1111 - DB ACEX.SLOT2 - DW %00'010'0'0100'1010 - DW %11'010'0'0110'1111 - DB ACEX.SLOT2 - DW %11'010'0'0100'1010 - DW %11'010'0'0110'1111 - DB ACEX.SLOT2 + DW %00'000'0'0100'1010 + DW %00'010'0'0110'1111 + DB ACEX.SLOT2 + DW %00'010'0'0100'1010 + DW %11'010'0'0110'1111 + DB ACEX.SLOT2 + DW %11'010'0'0100'1010 + DW %11'010'0'0110'1111 + DB ACEX.SLOT2 - DW %00'000'0'0110'1010 - DW %00'010'0'0110'1111 - DB ACEX.SLOT3 - DW %00'010'0'0110'1010 - DW %11'010'0'0110'1111 - DB ACEX.SLOT3 - DW %11'010'0'0110'1010 - DW %11'010'0'0110'1111 - DB ACEX.SLOT3 + DW %00'000'0'0110'1010 + DW %00'010'0'0110'1111 + DB ACEX.SLOT3 + DW %00'010'0'0110'1010 + DW %11'010'0'0110'1111 + DB ACEX.SLOT3 + DW %11'010'0'0110'1010 + DW %11'010'0'0110'1111 + DB ACEX.SLOT3 ; DCP END MARKER - DW 0,0,0 + DW 0,0,0 ;-----------------------------------------------------------------------; ; diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm index 08042d6..c008f93 100644 --- a/src/bios/exp/EXP.asm +++ b/src/bios/exp/EXP.asm @@ -1197,16 +1197,19 @@ ZX_SPECTRUM_MODE: CALL FN_SYNC.INT_PENT CALL SET_PAL_ZX - LD HL,#4104 LD E,0 - LD B,4 - CALL LP_OPEN_S - + ;!TEST + ; LD HL,#4104 + ; LD B,4 + ; CALL LP_OPEN_S + CALL LP_SET_32 + ; + LD E,0 LD HL,#5104 - LD E,0 - LD B,4 - CALL LP_OPEN_S - + ;!TEST + ; LD B,4 + ;CALL LP_OPEN_S + CALL LP_SET_32.X ; LD D,#35 ; CALL CMOS_RD diff --git a/src/bios/exp/FUNC_LOW_PRINT.ASM b/src/bios/exp/FUNC_LOW_PRINT.ASM index f369bb3..050d95a 100644 --- a/src/bios/exp/FUNC_LOW_PRINT.ASM +++ b/src/bios/exp/FUNC_LOW_PRINT.ASM @@ -1040,7 +1040,7 @@ LP_MODE_LINE: LD A,#50 OUT (SLOT3),A LD A,L ; вертикальное положение - CP 80H + CP #80 JR NC,LP_EXIT_MODE LP_MODE_RECURSE: @@ -1099,10 +1099,8 @@ LP_EXIT_MODE: RET ; Установка режима на линии -LP_MODE_LINE2: - ; Spectrum mode - +LP_MODE_LINE2: LD A,(IX+Window_Variables.WORK_2) LD B,(IX+Window_Variables.WORK_1) @@ -1112,12 +1110,12 @@ LP_MODE_LINE2: LD A,#50 OUT (SLOT3),A LD A,L ; вертикальное положение - CP 80H + CP #80 JR NC,LP_EXIT_MODE2 LP_MODE_RECURSE2: LD A,D ; горизонтальное положение - AND 7FH + AND #7F SUB 80 JR C,LP_MODE_LL2 SUB 48 @@ -1129,7 +1127,7 @@ LP_MODE_RECURSE2: LD A,E ; восстановить RRA - AND 3FH + AND #3F SUB C JR NC,LP_EXIT_MODE2 NEG @@ -1139,7 +1137,7 @@ LP_MODE_RECURSE2: LP_MODE_LL2: NEG RRA - AND 3FH + AND #3F CP C JR NC,LP_MODE_LR2 LD C,A diff --git a/src/bios/shared/RECOVERY.IMG b/src/bios/shared/RECOVERY.IMG index 5c60d3c..7e91f24 100755 Binary files a/src/bios/shared/RECOVERY.IMG and b/src/bios/shared/RECOVERY.IMG differ