From 6badb66772cf1d4844f1a9a2a0b7b4a416bfbfd4 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Wed, 23 Apr 2025 00:49:08 +1000
Subject: [PATCH] =?UTF-8?q?=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BD=D0=B5=D1=82?=
 =?UTF-8?q?=20=D0=B4=D0=B8=D1=81=D0=BA=D0=B0=20=D0=B2=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=B5,=20=D1=82=D0=BE=20=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=88=D0=B5=D1=82=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?=
 =?UTF-8?q?=D1=83,=20=D1=87=D1=82=D0=BE=20=D0=BD=D0=B5=D1=82=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=D0=B2=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CDX.ASM         | 61 ++++++++++++++++++++++++-------------------------
 Shared_Includes |  2 +-
 2 files changed, 31 insertions(+), 32 deletions(-)

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