updated RECOVERY.IMG

Мелкие правки

Shared_Includes

@@ -1 +1 @@
-Subproject commit a9892c6a6766ef6df26b45a82b1991ac836f2e4a
+Subproject commit 97d5ea8a4b1359d49fb706f24aae6af6bb4eef66

src/bios/exp/DCP.ASM

@@ -14,7 +14,7 @@
 ;                         FF2SR54  3        
 ;		                     108     
 ;DCP_DATA:       ....0..11.1110         
-;        WORD	%00000001101110 ; - b13..12 cnf, b11 pent512, b10 dos, b9 r/w, b8..0  ¤à¥á
+;        WORD	%00000001101110 ; - b13..12 cnf, b11 Lock48, b10 dos, b9 r/w, b8..0  ¤à¥á
 ;        WORD	%00001001101111 ; - ¬ áª  - 0 ¨§¬¥­ï¥¬ë¥ ¡¨âë, 1 ­¥¨§¬¥­ï¥¬ë¥
 ;        BYTE	ACEX.Border_FE  ; - ¯®àâ
 

src/bios/exp/EXP.asm

@@ -327,6 +327,7 @@ NO_RESTART:
 	OUT (Z84.PIO.Port_A.Command),A
 	XOR A
 	OUT (Z84.PIO.Port_A.Command),A
+	;LD	A,%11101010						; § ¦¥çì L
 	OUT (Z84.PIO.Port_A.Data),A					; PRINTER - PORT - all zeros
 	; -¨­¨æ¨ «¨§ æ¨ï á¨á⥬­ëå ¯®à⮢ Z84C15-
 	LD	BC,#FF*256 + Z84.SYS.Control
@@ -737,7 +738,7 @@ POST_5_ERROR:
  ENDIF
 
 POST_5_OK:
-	OUT (Z84.PIO.Port_A.Data),A			; ¢ë¢¥á⨠"5"
+	OUT (Z84.PIO.Port_A.Data),A			; ¢ë¢¥á⨠१ã«ìâ â â¥áâ 
 ; **********************************
 ;	POST § ¢¥à襭
 	ENDMODULE
@@ -1026,15 +1027,16 @@ PORTS_INIT:
 		DEC	A						;LD A,0
 		OUT	(Z84.SIO.Ch_B.Ctrl),A
 	; ˆ­¨æ¨ «¨§ æ¨ï ¯ à ««¥«ì­®£® ¯®àâ  1 (¯à¨­â¥à)
+	; !FIXIT ¯®ç¨â âì ¯à® íâã å७ì
 		; ¤«ï POST-Tester- 
-		LD	A,#CF	; BITS I/O
+		; LD	A,#CF	; BITS I/O
-		OUT	(Z84.PIO.Port_A.Command),A
+		; OUT	(Z84.PIO.Port_A.Command),A
-		XOR	A
+		; XOR	A
-		OUT	(Z84.PIO.Port_A.Command),A			; ALL - out
+		; OUT	(Z84.PIO.Port_A.Command),A			; ALL - out
-		OUT	(Z84.PIO.Port_A.Data),A				; DATA - all zeros
+		; OUT	(Z84.PIO.Port_A.Data),A				; DATA - all zeros
 		; ¤«ï ¯à¨­â¥à 
-		LD	A,#0F						; OUT
+		LD      A,#0F						; Init printer port for Out
-		OUT	(Z84.PIO.Port_A.Command),A
+		OUT     (Z84.PIO.Port_A.Command),A
 		OUT	(Z84.PIO.Port_A.Command),A
 	; ˆ­¨æ¨ «¨§ æ¨ï ¯ à ««¥«ì­®£® ¯®àâ  2 (INT/DMA ISA)
 		LD	BC,Z84.PIO.Port_B.Command 			;⮫쪮 ç¥à¥§ ॣ¨áâà BC, ¨­ ç¥ €«ìâ¥à  ¯¥à¥å¢ â¨â
@@ -1042,7 +1044,7 @@ PORTS_INIT:
 		OUT	(C),A
 		LD	A,#3F
 		OUT	(C),A
-		LD	A,#C0
+		LD	A,#C0						; Bit 7 - Select (1), Bit 6 - Auto_Line_Feed (1)
 		OUT	(Z84.PIO.Port_B.Data),A
 	; "‡ £«ã襭¨¥" ª®¢®ªá  ¨ à¥á¥â ISA
 		; à¥á¥â ISA ç áâì 1

src/bios/rom/ROM.asm

@@ -442,4 +442,6 @@ RET_TO_TRDOS:
 	DISPLAY 'Unused bytes before INT_POINTER: ',/A,INT_POINTER-before_intPointer
  ENDIF
 ;	ENDMODULE ;ROM_PART
-;
+;
+	DISPLAY ' '
+	DISPLAY 'FIX printer init!!!!!!!!'

src/bios/rom/ZX/ZX_FUNC.ASM

@@ -557,12 +557,42 @@ GOTO_SPECTRUM:	DI
 		CALL	Z,ToBIOS_FromEXT
 		;
 		; [x] ä¨ªá ­¥¯®«­®© ¤¥è¨äà æ¨¨ ¯®àâ  #FFFD (¯¨èãâ ¢ #C0FD) ¤«ï ZX mode
-		 LD	A,#FF
+		 LD	A,(SYS_PAGE.CONFIG_DE)
+		 AND	%0001'1000
+		 RLA
+	IF TMP_CELLS_INIT
+		 PUSH	AF
+	ENDIF
 		 LD	HL,%00'010'1'1110'1101
-		 LD	DE,%10'111'1'1111'1111				; CNF_0, CNF_1
+		 OR	H
+		 LD	H,A
+		 LD	DE,%11'011'1'1111'1111
 		 LD	BC,ACEX.AY_FFFD_WRITE*256 + BIOS.DCP_CONFIG	
+		 LD	A,C
 		 CALL	ToBIOS_FromEXT
 		;
+	IF TMP_CELLS_INIT	
+		; ¨­¨â ¯®à⮢ 4 ¨ 5 ¤«ï ¢à¥¬¥­­®£® åà ­¥­¨ï §­ ç¥­¨© ¢ âà-¤®á
+		 POP	AF
+		 PUSH	AF
+		 LD	HL,%00'00'0'00000'0100
+		 OR	H
+		 LD	H,A
+		 LD	DE,%11'01'0'00110'1111
+		 PUSH	DE
+		 LD	BC,ACEX.TMP_CELL_1 * 256 + BIOS.DCP_CONFIG
+		 LD	A,C
+		 CALL	ToBIOS_FromEXT
+		 ;
+		 POP	DE
+		 POP	AF
+		 LD	HL,%00'00'0'00000'0101
+		 OR	H
+		 LD	H,A
+		 LD	BC,ACEX.TMP_CELL_2 * 256 + BIOS.DCP_CONFIG
+		 LD	A,C
+		 CALL	ToBIOS_FromEXT
+	ENDIF
 		LD	E,0
 		LD	BC,BIOS.LP_OPEN_S.ZX_32x24_Default
 		CALL	ToBIOS_FromEXT

src/bios/shared/DEFINES.INC

@@ -26,6 +26,7 @@ RELEASEhotFIX	EQU			0			;
 ;DEFINE		HDDwriteProtect		0			; áâ à ï ä¨èª  ¤«ï ä㭪権 5x
  DEFINE		UnusedSettingsFeatures	0			;
 ;DEFINE		OPTIMIZE_RW_PROCEDURE	0			;
+ DEFINE		TMP_CELLS_INIT		0			; ¨­¨â ¯®à⮢ 4 ¨ 5 ¤«ï ¢à¥¬¥­­®£® åà ­¥­¨ï §­ ç¥­¨© ¢ âà-¤®á
  DEFINE		BIG_ENDIAN_STR_PRINT	1			;
 ; 		; 0 - ¯¥ç âì á ¯®à祩 ¡ãä¥à  ¨ ¯à®¯ã᪮¬ ¤¢®©­ëå ¯à®¡¥«®¢ - ¢ 1,5 à §  èãáâ॥ á⮪  ;!FIXIT ­¥ § â¨à ¥â ¯à¥¤ë¤ãéãî áâபã
 ;		; 1 - ¯¥ç âì á ¯®à祩 ¡ãä¥à  ¡¥§ ¯à®¯ã᪠ ¤¢®©­ëå ¯à®¡¥«®¢ - ¢ 3 à §  èãáâ॥ á⮪