From ccea8075cc3f98a8835e6e6cc2823ab2d92c5964 Mon Sep 17 00:00:00 2001 From: Patrice Mandin Date: Fri, 29 Jul 2005 10:59:49 +0000 Subject: [PATCH] Disable XBIOS in interrupt also under Magic --- README.MiNT | 9 +++++---- src/audio/mint/SDL_mintaudio_mcsn.c | 5 +++++ src/audio/mint/SDL_mintaudio_xbios.c | 5 +++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/README.MiNT b/README.MiNT index 9632dab34..45b6e85a0 100644 --- a/README.MiNT +++ b/README.MiNT @@ -131,9 +131,9 @@ SDL_JOYSTICK_ATARI: 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 @@ VBL timer driver: 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) diff --git a/src/audio/mint/SDL_mintaudio_mcsn.c b/src/audio/mint/SDL_mintaudio_mcsn.c index 7855d2805..65479ad6d 100644 --- a/src/audio/mint/SDL_mintaudio_mcsn.c +++ b/src/audio/mint/SDL_mintaudio_mcsn.c @@ -90,6 +90,11 @@ static int Audio_Available(void) 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")); diff --git a/src/audio/mint/SDL_mintaudio_xbios.c b/src/audio/mint/SDL_mintaudio_xbios.c index 55a70603c..25c735420 100644 --- a/src/audio/mint/SDL_mintaudio_xbios.c +++ b/src/audio/mint/SDL_mintaudio_xbios.c @@ -90,6 +90,11 @@ static int Audio_Available(void) 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"));