From dd79b546ecda77efe05c7718167e3bce38c06cd2 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Thu, 6 Mar 2025 03:29:13 +1000
Subject: [PATCH] new DSS in recovery

---
 Shared_Includes                 |   2 +-
 src/bios/exp/FONT.ASM           |   6 +-
 src/bios/exp/FUNC_LOW_PRINT.ASM | 476 +++++++++++++++++++++++++++++++-
 src/bios/rom/SETUP/MAIN.asm     |   4 +-
 src/bios/rom/SETUP/SETTINGS.asm |   4 +-
 src/bios/rom/SETUP/VIDEO_IO.asm |  12 +-
 src/bios/shared/RECOVERY.IMG    | Bin 98304 -> 98304 bytes
 7 files changed, 475 insertions(+), 29 deletions(-)

diff --git a/Shared_Includes b/Shared_Includes
index 60b5ff6..9bfe7bd 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit 60b5ff6a74b57614b1f54fbe5611585cd46582ab
+Subproject commit 9bfe7bd76b9648dae6f492dcd730b9b7ed80f48d
diff --git a/src/bios/exp/FONT.ASM b/src/bios/exp/FONT.ASM
index 2ef9370..3ea3f24 100644
--- a/src/bios/exp/FONT.ASM
+++ b/src/bios/exp/FONT.ASM
@@ -167,4 +167,8 @@
         end
   end
  ENDLUA
-;
\ No newline at end of file
+;
+/*
+Линия 256 байтов в ОЗУ становится столбиком в видеопамяти. 
+Слева направо переходит сверху вниз. Первая линия - первый столбик.
+*/
\ No newline at end of file
diff --git a/src/bios/exp/FUNC_LOW_PRINT.ASM b/src/bios/exp/FUNC_LOW_PRINT.ASM
index 29ad79c..70ac35e 100644
--- a/src/bios/exp/FUNC_LOW_PRINT.ASM
+++ b/src/bios/exp/FUNC_LOW_PRINT.ASM
@@ -597,12 +597,12 @@ WIN_SET_ZG:								; LP_SET_ZG:
 	 AND	#0F
 	 ADD	A,A
 	 OUT	(PORT_Y),A
-	 LD	A,B
-	 RRCA
-	 RRCA
-	 RRCA
-	 AND	#18
-	 OR	#40
+	 LD	A,B	; %xx00'0000
+	 RRCA		; %0xx0'0000
+	 RRCA		; %00xx'0000	
+	 RRCA		; %000x'x000
+	 AND	%0001'1000
+	 OR	%0100'0000
 	 LD	H,A
 	 LD	L,0
 	 LD	BC,#0800	;!HARDCODE
@@ -783,7 +783,7 @@ LP_INI_P:
 
 	EXX
 	EX AF,AF'
-	CALL WIN_SET_ZG.SET	;LP_SET_ZG1
+	CALL WIN_SET_ZG.SET			;LP_SET_ZG1
 	EXX
 	EX AF,AF'
 
@@ -833,9 +833,6 @@ LP_OPEN_S:	LD	A,B
 		LD	L,A
 		JR	NC,.no_inc
 		INC	H
-		; LD	A,H
-		; ADC	A,0
-		; LD	H,A
 .no_inc:	LD	A,(HL)
 		INC	HL
 		LD	H,(HL)
@@ -895,6 +892,9 @@ PIC_SET_S2:
 ;------------------------------------------------------------------[#B0]
 ; HL - место на экране по знакоместам (НЕ ИСПОЛЬЗУЕТСЯ)
 ; IX - описатель окна
+WIN_OPEN.SCR1:
+	LD	E,1
+;  E - bit0 - номер экрана
 WIN_OPEN:
 	LP_OPEN_PG
 	LD (SYS_PAGE.WIN_MAP_SC),IX	; карта окна
@@ -1055,7 +1055,7 @@ LP_MODE_LINE:
 
 LP_MODE_RECURSE:
 	LD A,D	; горизонтальное положение
-	AND 7FH
+	AND #7F
 	SUB 80
 	JR C,LP_MODE_LL
 	SUB 48
@@ -1067,7 +1067,7 @@ LP_MODE_RECURSE:
 
 	LD A,E	; восстановить
 	RRA
-	AND 3FH
+	AND #3F
 	SUB C
 	JR NC,LP_EXIT_MODE
 	NEG
@@ -1077,7 +1077,7 @@ LP_MODE_RECURSE:
 LP_MODE_LL:
 	NEG
 	RRA
-	AND 3FH
+	AND #3F
 	CP C
 	JR NC,LP_MODE_LR
 	LD C,A
@@ -1910,3 +1910,453 @@ LP_CR:	LD A,SYS_PAGE
 	JR LP_PRINT_LN_D11
 ;------------------------------------------------------------------[#E0]
 
+
+;!TODO старая LP_SET_MODE - расковырять старый LP_SCR_MNU
+/*
+	MODULE	EXPERIMENT
+
+;	byte 1
+;	0..4 - VIDEO_PAGE
+;	5    - mode 42/84	; 0 - 42,1 - 84
+;	6    - next line
+;	7    - end table
+;	byte 2 - number of places
+;	byte 3..4 - adress places/
+;	4000-5FFF - Spectrum modes/ C000-FFFF - Graf mode
+;
+	MACRO	LP_S	PG,XX,ADR
+	 DB	PG,XX
+	 DW	ADR
+	ENDM
+;---------------------------------------
+GR_BIT_END		EQU 7
+
+S_BIT_END		EQU 7
+S_BIT_LIN		EQU 6
+S_BIT_MOD		EQU 5
+
+BIT_1440		EQU 1
+BIT_MASK_1440		EQU %00000010
+
+MODE_PAGE		EQU #FC 
+;---------------------------------------
+ ;DS (($/4)*4+4-$)
+ 	ALIGN	4
+
+
+LP_SCR_MNU:
+	LP_S	#40,14,#40E7
+	LP_S	#40,14,#4807
+	LP_S	#40,14,#4827
+	LP_S	#40,14,#4847
+	LP_S	#40,14,#4867
+	LP_S	#40,14,#4887
+	LP_S	#40,14,#48A7
+	LP_S	#40,14,#48C7
+	LP_S	#40,14,#48E7
+	DB	#FF,0,0,0
+
+; LP_SCR_80:
+; 	DB 40,32,0,0,#1B,0,0,0
+; 	DB 0,0,0,0,0,0,0,0
+
+; LP_S %01100010,40,#4000
+; LP_S %01100010,40,#4028
+; LP_S %01100010,40,#4050
+; LP_S %01100010,40,#4078
+; LP_S %01100010,40,#40A0
+; LP_S %01100010,40,#40C8
+;
+; LP_S %01100010,40,#4800
+; LP_S %01100010,40,#4828
+; LP_S %01100010,40,#4850
+; LP_S %01100010,40,#4878
+; LP_S %01100010,40,#48A0
+; LP_S %01100010,40,#48C8
+;
+; LP_S %01100010,40,#5000
+; LP_S %01100010,40,#5028
+; LP_S %01100010,40,#5050
+; LP_S %01100010,40,#5078
+; LP_S %01100010,40,#50A0
+; LP_S %01100010,40,#50C8
+;
+; LP_S %01100100,40,#4000
+; LP_S %01100100,40,#4028
+; LP_S %01100100,40,#4050
+; LP_S %01100100,40,#4078
+; LP_S %01100100,40,#40A0
+; LP_S %01100100,40,#40C8
+;
+; LP_S %01100100,40,#4800
+; LP_S %01100100,40,#4828
+; LP_S %01100100,40,#4850
+; LP_S %01100100,40,#4878
+; LP_S %01100100,40,#48A0
+; LP_S %01100100,40,#48C8
+;
+; LP_S %01100100,40,#5000
+; LP_S %01100100,40,#5028
+;
+; DEFB #FF,0,0,0
+;
+; LP_SCR_40:
+; 	DB 40,32,0,0,7BH,0,0,0
+; 	DB 0,0,0,0,0,0,0,0
+;
+; LP_S 01000100B,40,5050H
+; LP_S 01000100B,40,5078H
+; LP_S 01000100B,40,50A0H
+; LP_S 01000100B,40,50C8H
+;
+; LP_S 01000110B,40,4000H
+; LP_S 01000110B,40,4028H
+; LP_S 01000110B,40,4050H
+; LP_S 01000110B,40,4078H
+; LP_S 01000110B,40,40A0H
+; LP_S 01000110B,40,40C8H
+;
+; LP_S 01000110B,40,4800H
+; LP_S 01000110B,40,4828H
+; LP_S 01000110B,40,4850H
+; LP_S 01000110B,40,4878H
+; LP_S 01000110B,40,48A0H
+; LP_S 01000110B,40,48C8H
+;
+; LP_S 01000110B,40,5000H
+; LP_S 01000110B,40,5028H
+; LP_S 01000110B,40,5050H
+; LP_S 01000110B,40,5078H
+; LP_S 01000110B,40,50A0H
+; LP_S 01000110B,40,50C8H
+;
+; LP_S 01001000B,40,4000H
+; LP_S 01001000B,40,4028H
+; LP_S 01001000B,40,4050H
+; LP_S 01001000B,40,4078H
+; LP_S 01001000B,40,40A0H
+; LP_S 01001000B,40,40C8H
+;
+; LP_S 01001000B,40,4800H
+; LP_S 01001000B,40,4828H
+; LP_S 01001000B,40,4850H
+; LP_S 01001000B,40,4878H
+;
+; DEFB 0FFh,0,0,0
+;
+; LP_SCR_32:
+; 	DB 32,24,4,4,30H,1,0,0
+; 	DB 0,0,0,0,0,0,0,0
+;
+; LP_S 040h,32,04000H
+; LP_S 040h,32,04020H
+; LP_S 040h,32,04040H
+; LP_S 040h,32,04060H
+; LP_S 040h,32,04080H
+; LP_S 040h,32,040A0H
+; LP_S 040h,32,040C0H
+; LP_S 040h,32,040E0H
+;
+; LP_S 040h,32,04800H
+; LP_S 040h,32,04820H
+; LP_S 040h,32,04840H
+; LP_S 040h,32,04860H
+; LP_S 040h,32,04880H
+; LP_S 040h,32,048A0H
+; LP_S 040h,32,048C0H
+; LP_S 040h,32,048E0H
+;
+; LP_S 040h,32,05000H
+; LP_S 040h,32,05020H
+; LP_S 040h,32,05040H
+; LP_S 040h,32,05060H
+; LP_S 040h,32,05080H
+; LP_S 040h,32,050A0H
+; LP_S 040h,32,050C0H
+; LP_S 040h,32,050E0H
+;
+; LP_S 0FFh,0,0
+;
+; LP_SCR_64:
+; 	DB 32,24,4,4,9BH,0,0,0
+; 	DB 0,0,0,0,0,0,0,0
+;
+; LP_S 06Ah,32,04000H
+; LP_S 06Ah,32,04020H
+; LP_S 06Ah,32,04040H
+; LP_S 06Ah,32,04060H
+; LP_S 06Ah,32,04080H
+; LP_S 06Ah,32,040A0H
+; LP_S 06Ah,32,040C0H
+; LP_S 06Ah,32,040E0H
+;
+; LP_S 06Ah,32,04800H
+; LP_S 06Ah,32,04820H
+; LP_S 06Ah,32,04840H
+; LP_S 06Ah,32,04860H
+; LP_S 06Ah,32,04880H
+; LP_S 06Ah,32,048A0H
+; LP_S 06Ah,32,048C0H
+; LP_S 06Ah,32,048E0H
+;
+; LP_S 06Ah,32,05000H
+; LP_S 06Ah,32,05020H
+; LP_S 06Ah,32,05040H
+; LP_S 06Ah,32,05060H
+; LP_S 06Ah,32,05080H
+; LP_S 06Ah,32,050A0H
+; LP_S 06Ah,32,050C0H
+; LP_S 06Ah,32,050E0H
+;
+; LP_S 0FFh,0,0
+
+
+LP_SET_MNU:
+	LD IX,LP_SCR_MNU
+	JR LP_SET_MODE
+
+
+; HL - смещение от начала экрана
+;	= hor_sh + vert_sh * 64 + 4000H
+; IX - экранная таблица
+LP_SET_MODE:	LP_OPEN_PG
+		LD	(SYS_PAGE.WIN_MAP_SC),IX
+		LD	(SYS_PAGE.WIN_MODE_SH),HL
+		LD	(SYS_PAGE.WIN_MODE_SC),DE
+		LD	HL,(SYS_PAGE.WIN_MAP_SC)
+		LD	DE,SYS_PAGE.WIN_MAP_IX
+.LP_SET_COPY:	LD	BC,4
+		LDIR
+		BIT	S_BIT_END,(HL)
+		JR	Z,.LP_SET_COPY
+		LD	BC,4
+		LDIR
+		LD	HL,SYS_PAGE.WIN_MAP_IX
+		LD	(SYS_PAGE.WIN_MAP_SC),HL
+.LP_SET_MODE_INT:
+		LD	IX,(SYS_PAGE.WIN_MAP_SC)
+		LD	HL,(SYS_PAGE.WIN_MODE_SH)
+		CALL	LP_SET_MODE1
+		LD	DE,(SYS_PAGE.WIN_MODE_SC)
+		LP_CLOSE_PG
+		PUSH	DE
+		CALL	LP_INI_P
+		POP	DE
+		LD	A,E
+		OUT	(RGMOD),A
+		CALL	LP_SIZE
+		RET
+
+LP_SET_MODE1:	AND	A
+		BIT	S_BIT_END,(IX)      ; проверка конца данных
+		RET	NZ
+
+		PUSH	HL
+
+		IN	A,(RGADR)
+		PUSH	AF
+
+		LD	A,H
+		CP	#48
+		CCF
+		LD	A,#16
+		ADC	A,0
+		OUT	(RGADR),A
+
+.LP_SET_LOOP:	CALL	LP_MODE_LINE
+
+		INC	IX
+		INC	IX
+		INC	IX
+		INC	IX
+		BIT	S_BIT_LIN,(IX)
+		JR	Z,.LP_SET_LOOP
+
+		POP	AF
+		OUT	(RGADR),A
+
+		POP	HL
+
+		LD	BC,#40
+		ADD	HL,BC
+		JR	LP_SET_MODE1
+
+;********************************************************
+;	Вычисление значения MODE из экранной таблицы.
+;	IX - текущее положение в таблице.
+LP_MODE_LINE:	BIT	3,H
+		RET	NZ
+
+		IN	A,(SLOT1)
+		LD	(SYS_PAGE.SYS_WORK1),A
+
+		IN	A,(RGADR)
+		AND	1
+		OR	MODE_PAGE
+		OUT	(SLOT1),A
+
+		LD	A,(IX)
+		LD	B,A
+		RRCA
+		AND	#0F
+		LD	C,A
+		LD	A,B
+		AND	#20
+		XOR	#30
+		OR	C
+		LD	C,A
+		LD	A,(IX+3)
+		RLC	A
+		RLC	A
+		RLC	A
+		AND	#C0
+		OR	C
+		LD	D,A		; Первый байт MODE
+		LD	E,(IX+2)	; Второй байт..
+
+		LD	B,(IX+1)	; число знакомест
+
+		LD	A,L
+		AND	#3F
+		SUB	40
+		JR	NC,.LP_NO_SET_MD
+		NEG
+		CP	B
+		JR	NC,.LP_MD_NO_B
+		LD	B,A
+.LP_MD_NO_B:
+
+.LP_MD_LOOP:	SET	4,H
+		LD	(HL),E
+		RES	4,H
+		LD	(HL),D
+
+		INC	E
+		INC	L
+		DJNZ	.LP_MD_LOOP
+
+.LP_MD_END:	LD	A,(SYS_PAGE.SYS_WORK1)
+		OUT	(SLOT1),A
+		RET
+
+.LP_NO_SET_MD:	LD	A,C
+
+.LP_MD_LOOP2:	INC	E
+		INC	L
+		BIT	5,H
+		JR	Z,.LP_MD_LOOP
+		DJNZ	.LP_MD_LOOP2
+		JR	.LP_MD_END
+
+
+; вычисление нового места
+LP_TAB_HL:	LD	HL,(SYS_PAGE.WIN_TAB_SC)	; загрузить текущее положение в таблице SCR
+		LD	A,(HL)				; загрузить флаги таблицы
+		BIT	S_BIT_END,A			; флаг конца
+		JR	Z,LP_TAB_H1			; если 0 - не конец
+LP_TAB_H2:	LD	HL,(SYS_PAGE.WIN_MAP_SC)	; загрузить начальное положение в таблице SCR
+LP_TAB_H3:	LD	A,(HL)				; и новые флаги
+LP_TAB_H1:	CALL	.LP_PG1				; переключить страницу
+		INC	HL				; (HL) - новое число символов
+		BIT	S_BIT_MOD,A			; бит 42/84
+		LD	A,(HL)				; загрузить число символов
+		JR	Z,.LP_NO_MUL			; если 84, то не нужно умножение на 2
+		ADD	A,A				; A=A*2
+.LP_NO_MUL:	LD	B,A				; число символов в B
+		INC	HL				; загрузка нового HL
+		LD	A,(HL)
+		INC	HL
+		INC	HL
+		LD	(SYS_PAGE.WIN_TAB_SC),HL	; с сохранением следующего положения в таблице SCR
+		DEC	HL
+		LD	H,(HL)				; положение на экране
+		LD	L,A
+
+		LD	A,H
+		RRCA					; вычислить положение
+		RRCA					; аттрибута
+		RRCA
+		AND	3
+		OR	H
+		OR	#18
+		LD	C,A
+		RET
+
+.LP_PG1:	AND	#1F				; переключать только страницы ОЗУ Spectrum mode
+		OUT	(RGADR),A
+		LD	E,(HL)				; значение битов и флагов
+
+		BIT	S_BIT_MOD,E			; бит 42/84
+		JR	Z,.LP_N_84			; если 42 то не устанавливать CF
+		SCF					; 84 mode
+.LP_N_84:	EX	AF,AF'				; спрятать флаги и значение для вывода в порт
+		LD	A,E				; в A должен быть байт с флагами
+		RET
+
+; program init registers
+; for low printer & save
+LP_INI_P:	EXX
+		LP_OPEN_PG
+		LD	DE,(SYS_PAGE.WIN_ZG)
+		LD	B,0
+		CALL	LP_TAB_H2
+		EXX
+; program save registers
+; for low printer
+LP_END_P:	EX	AF,AF'
+		EXX
+		RLA
+		LD	E,A
+		LD	(SYS_PAGE.WIN_SAV_HL),HL
+		LD	(SYS_PAGE.WIN_SAV_DE),DE
+		LD	(SYS_PAGE.WIN_SAV_BC),BC
+		LP_CLOSE_PG
+		EXX
+		EX	AF,AF'
+		RET
+
+
+; определение size
+LP_SIZE:	LP_OPEN_PG
+		EXX
+		XOR	A
+		LD	HL,(SYS_PAGE.WIN_MAP_SC)	; начало карты scr
+		CALL	.LP_LN2				; сканировать до
+		EXX					; конца
+		NEG					; получить число
+		LD	D,A				; строк в D
+		LD	E,0
+		EXX
+		;LD	A,3				; число символов
+		LD	HL,(SYS_PAGE.WIN_MAP_SC)	; по 3-йе строке
+		;CALL	LP_LN2				; настройка
+.LOOP:		CALL	LP_TAB_H3			; данные
+		LD	A,B
+		EXX
+		ADD	A,E
+		LD	E,A
+		EXX
+		LD	HL,(SYS_PAGE.WIN_TAB_SC)	; данные экрана
+		BIT	S_BIT_LIN,(HL)
+		JR	Z,.LOOP
+		;BIT	S_BIT_MOD,(HL)
+		EXX
+		;XOR	A
+		;OUT	(RGADR),A
+		LP_CLOSE_PG
+		RET
+		;
+.LP_LN0:	DEC	A
+		RET	Z
+.LP_LN1:	INC	HL
+		INC	HL
+		INC	HL
+		INC	HL
+.LP_LN2:	BIT	S_BIT_LIN,(HL)
+		JR	Z,.LP_LN1
+		BIT	S_BIT_END,(HL)
+		JR	Z,.LP_LN0
+		RET
+
+	ENDMODULE
+*/
diff --git a/src/bios/rom/SETUP/MAIN.asm b/src/bios/rom/SETUP/MAIN.asm
index b9c7910..bbbec36 100644
--- a/src/bios/rom/SETUP/MAIN.asm
+++ b/src/bios/rom/SETUP/MAIN.asm
@@ -496,9 +496,7 @@ INSTALL:
 	XOR	A
 	OUT	(BorderColor),A
 	LD	IX,win_descriptor.tab80x32
-	;LD	HL,#0000
-	LD	E,1
-        CALL    WIN_OPEN
+        CALL    WIN_OPEN.SCR1
 
 	LD	DE,0
 	LD	HL,#2050
diff --git a/src/bios/rom/SETUP/SETTINGS.asm b/src/bios/rom/SETUP/SETTINGS.asm
index a08ea4c..e436937 100644
--- a/src/bios/rom/SETUP/SETTINGS.asm
+++ b/src/bios/rom/SETUP/SETTINGS.asm
@@ -858,9 +858,7 @@ setInt: ld a,CMOS_CELL.ScreenSET
 .set:   CALL    FN_SYNC
 
         LD	IX,win_descriptor.tab80x32
-        ;LD	HL,#0000
-        LD	E,1
-        CALL    WIN_OPEN
+        CALL    WIN_OPEN.SCR1
 
         ld a,(ITEM)
         ld (ITEM_Restore),a
diff --git a/src/bios/rom/SETUP/VIDEO_IO.asm b/src/bios/rom/SETUP/VIDEO_IO.asm
index d12c672..be66ec6 100644
--- a/src/bios/rom/SETUP/VIDEO_IO.asm
+++ b/src/bios/rom/SETUP/VIDEO_IO.asm
@@ -316,12 +316,12 @@ LOGOTYPE:	CALL	SHOW_LOGO
 	;	;
 .ERASE_LOGO:	LD	IX,win_descriptor.tab80x32
 		;LD	HL,#0000
-		LD	E,1
+		;LD	E,1
 		;
 		EI 
 		HALT 
 		DI 
-        	CALL    WIN_OPEN
+        	CALL    WIN_OPEN.SCR1
 		;
 		LD	DE,0
 		LD	HL,#0920	;!HARDCODE LOGOTYPE SIZE
@@ -338,9 +338,7 @@ LOGOTYPE:	CALL	SHOW_LOGO
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 SHOW_LOGO:	LD	IX,win_descriptor.tab320x256
-		;LD	HL,#0000
-		LD	E,1
-		CALL    WIN_OPEN
+		CALL    WIN_OPEN.SCR1
 
 	SAFE_PORTY
 
@@ -449,9 +447,7 @@ go_setup:		; !FIXIT 
 	jr      nz,go_setup
 
 	LD	IX,win_descriptor.tab80x32
-	;LD	HL,#0000
-	LD	E,1
-        CALL    WIN_OPEN
+        CALL    WIN_OPEN.SCR1
 	JP      ENTER_SETUP
 
 .to_EXIT_SETUP:
diff --git a/src/bios/shared/RECOVERY.IMG b/src/bios/shared/RECOVERY.IMG
index 28b92a060d671c456fb5203d21457148ce9f8cba..b01f68cf518598b90ec8336cd393a3d8dc9b6673 100755
GIT binary patch
delta 4819
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
CpPD%U

delta 4804
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
Z_M@Pv|H1Bt3F(%L^`E?lpUX!%{}0>GoFV`K