diff --git a/CDX.ASM b/CDX.ASM index 92e0ec8..a2f970c 100644 --- a/CDX.ASM +++ b/CDX.ASM @@ -92,40 +92,45 @@ START: PUSH IX OR A CALL Z,COMMAND - CALL MDEALLOC -QUIT: CALL CRLF -.loop: LD BC,Dss.Exit - RST ToDSS - JP .loop + ;CALL MDEALLOC +QUIT: CALL CRLF +.set_par+1: LD B,1 + LD C,BIOS.DRV_SET_PAR + LD A,(CDDRIVE) + RST ToBIOS + ; +.loop: LD BC,Dss.Exit + RST ToDSS + JP .loop OLD_DSS LD A,MSG_OLD_DSS CALL MESSAGE JR QUIT -HNDMEM DB #FF +;HNDMEM DB #FF -MALLOC +MALLOC: LD BC,2*256 + Dss.GetMem RST ToDSS - JR NC,M_ALLOK + JR NC,.cont LD A,MSG_MEMERROR CALL MESSAGE SCF RET -M_ALLOK - LD (HNDMEM),A + ; +.cont: PUSH AF LD BC,1*256 + Dss.SetWin3 RST ToDSS LD HL,BANKTBL LD C,BIOS.GetMemBlkPages - LD A,(HNDMEM) + POP AF JP ToBIOS -MDEALLOC - LD A,(HNDMEM) - LD C,Dss.FreeMem - JP ToDSS +; MDEALLOC +; LD A,(HNDMEM) +; LD C,Dss.FreeMem +; JP ToDSS ; FIND_CDROM ; LD IX,DEV_CFG @@ -198,8 +203,17 @@ INIT: XOR A PUSH BC RST ToBIOS POP BC - JR C,.loop + JR NC,.found + ; + CP BIOS.Error.ATAPI.UnitAttention + JR NZ,.loop + ; + PUSH BC LD A,B + CALL SAVE_MEDIA_CHANGED + POP BC + ; +.found: LD A,B LD (CDDRIVE),A RET ; @@ -207,6 +221,17 @@ INIT: XOR A ; JP ToBIOS ; RET +SAVE_MEDIA_CHANGED: + LD C,BIOS.DRV_GET_PAR + RST ToBIOS + OR %0000'0010 + LD B,A + LD A,(QUIT.set_par) + OR B + LD (QUIT.set_par),A + RET + + ;VARIABLES ; FILENAME DS 256 @@ -421,7 +446,7 @@ MSG_COPYABORTED EQU 19 ;21 MSG0 BYTE 0 ;0 - BYTE "CDROM eXtension utility v1.01, 2023 (c) Sprinter Team",CR,LF + BYTE "CDROM eXtension utility v1.02, 2025 (c) Sprinter Team",CR,LF DZ "Type CDX.EXE -? for help.",CR,LF,CR,LF ;1 DZ "Opening tray..." diff --git a/Cd_dos.asm b/Cd_dos.asm index f635791..d9974e7 100644 --- a/Cd_dos.asm +++ b/Cd_dos.asm @@ -159,8 +159,7 @@ CHANGEDISK: LD A,(CDDRIVE) RET ; .drv_change: LD A,(CDDRIVE) - LD C,BIOS.DRV_GET_PAR - RST ToBIOS + CALL SAVE_MEDIA_CHANGED ; .cont: CALL INITDISK RET C diff --git a/Shared_Includes b/Shared_Includes index 857938d..237dd36 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 857938d1dbf3b332a5e9e8ccabfee531eb3848fa +Subproject commit 237dd36651b4af124f12d3f1eaee3688467f8fa3