Disable XBIOS in interrupt also under Magic
authorPatrice Mandin <patmandin@gmail.com>
Fri, 29 Jul 2005 10:59:49 +0000
changeset 1106524fd51f5d2c
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
     1.1 --- a/README.MiNT	Fri Jul 29 10:59:02 2005 +0000
     1.2 +++ b/README.MiNT	Fri Jul 29 10:59:49 2005 +0000
     1.3 @@ -131,9 +131,9 @@
     1.4  	The second joystick port on IKBD is used by the mouse, so not usable.
     1.5  	Another problem with the IKBD: mouse buttons and joystick fire buttons
     1.6  	are wired together at the hardware level, it means:
     1.7 -		port 0					port 0				port 1
     1.8 -		mouse left button	=	joystick fire 0	=	joystick fire 1
     1.9 -		mouse right button	=	joystick fire 1	=	joystick fire 0
    1.10 +		port 0                port 0           port 1
    1.11 +		mouse left button  = joystick fire 0 = joystick fire 1
    1.12 +		mouse right button = joystick fire 1 = joystick fire 0
    1.13  
    1.14  	Descriptions of joysticks/joypads:
    1.15  	- Joypads: 1 hat, 17 buttons (Atari Jaguar console-like).
    1.16 @@ -204,7 +204,8 @@
    1.17  
    1.18  Audio drivers:
    1.19  	Cookies _SND, MCSN, STFA and GSXB used to detect supported audio
    1.20 -	capabilities. Note: XBIOS and MCSN drivers can not be used under MiNT.
    1.21 +	capabilities. Note: XBIOS and MCSN drivers can not be used under MiNT or
    1.22 +	Magic.
    1.23  
    1.24  	STE, Mega STE, TT:
    1.25  		8 bits DMA (hardware access)
     2.1 --- a/src/audio/mint/SDL_mintaudio_mcsn.c	Fri Jul 29 10:59:02 2005 +0000
     2.2 +++ b/src/audio/mint/SDL_mintaudio_mcsn.c	Fri Jul 29 10:59:49 2005 +0000
     2.3 @@ -90,6 +90,11 @@
     2.4  		return(0);
     2.5  	}
     2.6  
     2.7 +	/* nor with Magic */
     2.8 +	if (Getcookie(C_MagX, &dummy) == C_FOUND) {
     2.9 +		return(0);
    2.10 +	}
    2.11 +
    2.12  	/* Check if user asked a different audio driver */
    2.13  	if ((envr) && (strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) {
    2.14  		DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n"));
     3.1 --- a/src/audio/mint/SDL_mintaudio_xbios.c	Fri Jul 29 10:59:02 2005 +0000
     3.2 +++ b/src/audio/mint/SDL_mintaudio_xbios.c	Fri Jul 29 10:59:49 2005 +0000
     3.3 @@ -90,6 +90,11 @@
     3.4  		return(0);
     3.5  	}
     3.6  
     3.7 +	/* nor with Magic */
     3.8 +	if (Getcookie(C_MagX, &dummy) == C_FOUND) {
     3.9 +		return(0);
    3.10 +	}
    3.11 +
    3.12  	/* Check if user asked a different audio driver */
    3.13  	if ((envr) && (strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) {
    3.14  		DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n"));