diff --git a/Shared_Includes b/Shared_Includes index ff7c239..c7bcbd0 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit ff7c23909878e2f143563eee9e30fd9013bcd570 +Subproject commit c7bcbd096d4674064766dc9f61121f4843ddd635 diff --git a/src/bios/exp/DCP.ASM b/src/bios/exp/DCP.ASM index 7a23d49..29c8b6b 100644 --- a/src/bios/exp/DCP.ASM +++ b/src/bios/exp/DCP.ASM @@ -1,5 +1,5 @@ ;-----------------------------------------------------------------------; -; DATA FOR DCP +; DATA FOR DCPCollision between port #1F and CBL port fix ; вбиваем в таблицу DCP.XLSX нужный внешний порт, ; смотрим смещение для OUT (С),x - это адрес ; @@ -18,7 +18,6 @@ ; WORD %00001001101111 ; - маска - 0 изменяемые биты, 1 неизменяемые ; BYTE ACEX.Border_FE ; - порт - ;-----------------------------------------------------------------------; ; .RECORD.Size EQU 5 @@ -302,6 +301,14 @@ DW %11'001'1'1111'1111 DB ACEX.Kempston_Mouse + + ;-1F 0001 1111 x00x 0111 + ; 3F 0011 1111 x01x 0111 + ; 4F 0100 1111 x10x 0111 + ; 5F 0101 1111 x10x 0111 + ;+DF 1101 1111 x10x 1111 drum + ; DD 1101 1101 x10x 1101 scorp + ; FB 1111 1011 x11x 1011 DW %00'011'0'0110'0011 DW %11'011'0'0110'1111 DB ACEX.CBL_OUT @@ -311,18 +318,27 @@ 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 + DW %10'010'0'0110'1011 + DW %11'010'0'0110'1111 DB ACEX.CBL_OUT + ;!TEST ; [ ] Collision between port #1F and CBL port fix + ; DW %00'010'0'0000'0111 + ; DW %11'011'0'0000'1111 + ; DB ACEX.CBL_OUT + DW %00'010'0'0010'0111 + DW %11'011'0'0010'1111 + DB ACEX.CBL_OUT + DW %00'010'0'0100'0111 + DW %11'011'0'0100'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