Disable XBIOS in interrupt also under Magic
authorPatrice Mandin <patmandin@gmail.com>
Fri, 29 Jul 2005 10:59:49 +0000
changeset 1106 524fd51f5d2c
parent 1105 1c9988e47824
child 1107 856f76a099c7
Disable XBIOS in interrupt also under Magic
README.MiNT
src/audio/mint/SDL_mintaudio_mcsn.c
src/audio/mint/SDL_mintaudio_xbios.c
--- a/README.MiNT	Fri Jul 29 10:59:02 2005 +0000
+++ b/README.MiNT	Fri Jul 29 10:59:49 2005 +0000
@@ -131,9 +131,9 @@
 	The second joystick port on IKBD is used by the mouse, so not usable.
 	Another problem with the IKBD: mouse buttons and joystick fire buttons
 	are wired together at the hardware level, it means:
-		port 0					port 0				port 1
-		mouse left button	=	joystick fire 0	=	joystick fire 1
-		mouse right button	=	joystick fire 1	=	joystick fire 0
+		port 0                port 0           port 1
+		mouse left button  = joystick fire 0 = joystick fire 1
+		mouse right button = joystick fire 1 = joystick fire 0
 
 	Descriptions of joysticks/joypads:
 	- Joypads: 1 hat, 17 buttons (Atari Jaguar console-like).
@@ -204,7 +204,8 @@
 
 Audio drivers:
 	Cookies _SND, MCSN, STFA and GSXB used to detect supported audio
-	capabilities. Note: XBIOS and MCSN drivers can not be used under MiNT.
+	capabilities. Note: XBIOS and MCSN drivers can not be used under MiNT or
+	Magic.
 
 	STE, Mega STE, TT:
 		8 bits DMA (hardware access)
--- a/src/audio/mint/SDL_mintaudio_mcsn.c	Fri Jul 29 10:59:02 2005 +0000
+++ b/src/audio/mint/SDL_mintaudio_mcsn.c	Fri Jul 29 10:59:49 2005 +0000
@@ -90,6 +90,11 @@
 		return(0);
 	}
 
+	/* nor with Magic */
+	if (Getcookie(C_MagX, &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"));
--- a/src/audio/mint/SDL_mintaudio_xbios.c	Fri Jul 29 10:59:02 2005 +0000
+++ b/src/audio/mint/SDL_mintaudio_xbios.c	Fri Jul 29 10:59:49 2005 +0000
@@ -90,6 +90,11 @@
 		return(0);
 	}
 
+	/* nor with Magic */
+	if (Getcookie(C_MagX, &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"));