diff --git a/CDX.ASM b/CDX.ASM index 78aac70..0f4e89d 100644 --- a/CDX.ASM +++ b/CDX.ASM @@ -12,8 +12,7 @@ ; COMMAND ; -h,? Help page - DEFINE _MAME 1 - +MAX_DSS_ERR EQU 33 CR EQU 13 LF EQU 10 @@ -241,9 +240,23 @@ SAVE_MEDIA_CHANGED: STOPMODE DB #00 - INCLUDE "cmdparse.asm" - INCLUDE "command.asm" - INCLUDE "cd_dos.asm" + + + +CMD_PARSE_ASM.Start: INCLUDE "cmdparse.asm" +CMD_PARSE_ASM.End EQU $ + DISPLAY "cmdparse.asm size: ",/D,CMD_PARSE_ASM.End - CMD_PARSE_ASM.Start + ; +COMMAND_ASM.Start INCLUDE "command.asm" +COMMAND_ASM.End EQU $ + DISPLAY "command.asm size: ",/D,COMMAND_ASM.End - COMMAND_ASM.Start + ; +CD_DOS_ASM.Start: INCLUDE "cd_dos.asm" +CD_DOS_ASM.End EQU $ + DISPLAY "cd_dos.asm size: ",/D,CD_DOS_ASM.End - CD_DOS_ASM.Start + + + CRLF: PUSH HL LD HL,MSG0.crlf @@ -258,11 +271,11 @@ CRLF: PUSH HL RET ; -ERROR: CP MAX_DSS_ERR +ERROR: ;CP MAX_DSS_ERR LD E,A LD D,0 - JR C,.ERR_MSG - LD E,D + ;JR C,.ERR_MSG + ;LD E,D ;JP .ERR_MSG ; .ERR_MSG: PUSH DE @@ -275,20 +288,70 @@ ERROR: CP MAX_DSS_ERR JP CRLF -FMESAGE INC DE - LD HL,ERR0 - LD BC,ERR0.Size -LCPIR XOR A - CPIR - RET PO - RET NZ - DEC DE - LD A,D - OR E - JP NZ,LCPIR - RET +FMESAGE: LD A,E + LD HL,SYS_ERRORS ; массив строк + LD BC,SYS_ERRORS.Size ; размер массива + RLA + jr nc,.set_de + ld hl,DRV_ERRORS ; массив строк + ld bc,DRV_ERRORS.Size ; размер массива +.set_de: SRL A + LD E,A + INC DE +LCPIR: XOR A + CPIR + RET PO + RET NZ + ; + XOR A + CP (HL) + JR Z,.no_mess + ; + DEC DE + LD A,D + OR E + JP NZ,LCPIR + RET +.no_mess: INC HL + RET +/* +LCPIR: xor a + cpir + ret po + ret nz + ;R11 + XOR A + CP (HL) + JR Z,.no_mess + ; + dec de + ld a,d + or e + jr nz,LCPIR + ret +.no_mess: INC HL + RET -MAX_DSS_ERR EQU 33 + +print_err_message: + ld hl,SYS_ERRORS ; массив строк + ld bc,SYS_ERRORS.Size ; размер массива + ;cp %1000'0000 + RLA + jr nc,.set_de + ; + ;and %0111'1111 + ld hl,DRV_ERRORS ; массив строк + ld bc,DRV_ERRORS.Size ; размер массива + ; +.set_de: SRL A + ld e,a + ld d,0 + inc de + call LCPIR ; найти строку + call PRINTZ ; формат. вывод строки + jp newline +*/ ERRCDX DB "CDX: ",0 @@ -448,8 +511,8 @@ MSG_COPYABORTED EQU 19 ;21 MSG0 BYTE 0 ;0 - BYTE "CDROM eXtension utility v1.02, 2025 (c) Sprinter Team",CR,LF - DZ "Type CDX.EXE -? for help.",CR,LF,CR,LF + BYTE "CDROM eXtension utility v1.02.1, 2025 (c) Sprinter Team",CR,LF + DZ "Type CDX.EXE -? for help.",CR,LF ;1 DZ "Opening tray..." ;2 @@ -547,5 +610,6 @@ BUFERS_NUMBER EQU 6 ; ASSERT (DUMPBUF+2048 < #C000), "NO FREE SPACE FOR BUFFERS" ;-----------------------------------------------------------------------; -DEV_CFG +DEV_CFG: + DISPLAY "\n\tCDX size: ",/D,DEV_CFG - START ;[END] diff --git a/CDX.TXT b/CDX.TXT index 92da5ac..ec377ad 100644 --- a/CDX.TXT +++ b/CDX.TXT @@ -1,5 +1,5 @@ - CDROM eXtension utility version 1.01 + CDROM eXtension utility version 1.02.01 ------------------------------------------------ It's utility came for solving the problem with support CDROM in DSS ver 1.x. diff --git a/COMMAND.ASM b/COMMAND.ASM index ccd493d..25c0816 100644 --- a/COMMAND.ASM +++ b/COMMAND.ASM @@ -91,7 +91,7 @@ CHELP: LD A,MSG_USAGE CCLOSE: LD A,MSG_TRAY_CLOSE CALL MESSAGE LD A,(CDDRIVE) - LD BC,BIOS.DRV_EXTENDED.CD_Close + LD BC,BIOS.DRV_EXTENDED.ATAPI_Close RST ToBIOS LD A,MSG_DONE JP MESSAGE @@ -99,7 +99,7 @@ CCLOSE: LD A,MSG_TRAY_CLOSE COPEN: LD A,MSG_TRAY_OPEN CALL MESSAGE LD A,(CDDRIVE) - LD BC,BIOS.DRV_EXTENDED.CD_Eject + LD BC,BIOS.DRV_EXTENDED.ATAPI_Eject RST ToBIOS LD A,MSG_DONE JP MESSAGE diff --git a/Cd_dos.asm b/Cd_dos.asm index d9974e7..aca4eb7 100644 --- a/Cd_dos.asm +++ b/Cd_dos.asm @@ -63,7 +63,7 @@ FM_BUF DB ". " ;+00 NAME DB #00 ;+43 EMPTY END_FM ;End of FM - DS 44*2 +; DS 44*2 FM_SIZE EQU END_FM-FM_BUF @@ -166,12 +166,12 @@ CHANGEDISK: LD A,(CDDRIVE) AND A RET -NDISK11 CP BIOS.Error.ATAPI.NotReady - SCF - RET NZ - ; - LD A,DSS_Error.sys.NOT_READY - RET +; NDISK11 CP BIOS.Error.ATAPI.NotReady +; SCF +; RET NZ +; ; +; LD A,DSS_Error.sys.NOT_READY +; RET INITDISK: LD A,DIRPAGE diff --git a/Shared_Includes b/Shared_Includes index 2b1e30c..f533c03 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 2b1e30c6108f0a5c271f84558e1e5f804a6d623a +Subproject commit f533c03f52f53e581c794c1017b7b0d61d39dfbf