Mercurial > sdl-ios-xcode
changeset 428:1338c24e30cb
Date: Fri, 12 Jul 2002 11:25:32 GMT+1
From: Patrice Mandin <pmandin@caramail.com>
Subject: [SDL][PATCH] Audio for Atari, and XFree86 compilation
I corrected a little bug in the Atari audio driver in SDL.
I also added the patch for xfree86 detection in configure.in
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 29 Jul 2002 23:20:16 +0000 |
| parents | 027ae30b867f |
| children | c1666427297c |
| files | configure.in src/audio/mint/SDL_mintaudiointerrupt.S |
| diffstat | 2 files changed, 13 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Mon Jul 29 22:26:43 2002 +0000 +++ b/configure.in Mon Jul 29 23:20:16 2002 +0000 @@ -548,7 +548,7 @@ AC_PATH_X AC_PATH_XTRA if test x$have_x = xyes; then - CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -I\$(top_srcdir)/include -I\$(top_srcdir)/src/video" + CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_X11 -I$srcdir/include -I$srcdir/src/video" if test x$ac_cv_func_shmat != xyes; then CFLAGS="$CFLAGS -DNO_SHARED_MEMORY" fi
--- a/src/audio/mint/SDL_mintaudiointerrupt.S Mon Jul 29 22:26:43 2002 +0000 +++ b/src/audio/mint/SDL_mintaudiointerrupt.S Mon Jul 29 23:20:16 2002 +0000 @@ -30,14 +30,17 @@ .text _SDL_MintAudio_IntDma: + /* Reenable interrupts, so other interrupts can work */ + movew #0x2300,sr + + /* Clear service bit, so other MFP interrupts can work */ + bclr #5,0xfffffa0f:w + /* Check if we are not already running */ tstw _SDL_MintAudio_mutex bnes intdma_end notw _SDL_MintAudio_mutex - /* Reenable interrupts */ - movew #0x2300,sr - /* Swap buffers */ moveml d0-d1/a0-a1,sp@- @@ -76,7 +79,6 @@ clrw _SDL_MintAudio_mutex intdma_end: - bclr #5,0xfffffa0f:w rte /*--- Xbios interrupt vector ---*/ @@ -84,14 +86,17 @@ .text _SDL_MintAudio_IntXbios: + /* Reenable interrupts, so other interrupts can work */ + movew #0x2300,sr + + /* Clear service bit, so other MFP interrupts can work */ + bclr #5,0xfffffa0f:w + /* Check if we are not already running */ tstw _SDL_MintAudio_mutex bnes intxbios_end notw _SDL_MintAudio_mutex - /* Reenable interrupts */ - movew #0x2300,sr - /* Swap buffers */ moveml d0-d2/a0-a2,sp@- @@ -123,7 +128,6 @@ clrw _SDL_MintAudio_mutex intxbios_end: - bclr #5,0xfffffa0f:w rte /*--- GSXB interrupt vector ---*/