From 085ef3c33245e463d9d2b423fc728ad9b5a0b6c2 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Fri, 16 Aug 2024 03:37:44 +1000
Subject: [PATCH] =?UTF-8?q?=D1=87=D1=83=D1=82=D1=8C=20=D0=B4=D1=80=D1=83?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BB=D1=8E=D0=B1=D0=BD=D0=B5=D0=B5=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20=D0=B2=20=D1=80=D0=B5=D0=B6?=
 =?UTF-8?q?=D0=B8=D0=BC=20=D1=81=D0=BF=D0=B5=D0=BA=D1=82=D1=80=D1=83=D0=BC?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Shared_Includes                 |   2 +-
 src/altera/acex/k30/DCP.TDF     |  92 ++++++++++-----------
 src/bios/exp/EXP.asm            |   5 +-
 src/bios/exp/ZX_MEM.TXT         |  13 +++
 src/bios/rom/SETUP/MAIN.asm     |  88 ++++++++++----------
 src/bios/rom/SETUP/SETTINGS.asm | 138 ++++++++++++++++----------------
 src/bios/rom/SETUP/VIDEO_IO.asm |   2 +-
 7 files changed, 178 insertions(+), 162 deletions(-)
 create mode 100644 src/bios/exp/ZX_MEM.TXT

diff --git a/Shared_Includes b/Shared_Includes
index eebde92..3ac606f 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit eebde92dd60cdf33588e34a7248413ec107edfe0
+Subproject commit 3ac606f87285e76a56c826ad33efdd26ada872f6
diff --git a/src/altera/acex/k30/DCP.TDF b/src/altera/acex/k30/DCP.TDF
index d73e33f..2a1f2cf 100644
--- a/src/altera/acex/k30/DCP.TDF
+++ b/src/altera/acex/k30/DCP.TDF
@@ -220,39 +220,39 @@ VARIABLE
 BEGIN
 
 %
-	DC.CLK42	= CLK42;
-	DC./RESET	= /RESET;
-
-	DC.A[15..0]	= A[15..0];
-
-	DC./IO		= /IO;
-	DC./WR		= /WR;
-	DC./M1		= /M1;
-
---	DC./IOM;
---	DC./IOMM;
---	DC.DCP[7..0];
-
-	DC.DOS		= DOS;
-	DC.CNF[1..0]= CNF[4..3];
-
-	DC.SYS		= SYS;
-
---	DC.PORT_X;
+-- 	DC.CLK42	= CLK42;
+-- 	DC./RESET	= /RESET;
+-- 
+-- 	DC.A[15..0]	= A[15..0];
+-- 
+-- 	DC./IO		= /IO;
+-- 	DC./WR		= /WR;
+-- 	DC./M1		= /M1;
+-- 
+-- --	DC./IOM;
+-- --	DC./IOMM;
+-- --	DC.DCP[7..0];
+-- 
+-- 	DC.DOS		= DOS;
+-- 	DC.CNF[1..0]= CNF[4..3];
+-- 
+-- 	DC.SYS		= SYS;
+-- 
+-- --	DC.PORT_X;
 %
 
 
 --	==============================================================
 %
-	CT[].clk	= CLK42;
-
-	IF CT1 THEN
-		CT[1..0] 	= GND;
-		CT2			= !CT2;
-	ELSE
-		CT[1..0]	= CT[1..0]+1;
-		CT2			= CT2;
-	END IF;
+-- 	CT[].clk	= CLK42;
+-- 
+-- 	IF CT1 THEN
+-- 		CT[1..0] 	= GND;
+-- 		CT2			= !CT2;
+-- 	ELSE
+-- 		CT[1..0]	= CT[1..0]+1;
+-- 		CT2			= CT2;
+-- 	END IF;
 %
 
 	/RES	= DFFE(VCC,CLK42,,,CT0);
@@ -319,18 +319,18 @@ BEGIN
 	END IF;
 
 %
-	MA_[11..0]	bit0 - WG_A5
-				bit1 - WG_A6
-				bit2 - MUX_KP11, 0 - WG,CMOS	1 - KMPS,TM9
-				bit3 - RD/WR	 0 - WRITE		1 - READ
-				bit4 - CS_WG93 or WR_TM9
-				bit5 - HDD/CMOS strobe
-				bit7,6	- 	00 - not
-							01 - ????
-							10 - HDD1/2
-							11 - CMOS
-				bit8 - HDD CS1/CS3 or CMOS data/adr
-				bit9,10,11 - HDD_A[2..0]
+--	MA_[11..0]	bit0 - WG_A5
+--				bit1 - WG_A6
+--				bit2 - MUX_KP11, 0 - WG,CMOS	1 - KMPS,TM9
+--				bit3 - RD/WR	 0 - WRITE		1 - READ
+--				bit4 - CS_WG93 or WR_TM9
+--				bit5 - HDD/CMOS strobe
+--				bit7,6	- 	00 - not
+--							01 - ????
+--							10 - HDD1/2
+--							11 - CMOS
+--				bit8 - HDD CS1/CS3 or CMOS data/adr
+--				bit9,10,11 - HDD_A[2..0]
 %
 	CASE A[15..14] IS
 		WHEN 0 => SP_SCR = GND;		SP_SA = GND;
@@ -357,11 +357,11 @@ BEGIN
 		WHEN 1 => X_MA_[] = (HDD_A[2..0],B"00000",/WR,VCC,A[6..5]);
 	END CASE;
 %
-	CASE MA_CT1 IS
---		WHEN 0 => MA_[] = X_ADR[];
-		WHEN 0 => MA_[] = (GND,X_ADR[10..0]);
-		WHEN 1 => MA_[] = (HDD_A[2..0],X_MA_[8..4],/WR,X_MA_[3],A[6..5]);
-	END CASE;
+--	CASE MA_CT1 IS
+----		WHEN 0 => MA_[] = X_ADR[];
+--		WHEN 0 => MA_[] = (GND,X_ADR[10..0]);
+--		WHEN 1 => MA_[] = (HDD_A[2..0],X_MA_[8..4],/WR,X_MA_[3],A[6..5]);
+--	END CASE;
 %
 
 	CASE (IO_RW,MA_CT1) IS
@@ -667,7 +667,7 @@ END GENERATE;
 	SC[].clrn		= /RESET & !CNF6;	-- Scorpion-OFF
 
 	PN[5..0].clrn	= /RESET & !CNF5;	-- reset PN5
-	PN[7..5].clrn	= /RESET & CNF7;	-- set Pentagon-512
+	PN[7..6].clrn	= /RESET & CNF7;	-- set Pentagon-512
 
 	PN4Q	= PN4;
 
diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm
index 697b8c6..4145587 100644
--- a/src/bios/exp/EXP.asm
+++ b/src/bios/exp/EXP.asm
@@ -929,7 +929,8 @@ Setup_to_RAM:	LD HL,Setup_Starter.Start
 		LDIR
 	; на стек кладётся адрес возврата и дальше тащится всякими костылями, чтоб вернуться назад
 		CALL Setup_Starter.Exec					; #C000
-PrepareToZX:	; Setup HDD drives for ZX Spectrum mode
+PrepareToZX:	;CALL	init_zx_roms
+		; Setup HDD drives for ZX Spectrum mode
 		DI
 		LD	D,CMOS_CELL.TRDOSmount
 		CALL	CMOS_RD
@@ -1480,7 +1481,7 @@ PROG_NO_ROM:
 	;
 	LD      HL,#A000
 	LD      D,0							; delimiter
-	LD      E,COLORS.CGA.FLASH + COLORS.CGA.INC.RED
+	LD      E,COLORS.CGA.FLASH + COLORS.CGA.INK.RED
 	LD      B,A
 	LD      C,BIOS.LP_PRINT_LINE3
 	RST     ToBIOS
diff --git a/src/bios/exp/ZX_MEM.TXT b/src/bios/exp/ZX_MEM.TXT
new file mode 100644
index 0000000..cf20fbf
--- /dev/null
+++ b/src/bios/exp/ZX_MEM.TXT
@@ -0,0 +1,13 @@
+Отдельные рамблоки для:
+	vROM
+	vRAM
+Отдельные процедуры выделения страниц для:
+	#1FFD - обрабатывать первым если нужен. Не подходят #A0, #D0..#DF
+	#7FFD - 128/512, не выделять память для #1FFD в режиме pent 512
+	vROM
+Страницу 0 использовать как раньше для маппа в #7FFD и для #1FFD=1
+Подкрутить в меню спектрума переключалку режимов и освобождение памяти под новую модель памяти
+При освобождении памяти vROM мапить на эти порты обратно Spec_Page
+Проверить на хардкод биос и zxroms, чтоб не втыкались стандартные (зарезервированные) страницы
+;
+Сделать переключалку в биосе старый/новый режим работы памяти?
\ No newline at end of file
diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm
index ac308ed..4b4ea0a 100644
--- a/src/bios/rom/SETUP/MAIN.asm
+++ b/src/bios/rom/SETUP/MAIN.asm
@@ -411,29 +411,29 @@ INSTALL:
 	LD	DE,#0028				; !HARDCODE
         CALL    LP_SET_PLACE
 	LD	HL,memBUFFER.ID
-	LD	A,COLORS.CGA.INC.LCYAN
+	LD	A,COLORS.CGA.INK.LCYAN
 	CALL	CPRINTZ
 	; LD	HL,BUILD
-	; LD	A,COLORS.CGA.INC.LCYAN
+	; LD	A,COLORS.CGA.INK.LCYAN
 	; CALL	CPRINTZ
 
 	LD	DE,#0128				; !HARDCODE
         CALL    LP_SET_PLACE
 	LD	A,msgStrings.copyRightPeters
-	LD	E,COLORS.CGA.INC.LGREEN
+	LD	E,COLORS.CGA.INK.LGREEN
 	CALL	POSTMSC
 
 	LD	DE,#0228				; !HARDCODE
         CALL    LP_SET_PLACE
 	LD	A,msgStrings.copyRightSPTeam
-	LD	E,COLORS.CGA.INC.GREEN
+	LD	E,COLORS.CGA.INK.GREEN
 	CALL	POSTMSC
 
  IF BETA_BUILD > 0
 	LD	DE,#0328
         CALL    LP_SET_PLACE
 	LD	A,msgStrings.testBIOSmsg
-	LD	E,COLORS.CGA.FLASH + COLORS.CGA.INC.RED
+	LD	E,COLORS.CGA.FLASH + COLORS.CGA.INK.RED
 	CALL	POSTMSC
  ENDIF
 
@@ -569,7 +569,7 @@ QIGNORE:
 	;CALL	ScreenPOS.LOCAT
         CALL    LP_SET_PLACE
 	LD	A,msgStrings.toSetupButton
-	LD	E,COLORS.CGA.FLASH + COLORS.CGA.INC.WHITE
+	LD	E,COLORS.CGA.FLASH + COLORS.CGA.INK.WHITE
 	CALL	POSTMSC
 
 	LD	DE,#0900
@@ -582,7 +582,7 @@ ERRSUM+1:
 	XOR	A
 	ld (.ErrDateTime+1),a					; если контрольная сумма слетела, то сообщение о кривых дате/времени в кмос не выводим
 	LD	A,msgStrings.cmosChecksumErr
-	LD	E,COLORS.CGA.INC.RED
+	LD	E,COLORS.CGA.INK.RED
 	CALL	POSTMSC
 	CALL	ScreenPOS.CRLF
 	CALL	ScreenPOS.CRLF
@@ -593,7 +593,7 @@ ERRSUM+1:
 	OR      A
 	JR      Z,CHEKOK
 	LD	A,msgStrings.cmosDateTimeErr
-	LD	E,COLORS.CGA.INC.RED
+	LD	E,COLORS.CGA.INK.RED
 	CALL	POSTMSC
 	CALL	ScreenPOS.CRLF
 	CALL	ScreenPOS.CRLF
@@ -657,14 +657,14 @@ INFO_MESSAGE:
 	; LD	DE,#0428
 	; CALL	LP_SET_PLACE
 	; LD	A,msgStrings.forCtrlBootButton
-	; LD	E,COLORS.CGA.INC.WHITE
+	; LD	E,COLORS.CGA.INK.WHITE
 	; CALL	POSTMSC
 	;
 	; <ALT> For alternative boot
 	LD	DE,#0528
 	CALL	LP_SET_PLACE
 	LD	A,msgStrings.forAltBootButton
-	LD	E,COLORS.CGA.INC.WHITE
+	LD	E,COLORS.CGA.INK.WHITE
 	CALL	POSTMSC
 
 
@@ -690,20 +690,20 @@ INFO_MESSAGE:
 RECOVERY_BOOT:
 	CALL	PrepareToBOOT       
 	LD	A,msgStrings.bootFail
-	LD	E,COLORS.CGA.INC.LRED
+	LD	E,COLORS.CGA.INK.LRED
 	CALL	C,POSTMSC
 	CALL	ScreenPOS.CRLF
 	;
 	CALL	INT_ON
 ALT_BOOT:
 	LD	A,msgStrings.bootAltDrv
-	LD	E,COLORS.CGA.INC.LGREEN
+	LD	E,COLORS.CGA.INK.LGREEN
 	CALL	POSTMSC
 
 	LD	BC,CMOS_CELL.BootDrives.Mask.AltSysDisk			;#7010
 	CALL	PrepareToBOOT
 	LD	A,msgStrings.bootFail
-	LD	E,COLORS.CGA.INC.LRED
+	LD	E,COLORS.CGA.INK.LRED
 	CALL	C,POSTMSC
 	CALL	ScreenPOS.CRLF
 
@@ -715,7 +715,7 @@ ALT_BOOT:
 
 	CALL	ScreenPOS.CRLF
 	LD	A,msgStrings.afterBootFail
-	LD	E,COLORS.CGA.INC.RED
+	LD	E,COLORS.CGA.INK.RED
 	CALL	POSTMSC
 
 	;EI
@@ -1056,7 +1056,7 @@ OS_LOAD:
 	EX	AF,AF'
 	PUSH	AF
 	LD	A,msgStrings.bootOk
-	LD	E,COLORS.CGA.INC.LGREEN
+	LD	E,COLORS.CGA.INK.LGREEN
 	;CALL	POSTMSG
 	CALL	POSTMSC
 	CALL	ScreenPOS.CRLF
@@ -1586,9 +1586,9 @@ PRINT_CHANEL:
 
 ;----------------------------------------------------------------------[]
 ;!TODO сделать выбор в Setup, что грузить в vПЗУ при старте. Варианты:
-;[ ]	0 - Не грузить ПЗУ спектрума, инитить страницу #41 как в 3.04
-;[ ]	1 - Грузит ПЗУ спектрума из ROM при старте если нет флага ZX
-;[ ]	2 - Грузит ПЗУ спектрума из ROM при каждом перезапуске
+;[x]	0 - Не грузить ПЗУ спектрума, инитить страницу #41 как в 3.04
+;[x]	1 - Грузит ПЗУ спектрума из ROM при старте если нет флага ZX
+;[x]	2 - Грузит ПЗУ спектрума из ROM при каждом перезапуске
 ;[ ]	3 - Не грузить ПЗУ спектрума, инитить страницу #41 так,
 ;	     чтоб код в ней подгружал ПЗУ спектрума при обращении
 ZXMODE_SETUP:	IN	A,(SLOT3)
@@ -1624,41 +1624,25 @@ ZXMODE_SETUP:	IN	A,(SLOT3)
 		 LD	R,A
 		;
 		; Load ZX ROM's
-		call	init_zx_roms
-		;
-		LD	HL,#C000
-		LD	DE,#C001
-		LD	BC,#3FFF
-		LD	(HL),C
-		LDIR								; забить FF-ами
+		CALL	init_zx_roms	
         	; ставим метку если прогрузили ПЗУ спектрума
-		DEC	DE		; Spec_Page.flag_X
-        	LD	A,'X'
-        	LD	(DE),A
-        	DEC	DE		; Spec_Page.flag_Z
-        	LD	A,'Z'
-        	LD	(DE),A     
-		; Заглушка для страницы #41 на всякий пожарный
-.init_41h:	LD HL,PROG_NO_ROM
-		LD DE,#C000 + Spec_Page.no_zx_rom
-		LD BC,PROG_NO_ROM.size
-		LDIR
+		LD	HL,Spec_Page.flag_X
+        	LD	(HL),'X'
+        	DEC	HL			; Spec_Page.flag_Z
+        	LD	(HL),'Z'
 		;
-		LD HL,RAM_BIOS_PROG
-		LD DE,#C000 + Spec_Page.to_bios
-		LD BC,RAM_BIOS_PROG.Length
-		LDIR
 .No_Need_To_Load_ZXROMS:
 		POP	AF
 		OUT	(SLOT3),A
 		RET
-
+		;
+.init_41h:	CALL	init_zx_roms.init_41h
+		JR	.No_Need_To_Load_ZXROMS
 ;
 ;--------------------[copy zx-roms to zx-pages]-----------------;
 ; SLOT0 - ROM 8, sys_port - on.
 ; RAM SLOT0 - page 0
 ; для режима zx spectrum
-; ВЫПОЛНЯЕТСЯ ИЗ ОЗУ
 ; !HARDCODE номера страниц для эмулятора ПЗУ
 init_zx_roms:	IN      A,(SLOT3)
 		EX	AF,AF'
@@ -1718,8 +1702,26 @@ init_zx_roms:	IN      A,(SLOT3)
 		 LD	A,ACEX.vROM.BIOS_4				; ROM-ID - BIOS-2
 		 ;LD	B,#47						;!HARDCODE page
 		 LD	B,#41
-		 JP	SET_PORTS
+		 CALL	SET_PORTS
 		; можно задействовать ещё 4 страницы на порты #E4..#E7
+		;
+.init_41h:	; забить FF-ами
+		LD	HL,#C000
+		LD	DE,#C001
+		LD	BC,#3FFF
+		LD	(HL),C
+		LDIR
+		; Заглушка для страницы #41
+		LD HL,PROG_NO_ROM
+		LD DE,#C000 + Spec_Page.no_zx_rom
+		LD BC,PROG_NO_ROM.size
+		LDIR
+		;
+		LD HL,RAM_BIOS_PROG
+		LD DE,#C000 + Spec_Page.to_bios
+		LD BC,RAM_BIOS_PROG.Length
+		LDIR
+		RET
 ;---------------------------------------------------------------------[]
 
 
diff --git a/src/bios/rom/SETUP/SETTINGS.asm b/src/bios/rom/SETUP/SETTINGS.asm
index 175269b..2c7c7ef 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.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
+NORCLR:	        DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INK.WHITE
+HLTCLR:	        DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INK.YELLOW
+CURCLR:	        DB COLORS.CGA.PAPER.RED + COLORS.CGA.INK.WHITE
+WRMCLR:	        DB COLORS.CGA.PAPER.BLUE + COLORS.CGA.INK.WHITE
 
 
 ;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\-[v]
@@ -800,7 +800,7 @@ SetTime:
          push de
          CALL    LP_SET_PLACE
          ; печать атрибутов
-         LD E,COLORS.CGA.INC.RED
+         LD E,COLORS.CGA.INK.RED
          LD      B,#0E
          CALL    LP_PRINT_ATR
 
@@ -934,85 +934,85 @@ HDDWP           EQU     #01
 
 STYLES:
 ; Color	Style 0
-	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
+	DB	COLORS.CGA.PAPER.BLUE    + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.BLUE    + COLORS.CGA.INK.YELLOW
+	DB	COLORS.CGA.PAPER.RED     + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.BLUE    + COLORS.CGA.INK.WHITE
 ; Color	Style 1
-	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
+	DB	COLORS.CGA.PAPER.BLUE    + COLORS.CGA.INK.LGREEN
+	DB	COLORS.CGA.PAPER.BLUE    + COLORS.CGA.INK.LMAGENT
+	DB	COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.BLUE    + COLORS.CGA.INK.WHITE
 ; Color	Style 2
-	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
+	DB	COLORS.CGA.PAPER.GREEN   + COLORS.CGA.INK.LCYAN
+	DB	COLORS.CGA.PAPER.GREEN   + COLORS.CGA.INK.YELLOW
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.BLACK
+	DB	COLORS.CGA.PAPER.GREEN   + COLORS.CGA.INK.BLACK
 ; Color	Style 3
-	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
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.BLACK
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.YELLOW
+	DB	COLORS.CGA.PAPER.GREEN   + COLORS.CGA.INK.BLACK
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.LGREEN
 ; Color	Style 4
-	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
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.BLACK
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.BLUE
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.YELLOW
 ; Color	Style 5
-	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
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.BLACK
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.BROWN
+	DB	COLORS.CGA.PAPER.BROWN   + COLORS.CGA.INK.LGRAY
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.WHITE
 ; Color	Style 6
-	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
+	DB	COLORS.CGA.PAPER.RED     + COLORS.CGA.INK.YELLOW
+	DB	COLORS.CGA.PAPER.RED     + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.BLACK   + COLORS.CGA.INK.GREEN
+	DB	COLORS.CGA.PAPER.RED     + COLORS.CGA.INK.GREEN
 ; Color	Style 7
-	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
+	DB	COLORS.CGA.PAPER.RED     + COLORS.CGA.INK.LGRAY
+	DB	COLORS.CGA.PAPER.RED     + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.BLUE    + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.RED     + COLORS.CGA.INK.WHITE
 ; Color	Style 8
-	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
+	DB	COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INK.LCYAN
+	DB	COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INK.LGREEN
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.BLACK
+	DB	COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INK.WHITE
 ; Color	Style 9
-	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
+	DB	COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INK.YELLOW
+	DB	COLORS.CGA.PAPER.GREEN   + COLORS.CGA.INK.BLUE
+	DB	COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INK.LRED
 ; Color	Style 10
-	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
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.BLACK
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.RED
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.WHITE
 ; Color	Style 11
-	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
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.BLUE
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.YELLOW
+	DB	COLORS.CGA.PAPER.MAGENTA + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.WHITE
 ; Color	Style 12
-	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
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.LGREEN
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.LCYAN
+	DB	COLORS.CGA.PAPER.GREEN   + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.WHITE
 ; Color	Style 13
-	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
+	DB	COLORS.CGA.PAPER.BLACK   + COLORS.CGA.INK.LGREEN
+	DB	COLORS.CGA.PAPER.BLACK   + COLORS.CGA.INK.LCYAN
+	DB	COLORS.CGA.PAPER.CYAN    + COLORS.CGA.INK.YELLOW
+	DB	COLORS.CGA.PAPER.BLACK   + COLORS.CGA.INK.YELLOW
 ; Color	Style 14 (Mono)
-	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
+	DB	COLORS.CGA.PAPER.BLACK   + COLORS.CGA.INK.LGRAY
+	DB	COLORS.CGA.PAPER.BLACK   + COLORS.CGA.INK.WHITE
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.BLACK
+	DB	COLORS.CGA.PAPER.BLACK   + COLORS.CGA.INK.LGRAY
 ; Color	Style 15
-	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
+	DB	COLORS.CGA.PAPER.BLACK   + COLORS.CGA.INK.LMAGENT
+	DB	COLORS.CGA.PAPER.BLACK   + COLORS.CGA.INK.LGREEN
+	DB	COLORS.CGA.PAPER.LGRAY   + COLORS.CGA.INK.RED
+	DB	COLORS.CGA.PAPER.BLACK   + COLORS.CGA.INK.RED
 
 DEFVAL: DB	SAVERAM+EXTBIOS+SDELAY1					;#0E - OPTIONS
 	DB	TDL250+TRATE30						;#0F - KEYBOARD
diff --git a/src/bios/rom/SETUP/VIDEO_IO.asm b/src/bios/rom/SETUP/VIDEO_IO.asm
index 3e0ee1f..66ec664 100644
--- a/src/bios/rom/SETUP/VIDEO_IO.asm
+++ b/src/bios/rom/SETUP/VIDEO_IO.asm
@@ -59,7 +59,7 @@ PRINTZ:	LD	B,0
 
 HPRINTZ: LD	B,0
 	LD	D,B
-	LD	E,COLORS.CGA.INC.WHITE
+	LD	E,COLORS.CGA.INK.WHITE
         JP	LP_PRINT_LINE5
 
 CPRINTZ: LD	B,0