Mercurial > sdl-ios-xcode
changeset 3272:e8f63b28947d
Removed outdated Dreamcast support
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 19 Sep 2009 07:21:22 +0000 |
| parents | 32fc3ba8df0b |
| children | e0dfba770eb7 |
| files | Makefile.dc Makefile.in README README.DC VisualCE/SDLMain/SDLmain.vcp VisualCE/loopwave/loopwave.vcp VisualCE/testalpha/testalpha.vcp VisualCE/testtimer/testtimer.vcp VisualCE/testwin/testwin.vcp Xcode/SDL/pkg-support/resources/ReadMe.txt include/SDL.h include/SDL_config.h.default include/SDL_config.h.in include/SDL_config_dreamcast.h src/audio/SDL_audio.c src/audio/dc/SDL_dcaudio.c src/audio/dc/SDL_dcaudio.h src/audio/dc/aica.c src/audio/dc/aica.h src/joystick/dc/SDL_sysjoystick.c src/power/SDL_power.c src/thread/SDL_thread_c.h src/thread/dc/SDL_syscond.c src/thread/dc/SDL_syscond_c.h src/thread/dc/SDL_sysmutex.c src/thread/dc/SDL_sysmutex_c.h src/thread/dc/SDL_syssem.c src/thread/dc/SDL_syssem_c.h src/thread/dc/SDL_systhread.c src/thread/dc/SDL_systhread_c.h src/timer/dc/SDL_systimer.c src/video/SDL_sysvideo.h src/video/SDL_video.c src/video/dc/SDL_dcevents.c src/video/dc/SDL_dcevents_c.h src/video/dc/SDL_dcmouse.c src/video/dc/SDL_dcmouse_c.h src/video/dc/SDL_dcvideo.c src/video/dc/SDL_dcvideo.h |
| diffstat | 39 files changed, 8 insertions(+), 2772 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.dc Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ -#GL=1 - -CC = sh-elf-gcc -AR = sh-elf-ar - -ifdef GL -DEFS += -DSDL_VIDEO_OPENGL=1 -TARGET = libSDL_gl.a -else -TARGET = libSDL.a -endif - -CFLAGS=$(KOS_CFLAGS) $(DEFS) -Iinclude - -SRCS = \ - src/audio/dc/SDL_dcaudio.c \ - src/audio/dc/aica.c \ - src/audio/dummy/SDL_dummyaudio.c \ - src/audio/SDL_audio.c \ - src/audio/SDL_audiocvt.c \ - src/audio/SDL_audiodev.c \ - src/audio/SDL_mixer.c \ - src/audio/SDL_wave.c \ - src/cdrom/dc/SDL_syscdrom.c \ - src/cdrom/SDL_cdrom.c \ - src/events/SDL_active.c \ - src/events/SDL_events.c \ - src/events/SDL_expose.c \ - src/events/SDL_keyboard.c \ - src/events/SDL_mouse.c \ - src/events/SDL_quit.c \ - src/events/SDL_resize.c \ - src/file/SDL_rwops.c \ - src/power/SDL_power.c \ - src/joystick/dc/SDL_sysjoystick.c \ - src/joystick/SDL_joystick.c \ - src/loadso/dummy/SDL_sysloadso.c \ - src/SDL.c \ - src/SDL_error.c \ - src/SDL_fatal.c \ - src/stdlib/SDL_getenv.c \ - src/stdlib/SDL_iconv.c \ - src/stdlib/SDL_malloc.c \ - src/stdlib/SDL_qsort.c \ - src/stdlib/SDL_stdlib.c \ - src/stdlib/SDL_string.c \ - src/thread/dc/SDL_syscond.c \ - src/thread/dc/SDL_sysmutex.c \ - src/thread/dc/SDL_syssem.c \ - src/thread/dc/SDL_systhread.c \ - src/thread/SDL_thread.c \ - src/timer/dc/SDL_systimer.c \ - src/timer/SDL_timer.c \ - src/video/dc/SDL_dcevents.c \ - src/video/dc/SDL_dcvideo.c \ - src/video/dummy/SDL_nullevents.c \ - src/video/dummy/SDL_nullmouse.c \ - src/video/dummy/SDL_nullvideo.c \ - src/video/glsdl/SDL_glsdl.c \ - src/video/SDL_blit.c \ - src/video/SDL_blit_0.c \ - src/video/SDL_blit_1.c \ - src/video/SDL_blit_A.c \ - src/video/SDL_blit_N.c \ - src/video/SDL_bmp.c \ - src/video/SDL_cursor.c \ - src/video/SDL_gamma.c \ - src/video/SDL_pixels.c \ - src/video/SDL_RLEaccel.c \ - src/video/SDL_stretch.c \ - src/video/SDL_surface.c \ - src/video/SDL_video.c \ - src/video/SDL_yuv.c \ - src/video/SDL_yuv_sw.c \ - -OBJS = $(SRCS:.c=.o) - -TEST = \ - test/checkkeys.c \ - test/graywin.c \ - test/loopwave.c \ - test/testalpha.c \ - test/testbitmap.c \ - test/testcdrom.c \ - test/testerror.c \ - test/testgamma.c \ - test/testgl.c \ - test/testhread.c \ - test/testjoystick.c \ - test/testkeys.c \ - test/testlock.c \ - test/testoverlay.c \ - test/testpalette.c \ - test/testsem.c \ - test/testsprite.c \ - test/testtimer.c \ - test/testtypes.c \ - test/testver.c \ - test/testvidinfo.c \ - test/testwin.c \ - test/testwm.c \ - test/threadwin.c \ - test/torturethread.c \ - -$(TARGET): copy_config \ - $(OBJS) - $(AR) rcs $(TARGET) $(OBJS) - -copy_config: - @cp include/SDL_config.h.default include/SDL_config.h - -clean: - rm -f include/SDL_config.h $(OBJS)
--- a/Makefile.in Sat Sep 19 07:09:41 2009 +0000 +++ b/Makefile.in Sat Sep 19 07:21:22 2009 +0000 @@ -45,7 +45,7 @@ EMBEDSPU = @EMBEDSPU@ #include $(srcdir)/src/video/ps3/spulibs/Makefile -DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS docs docs.html include INSTALL Makefile.dc Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.qpg.in SDL.spec SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode +DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS docs docs.html include INSTALL Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.qpg.in SDL.spec SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode HDRS = SDL.h SDL_atomic.h SDL_audio.h SDL_compat.h SDL_cpuinfo.h SDL_endian.h SDL_error.h SDL_events.h SDL_haptic.h SDL_joystick.h SDL_keyboard.h SDL_keysym.h SDL_loadso.h SDL_main.h SDL_mouse.h SDL_mutex.h SDL_name.h SDL_opengl.h SDL_opengles.h SDL_pixels.h SDL_platform.h SDL_power.h SDL_quit.h SDL_rect.h SDL_revision.h SDL_rwops.h SDL_scancode.h SDL_stdinc.h SDL_surface.h SDL_syswm.h SDL_thread.h SDL_timer.h SDL_types.h SDL_version.h SDL_video.h begin_code.h close_code.h
--- a/README Sat Sep 19 07:09:41 2009 +0000 +++ b/README Sat Sep 19 07:21:22 2009 +0000 @@ -14,8 +14,8 @@ The current version supports Linux, Windows, Windows CE, BeOS, MacOS, Mac OS X, FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. -The code contains support for Dreamcast, Atari, AIX, OSF/Tru64, -RISC OS, SymbianOS, but these are not officially supported. +The code contains support for Atari, AIX, OSF/Tru64, RISC OS, and +SymbianOS, but these are not officially supported. SDL is written in C, but works with C++ natively, and has bindings to several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
--- a/README.DC Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -SDL for Dreamcast (beta2) - - BERO - berobero@users.sourceforge.net - - http://www.geocities.co.jp/Playtown/2004/ - -this work with kos-newlib -http://sourceforge.net/projects/dcquake/ - -compile -- source environ.sh (from the KOS distribution) -- make -f Makefile.dc - -compile with gl support -- install latest libgl from http://sourceforge.net/projects/dcquake/ -- uncomment GL=1 in Makefile.dc -- make -f Makefile.dc clean -- make -f Makefile.dc - -install -- copy include/*.h and libSDL.a or libSDL_gl.a for your enviroment - -changelog: - -beta2 -- OpenGL support -- Hardware page flip support - -beta -- thread, timer don't tested so much. -- not support OpenGL
--- a/VisualCE/SDLMain/SDLmain.vcp Sat Sep 19 07:09:41 2009 +0000 +++ b/VisualCE/SDLMain/SDLmain.vcp Sat Sep 19 07:21:22 2009 +0000 @@ -1518,10 +1518,8 @@ {$(INCLUDE)}"..\..\include\SDL_cdrom.h"\ {$(INCLUDE)}"..\..\include\SDL_config.h"\ {$(INCLUDE)}"..\..\include\SDL_config_amiga.h"\ - {$(INCLUDE)}"..\..\include\SDL_config_dreamcast.h"\ {$(INCLUDE)}"..\..\include\SDL_config_macos.h"\ {$(INCLUDE)}"..\..\include\SDL_config_macosx.h"\ - {$(INCLUDE)}"..\..\include\SDL_config_os2.h"\ {$(INCLUDE)}"..\..\include\SDL_config_win32.h"\ {$(INCLUDE)}"..\..\include\SDL_config_wince.h"\ {$(INCLUDE)}"..\..\include\SDL_cpuinfo.h"\ @@ -1556,10 +1554,8 @@ {$(INCLUDE)}"..\..\include\SDL_cdrom.h"\ {$(INCLUDE)}"..\..\include\SDL_config.h"\ {$(INCLUDE)}"..\..\include\SDL_config_amiga.h"\ - {$(INCLUDE)}"..\..\include\SDL_config_dreamcast.h"\ {$(INCLUDE)}"..\..\include\SDL_config_macos.h"\ {$(INCLUDE)}"..\..\include\SDL_config_macosx.h"\ - {$(INCLUDE)}"..\..\include\SDL_config_os2.h"\ {$(INCLUDE)}"..\..\include\SDL_config_win32.h"\ {$(INCLUDE)}"..\..\include\SDL_config_wince.h"\ {$(INCLUDE)}"..\..\include\SDL_cpuinfo.h"\
--- a/VisualCE/loopwave/loopwave.vcp Sat Sep 19 07:09:41 2009 +0000 +++ b/VisualCE/loopwave/loopwave.vcp Sat Sep 19 07:21:22 2009 +0000 @@ -359,10 +359,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_config_wince.h"\ "..\include\SDL_cpuinfo.h"\ @@ -399,10 +397,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_config_wince.h"\ "..\include\SDL_cpuinfo.h"\ @@ -439,10 +435,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_config_wince.h"\ "..\include\SDL_cpuinfo.h"\ @@ -479,10 +473,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_config_wince.h"\ "..\include\SDL_cpuinfo.h"\
--- a/VisualCE/testalpha/testalpha.vcp Sat Sep 19 07:09:41 2009 +0000 +++ b/VisualCE/testalpha/testalpha.vcp Sat Sep 19 07:21:22 2009 +0000 @@ -392,10 +392,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -430,10 +428,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -468,10 +464,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -506,10 +500,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -546,10 +538,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_config_wince.h"\ "..\include\SDL_cpuinfo.h"\ @@ -586,10 +576,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_config_wince.h"\ "..\include\SDL_cpuinfo.h"\
--- a/VisualCE/testtimer/testtimer.vcp Sat Sep 19 07:09:41 2009 +0000 +++ b/VisualCE/testtimer/testtimer.vcp Sat Sep 19 07:21:22 2009 +0000 @@ -531,10 +531,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_cpuinfo.h"\ "..\include\SDL_endian.h"\ @@ -570,10 +568,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_cpuinfo.h"\ "..\include\SDL_endian.h"\ @@ -607,10 +603,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -644,10 +638,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -683,10 +675,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_cpuinfo.h"\ "..\include\SDL_endian.h"\ @@ -722,10 +712,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_cpuinfo.h"\ "..\include\SDL_endian.h"\ @@ -771,10 +759,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -808,10 +794,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\
--- a/VisualCE/testwin/testwin.vcp Sat Sep 19 07:09:41 2009 +0000 +++ b/VisualCE/testwin/testwin.vcp Sat Sep 19 07:21:22 2009 +0000 @@ -394,10 +394,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -431,10 +429,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -468,10 +464,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -505,10 +499,8 @@ "..\..\include\SDL_cdrom.h"\ "..\..\include\SDL_config.h"\ "..\..\include\SDL_config_amiga.h"\ - "..\..\include\SDL_config_dreamcast.h"\ "..\..\include\SDL_config_macos.h"\ "..\..\include\SDL_config_macosx.h"\ - "..\..\include\SDL_config_os2.h"\ "..\..\include\SDL_config_win32.h"\ "..\..\include\SDL_cpuinfo.h"\ "..\..\include\SDL_endian.h"\ @@ -544,10 +536,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_config_wince.h"\ "..\include\SDL_cpuinfo.h"\ @@ -584,10 +574,8 @@ "..\include\SDL_cdrom.h"\ "..\include\SDL_config.h"\ "..\include\SDL_config_amiga.h"\ - "..\include\SDL_config_dreamcast.h"\ "..\include\SDL_config_macos.h"\ "..\include\SDL_config_macosx.h"\ - "..\include\SDL_config_os2.h"\ "..\include\SDL_config_win32.h"\ "..\include\SDL_config_wince.h"\ "..\include\SDL_cpuinfo.h"\
--- a/Xcode/SDL/pkg-support/resources/ReadMe.txt Sat Sep 19 07:09:41 2009 +0000 +++ b/Xcode/SDL/pkg-support/resources/ReadMe.txt Sat Sep 19 07:21:22 2009 +0000 @@ -84,8 +84,8 @@ there are new public headers. But also as a result of these changes, there are also new headers that qualify as "PrivateHeaders". Private Headers are headers that must be exported because a public header includes them, but users shouldn't - directly invoke these. SDL_config_macosx.h and SDL_config_dreamcast.h are - examples of this. We have considered marking these headers as Private, but it + directly invoke these. SDL_config_macosx.h is an example of this. + We have considered marking these headers as Private, but it requires that the public headers invoke them via framework conventions, i.e. #include <FrameworkName/Header.h> e.g.
--- a/include/SDL.h Sat Sep 19 07:09:41 2009 +0000 +++ b/include/SDL.h Sat Sep 19 07:21:22 2009 +0000 @@ -38,8 +38,8 @@ The current version supports Linux, Windows, Windows CE, BeOS, MacOS, Mac OS X, FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. -The code contains support for Dreamcast, Atari, AIX, OSF/Tru64, -RISC OS, SymbianOS, but these are not officially supported. +The code contains support for Atari, AIX, OSF/Tru64, RISC OS, and +SymbianOS, but these are not officially supported. SDL is written in C, but works with C++ natively, and has bindings to several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
--- a/include/SDL_config.h.default Sat Sep 19 07:09:41 2009 +0000 +++ b/include/SDL_config.h.default Sat Sep 19 07:21:22 2009 +0000 @@ -28,8 +28,6 @@ /* Add any platform that doesn't build using the configure system */ #if defined(__NINTENDODS__) #include "SDL_config_nintendods.h" -#elif defined(__DREAMCAST__) -#include "SDL_config_dreamcast.h" #elif defined(__IPHONEOS__) #include "SDL_config_iphoneos.h" #elif defined(__MACOSX__)
--- a/include/SDL_config.h.in Sat Sep 19 07:09:41 2009 +0000 +++ b/include/SDL_config.h.in Sat Sep 19 07:21:22 2009 +0000 @@ -182,7 +182,6 @@ #undef SDL_AUDIO_DRIVER_BSD #undef SDL_AUDIO_DRIVER_COREAUDIO #undef SDL_AUDIO_DRIVER_DART -#undef SDL_AUDIO_DRIVER_DC #undef SDL_AUDIO_DRIVER_DISK #undef SDL_AUDIO_DRIVER_DUMMY #undef SDL_AUDIO_DRIVER_DMEDIA @@ -207,7 +206,6 @@ #undef SDL_INPUT_LINUXEV #undef SDL_INPUT_TSLIB #undef SDL_JOYSTICK_BEOS -#undef SDL_JOYSTICK_DC #undef SDL_JOYSTICK_DINPUT #undef SDL_JOYSTICK_DUMMY #undef SDL_JOYSTICK_IOKIT @@ -233,7 +231,6 @@ /* Enable various threading systems */ #undef SDL_THREAD_BEOS -#undef SDL_THREAD_DC #undef SDL_THREAD_NDS #undef SDL_THREAD_PTH #undef SDL_THREAD_PTHREAD @@ -244,7 +241,6 @@ /* Enable various timer systems */ #undef SDL_TIMER_BEOS -#undef SDL_TIMER_DC #undef SDL_TIMER_DUMMY #undef SDL_TIMER_MINT #undef SDL_TIMER_NDS @@ -256,7 +252,6 @@ /* Enable various video drivers */ #undef SDL_VIDEO_DRIVER_BWINDOW #undef SDL_VIDEO_DRIVER_COCOA -#undef SDL_VIDEO_DRIVER_DC #undef SDL_VIDEO_DRIVER_DIRECTFB #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC #undef SDL_VIDEO_DRIVER_DUMMY
--- a/include/SDL_config_dreamcast.h Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,110 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#ifndef _SDL_config_dreamcast_h -#define _SDL_config_dreamcast_h - -#include "SDL_platform.h" - -/* This is a set of defines to configure the SDL features */ - -#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef signed short int16_t; -typedef unsigned short uint16_t; -typedef signed int int32_t; -typedef unsigned int uint32_t; -typedef signed long long int64_t; -typedef unsigned long long uint64_t; -typedef unsigned long uintptr_t; -#endif /* !_STDINT_H_ && !HAVE_STDINT_H */ - -#define SIZEOF_VOIDP 4 -#define SDL_HAS_64BIT_TYPE 1 - -/* Useful headers */ -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDIO_H 1 -#define STDC_HEADERS 1 -#define HAVE_STRING_H 1 -#define HAVE_CTYPE_H 1 - -/* C library functions */ -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FREE 1 -#define HAVE_ALLOCA 1 -#define HAVE_GETENV 1 -#define HAVE_PUTENV 1 -#define HAVE_QSORT 1 -#define HAVE_ABS 1 -#define HAVE_BCOPY 1 -#define HAVE_MEMSET 1 -#define HAVE_MEMCPY 1 -#define HAVE_MEMMOVE 1 -#define HAVE_MEMCMP 1 -#define HAVE_STRLEN 1 -#define HAVE_STRDUP 1 -#define HAVE_INDEX 1 -#define HAVE_RINDEX 1 -#define HAVE_STRCHR 1 -#define HAVE_STRRCHR 1 -#define HAVE_STRSTR 1 -#define HAVE_STRTOL 1 -#define HAVE_STRTOD 1 -#define HAVE_ATOI 1 -#define HAVE_ATOF 1 -#define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_STRICMP 1 -#define HAVE_STRCASECMP 1 -#define HAVE_SSCANF 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSNPRINTF 1 - -/* Enable various audio drivers */ -#define SDL_AUDIO_DRIVER_DC 1 -#define SDL_AUDIO_DRIVER_DISK 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 - -/* Enable various input drivers */ -#define SDL_JOYSTICK_DC 1 -#define SDL_HAPTIC_DUMMY 1 - -/* Enable various shared object loading systems */ -#define SDL_LOADSO_DUMMY 1 - -/* Enable various threading systems */ -#define SDL_THREAD_DC 1 - -/* Enable various timer systems */ -#define SDL_TIMER_DC 1 - -/* Enable various video drivers */ -#define SDL_VIDEO_DRIVER_DC 1 -#define SDL_VIDEO_DRIVER_DUMMY 1 - -#define SDL_POWER_HARDWIRED 1 - -#endif /* _SDL_config_dreamcast_h */
--- a/src/audio/SDL_audio.c Sat Sep 19 07:09:41 2009 +0000 +++ b/src/audio/SDL_audio.c Sat Sep 19 07:21:22 2009 +0000 @@ -140,9 +140,6 @@ #if SDL_AUDIO_DRIVER_DUMMY &DUMMYAUD_bootstrap, #endif -#if SDL_AUDIO_DRIVER_DC - &DCAUD_bootstrap, -#endif #if SDL_AUDIO_DRIVER_MMEAUDIO &MMEAUDIO_bootstrap, #endif
--- a/src/audio/dc/SDL_dcaudio.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,245 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - -*/ -#include "SDL_config.h" - -/* Output dreamcast aica */ - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "SDL_dcaudio.h" - -#include "aica.h" -#include <dc/spu.h> - -#define SPU_RAM_BASE 0xa0800000 - -static void -spu_memload_stereo8(int leftpos, int rightpos, void *src0, size_t size) -{ - uint8 *src = src0; - uint32 *left = (uint32 *) (leftpos + SPU_RAM_BASE); - uint32 *right = (uint32 *) (rightpos + SPU_RAM_BASE); - size = (size + 7) / 8; - while (size--) { - unsigned lval, rval; - lval = *src++; - rval = *src++; - lval |= (*src++) << 8; - rval |= (*src++) << 8; - lval |= (*src++) << 16; - rval |= (*src++) << 16; - lval |= (*src++) << 24; - rval |= (*src++) << 24; - g2_write_32(left++, lval); - g2_write_32(right++, rval); - g2_fifo_wait(); - } -} - -static void -spu_memload_stereo16(int leftpos, int rightpos, void *src0, size_t size) -{ - uint16 *src = src0; - uint32 *left = (uint32 *) (leftpos + SPU_RAM_BASE); - uint32 *right = (uint32 *) (rightpos + SPU_RAM_BASE); - size = (size + 7) / 8; - while (size--) { - unsigned lval, rval; - lval = *src++; - rval = *src++; - lval |= (*src++) << 16; - rval |= (*src++) << 16; - g2_write_32(left++, lval); - g2_write_32(right++, rval); - g2_fifo_wait(); - } -} - -static void -DCAUD_PlayDevice(_THIS) -{ - SDL_AudioSpec *spec = &this->spec; - unsigned int offset; - - if (this->hidden->playing) { - /* wait */ - while (aica_get_pos(0) / spec->samples == this->hidden->nextbuf) { - thd_pass(); - } - } - - offset = this->hidden->nextbuf * spec->size; - this->hidden->nextbuf ^= 1; - /* Write the audio data, checking for EAGAIN on broken audio drivers */ - if (spec->channels == 1) { - spu_memload(this->hidden->leftpos + offset, this->hidden->mixbuf, - this->hidden->mixlen); - } else { - offset /= 2; - if ((this->spec.format & 255) == 8) { - spu_memload_stereo8(this->hidden->leftpos + offset, - this->hidden->rightpos + offset, - this->hidden->mixbuf, this->hidden->mixlen); - } else { - spu_memload_stereo16(this->hidden->leftpos + offset, - this->hidden->rightpos + offset, - this->hidden->mixbuf, this->hidden->mixlen); - } - } - - if (!this->hidden->playing) { - int mode; - this->hidden->playing = 1; - mode = (spec->format == AUDIO_S8) ? SM_8BIT : SM_16BIT; - if (spec->channels == 1) { - aica_play(0, mode, this->hidden->leftpos, 0, - spec->samples * 2, spec->freq, 255, 128, 1); - } else { - aica_play(0, mode, this->hidden->leftpos, 0, - spec->samples * 2, spec->freq, 255, 0, 1); - aica_play(1, mode, this->hidden->rightpos, 0, - spec->samples * 2, spec->freq, 255, 255, 1); - } - } -} - -static Uint8 * -DCAUD_GetDeviceBuf(_THIS) -{ - return (this->hidden->mixbuf); -} - -/* This function waits until it is possible to write a full sound buffer */ -static void -DCAUD_WaitDevice(_THIS) -{ - if (this->hidden->playing) { - /* wait */ - while (aica_get_pos(0) / this->spec.samples == this->hidden->nextbuf) { - thd_pass(); - } - } -} - -static void -DCAUD_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - aica_stop(0); - if (this->spec.channels == 2) { - aica_stop(1); - } - if (this->hidden->mixbuf != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - SDL_free(this->hidden); - this->hidden = NULL; - - /* !!! FIXME: is there a reverse of spu_init()? */ - } -} - -static int -DCAUD_OpenDevice(_THIS, SDL_AudioSpec * spec) -{ - SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format); - int valid_datatype = 0; - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - spu_init(); - - while ((!valid_datatype) && (test_format)) { - spec->format = test_format; - switch (test_format) { - /* only formats Dreamcast accepts... */ - case AUDIO_S8: - case AUDIO_S16LSB: - valid_datatype = 1; - break; - - default: - test_format = SDL_NextAudioFormat(); - break; - } - } - - if (!valid_datatype) { /* shouldn't happen, but just in case... */ - DCAUD_CloseDevice(this); - SDL_SetError("Unsupported audio format"); - return 0; - } - - if (spec->channels > 2) - spec->channels = 2; /* no more than stereo on the Dreamcast. */ - - /* Update the fragment size as size in bytes */ - SDL_CalculateAudioSpec(spec); - - /* Allocate mixing buffer */ - this->hidden->mixlen = spec->size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - DCAUD_CloseDevice(this); - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden->mixbuf, spec->silence, spec->size); - this->hidden->leftpos = 0x11000; - this->hidden->rightpos = 0x11000 + spec->size; - this->hidden->playing = 0; - this->hidden->nextbuf = 0; - - /* We're ready to rock and roll. :-) */ - return 1; -} - -static int -DCAUD_Init(SDL_AudioDriverImpl * impl) -{ - /* Set the function pointers */ - impl->OpenDevice = DCAUD_OpenDevice; - impl->PlayDevice = DCAUD_PlayDevice; - impl->WaitDevice = DCAUD_WaitDevice; - impl->GetDeviceBuf = DCAUD_GetDeviceBuf; - impl->CloseDevice = DCAUD_CloseDevice; - impl->OnlyHasDefaultOutputDevice = 1; - - return 1; -} - -AudioBootStrap DCAUD_bootstrap = { - "dcaudio", "Dreamcast AICA audio", DCAUD_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/audio/dc/SDL_dcaudio.h Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_dcaudio_h -#define _SDL_dcaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* The file descriptor for the audio device */ - Uint8 *mixbuf; - Uint32 mixlen; - int playing; - int leftpos, rightpos; - int nextbuf; -}; - -#endif /* _SDL_dcaudio_h */ -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/audio/dc/aica.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,301 +0,0 @@ -/* This file is part of the Dreamcast function library. - * Please see libdream.c for further details. - * - * (c)2000 Dan Potter - * modify BERO - */ -#include "aica.h" - -#include <arch/irq.h> -#include <dc/spu.h> - -#if 0 -#define dc_snd_base ((volatile unsigned char *)0x00800000) /* arm side */ -#endif -#define dc_snd_base ((volatile unsigned char *)0xa0700000) /* dc side */ - -/* Some convienence macros */ -#define SNDREGADDR(x) (0xa0700000 + (x)) -#define CHNREGADDR(ch,x) SNDREGADDR(0x80*(ch)+(x)) - - -#define SNDREG32(x) (*(volatile unsigned long *)SNDREGADDR(x)) -#define SNDREG8(x) (*(volatile unsigned char *)SNDREGADDR(x)) -#define CHNREG32(ch, x) (*(volatile unsigned long *)CHNREGADDR(ch,x)) -#define CHNREG8(ch, x) (*(volatile unsigned long *)CHNREGADDR(ch,x)) - -#define G2_LOCK(OLD) \ - do { \ - if (!irq_inside_int()) \ - OLD = irq_disable(); \ - /* suspend any G2 DMA here... */ \ - while((*(volatile unsigned int *)0xa05f688c) & 0x20) \ - ; \ - } while(0) - -#define G2_UNLOCK(OLD) \ - do { \ - /* resume any G2 DMA here... */ \ - if (!irq_inside_int()) \ - irq_restore(OLD); \ - } while(0) - - -void -aica_init() -{ - int i, j, old = 0; - - /* Initialize AICA channels */ - G2_LOCK(old); - SNDREG32(0x2800) = 0x0000; - - for (i = 0; i < 64; i++) { - for (j = 0; j < 0x80; j += 4) { - if ((j & 31) == 0) - g2_fifo_wait(); - CHNREG32(i, j) = 0; - } - g2_fifo_wait(); - CHNREG32(i, 0) = 0x8000; - CHNREG32(i, 20) = 0x1f; - } - - SNDREG32(0x2800) = 0x000f; - g2_fifo_wait(); - G2_UNLOCK(old); -} - -/* Translates a volume from linear form to logarithmic form (required by - the AICA chip */ -/* int logs[] = { - -0, 40, 50, 58, 63, 68, 73, 77, 80, 83, 86, 89, 92, 94, 97, 99, 101, 103, -105, 107, 109, 111, 112, 114, 116, 117, 119, 120, 122, 123, 125, 126, 127, -129, 130, 131, 133, 134, 135, 136, 137, 139, 140, 141, 142, 143, 144, 145, -146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 156, 157, 158, 159, -160, 161, 162, 162, 163, 164, 165, 166, 166, 167, 168, 169, 170, 170, 171, -172, 172, 173, 174, 175, 175, 176, 177, 177, 178, 179, 180, 180, 181, 182, -182, 183, 183, 184, 185, 185, 186, 187, 187, 188, 188, 189, 190, 190, 191, -191, 192, 193, 193, 194, 194, 195, 196, 196, 197, 197, 198, 198, 199, 199, -200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 206, 207, 207, -208, 208, 209, 209, 210, 210, 211, 211, 212, 212, 213, 213, 214, 214, 215, -215, 216, 216, 217, 217, 217, 218, 218, 219, 219, 220, 220, 221, 221, 222, -222, 222, 223, 223, 224, 224, 225, 225, 225, 226, 226, 227, 227, 228, 228, -228, 229, 229, 230, 230, 230, 231, 231, 232, 232, 232, 233, 233, 234, 234, -234, 235, 235, 236, 236, 236, 237, 237, 238, 238, 238, 239, 239, 240, 240, -240, 241, 241, 241, 242, 242, 243, 243, 243, 244, 244, 244, 245, 245, 245, -246, 246, 247, 247, 247, 248, 248, 248, 249, 249, 249, 250, 250, 250, 251, -251, 251, 252, 252, 252, 253, 253, 253, 254, 254, 254, 255 - -}; */ - -const static unsigned char logs[] = { - 0, 15, 22, 27, 31, 35, 39, 42, 45, 47, 50, 52, 55, 57, 59, 61, - 63, 65, 67, 69, 71, 73, 74, 76, 78, 79, 81, 82, 84, 85, 87, 88, - 90, 91, 92, 94, 95, 96, 98, 99, 100, 102, 103, 104, 105, 106, - 108, 109, 110, 111, 112, 113, 114, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 146, 147, 148, 149, 150, 151, 152, 152, 153, 154, 155, 156, 156, - 157, 158, 159, 160, 160, 161, 162, 163, 164, 164, 165, 166, 167, - 167, 168, 169, 170, 170, 171, 172, 173, 173, 174, 175, 176, 176, - 177, 178, 178, 179, 180, 181, 181, 182, 183, 183, 184, 185, 185, - 186, 187, 187, 188, 189, 189, 190, 191, 191, 192, 193, 193, 194, - 195, 195, 196, 197, 197, 198, 199, 199, 200, 200, 201, 202, 202, - 203, 204, 204, 205, 205, 206, 207, 207, 208, 209, 209, 210, 210, - 211, 212, 212, 213, 213, 214, 215, 215, 216, 216, 217, 217, 218, - 219, 219, 220, 220, 221, 221, 222, 223, 223, 224, 224, 225, 225, - 226, 227, 227, 228, 228, 229, 229, 230, 230, 231, 232, 232, 233, - 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 239, 239, 240, - 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 246, 246, - 247, 247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 254, 255 -}; - -/* For the moment this is going to have to suffice, until we really - figure out what these mean. */ -#define AICA_PAN(x) ((x)==0x80?(0):((x)<0x80?(0x1f):(0x0f))) -#define AICA_VOL(x) (0xff - logs[128 + (((x) & 0xff) / 2)]) -//#define AICA_VOL(x) (0xff - logs[x&255]) - -static inline unsigned -AICA_FREQ(unsigned freq) -{ - unsigned long freq_lo, freq_base = 5644800; - int freq_hi = 7; - - /* Need to convert frequency to floating point format - (freq_hi is exponent, freq_lo is mantissa) - Formula is ferq = 44100*2^freq_hi*(1+freq_lo/1024) */ - while (freq < freq_base && freq_hi > -8) { - freq_base >>= 1; - --freq_hi; - } - while (freq < freq_base && freq_hi > -8) { - freq_base >>= 1; - freq_hi--; - } - freq_lo = (freq << 10) / freq_base; - return (freq_hi << 11) | (freq_lo & 1023); -} - -/* Sets up a sound channel completely. This is generally good if you want - a quick and dirty way to play notes. If you want a more comprehensive - set of routines (more like PC wavetable cards) see below. - - ch is the channel to play on (0 - 63) - smpptr is the pointer to the sound data; if you're running off the - SH4, then this ought to be (ptr - 0xa0800000); otherwise it's just - ptr. Basically, it's an offset into sound ram. - mode is one of the mode constants (16 bit, 8 bit, ADPCM) - nsamp is the number of samples to play (not number of bytes!) - freq is the sampling rate of the sound - vol is the volume, 0 to 0xff (0xff is louder) - pan is a panning constant -- 0 is left, 128 is center, 255 is right. - - This routine (and the similar ones) owe a lot to Marcus' sound example -- - I hadn't gotten quite this far into dissecting the individual regs yet. */ -void -aica_play(int ch, int mode, unsigned long smpptr, int loopst, int loopend, - int freq, int vol, int pan, int loopflag) -{ -/* int i; -*/ - int val; - int old = 0; - - /* Stop the channel (if it's already playing) */ - aica_stop(ch); - /* doesn't seem to be needed, but it's here just in case */ -/* - for (i=0; i<256; i++) { - asm("nop"); - asm("nop"); - asm("nop"); - asm("nop"); - } -*/ - G2_LOCK(old); - /* Envelope setup. The first of these is the loop point, - e.g., where the sample starts over when it loops. The second - is the loop end. This is the full length of the sample when - you are not looping, or the loop end point when you are (though - storing more than that is a waste of memory if you're not doing - volume enveloping). */ - CHNREG32(ch, 8) = loopst & 0xffff; - CHNREG32(ch, 12) = loopend & 0xffff; - - /* Write resulting values */ - CHNREG32(ch, 24) = AICA_FREQ(freq); - - /* Set volume, pan, and some other things that we don't know what - they do =) */ - CHNREG32(ch, 36) = AICA_PAN(pan) | (0xf << 8); - /* Convert the incoming volume and pan into hardware values */ - /* Vol starts at zero so we can ramp */ - vol = AICA_VOL(vol); - CHNREG32(ch, 40) = 0x24 | (vol << 8); - /* Convert the incoming volume and pan into hardware values */ - /* Vol starts at zero so we can ramp */ - - /* If we supported volume envelopes (which we don't yet) then - this value would set that up. The top 4 bits determine the - envelope speed. f is the fastest, 1 is the slowest, and 0 - seems to be an invalid value and does weird things). The - default (below) sets it into normal mode (play and terminate/loop). - CHNREG32(ch, 16) = 0xf010; - */ - CHNREG32(ch, 16) = 0x1f; /* No volume envelope */ - - - /* Set sample format, buffer address, and looping control. If - 0x0200 mask is set on reg 0, the sample loops infinitely. If - it's not set, the sample plays once and terminates. We'll - also set the bits to start playback here. */ - CHNREG32(ch, 4) = smpptr & 0xffff; - val = 0xc000 | 0x0000 | (mode << 7) | (smpptr >> 16); - if (loopflag) - val |= 0x200; - - CHNREG32(ch, 0) = val; - - G2_UNLOCK(old); - - /* Enable playback */ - /* CHNREG32(ch, 0) |= 0xc000; */ - g2_fifo_wait(); - -#if 0 - for (i = 0xff; i >= vol; i--) { - if ((i & 7) == 0) - g2_fifo_wait(); - CHNREG32(ch, 40) = 0x24 | (i << 8);; - } - - g2_fifo_wait(); -#endif -} - -/* Stop the sound on a given channel */ -void -aica_stop(int ch) -{ - g2_write_32(CHNREGADDR(ch, 0), - (g2_read_32(CHNREGADDR(ch, 0)) & ~0x4000) | 0x8000); - g2_fifo_wait(); -} - - -/* The rest of these routines can change the channel in mid-stride so you - can do things like vibrato and panning effects. */ - -/* Set channel volume */ -void -aica_vol(int ch, int vol) -{ -// g2_write_8(CHNREGADDR(ch, 41),AICA_VOL(vol)); - g2_write_32(CHNREGADDR(ch, 40), - (g2_read_32(CHNREGADDR(ch, 40)) & 0xffff00ff) | - (AICA_VOL(vol) << 8)); - g2_fifo_wait(); -} - -/* Set channel pan */ -void -aica_pan(int ch, int pan) -{ -// g2_write_8(CHNREGADDR(ch, 36),AICA_PAN(pan)); - g2_write_32(CHNREGADDR(ch, 36), - (g2_read_32(CHNREGADDR(ch, 36)) & 0xffffff00) | - (AICA_PAN(pan))); - g2_fifo_wait(); -} - -/* Set channel frequency */ -void -aica_freq(int ch, int freq) -{ - g2_write_32(CHNREGADDR(ch, 24), AICA_FREQ(freq)); - g2_fifo_wait(); -} - -/* Get channel position */ -int -aica_get_pos(int ch) -{ -#if 1 - /* Observe channel ch */ - g2_write_32(SNDREGADDR(0x280c), - (g2_read_32(SNDREGADDR(0x280c)) & 0xffff00ff) | (ch << 8)); - g2_fifo_wait(); - /* Update position counters */ - return g2_read_32(SNDREGADDR(0x2814)) & 0xffff; -#else - /* Observe channel ch */ - g2_write_8(SNDREGADDR(0x280d), ch); - /* Update position counters */ - return g2_read_32(SNDREGADDR(0x2814)) & 0xffff; -#endif -} - -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/audio/dc/aica.h Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _AICA_H_ -#define _AICA_H_ - -#define AICA_MEM 0xa0800000 - -#define SM_8BIT 1 -#define SM_16BIT 0 -#define SM_ADPCM 2 - -void aica_play(int ch, int mode, unsigned long smpptr, int looptst, - int loopend, int freq, int vol, int pan, int loopflag); -void aica_stop(int ch); -void aica_vol(int ch, int vol); -void aica_pan(int ch, int pan); -void aica_freq(int ch, int freq); -int aica_get_pos(int ch); - -#endif -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/joystick/dc/SDL_sysjoystick.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,216 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifdef SDL_JOYSTICK_DC - -#include "SDL_events.h" -#include "SDL_joystick.h" -#include "../SDL_sysjoystick.h" -#include "../SDL_joystick_c.h" - -#include <dc/maple.h> -#include <dc/maple/controller.h> - -#define MAX_JOYSTICKS 8 /* only 2 are supported in the multimedia API */ -#define MAX_AXES 6 /* each joystick can have up to 6 axes */ -#define MAX_BUTTONS 8 /* and 8 buttons */ -#define MAX_HATS 2 - -#define JOYNAMELEN 8 - -/* array to hold joystick ID values */ -static uint8 SYS_Joystick_addr[MAX_JOYSTICKS]; - -/* The private structure used to keep track of a joystick */ -struct joystick_hwdata -{ - cont_cond_t prev_cond; - int prev_buttons; -}; - -/* Function to scan the system for joysticks. - * This function should set SDL_numjoysticks to the number of available - * joysticks. Joystick 0 should be the system default joystick. - * It should return 0, or -1 on an unrecoverable fatal error. - */ -int -SDL_SYS_JoystickInit(void) -{ - int numdevs; - - int p, u; - - numdevs = 0; - for (p = 0; p < MAPLE_PORT_COUNT; p++) { - for (u = 0; u < MAPLE_UNIT_COUNT; u++) { - if (maple_device_func(p, u) & MAPLE_FUNC_CONTROLLER) { - SYS_Joystick_addr[numdevs] = maple_addr(p, u); - numdevs++; - } - } - } - - return (numdevs); -} - -/* Function to get the device-dependent name of a joystick */ -const char * -SDL_SYS_JoystickName(int index) -{ - maple_device_t *dev; - if (maple_compat_resolve - (SYS_Joystick_addr[index], &dev, MAPLE_FUNC_CONTROLLER) != 0) - return NULL; - return dev->info.product_name; -} - -/* Function to open a joystick for use. - The joystick to open is specified by the index field of the joystick. - This should fill the nbuttons and naxes fields of the joystick structure. - It returns 0, or -1 if there is an error. - */ -int -SDL_SYS_JoystickOpen(SDL_Joystick * joystick) -{ - /* allocate memory for system specific hardware data */ - joystick->hwdata = - (struct joystick_hwdata *) SDL_malloc(sizeof(*joystick->hwdata)); - if (joystick->hwdata == NULL) { - SDL_OutOfMemory(); - return (-1); - } - SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata)); - - /* fill nbuttons, naxes, and nhats fields */ - joystick->nbuttons = MAX_BUTTONS; - joystick->naxes = MAX_AXES; - joystick->nhats = MAX_HATS; - return (0); -} - - -/* Function to update the state of a joystick - called as a device poll. - * This function shouldn't update the joystick structure directly, - * but instead should call SDL_PrivateJoystick*() to deliver events - * and update joystick device state. - */ - -void -SDL_SYS_JoystickUpdate(SDL_Joystick * joystick) -{ - const int sdl_buttons[] = { - CONT_C, - CONT_B, - CONT_A, - CONT_START, - CONT_Z, - CONT_Y, - CONT_X, - CONT_D - }; - - uint8 addr; - cont_cond_t cond, *prev_cond; - int buttons, prev_buttons, i, changed; - - addr = SYS_Joystick_addr[joystick->index]; - if (cont_get_cond(addr, &cond) < 0) - return; - - buttons = cond.buttons; - prev_buttons = joystick->hwdata->prev_buttons; - changed = buttons ^ prev_buttons; - - if ((changed) & - (CONT_DPAD_UP | CONT_DPAD_DOWN | CONT_DPAD_LEFT | CONT_DPAD_RIGHT)) { - int hat = SDL_HAT_CENTERED; - if (buttons & CONT_DPAD_UP) - hat |= SDL_HAT_UP; - if (buttons & CONT_DPAD_DOWN) - hat |= SDL_HAT_DOWN; - if (buttons & CONT_DPAD_LEFT) - hat |= SDL_HAT_LEFT; - if (buttons & CONT_DPAD_RIGHT) - hat |= SDL_HAT_RIGHT; - SDL_PrivateJoystickHat(joystick, 0, hat); - } - if ((changed) & - (CONT_DPAD2_UP | CONT_DPAD2_DOWN | CONT_DPAD2_LEFT | - CONT_DPAD2_RIGHT)) { - int hat = SDL_HAT_CENTERED; - if (buttons & CONT_DPAD2_UP) - hat |= SDL_HAT_UP; - if (buttons & CONT_DPAD2_DOWN) - hat |= SDL_HAT_DOWN; - if (buttons & CONT_DPAD2_LEFT) - hat |= SDL_HAT_LEFT; - if (buttons & CONT_DPAD2_RIGHT) - hat |= SDL_HAT_RIGHT; - SDL_PrivateJoystickHat(joystick, 1, hat); - } - - for (i = 0; i < sizeof(sdl_buttons) / sizeof(sdl_buttons[0]); i++) { - if (changed & sdl_buttons[i]) { - SDL_PrivateJoystickButton(joystick, i, - (buttons & sdl_buttons[i]) ? - SDL_PRESSED : SDL_RELEASED); - } - } - - prev_cond = &joystick->hwdata->prev_cond; - if (cond.joyx != prev_cond->joyx) - SDL_PrivateJoystickAxis(joystick, 0, cond.joyx - 128); - if (cond.joyy != prev_cond->joyy) - SDL_PrivateJoystickAxis(joystick, 1, cond.joyy - 128); - if (cond.rtrig != prev_cond->rtrig) - SDL_PrivateJoystickAxis(joystick, 2, cond.rtrig); - if (cond.ltrig != prev_cond->ltrig) - SDL_PrivateJoystickAxis(joystick, 3, cond.ltrig); - if (cond.joy2x != prev_cond->joy2x) - SDL_PrivateJoystickAxis(joystick, 4, cond.joy2x - 128); - if (cond.joy2y != prev_cond->joy2y) - SDL_PrivateJoystickAxis(joystick, 5, cond.joy2y - 128); - - joystick->hwdata->prev_buttons = buttons; - joystick->hwdata->prev_cond = cond; -} - -/* Function to close a joystick after use */ -void -SDL_SYS_JoystickClose(SDL_Joystick * joystick) -{ - if (joystick->hwdata != NULL) { - /* free system specific hardware data */ - SDL_free(joystick->hwdata); - } -} - -/* Function to perform any system-specific joystick related cleanup */ -void -SDL_SYS_JoystickQuit(void) -{ - return; -} - -#endif /* SDL_JOYSTICK_DC */ -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/power/SDL_power.c Sat Sep 19 07:09:41 2009 +0000 +++ b/src/power/SDL_power.c Sat Sep 19 07:21:22 2009 +0000 @@ -39,7 +39,7 @@ #ifndef SDL_POWER_DISABLED #ifdef SDL_POWER_HARDWIRED -/* This is for things that _never_ have a battery, like the Dreamcast, etc. */ +/* This is for things that _never_ have a battery */ static SDL_bool SDL_GetPowerInfo_Hardwired(SDL_PowerState * state, int *seconds, int *percent) {
--- a/src/thread/SDL_thread_c.h Sat Sep 19 07:09:41 2009 +0000 +++ b/src/thread/SDL_thread_c.h Sat Sep 19 07:21:22 2009 +0000 @@ -29,8 +29,6 @@ #include "generic/SDL_systhread_c.h" #elif SDL_THREAD_BEOS #include "beos/SDL_systhread_c.h" -#elif SDL_THREAD_DC -#include "dc/SDL_systhread_c.h" #elif SDL_THREAD_EPOC #include "epoc/SDL_systhread_c.h" #elif SDL_THREAD_PTH
--- a/src/thread/dc/SDL_syscond.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,223 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* An implementation of condition variables using semaphores and mutexes */ -/* - This implementation borrows heavily from the BeOS condition variable - implementation, written by Christopher Tate and Owen Smith. Thanks! - */ - -#include "SDL_thread.h" - -struct SDL_cond -{ - SDL_mutex *lock; - int waiting; - int signals; - SDL_sem *wait_sem; - SDL_sem *wait_done; -}; - -/* Create a condition variable */ -SDL_cond * -SDL_CreateCond(void) -{ - SDL_cond *cond; - - cond = (SDL_cond *) SDL_malloc(sizeof(SDL_cond)); - if (cond) { - cond->lock = SDL_CreateMutex(); - cond->wait_sem = SDL_CreateSemaphore(0); - cond->wait_done = SDL_CreateSemaphore(0); - cond->waiting = cond->signals = 0; - if (!cond->lock || !cond->wait_sem || !cond->wait_done) { - SDL_DestroyCond(cond); - cond = NULL; - } - } else { - SDL_OutOfMemory(); - } - return (cond); -} - -/* Destroy a condition variable */ -void -SDL_DestroyCond(SDL_cond * cond) -{ - if (cond) { - if (cond->wait_sem) { - SDL_DestroySemaphore(cond->wait_sem); - } - if (cond->wait_done) { - SDL_DestroySemaphore(cond->wait_done); - } - if (cond->lock) { - SDL_DestroyMutex(cond->lock); - } - SDL_free(cond); - } -} - -/* Restart one of the threads that are waiting on the condition variable */ -int -SDL_CondSignal(SDL_cond * cond) -{ - if (!cond) { - SDL_SetError("Passed a NULL condition variable"); - return -1; - } - - /* If there are waiting threads not already signalled, then - signal the condition and wait for the thread to respond. - */ - SDL_LockMutex(cond->lock); - if (cond->waiting > cond->signals) { - ++cond->signals; - SDL_SemPost(cond->wait_sem); - SDL_UnlockMutex(cond->lock); - SDL_SemWait(cond->wait_done); - } else { - SDL_UnlockMutex(cond->lock); - } - - return 0; -} - -/* Restart all threads that are waiting on the condition variable */ -int -SDL_CondBroadcast(SDL_cond * cond) -{ - if (!cond) { - SDL_SetError("Passed a NULL condition variable"); - return -1; - } - - /* If there are waiting threads not already signalled, then - signal the condition and wait for the thread to respond. - */ - SDL_LockMutex(cond->lock); - if (cond->waiting > cond->signals) { - int i, num_waiting; - - num_waiting = (cond->waiting - cond->signals); - cond->signals = cond->waiting; - for (i = 0; i < num_waiting; ++i) { - SDL_SemPost(cond->wait_sem); - } - /* Now all released threads are blocked here, waiting for us. - Collect them all (and win fabulous prizes!) :-) - */ - SDL_UnlockMutex(cond->lock); - for (i = 0; i < num_waiting; ++i) { - SDL_SemWait(cond->wait_done); - } - } else { - SDL_UnlockMutex(cond->lock); - } - - return 0; -} - -/* Wait on the condition variable for at most 'ms' milliseconds. - The mutex must be locked before entering this function! - The mutex is unlocked during the wait, and locked again after the wait. - -Typical use: - -Thread A: - SDL_LockMutex(lock); - while ( ! condition ) { - SDL_CondWait(cond); - } - SDL_UnlockMutex(lock); - -Thread B: - SDL_LockMutex(lock); - ... - condition = true; - ... - SDL_UnlockMutex(lock); - */ -int -SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms) -{ - int retval; - - if (!cond) { - SDL_SetError("Passed a NULL condition variable"); - return -1; - } - - /* Obtain the protection mutex, and increment the number of waiters. - This allows the signal mechanism to only perform a signal if there - are waiting threads. - */ - SDL_LockMutex(cond->lock); - ++cond->waiting; - SDL_UnlockMutex(cond->lock); - - /* Unlock the mutex, as is required by condition variable semantics */ - SDL_UnlockMutex(mutex); - - /* Wait for a signal */ - if (ms == SDL_MUTEX_MAXWAIT) { - retval = SDL_SemWait(cond->wait_sem); - } else { - retval = SDL_SemWaitTimeout(cond->wait_sem, ms); - } - - /* Let the signaler know we have completed the wait, otherwise - the signaler can race ahead and get the condition semaphore - if we are stopped between the mutex unlock and semaphore wait, - giving a deadlock. See the following URL for details: - http://www-classic.be.com/aboutbe/benewsletter/volume_III/Issue40.html - */ - SDL_LockMutex(cond->lock); - if (cond->signals > 0) { - /* If we timed out, we need to eat a condition signal */ - if (retval > 0) { - SDL_SemWait(cond->wait_sem); - } - /* We always notify the signal thread that we are done */ - SDL_SemPost(cond->wait_done); - - /* Signal handshake complete */ - --cond->signals; - } - --cond->waiting; - SDL_UnlockMutex(cond->lock); - - /* Lock the mutex, as is required by condition variable semantics */ - SDL_LockMutex(mutex); - - return retval; -} - -/* Wait on the condition variable forever */ -int -SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex) -{ - return SDL_CondWaitTimeout(cond, mutex, SDL_MUTEX_MAXWAIT); -} - -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/thread/dc/SDL_syscond_c.h Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/thread/dc/SDL_sysmutex.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,129 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* An implementation of mutexes using semaphores */ - -#include "SDL_thread.h" -#include "SDL_systhread_c.h" - -#include <arch/spinlock.h> - -struct SDL_mutex -{ - int recursive; - Uint32 owner; - spinlock_t mutex; -}; - -/* Create a mutex */ -SDL_mutex * -SDL_CreateMutex(void) -{ - SDL_mutex *mutex; - - /* Allocate mutex memory */ - mutex = (SDL_mutex *) SDL_malloc(sizeof(*mutex)); - if (mutex) { - spinlock_init(&mutex->mutex); - mutex->recursive = 0; - mutex->owner = 0; - } else { - SDL_OutOfMemory(); - } - return mutex; -} - -/* Free the mutex */ -void -SDL_DestroyMutex(SDL_mutex * mutex) -{ - if (mutex) { - SDL_free(mutex); - } -} - -/* Lock the semaphore */ -int -SDL_mutexP(SDL_mutex * mutex) -{ -#if SDL_THREADS_DISABLED - return SDL_arraysize(return), 0; -#else - Uint32 this_thread; - - if (mutex == NULL) { - SDL_SetError("Passed a NULL mutex"); - return -1; - } - - this_thread = SDL_ThreadID(); - if (mutex->owner == this_thread) { - ++mutex->recursive; - } else { - /* The order of operations is important. - We set the locking thread id after we obtain the lock - so unlocks from other threads will fail. - */ - spinlock_lock(&mutex->mutex); - mutex->owner = this_thread; - mutex->recursive = 0; - } - - return 0; -#endif /* SDL_THREADS_DISABLED */ -} - -/* Unlock the mutex */ -int -SDL_mutexV(SDL_mutex * mutex) -{ -#if SDL_THREADS_DISABLED - return 0; -#else - if (mutex == NULL) { - SDL_SetError("Passed a NULL mutex"); - return -1; - } - - /* If we don't own the mutex, we can't unlock it */ - if (SDL_ThreadID() != mutex->owner) { - SDL_SetError("mutex not owned by this thread"); - return -1; - } - - if (mutex->recursive) { - --mutex->recursive; - } else { - /* The order of operations is important. - First reset the owner so another thread doesn't lock - the mutex and set the ownership before we reset it, - then release the lock semaphore. - */ - mutex->owner = 0; - spinlock_unlock(&mutex->mutex); - } - return 0; -#endif /* SDL_THREADS_DISABLED */ -} - -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/thread/dc/SDL_sysmutex_c.h Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/thread/dc/SDL_syssem.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,186 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* An implementation of semaphores using mutexes and condition variables */ - -#include "SDL_timer.h" -#include "SDL_thread.h" -#include "SDL_systhread_c.h" - - -#if SDL_THREADS_DISABLED - -SDL_sem * -SDL_CreateSemaphore(Uint32 initial_value) -{ - SDL_SetError("SDL not configured with thread support"); - return (SDL_sem *) 0; -} - -void -SDL_DestroySemaphore(SDL_sem * sem) -{ - return; -} - -int -SDL_SemTryWait(SDL_sem * sem) -{ - SDL_SetError("SDL not configured with thread support"); - return -1; -} - -int -SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout) -{ - SDL_SetError("SDL not configured with thread support"); - return -1; -} - -int -SDL_SemWait(SDL_sem * sem) -{ - SDL_SetError("SDL not configured with thread support"); - return -1; -} - -Uint32 -SDL_SemValue(SDL_sem * sem) -{ - return 0; -} - -int -SDL_SemPost(SDL_sem * sem) -{ - SDL_SetError("SDL not configured with thread support"); - return -1; -} - -#else - -#include <kos/sem.h> - -struct SDL_semaphore -{ - semaphore_t sem; -}; - -SDL_sem * -SDL_CreateSemaphore(Uint32 initial_value) -{ - return (SDL_sem *) sem_create(initial_value); -} - -/* WARNING: - You cannot call this function when another thread is using the semaphore. -*/ -void -SDL_DestroySemaphore(SDL_sem * sem) -{ - if (!sem) { - SDL_SetError("Passed a NULL semaphore"); - return; - } - - sem_destroy(&sem->sem); -} - -int -SDL_SemTryWait(SDL_sem * sem) -{ - int retval; - - if (!sem) { - SDL_SetError("Passed a NULL semaphore"); - return -1; - } - - retval = sem_trywait(&sem->sem); - if (retval == 0) - return 0; - else - return SDL_MUTEX_TIMEDOUT; - - return retval; -} - -int -SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout) -{ - int retval; - - if (!sem) { - SDL_SetError("Passed a NULL semaphore"); - return -1; - } - - /* A timeout of 0 is an easy case */ - if (timeout == 0) { - return SDL_SemTryWait(sem); - } - - retval = sem_wait_timed(&sem->sem, timeout); - if (retval == -1) - retval = SDL_MUTEX_TIMEDOUT; - - return retval; -} - -int -SDL_SemWait(SDL_sem * sem) -{ - if (!sem) { - SDL_SetError("Passed a NULL semaphore"); - return -1; - } - - sem_wait(&sem->sem); - return 0; -} - -Uint32 -SDL_SemValue(SDL_sem * sem) -{ - if (!sem) { - SDL_SetError("Passed a NULL semaphore"); - return -1; - } - - return sem_count(&sem->sem); -} - -int -SDL_SemPost(SDL_sem * sem) -{ - if (!sem) { - SDL_SetError("Passed a NULL semaphore"); - return -1; - } - - sem_signal(&sem->sem); - return 0; -} - -#endif /* SDL_THREADS_DISABLED */ -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/thread/dc/SDL_syssem_c.h Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/thread/dc/SDL_systhread.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Thread management routines for SDL */ - -#include "SDL_thread.h" -#include "../SDL_thread_c.h" -#include "../SDL_systhread.h" - -#include <kos/thread.h> - -int -SDL_SYS_CreateThread(SDL_Thread * thread, void *args) -{ - thread->handle = thd_create(SDL_RunThread, args); - if (thread->handle == NULL) { - SDL_SetError("Not enough resources to create thread"); - return (-1); - } - return (0); -} - -void -SDL_SYS_SetupThread(void) -{ - return; -} - -Uint32 -SDL_ThreadID(void) -{ - return (Uint32) thd_get_current(); -} - -void -SDL_SYS_WaitThread(SDL_Thread * thread) -{ - thd_wait(thread->handle); -} - -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/thread/dc/SDL_systhread_c.h Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -typedef struct kthread *SYS_ThreadHandle; -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/timer/dc/SDL_systimer.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,109 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifdef SDL_TIMER_DC - -#include <kos.h> - -#include "SDL_thread.h" -#include "SDL_timer.h" -#include "../SDL_timer_c.h" - -static unsigned start; - -/* - jif = ms * HZ /1000 - ms = jif * 1000/HZ -*/ - -void -SDL_StartTicks(void) -{ - /* Set first ticks value */ - start = jiffies; -} - -Uint32 -SDL_GetTicks(void) -{ - return ((jiffies - start) * 1000 / HZ); -} - -void -SDL_Delay(Uint32 ms) -{ - thd_sleep(ms); -} - -/* Data to handle a single periodic alarm */ -static int timer_alive = 0; -static SDL_Thread *timer = NULL; - -static int -RunTimer(void *unused) -{ - while (timer_alive) { - if (SDL_timer_running) { - SDL_ThreadedTimerCheck(); - } - SDL_Delay(10); - } - return (0); -} - -/* This is only called if the event thread is not running */ -int -SDL_SYS_TimerInit(void) -{ - timer_alive = 1; - timer = SDL_CreateThread(RunTimer, NULL); - if (timer == NULL) - return (-1); - return (SDL_SetTimerThreaded(1)); -} - -void -SDL_SYS_TimerQuit(void) -{ - timer_alive = 0; - if (timer) { - SDL_WaitThread(timer, NULL); - timer = NULL; - } -} - -int -SDL_SYS_StartTimer(void) -{ - SDL_SetError("Internal logic error: DC uses threaded timer"); - return (-1); -} - -void -SDL_SYS_StopTimer(void) -{ - return; -} - -#endif /* SDL_TIMER_DC */ -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/video/SDL_sysvideo.h Sat Sep 19 07:09:41 2009 +0000 +++ b/src/video/SDL_sysvideo.h Sat Sep 19 07:21:22 2009 +0000 @@ -389,9 +389,6 @@ #if SDL_VIDEO_DRIVER_GEM extern VideoBootStrap GEM_bootstrap; #endif -#if SDL_VIDEO_DRIVER_DC -extern VideoBootStrap DC_bootstrap; -#endif #if SDL_VIDEO_DRIVER_RISCOS extern VideoBootStrap RISCOS_bootstrap; #endif
--- a/src/video/SDL_video.c Sat Sep 19 07:09:41 2009 +0000 +++ b/src/video/SDL_video.c Sat Sep 19 07:21:22 2009 +0000 @@ -103,9 +103,6 @@ #if SDL_VIDEO_DRIVER_GEM &GEM_bootstrap, #endif -#if SDL_VIDEO_DRIVER_DC - &DC_bootstrap, -#endif #if SDL_VIDEO_DRIVER_RISCOS &RISCOS_bootstrap, #endif
--- a/src/video/dc/SDL_dcevents.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,170 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include "../../events/SDL_sysevents.h" -#include "../../events/SDL_events_c.h" -#include "SDL_dcvideo.h" -#include "SDL_dcevents_c.h" - -#include <dc/maple.h> -#include <dc/maple/mouse.h> -#include <dc/maple/keyboard.h> - -const static unsigned short sdl_key[] = { - /*0 */ 0, 0, 0, 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', - 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', - 'u', 'v', 'w', 'x', 'y', 'z', - /*1e */ '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', - /*28 */ SDLK_RETURN, SDLK_ESCAPE, SDLK_BACKSPACE, SDLK_TAB, SDLK_SPACE, - SDLK_MINUS, SDLK_PLUS, SDLK_LEFTBRACKET, - SDLK_RIGHTBRACKET, SDLK_BACKSLASH, 0, SDLK_SEMICOLON, SDLK_QUOTE, - /*35 */ '~', SDLK_COMMA, SDLK_PERIOD, SDLK_SLASH, SDLK_CAPSLOCK, - SDLK_F1, SDLK_F2, SDLK_F3, SDLK_F4, SDLK_F5, SDLK_F6, SDLK_F7, SDLK_F8, - SDLK_F9, SDLK_F10, SDLK_F11, SDLK_F12, - /*46 */ SDLK_PRINT, SDLK_SCROLLOCK, SDLK_PAUSE, SDLK_INSERT, SDLK_HOME, - SDLK_PAGEUP, SDLK_DELETE, SDLK_END, SDLK_PAGEDOWN, SDLK_RIGHT, - SDLK_LEFT, SDLK_DOWN, SDLK_UP, - /*53 */ SDLK_NUMLOCK, SDLK_KP_DIVIDE, SDLK_KP_MULTIPLY, SDLK_KP_MINUS, - SDLK_KP_PLUS, SDLK_KP_ENTER, - SDLK_KP1, SDLK_KP2, SDLK_KP3, SDLK_KP4, SDLK_KP5, SDLK_KP6, - /*5f */ SDLK_KP7, SDLK_KP8, SDLK_KP9, SDLK_KP0, SDLK_KP_PERIOD, 0 - /* S3 */ -}; - -const static unsigned short sdl_shift[] = { - SDLK_LCTRL, SDLK_LSHIFT, SDLK_LALT, 0 /* S1 */ , - SDLK_RCTRL, SDLK_RSHIFT, SDLK_RALT, 0 /* S2 */ , -}; - -#define MOUSE_WHEELUP (1<<4) -#define MOUSE_WHEELDOWN (1<<5) - -static void -mouse_update(void) -{ - const static char sdl_mousebtn[] = { - MOUSE_LEFTBUTTON, - MOUSE_RIGHTBUTTON, - MOUSE_SIDEBUTTON, - MOUSE_WHEELUP, - MOUSE_WHEELDOWN - }; - - uint8 addr; - mouse_cond_t cond; - - static int prev_buttons; - int buttons, changed; - int i; - - if ((addr = maple_first_mouse()) == 0 || mouse_get_cond(addr, &cond) < 0) - return; - - buttons = cond.buttons ^ 0xff; - if (cond.dz < 0) - buttons |= MOUSE_WHEELUP; - if (cond.dz > 0) - buttons |= MOUSE_WHEELDOWN; - - if (cond.dx || cond.dy) - SDL_PrivateMouseMotion(0, 1, cond.dx, cond.dy); - - changed = buttons ^ prev_buttons; - for (i = 0; i < sizeof(sdl_mousebtn); i++) { - if (changed & sdl_mousebtn[i]) { - SDL_PrivateMouseButton((buttons & sdl_mousebtn[i]) ? - SDL_PRESSED : SDL_RELEASED, i, 0, 0); - } - } - prev_buttons = buttons; -} - -static void -keyboard_update(void) -{ - static kbd_state_t old_state; - static uint8 old_addr; - - kbd_state_t *state; - uint8 addr; - int port, unit; - - int shiftkeys; - SDL_keysym keysym; - - int i; - - addr = maple_first_kb(); - - if (addr == 0) - return; - - if (addr != old_addr) { - old_addr = addr; - SDL_memset(&old_state, 0, sizeof(old_state)); - } - - maple_raddr(addr, &port, &unit); - - state = maple_dev_state(port, unit); - if (!state) - return; - - shiftkeys = state->shift_keys ^ old_state.shift_keys; - for (i = 0; i < sizeof(sdl_shift); i++) { - if ((shiftkeys >> i) & 1) { - keysym.sym = sdl_shift[i]; - SDL_PrivateKeyboard(((state->shift_keys >> i) & 1) ? SDL_PRESSED : - SDL_RELEASED, &keysym); - } - } - - for (i = 0; i < sizeof(sdl_key); i++) { - if (state->matrix[i] != old_state.matrix[i]) { - int key = sdl_key[i]; - if (key) { - keysym.sym = key; - SDL_PrivateKeyboard(state->matrix[i] ? SDL_PRESSED : - SDL_RELEASED, &keysym); - } - } - } - - old_state = *state; -} - -void -DC_PumpEvents(_THIS) -{ - keyboard_update(); - mouse_update(); -} - -void -DC_InitOSKeymap(_THIS) -{ - /* do nothing. */ -} - -/* end of SDL_dcevents.c ... */ -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/video/dc/SDL_dcevents_c.h Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include "SDL_dcvideo.h" - -/* Variables and functions exported by SDL_sysevents.c to other parts - of the native video subsystem (SDL_sysvideo.c) -*/ -extern void DC_InitOSKeymap(_THIS); -extern void DC_PumpEvents(_THIS); - -/* end of SDL_dcevents_c.h ... */ -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/video/dc/SDL_dcmouse.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include <stdio.h> - -#include "SDL_mouse.h" -#include "../../events/SDL_events_c.h" - -#include "SDL_dcmouse_c.h" - - -/* The implementation dependent data for the window manager cursor */ -struct WMcursor -{ - int unused; -}; -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/video/dc/SDL_dcmouse_c.h Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include "SDL_dcvideo.h" - -/* Functions to be exported */ -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/video/dc/SDL_dcvideo.c Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,479 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include "SDL_video.h" -#include "SDL_mouse.h" -#include "../SDL_sysvideo.h" -#include "../SDL_pixels_c.h" -#include "../../events/SDL_events_c.h" - -#include "SDL_dcvideo.h" -#include "SDL_dcevents_c.h" -#include "SDL_dcmouse_c.h" - -#include <dc/video.h> -#include <dc/pvr.h> - - -/* Initialization/Query functions */ -static int DC_VideoInit(_THIS, SDL_PixelFormat * vformat); -static SDL_Rect **DC_ListModes(_THIS, SDL_PixelFormat * format, Uint32 flags); -static SDL_Surface *DC_SetVideoMode(_THIS, SDL_Surface * current, int width, - int height, int bpp, Uint32 flags); -static int DC_SetColors(_THIS, int firstcolor, int ncolors, - SDL_Color * colors); -static void DC_VideoQuit(_THIS); - -/* Hardware surface functions */ -static int DC_AllocHWSurface(_THIS, SDL_Surface * surface); -static int DC_LockHWSurface(_THIS, SDL_Surface * surface); -static void DC_UnlockHWSurface(_THIS, SDL_Surface * surface); -static void DC_FreeHWSurface(_THIS, SDL_Surface * surface); -static int DC_FlipHWSurface(_THIS, SDL_Surface * surface); - -/* etc. */ -static void DC_UpdateRects(_THIS, int numrects, SDL_Rect * rects); - -/* OpenGL */ -#if SDL_VIDEO_OPENGL -static void *DC_GL_GetProcAddress(_THIS, const char *proc); -static int DC_GL_LoadLibrary(_THIS, const char *path); -static int DC_GL_GetAttribute(_THIS, SDL_GLattr attrib, int *value); -static void DC_GL_SwapBuffers(_THIS); -#endif - -/* DC driver bootstrap functions */ - -static int -DC_Available(void) -{ - return 1; -} - -static void -DC_DeleteDevice(SDL_VideoDevice * device) -{ - SDL_free(device->hidden); - SDL_free(device); -} - -static SDL_VideoDevice * -DC_CreateDevice(int devindex) -{ - SDL_VideoDevice *device; - - /* Initialize all variables that we clean on shutdown */ - device = (SDL_VideoDevice *) SDL_malloc(sizeof(SDL_VideoDevice)); - if (device) { - SDL_memset(device, 0, (sizeof *device)); - device->hidden = (struct SDL_PrivateVideoData *) - SDL_malloc((sizeof *device->hidden)); - } - if ((device == NULL) || (device->hidden == NULL)) { - SDL_OutOfMemory(); - if (device) { - SDL_free(device); - } - return (0); - } - SDL_memset(device->hidden, 0, (sizeof *device->hidden)); - - /* Set the function pointers */ - device->VideoInit = DC_VideoInit; - device->ListModes = DC_ListModes; - device->SetVideoMode = DC_SetVideoMode; - device->CreateYUVOverlay = NULL; - device->SetColors = DC_SetColors; - device->UpdateRects = DC_UpdateRects; - device->VideoQuit = DC_VideoQuit; - device->AllocHWSurface = DC_AllocHWSurface; - device->CheckHWBlit = NULL; - device->FillHWRect = NULL; - device->SetHWColorKey = NULL; - device->SetHWAlpha = NULL; - device->LockHWSurface = DC_LockHWSurface; - device->UnlockHWSurface = DC_UnlockHWSurface; - device->FlipHWSurface = DC_FlipHWSurface; - device->FreeHWSurface = DC_FreeHWSurface; -#if SDL_VIDEO_OPENGL - device->GL_LoadLibrary = DC_GL_LoadLibrary; - device->GL_GetProcAddress = DC_GL_GetProcAddress; - device->GL_GetAttribute = DC_GL_GetAttribute; - device->GL_MakeCurrent = NULL; - device->GL_SwapBuffers = DC_GL_SwapBuffers; -#endif - device->SetCaption = NULL; - device->SetIcon = NULL; - device->IconifyWindow = NULL; - device->GrabInput = NULL; - device->GetWMInfo = NULL; - device->InitOSKeymap = DC_InitOSKeymap; - device->PumpEvents = DC_PumpEvents; - - device->free = DC_DeleteDevice; - - return device; -} - -VideoBootStrap DC_bootstrap = { - "dcvideo", "Dreamcast Video", - DC_Available, DC_CreateDevice -}; - - -int -DC_VideoInit(_THIS, SDL_PixelFormat * vformat) -{ - /* Determine the screen depth (use default 16-bit depth) */ - /* we change this during the SDL_SetVideoMode implementation... */ - vformat->BitsPerPixel = 16; - vformat->Rmask = 0x0000f800; - vformat->Gmask = 0x000007e0; - vformat->Bmask = 0x0000001f; - - /* We're done! */ - return (0); -} - -const static SDL_Rect RECT_800x600 = { 0, 0, 800, 600 }, RECT_640x480 = { -0, 0, 640, 480}, RECT_320x240 = { -0, 0, 320, 240}; - -const static SDL_Rect *vid_modes[] = { - &RECT_800x600, - &RECT_640x480, - &RECT_320x240, - NULL -}; - -SDL_Rect ** -DC_ListModes(_THIS, SDL_PixelFormat * format, Uint32 flags) -{ - switch (format->BitsPerPixel) { - case 15: - case 16: - return &vid_modes; - case 32: - if (!(flags & SDL_INTERNALOPENGL)) - return &vid_modes; - default: - return NULL; - } -// return (SDL_Rect **) -1; -} - -pvr_init_params_t params = { - /* Enable opaque and translucent polygons with size 16 */ - {PVR_BINSIZE_16, PVR_BINSIZE_0, PVR_BINSIZE_16, PVR_BINSIZE_0, - PVR_BINSIZE_16} - , - - /* Vertex buffer size */ - 512 * 1024 -}; - -#if SDL_VIDEO_OPENGL -static int pvr_inited; -#endif - -SDL_Surface * -DC_SetVideoMode(_THIS, SDL_Surface * current, - int width, int height, int bpp, Uint32 flags) -{ - int disp_mode, pixel_mode, pitch; - Uint32 Rmask, Gmask, Bmask; - - if (width == 320 && height == 240) - disp_mode = DM_320x240; - else if (width == 640 && height == 480) - disp_mode = DM_640x480; - else if (width == 800 && height == 600) - disp_mode = DM_800x608; - else { - SDL_SetError("Couldn't find requested mode in list"); - return (NULL); - } - - switch (bpp) { - case 15: - pixel_mode = PM_RGB555; - pitch = width * 2; - /* 5-5-5 */ - Rmask = 0x00007c00; - Gmask = 0x000003e0; - Bmask = 0x0000001f; - break; - case 16: - pixel_mode = PM_RGB565; - pitch = width * 2; - /* 5-6-5 */ - Rmask = 0x0000f800; - Gmask = 0x000007e0; - Bmask = 0x0000001f; - break; - case 24: - bpp = 32; - case 32: - pixel_mode = PM_RGB888; - pitch = width * 4; - Rmask = 0x00ff0000; - Gmask = 0x0000ff00; - Bmask = 0x000000ff; -#if SDL_VIDEO_OPENGL - if (!(flags & SDL_INTERNALOPENGL)) -#endif - break; - default: - SDL_SetError("Couldn't find requested mode in list"); - return (NULL); - } - -// if ( bpp != current->format->BitsPerPixel ) { - if (!SDL_ReallocFormat(current, bpp, Rmask, Gmask, Bmask, 0)) { - return (NULL); - } -// } - - /* Set up the new mode framebuffer */ - current->flags = (SDL_FULLSCREEN | SDL_HWSURFACE); - current->w = width; - current->h = height; - current->pitch = pitch; - -#if SDL_VIDEO_OPENGL - if (pvr_inited) { - pvr_inited = 0; - pvr_shutdown(); - } -#endif - - vid_set_mode(disp_mode, pixel_mode); - - current->pixels = vram_s; - -#if SDL_VIDEO_OPENGL - if (flags & SDL_INTERNALOPENGL) { - this->gl_config.driver_loaded = 1; - current->flags = SDL_FULLSCREEN | SDL_INTERNALOPENGL; - current->pixels = NULL; - pvr_inited = 1; - pvr_init(¶ms); - glKosInit(); - glKosBeginFrame(); - } else -#endif - if (flags | SDL_DOUBLEBUF) { - current->flags |= SDL_DOUBLEBUF; - current->pixels = (void *) ((int) current->pixels | 0x400000); - } - - /* We're done */ - return (current); -} - -/* We don't actually allow hardware surfaces other than the main one */ -static int -DC_AllocHWSurface(_THIS, SDL_Surface * surface) -{ - return (-1); -} - -static void -DC_FreeHWSurface(_THIS, SDL_Surface * surface) -{ - return; -} - -/* We need to wait for vertical retrace on page flipped displays */ -static int -DC_LockHWSurface(_THIS, SDL_Surface * surface) -{ - return (0); -} - -static void -DC_UnlockHWSurface(_THIS, SDL_Surface * surface) -{ - return; -} - -static int -DC_FlipHWSurface(_THIS, SDL_Surface * surface) -{ - if (surface->flags & SDL_DOUBLEBUF) { - vid_set_start((int) surface->pixels & 0xffffff); - surface->pixels = (void *) ((int) surface->pixels ^ 0x400000); - } - return (0); -} - -static void -DC_UpdateRects(_THIS, int numrects, SDL_Rect * rects) -{ - /* do nothing. */ -} - -static int -DC_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color * colors) -{ - /* do nothing of note. */ - return (1); -} - -/* Note: If we are terminated, this could be called in the middle of - another SDL video routine -- notably UpdateRects. -*/ -static void -DC_VideoQuit(_THIS) -{ -#if SDL_VIDEO_OPENGL - if (pvr_inited) { - pvr_inited = 0; - pvr_shutdown(); - } -#endif -} - -#if SDL_VIDEO_OPENGL - -void -dmyfunc(void) -{ -} - -typedef void (*funcptr) (); -const static struct -{ - char *name; - funcptr addr; -} glfuncs[] = { -#define DEF(func) {#func,&func} - DEF(glBegin), DEF(glBindTexture), DEF(glBlendFunc), DEF(glColor4f), -// DEF(glCopyImageID), - DEF(glDisable), - DEF(glEnable), - DEF(glEnd), - DEF(glFlush), - DEF(glGenTextures), - DEF(glGetString), - DEF(glLoadIdentity), - DEF(glMatrixMode), DEF(glOrtho), DEF(glPixelStorei), -// DEF(glPopAttrib), -// DEF(glPopClientAttrib), - { - "glPopAttrib", &dmyfunc}, { - "glPopClientAttrib", &dmyfunc}, DEF(glPopMatrix), -// DEF(glPushAttrib), -// DEF(glPushClientAttrib), - { - "glPushAttrib", &dmyfunc}, { - "glPushClientAttrib", &dmyfunc}, - DEF(glPushMatrix), - DEF(glTexCoord2f), - DEF(glTexEnvf), - DEF(glTexImage2D), - DEF(glTexParameteri), - DEF(glTexSubImage2D), DEF(glVertex2i), DEF(glViewport), -#undef DEF -}; - -static void * -DC_GL_GetProcAddress(_THIS, const char *proc) -{ - void *ret; - int i; - - ret = glKosGetProcAddress(proc); - if (ret) - return ret; - - for (i = 0; i < sizeof(glfuncs) / sizeof(glfuncs[0]); i++) { - if (SDL_strcmp(proc, glfuncs[i].name) == 0) - return glfuncs[i].addr; - } - - return NULL; -} - -static int -DC_GL_LoadLibrary(_THIS, const char *path) -{ - this->gl_config.driver_loaded = 1; - - return 0; -} - -static int -DC_GL_GetAttribute(_THIS, SDL_GLattr attrib, int *value) -{ - GLenum mesa_attrib; - int val; - - switch (attrib) { - case SDL_GL_RED_SIZE: - val = 5; - break; - case SDL_GL_GREEN_SIZE: - val = 6; - break; - case SDL_GL_BLUE_SIZE: - val = 5; - break; - case SDL_GL_ALPHA_SIZE: - val = 0; - break; - case SDL_GL_DOUBLEBUFFER: - val = 1; - break; - case SDL_GL_DEPTH_SIZE: - val = 16; /* or 32? */ - break; - case SDL_GL_STENCIL_SIZE: - val = 0; - break; - case SDL_GL_ACCUM_RED_SIZE: - val = 0; - break; - case SDL_GL_ACCUM_GREEN_SIZE: - val = 0; - case SDL_GL_ACCUM_BLUE_SIZE: - val = 0; - break; - case SDL_GL_ACCUM_ALPHA_SIZE: - val = 0; - break; - default: - return -1; - } - *value = val; - return 0; -} - -static void -DC_GL_SwapBuffers(_THIS) -{ - glKosFinishFrame(); - glKosBeginFrame(); -} -#endif -/* vi: set ts=4 sw=4 expandtab: */
--- a/src/video/dc/SDL_dcvideo.h Sat Sep 19 07:09:41 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2009 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_dcvideo_h -#define _SDL_dcvideo_h - -#include "SDL_mouse.h" -#include "SDL_mutex.h" -#include "../SDL_sysvideo.h" - -/* Hidden "this" pointer for the video functions */ -#define _THIS SDL_VideoDevice *this - - -/* Private display data */ - -struct SDL_PrivateVideoData -{ - int w, h; - void *buffer; -}; - -#endif /* _SDL_dcvideo_h */ -/* vi: set ts=4 sw=4 expandtab: */