diff --git a/CDX.ASM b/CDX.ASM index 0f4e89d..5543ad5 100644 --- a/CDX.ASM +++ b/CDX.ASM @@ -190,37 +190,36 @@ MALLOC: ; RST ToDSS ; RET -INIT: XOR A - LD (STOPMODE),A - DEC A - LD (CDDRIVE),A - ; - LD BC,+(#C0-1)*256 + BIOS.DRV_DETECT -.loop: INC B - LD A,B - CP #C4 - SCF - RET Z - PUSH BC - RST ToBIOS - POP BC - 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 - ; - ; LD C,BIOS.DRV_RESET - ; JP ToBIOS -; RET +INIT: XOR A + LD (STOPMODE),A + DEC A + LD (CDDRIVE),A + ; + LD BC,+(#C0-1)*256 + BIOS.DRV_DETECT +.loop: INC B + LD A,B + CP #C4 + SCF + RET Z + PUSH BC + RST ToBIOS + POP BC + JR NC,.found + ; + CP BIOS.Error.ATAPI.MediumError + JR Z,.media_changed + CP BIOS.Error.ATAPI.UnitAttention + JR NZ,.loop + ; +.media_changed: PUSH BC + LD A,B + CALL SAVE_MEDIA_CHANGED + POP BC + ; +.found: LD A,B + LD (CDDRIVE),A + RET + SAVE_MEDIA_CHANGED: LD C,BIOS.DRV_GET_PAR diff --git a/Shared_Includes b/Shared_Includes index f533c03..a0e68ce 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit f533c03f52f53e581c794c1017b7b0d61d39dfbf +Subproject commit a0e68ce3a19bd47537585e49bfbf5e45fab197a1