testing adaptation for bios

SP_128.ASM

@@ -691,7 +691,7 @@ CHAR_SET    EQU #3D00
          DEFW  adr
  ENDM
 
-	DEFINE	START_PAUSE #0000
+	DEFINE	START_PAUSE #0001
         INCLUDE 'shared_includes/constants/sp2000.inc'
         INCLUDE 'shared_includes/constants/zx_char_codes.inc'
 ;[^]..................................................................................................................... SP2000 [^]

SP_TRDOS.ASM

@@ -6375,43 +6375,48 @@ RUS_PRINT:
 		DISPLAY "14k"
 
         BLOCK #3C00 - $,255
-
-;*********************************************
-
 AUTO_3C00:
 	RST	R38
 	JR	AUTO_3C06
 	RST	R38
 	JR	AUTO_3C09
+;
+;
+        BLOCK #3C06 - $,255
 AUTO_3C06:
 	JP	AUTO_3D00
+;
+;
+        BLOCK #3C09 - $,255
 AUTO_3C09:
 	JP	AUTO_3D03
 
-;*****************************
+;************************************
+;!FIXIT not used
         BLOCK #3C10 - $,255
 ;KBD_EXP:
 	LD A,D_ROM16OFF
 	OUT (CNF_PORT),A
 	RET
-	NOP
+;
-	NOP
+;************************************
-	NOP
+;!FIXIT not used
+        BLOCK #3C18 - $,255
 ;KBD_OFF:
 	LD A,D_ROM16OFF
 	OUT (CNF_PORT),A
 	RET
-	NOP
+
-	NOP
-	NOP
 ;************************************
+;!FIXIT not used
+        BLOCK #3C20 - $,255
 READR_X:
-	CALL 3E08h
+	CALL get_disk_time:
 	LD B,A
-	JP 1FEBh
+	JP set_side_0
-
+;************************************
+;!FIXIT not used
         BLOCK #3C30 - $,255
-
         IN      A,(WG_COM)
         RET
 
@@ -6452,7 +6457,6 @@ PRINT_RED:
         RET
 
 ;*******************************
-
         BLOCK #3CC0 - $,255
 MAGIC_1:
         PUSH AF
@@ -6460,6 +6464,8 @@ MAGIC_1:
         OUT (CNF_PORT),A
         POP AF
         JP MAGIC_2
+;*******************************
+        BLOCK #3CC9 - $,255
 MAGIC_3:
         PUSH AF
         LD A,D_ROM16OFF
@@ -6510,7 +6516,7 @@ AUTO_3CFD:
 ;	JP	AUTO_283C
 
 ;***********************************************************************;
-        BLOCK #3D00-$,FF
+        BLOCK #3D00-$,#FF
 
 AUTO_3D00:
 	NOP
@@ -7010,9 +7016,7 @@ AUTO_3FEC:
 
 ;******************************************
 	BLOCK #3FF0-$, #FF
-
+HD_CMD:	PUSH AF
-HD_CMD:
-	PUSH AF
 	DI
 	LD A,D_ROM16ON
 	OUT (SYS_PORT_ON),A

SP__48.ASM

@@ -19282,8 +19282,8 @@ L3C97:
 ;	ÈÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍͼ
         ;!FIXIT ᤥ« âì ¢ë¡®à áâà ­¨æë ¬ ªà®á®¬ á ãá«®¢¨ï¬¨ ª®¬¯¨«ï樨, 
         ;ç⮡ ¬®¦­® ¡ë«® ª®¬¯¨«¨âì vROM ª ª ¤«ï à ¡®âë á <20>‡“, â ª ¨ ¯®«­®áâìî ¡¥§ ­¥£®
-         //LD HL,#C0               ; POINT - ¢å®¤ ¢ MENU ¨§ BASIC 48.  for ZX_MODE.ASM - RET_FROM_BIOS_TO_BASIC48
+         LD HL,#C0               ; POINT - ¢å®¤ ¢ MENU ¨§ BASIC 48.  for ZX_MODE.ASM - RET_FROM_BIOS_TO_BASIC48
-         LD HL,#3CF0               ; POINT - ¢å®¤ ¢ MENU ¨§ BASIC 48.  for ZX_MODE.ASM - RET_FROM_BIOS_TO_BASIC48
+         //LD HL,#3CF0               ; POINT - ¢å®¤ ¢ MENU ¨§ BASIC 48.  for ZX_MODE.ASM - RET_FROM_BIOS_TO_BASIC48
         ;
         JR JMP_EX
 
@@ -19296,8 +19296,10 @@ JMP_EX:	PUSH HL
 
         ;!FIXIT ᤥ« âì ¢ë¡®à áâà ­¨æë ¬ ªà®á®¬ á ãá«®¢¨ï¬¨ ª®¬¯¨«ï樨, 
         ;ç⮡ ¬®¦­® ¡ë«® ª®¬¯¨«¨âì vROM ª ª ¤«ï à ¡®âë á <20>‡“, â ª ¨ ¯®«­®áâìî ¡¥§ ­¥£®
-         LD     A,0
+         //LD     A,0
-         OUT    (CNF_PORT.ON),A
+         //OUT    (CNF_PORT.ON),A
+         LD     A,ROM.EXTENSION
+         OUT    (SYS_PORT.ROM),A
         ;
 	POP AF
 	RET		; ¢®§¢à â

ZX_EXP.ASM

@@ -204,39 +204,41 @@ REST_LOOP:
 RESTART_TXT_L EQU $-RESTART_TXT
 
 ;**********************************
+        BLOCK #100 - $,255
+; ‚믮«­ï¥âáï á  ¤à¥á  #C000
 SETUP_TXT:
-
 	LD A,CNF_0+D_ROM16ON
 	OUT (CNF_PORT),A
 
-	LD HL,1000H
+	LD HL,#1000
-	LD DE,8000H
+	LD DE,#8000
-	LD BC,3000H
+	LD BC,#3000
 	LDIR
 
 	LD A,CNF_0+D_ROM16OFF
 	OUT (CNF_PORT),A
 
-	LD HL,08005H
+	LD HL,#8005
 
-	LD A,0FEh
+	LD A,#FE
-	LD BC,204Eh
+	LD BC,#204E     ;ALL_MODE
 	OUT (C),A
 
-	LD A,7FH
+	LD A,#7F
-	IN A,(0FEH)
+	IN A,(#FE)
 	CPL
 	AND 1
 	EX AF,AF'
 
-	LD A,0FFh
+	LD A,#FF
 	OUT (C),A
 
 	EX AF,AF'
 
 	JP (HL)
-
 SETUP_TXT_LEN EQU $-SETUP_TXT
+;**********************************
+
 
 SYSTEM_ID_TXT:
 	DB "NEW_BIOS"
@@ -704,19 +706,19 @@ ELSE
 	LD BC,204Eh	; system_port
 	OUT (C),A
 
-	LD SP,0BFFFH
+	LD SP,#BFFF
 	LD HL,L_PENTAGON
 	CALL SINC_DEF
 
-	LD SP,0BFFFH
+	LD SP,#BFFF
 	LD HL,L_PENTAGON
 	CALL SINC_DEF
 
 	LD HL,SETUP_TXT
-	LD DE,0C000H
+	LD DE,#C000
 	LD BC,SETUP_TXT_LEN
 	LDIR
-	CALL 0C000H
+	CALL #C000
 	JP NO_SETUP_1
 
 GOTO_SPEC:
@@ -743,7 +745,7 @@ NO_SETUP_1:
 	OUT (C),A
 
 SND_TEST_RET:
-	LD SP,0BFFFH
+	LD SP,#BFFF
 
 	LD HL,L_PENTAGON
 	CALL SINC_DEF
@@ -1396,8 +1398,9 @@ LOOP_EQ:		;
 	OUT (LPT1_D),A
 	RET
 
+;
 ;**********************************************
-;	DSS 3C10h,255
+;	BLOCK #3C10 - $,255
 ;KBD_RET:
 ;	LD A,D_ROM16OFF
 ;	OUT (SYS_PORT_OFF),A
@@ -1422,10 +1425,10 @@ LOOP_EQ:		;
 ;	CALL KBD_OFF
 ;	CALL DOS_ON
 ;	JR KBD_RET2
-
 ;******************************************************
 
-        BLOCK 3CC0h - $,255
+;******************************************************
+        BLOCK #3CC0 - $,255
 MAGIC_1:                ; ‡€ƒ‹“˜Š€ „‹Ÿ MAGIC
         PUSH AF
         LD A,D_ROM16OFF
@@ -1701,43 +1704,44 @@ kbd_loop2:
 	AND A
 	RET
 
-
+;***********************************************************************;
-	BLOCK 3FD0H - $,0
+;!FIXIT not used
+	BLOCK #3FD0 - $,0
 FN1_RET:
 	PUSH AF
 	LD A,D_ROM16ON
 	OUT (CNF_PORT),A
 	POP AF
-	RST 18H
+	RST #18
 	JR FN1_RET
 
-;******************************************
+;***********************************************************************;
-	BLOCK 3FE0H - $,255
+;!FIXIT not used
-
+	BLOCK #3FE0 - $,255
 SOUND_TEST:
 	LD A,D_ROM16ON		; AROM16 = 1
 	OUT (CNF_PORT),A
 	JP SND_TEST_RET
         
-	BLOCK 3FE8H - $,255
+;***********************************************************************;
-HDD_EXE:
+	BLOCK #3FE8 - $,255
 EXP_HDD:
 	PUSH AF
-	LD A,D_ROM16ON          ;!FIXIT ¯à¨¤ã¬ âì ­ §¢ ­¨ï ¬¥âª ¬
+	LD A,D_ROM16ON
 	OUT (CNF_PORT),A
 	POP AF
 	RET
-
+;***********************************************************************;
-	BLOCK 3FF0H-$,255
+	BLOCK #3FF0-$,255
-
+;***********************************************************************;
-	BLOCK 3FF8H-$,255
+	BLOCK #3FF8-$,255
 EXP_FNS_RET:
 	PUSH AF
 	LD A,D_ROM16OFF
 	OUT (SYS_PORT_OFF),A
 	JP EXP_FNS
 
-;******************************************
+;***********************************************************************;
-        BLOCK 4000h-$,255
+        BLOCK #4000-$,255
 ;
 

ZX_EXP/SERVICE.ASM

@@ -691,7 +691,7 @@ UTILIT:
 
 	CALL DOS_ON
 	LD A,0		; DETECT_HDD
-	CALL HDD_EXE
+	CALL EXP_HDD
 	CALL DOS_OFF
 
 	JR C,DISK_UTILIT

ZX_EXP2.ASM

@@ -4,24 +4,24 @@
 	ORG 0
 
 	INCLUDE 'INC/SPRINT00.INC'		; ª®­áâ ­âë, ¬ ªà®áë..
-;******************************
+        ; ***************************
-; ***** BEGIN EXPANSION *****
+        ; ***** BEGIN EXPANSION *****
-;******************************
+        ; ***************************
 START:
 	DI
 	HALT
-;***************************
+;***********************************************************************;
 	BLOCK #10-$,255
 	RET
-;***************************
+;***********************************************************************;
 	BLOCK #38-$,255
 	EI
 	RETI
-;***************************
+;***********************************************************************;
 	BLOCK #66-$,#C9
 	RETN
 
-;***************************
+;***********************************************************************;
 	BLOCK #100-$,255
 	INCLUDE 'ZX_EXP/EXP_HDD.ASM'
 ;	INCLUDE 'EXP_KBD.ASZ'
@@ -38,9 +38,8 @@ START:
 ;	PUSH HL
 ;	DI
 ;	RET
-
+;***********************************************************************;
 	BLOCK #3FD0-$,255
-
 	PUSH AF
 	LD A,D_ROM16OFF
 	OUT (SYS_PORT_ON),A
@@ -48,17 +47,20 @@ START:
 HD_CMD_XR_RET:
 	RET
 
+;***********************************************************************;
+        BLOCK #3FD7-$,255
 HD_CMD_XR:
 	JP HD_CMD
 
-;************************
+;***********************************************************************;
+;!FIXIT not used
 	BLOCK #3FE0-$,255
 SND_TEST_RET:
 	LD A,D_ROM16OFF
 	OUT (SYS_PORT_OFF),A
         JP SND_TEST_RET
 
-;***************************
+;***********************************************************************;
 	BLOCK #3FE8-$,255
 HD_EXP_RET:
 	PUSH AF
@@ -69,8 +71,8 @@ HD_EXP_RET:
         ;
 	JP HD_EXP_EXE
 
+;***********************************************************************;
 	BLOCK #3FF0-$,255
-
 HD_DOS_RET:
 	PUSH AF
 	DI
@@ -78,13 +80,15 @@ HD_DOS_RET:
 	OUT (SYS_PORT_OFF),A
 	JR HD_CMD_XR
 
+;***********************************************************************;
+	BLOCK #3FF8-$,255
 EXP_FNS_RET:
 	PUSH AF
 	LD A,D_ROM16OFF
 	OUT (SYS_PORT_OFF),A
 	JP HD_CMD_XR_RET
 
-;******************************************
+;***********************************************************************;
 	BLOCK #4000-$,255
 ;
 ;