Commit 3bcb730b authored by Patrice Mandin's avatar Patrice Mandin

Disable XBIOS in interrupt also under Magic

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401107
parent 467a069a
......@@ -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)
......
......@@ -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"));
......
......@@ -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"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment