...

src/bios/BIOS.asm

@@ -158,6 +158,7 @@
 	EXPORT	msgStrings.str_ACEX_MODEL
 	EXPORT	msgRusStrings.str_ACEX_MODEL
 	EXPORT	BETA_BUILD
+	EXPORT	BETA_RC
 	; LUA ALLPASS
 	; 	print ("DEPACKER", sj.get_label("DEPACKER.PackedMAIN"))
 	; 	print ("UnPacker", sj.get_label("UnPacker.PackedMAIN"))

src/bios/exp/EXP.asm

@@ -928,7 +928,7 @@ PORTS_INIT:
 	;
 	; ˆ­¨æ¨ «¨§ æ¨ï ¯®á«¥¤®¢ â¥«ì­®£® ¯®àâ  ª« ¢¨ âãàë
 		; reg 0
-		XOR     A       ;LD A,0
+		XOR     A						;LD A,0
 		OUT	(Z84.SIO.Ch_A.Ctrl),A
 		; reg 4
 		LD	A,4
@@ -938,7 +938,7 @@ PORTS_INIT:
 		; reg 3
 		LD	A,3
 		OUT	(Z84.SIO.Ch_A.Ctrl),A
-		LD A,#C1
+		LD	A,#C1
 		OUT	(Z84.SIO.Ch_A.Ctrl),A
 		; reg 5
 		LD	A,5
@@ -948,13 +948,13 @@ PORTS_INIT:
 		; reg 1
 		LD	A,1
 		OUT	(Z84.SIO.Ch_A.Ctrl),A
-		DEC	A     		;LD A,0  ; #18 ¢ª«î祭¨¥ ¯à¥à뢠­¨©
+		DEC	A     						;LD A,0  ; #18 ¢ª«î祭¨¥ ¯à¥à뢠­¨©
 		OUT	(Z84.SIO.Ch_A.Ctrl),A
 .mouse:	; ˆ­¨æ¨ «¨§ æ¨ï ¬ëè¨	
 		; ˆ­¨æ¨ «¨§ æ¨ï â ©¬¥à  ¬ëè¨
 		LD	A,#55
 		OUT	(Z84.CTC.Ch_0),A
-		LD	A,#2D
+		LD	A,#2D						; ᪮à®áâì ¯®àâ  - ¢â®à®© ¬­®¦¨â¥«ì
 		OUT	(Z84.CTC.Ch_0),A
 		; reg 0
 		XOR     A       ;LD A,0
@@ -962,8 +962,11 @@ PORTS_INIT:
 		; reg 4
 		LD	A,4
 		OUT	(Z84.SIO.Ch_B.Ctrl),A
-		;LD	A,#45
+		;!TODO ¢á¯®¬­¨âì
-		LD	A,#40
+		 ;LD	A,#45
+		 ;LD	A,#44
+		;
+		LD	A,#40						; ᪮à®áâì ¯®àâ  - ¯¥à¢ë© ¬­®¦¨â¥«ì = 16
 		OUT	(Z84.SIO.Ch_B.Ctrl),A
 		; reg 3
 		LD	A,3
@@ -978,22 +981,22 @@ PORTS_INIT:
 		; reg 1
 		LD	A,1
 		OUT	(Z84.SIO.Ch_B.Ctrl),A
-		DEC	A			;LD A,0
+		DEC	A						;LD A,0
 		OUT	(Z84.SIO.Ch_B.Ctrl),A
 	; ˆ­¨æ¨ «¨§ æ¨ï ¯ à ««¥«ì­®£® ¯®àâ  1 (¯à¨­â¥à)
 		; ¤«ï POST-Tester- 
 		LD	A,#CF	; BITS I/O
 		OUT	(Z84.PIO.Port_A.Command),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
-		; ¤«ï printer-a
+		; ¤«ï ¯à¨­â¥à 
-		LD	A,#0F							; OUT
+		LD	A,#0F						; OUT
 		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, ¨­ ç¥ €«ìâ¥à  ¯¥à¥å¢ â¨â
+		LD	BC,Z84.PIO.Port_B.Command 			;⮫쪮 ç¥à¥§ ॣ¨áâà BC, ¨­ ç¥ €«ìâ¥à  ¯¥à¥å¢ â¨â
-		LD	A,#CF							; BITS I/O
+		LD	A,#CF						; BITS I/O
 		OUT	(C),A
 		LD	A,#3F
 		OUT	(C),A

src/bios/exp/EXTENDED/IDE/CD_DRV.ASM

@@ -161,7 +161,7 @@ TRAY_FN:
 ;	 #0B - ABORTED COMMAND
 ;	 #80 - TIME OUT
 AP_COM:	EXX 
-	 LD	DE,#8000
+	 ;LD	DE,#8000
 	 CALL	CD_WAITPRT
 	EXX 
 	JR	NC,.READY
@@ -173,7 +173,7 @@ AP_COM:	EXX
 .pause:	DJNZ	.pause
 
 	EXX 
-	 LD	DE,#8000
+	 ;LD	DE,#8000
 	 CALL	CD_WAITPRT
 	EXX 
 	RET	C
@@ -186,7 +186,6 @@ AP_COM:	EXX
 
 	LD	A,SYS_PAGE
 	OUT	(C),A
-	LD	A,B
 	LD	DE,RAM_ATAPI_PK	;!FIXIT ¬®¦¥â ­  á⥪¥ ¢ë¤¥«ïâì ¬¥áâ®?
 	LD	BC,PKTSIZE
 	LDIR
@@ -209,19 +208,20 @@ AP_COM:	EXX
 	 LD	BC,IDE.Write.Command
 	 LD	A,IDE.ATAPI.Packet
 	 OUT	(C),A
-	 LD	DE,#8000
+	 ;LD	DE,#8000
 	 CALL	CD_WAITPRT
 	EXX 
 	RET	C
 	EXX 
 	 LD	DE,#0908
-	 CALL	CD_WAITPRT
+	 CALL	CD_WAITPRT.Custom
 	EXX 
 	BIT	IDE.ControlBit.Error,A
 	JR	NZ,.CDERROR
 	JR	NC,.YEP_DRQ
-	LD	A,#80			; TIME OUT ;!HARDCODE
+	LD	A,#80			; ERROR TIME OUT ;!HARDCODE
 	RET
+	;
 .YEP_DRQ:
 	LD	C,SLOT3
 	IN	B,(C)
@@ -236,16 +236,16 @@ AP_COM:	EXX
 	OUTI 
 	DEC	A
 	JR	NZ,.OUTPKT
-
+	;
 	POP	BC
 	OUT	(C),B
-
+	;
 	LD	B,#80
 .pause2: DJNZ	.pause2
-
+	;
 .AP_LOOP:
 	EXX 
-	 LD	DE,#8000
+	 ;LD	DE,#8000
 	 CALL	CD_WAITPRT
 	EXX 
 	RET	C
@@ -279,7 +279,6 @@ AP_COM:	EXX
 	LD	BC,IDE.Read.Counter
 	IN	A,(C)
 	AND	#02
-	;CP	#02
 	JR	NZ,.FROM_CD
 ;.TO_CD:
 	LD	BC,IDE.Read.Data
@@ -293,7 +292,9 @@ AP_COM:	EXX
 	JR	NZ,.WR_T_CD
 	EX	DE,HL
 	JR	.AP_LOOP
+	;
 .FROM_CD:
+	; 能恥丞<E681A5> <20> 砲鄍祚垠平言 𨸹鄍<F0A8B8B9> ～銗<EFBD9E>
 	LD	A,H
 	OR	L
 	JR	Z,.NULL
@@ -308,6 +309,7 @@ AP_COM:	EXX
 	JR	NZ,.RD_F_CD
 	EX	DE,HL
 	JR	.AP_LOOP
+	;
 .NULL:	LD	BC,IDE.Read.Data
 .RD_N_CD:
 	IN	A,(C)
@@ -325,35 +327,33 @@ AP_COM:	EXX
 
 
 ;----------------------------------------------------------------------;
-; D - MASK
+CD_WAITPRT:	LD	DE,#8000		; D - MASK, E - PATTERN
-; E - PATTERN
+.Custom:	LD	BC,IDE.Read.Status
-CD_WAITPRT:
+		LD	A,100
-	LD	BC,IDE.Read.Status
+		LD	HL,#0000
-	LD	A,100
+.LOOP_A:	EX	AF,AF'
-	LD	HL,#0000
+.LOOP_HL:	IN	A,(C)
-.CWAITPX:
+		CP	#FF
-	EX	AF,AF'
+		JR	Z,.error
-.CWAITP0:
+		AND	D
-	IN	A,(C)
+		CP	E
-	CP	#FF
+		;
-	JR	Z,.CWAITP1
+		 ; JR	NZ,.NEXT_TRY
-	AND	D
+		 ; AND	A
-	CP	E
+		 ; RET
-	JR	NZ,.CWAITP2
+		 RET	Z
-	AND	A
+		;
-	RET 
+.NEXT_TRY:	DEC	L
-.CWAITP2:
+		JR	NZ,.LOOP_HL
-	DEC	L
+		DEC	H
-	JR	NZ,.CWAITP0
+		JR	NZ,.LOOP_HL
-	DEC	H
+		EX	AF,AF'
-	JR	NZ,.CWAITP0
+		DEC	A
-	EX	AF,AF'
+		JR	NZ,.LOOP_A
-	DEC	A
+		;
-	JR	NZ,.CWAITPX
+		EX	AF,AF'
-	EX	AF,AF'
+.error:		SCF 
-.CWAITP1:
+		RET 
-	SCF 
-	RET 
 ;----------------------------------------------------------------------;
 
 

src/bios/exp/FUNC_CMOS.ASM

@@ -7,7 +7,6 @@
 	ENDM
 ;
 
-
 ;!FIXIT ¯® ¤®ª¥ ­  äã­ªæ¨î ¤®«¦¥­ ¯¥à¥¤ ¢ë室®¬ CF áâ ¢¨âìáï
 CMOS_EMU_WR:
 	PUSH DE
@@ -26,6 +25,7 @@ CMOS_EMU_WR:
 ;
 
 ; § ¯¨áì ¢ CMOS
+;!FIXIT ¯¥à¥¤¥« âì ¯® ¤®ª¥ ­  „ «« á ¨ § ¯¨áì ¢ ï祩ª¨ ç á®¢
 CMOS_WR:	; [x]
 		 _mCMOS_MAX_TEST
 		;

src/bios/shared/DEFINES.INC

@@ -1,5 +1,6 @@
 ;=======================[All shared EQUs]=======================;
-BETA_BUILD	EQU			17			; ¤®¡ ¢«ï¥â áâப㠨 á®®¡é¥­¨¥ ® â¥á⮢®© ᡮથ ­  áâ à⮢®¬ íªà ­¥
+BETA_BUILD	EQU			10			; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ப<EFBFBD> <20> ᮮ<>饭<EFBFBD><E9A5AD> <20> <20><><EFBFBD>⮢<EFBFBD><E2AEA2> ᡮથ <20><> <20><><EFBFBD><EFBFBD>⮢<EFBFBD><E2AEA2> <20><>࠭<EFBFBD>
+BETA_RC		EQU			1			;
 ;======================[All shared defines]=====================;
  DEFINE		PACKED_MAIN		0			; ¯ ª®¢ âì MAIN ¨«¨ ¢«¥§ ¥â ¡¥§ í⮣®?
  DEFINE		SP2000_Loader_Flag	#0107			;

src/bios/shared/VERSION.inc

@@ -8,7 +8,11 @@ BIOS_ver_hex		EQU	EXP_ID.VER*256+EXP_ID.MOD
  DEFINE BIOS_ver_string '0'+EXP_ID.VER, '.', '0'+EXP_ID.MOD/10, '0'+EXP_ID.MOD-(EXP_ID.MOD/10)*10
 
  IF BETA_BUILD > 0
-  DEFINE BETA_str_ver	"BETA ","0"+BETA_BUILD
+	IF BETA_RC > 0
+	 DEFINE BETA_str_ver	"RC","0"+BETA_RC
+	ELSE
+	 DEFINE BETA_str_ver	"BETA ","0"+BETA_BUILD
+	ENDIF
  ENDIF
 ;---------------------------------------
         DEFINE BoardID_start	#5283