XBIOS in interrupt not usable under MiNT

libsdl-org · Jul 20, 2005 · b821b6a · b821b6a
1 parent 20fe8e6
commit b821b6a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/README.MiNT b/README.MiNT
@@ -204,7 +204,7 @@ VBL timer driver:
 
 Audio drivers:
 	Cookies _SND, MCSN, STFA and GSXB used to detect supported audio
-	capabilities.
+	capabilities. Note: XBIOS and MCSN drivers can not be used under MiNT.
 
 	STE, Mega STE, TT:
 		8 bits DMA (hardware access)

diff --git a/src/audio/mint/SDL_mintaudio_mcsn.c b/src/audio/mint/SDL_mintaudio_mcsn.c
@@ -82,8 +82,14 @@ static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec);
 
 static int Audio_Available(void)
 {
+	unsigned long dummy;
 	const char *envr = getenv("SDL_AUDIODRIVER");
 
+	/* We can't use XBIOS in interrupt under MiNT */
+	if (Getcookie(C_MiNT, &dummy) == C_FOUND) {
+		return(0);
+	}
+
 	/* Check if user asked a different audio driver */
 	if ((envr) && (strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) {
 		DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n"));

diff --git a/src/audio/mint/SDL_mintaudio_xbios.c b/src/audio/mint/SDL_mintaudio_xbios.c
@@ -82,8 +82,14 @@ static void Mint_InitAudio(_THIS, SDL_AudioSpec *spec);
 
 static int Audio_Available(void)
 {
+	unsigned long dummy;
 	const char *envr = getenv("SDL_AUDIODRIVER");
 
+	/* We can't use XBIOS in interrupt under MiNT */
+	if (Getcookie(C_MiNT, &dummy) == C_FOUND) {
+		return(0);
+	}
+
 	/* Check if user asked a different audio driver */
 	if ((envr) && (strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) {
 		DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n"));