Disable XBIOS in interrupt also under Magic

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401107
This commit is contained in:
Patrice Mandin 2005-07-29 10:59:49 +00:00
parent 467a069a72
commit 3bcb730b00
3 changed files with 15 additions and 4 deletions

View file

@ -131,9 +131,9 @@ SDL_JOYSTICK_ATARI:
The second joystick port on IKBD is used by the mouse, so not usable. 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 Another problem with the IKBD: mouse buttons and joystick fire buttons
are wired together at the hardware level, it means: are wired together at the hardware level, it means:
port 0 port 0 port 1 port 0 port 0 port 1
mouse left button = joystick fire 0 = joystick fire 1 mouse left button = joystick fire 0 = joystick fire 1
mouse right button = joystick fire 1 = joystick fire 0 mouse right button = joystick fire 1 = joystick fire 0
Descriptions of joysticks/joypads: Descriptions of joysticks/joypads:
- Joypads: 1 hat, 17 buttons (Atari Jaguar console-like). - Joypads: 1 hat, 17 buttons (Atari Jaguar console-like).
@ -204,7 +204,8 @@ VBL timer driver:
Audio drivers: Audio drivers:
Cookies _SND, MCSN, STFA and GSXB used to detect supported audio 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: STE, Mega STE, TT:
8 bits DMA (hardware access) 8 bits DMA (hardware access)

View file

@ -90,6 +90,11 @@ static int Audio_Available(void)
return(0); return(0);
} }
/* nor with Magic */
if (Getcookie(C_MagX, &dummy) == C_FOUND) {
return(0);
}
/* Check if user asked a different audio driver */ /* Check if user asked a different audio driver */
if ((envr) && (strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) { if ((envr) && (strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) {
DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n")); DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n"));

View file

@ -90,6 +90,11 @@ static int Audio_Available(void)
return(0); return(0);
} }
/* nor with Magic */
if (Getcookie(C_MagX, &dummy) == C_FOUND) {
return(0);
}
/* Check if user asked a different audio driver */ /* Check if user asked a different audio driver */
if ((envr) && (strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) { if ((envr) && (strcmp(envr, MINT_AUDIO_DRIVER_NAME)!=0)) {
DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n")); DEBUG_PRINT((DEBUG_NAME "user asked a different audio driver\n"));