X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2Fcd_sys.c;h=6d4cb430eeef9d3e4af1fa5520601124a33aaf9b;hb=d9153729685381acb0559d8a4fdca47cb839427a;hp=c0199e826c4e281b04db790b440389143ab42211;hpb=75736070161d40608ba3052b4c95b42943f9de3d;p=picodrive.git

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index c0199e8..6d4cb43 100644
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -152,17 +152,7 @@ void Check_CD_Command(void)
 {
 	cdprintf("CHECK CD COMMAND");
 
-	// Check CDD
-
-	if (Pico_mcd->scd.CDD_Complete)
-	{
-		Pico_mcd->scd.CDD_Complete = 0;
-
-		CDD_Export_Status();
-	}
-
 	// Check CDC
-
 	if (Pico_mcd->scd.Status_CDC & 1)			// CDC is reading data ...
 	{
 		cdprintf("Got a read command");
@@ -179,6 +169,14 @@ void Check_CD_Command(void)
 		else Pico_mcd->scd.File_Add_Delay--;
 	}
 
+	// Check CDD
+	if (Pico_mcd->scd.CDD_Complete)
+	{
+		Pico_mcd->scd.CDD_Complete = 0;
+
+		CDD_Export_Status();
+	}
+
 	if (Pico_mcd->scd.Status_CDD == FAST_FOW)
 	{
 		Pico_mcd->scd.Cur_LBA += 10;
@@ -210,8 +208,10 @@ void Reset_CD(void)
 {
 	Pico_mcd->scd.Cur_Track = 0;
 	Pico_mcd->scd.Cur_LBA = -150;
+	Pico_mcd->scd.Status_CDC &= ~1;
 	Pico_mcd->scd.Status_CDD = READY;
 	Pico_mcd->scd.CDD_Complete = 0;
+	Pico_mcd->scd.File_Add_Delay = 0;
 }