From 668747920b0d58ea1cb49d42ad90d09ca7ee79c7 Mon Sep 17 00:00:00 2001 From: David Schmidt Date: Mon, 26 Apr 2010 03:55:13 +0000 Subject: [PATCH] More OS/2 work --- src/arch/os2/Makefile | 115 ++++++++++++++++++----------------- src/arch/os2/os2snd_driver.c | 22 +++++++ src/sound.c | 4 -- 3 files changed, 80 insertions(+), 61 deletions(-) create mode 100644 src/arch/os2/os2snd_driver.c diff --git a/src/arch/os2/Makefile b/src/arch/os2/Makefile index 6b5ec05..da922f6 100644 --- a/src/arch/os2/Makefile +++ b/src/arch/os2/Makefile @@ -1,57 +1,58 @@ -# GSport OS/2 makefile - -OBJECTS1 = dirport.obj adb.obj clock.obj dis.obj engine_c.obj scc.obj \ - iwm.obj joystick_driver.obj moremem.obj paddles.obj \ - sim65816.obj smartport.obj sound.obj \ - video.obj config.obj scc_socket_os2.obj os2driver.obj - -{..\..}.c.obj: - @echo " Compile::C++ Compiler " - icc.exe /DTCPV40HDRS /DBSD_SELECT /Dinline= /I..\.. /Ss /Q /Ti /Gm /G4 /Ft- /C %s - -{src\}.c.obj: - @echo " Compile::C++ Compiler " - icc.exe /DTCPV40HDRS /DBSD_SELECT /Dinline= /I..\.. /Ss /Q /Ti /Gm /G4 /Ft- /C %s - -.c.obj: - @echo " Compile::C++ Compiler " - icc.exe /DTCPV40HDRS /DBSD_SELECT /Dinline= /I..\.. /Ss /Q /Ti /Gm /G4 /Ft- /C %s - -gsport.exe: $(OBJECTS1) - @echo " Link::Linker " - icc.exe @<< - /B" /de /pmtype:pm /st:196608 " - /Fegsport.exe - so32dll.lib - tcp32dll.lib - $(OBJECTS1) -<< - rc gsportos2.rc gsport.exe - echo done - -clean: - - rm $(OBJECTS1) - -# dependency stuff -dirport.obj: src/dirport.c src/dirport.h -adb.obj: ../../adb.c ../../adb.h ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h -engine_c.obj: ../../engine_c.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../protos_engine_c.h ../../size_c.h ../../op_routs.h ../../defs_instr.h ../../8inst_c.h ../../16inst_c.h -clock.obj: ..\..\clock.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h -compile_time.obj: ../../compile_time.c -config.obj: ../../config.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../config.h -dis.obj: ../../dis.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../disas.h -scc.obj: ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../scc.h -scc_socket_driver.obj: ../../scc_socket_driver.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../scc.h -scc_socket_os2.obj: scc_socket_os2.c -iwm.obj: ../../iwm.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../iwm_35_525.h -joystick_driver.obj: ../../joystick_driver.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h -moremem.obj: ../../moremem.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h -paddles.obj: ../../paddles.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h -parallel.obj: ../../parallel.c ../../defc.h -printer.obj: ../../printer.cpp -sim65816.obj: ../../sim65816.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h -smartport.obj: ../../smartport.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h -sound.obj: ../../sound.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h -sound_driver.obj: ../../sound_driver.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../sound.h -video.obj: ../../video.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../superhires.h ../../gsportfont.h -os2driver.obj: os2driver.c gsportos2.h ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h +# GSport OS/2 makefile + +OBJECTS1 = dirport.obj adb.obj clock.obj dis.obj engine_c.obj scc.obj \ + iwm.obj joystick_driver.obj moremem.obj paddles.obj \ + sim65816.obj smartport.obj sound.obj \ + video.obj config.obj scc_socket_os2.obj os2driver.obj os2snd_driver.obj + +{..\..}.c.obj: + @echo " Compile::C++ Compiler " + icc.exe /DTCPV40HDRS /DBSD_SELECT /Dinline= /I..\.. /Ss /Q /Ti /Gm /G4 /Ft- /C %s + +{src\}.c.obj: + @echo " Compile::C++ Compiler " + icc.exe /DTCPV40HDRS /DBSD_SELECT /Dinline= /I..\.. /Ss /Q /Ti /Gm /G4 /Ft- /C %s + +.c.obj: + @echo " Compile::C++ Compiler " + icc.exe /DTCPV40HDRS /DBSD_SELECT /Dinline= /I..\.. /Ss /Q /Ti /Gm /G4 /Ft- /C %s + +gsport.exe: $(OBJECTS1) + @echo " Link::Linker " + icc.exe @<< + /B" /de /pmtype:pm /st:196608 " + /Fegsport.exe + so32dll.lib + tcp32dll.lib + $(OBJECTS1) +<< + rc gsportos2.rc gsport.exe + echo done + +clean: + - rm $(OBJECTS1) + +# dependency stuff +dirport.obj: src/dirport.c src/dirport.h +adb.obj: ../../adb.c ../../adb.h ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h +engine_c.obj: ../../engine_c.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../protos_engine_c.h ../../size_c.h ../../op_routs.h ../../defs_instr.h ../../8inst_c.h ../../16inst_c.h +clock.obj: ..\..\clock.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h +compile_time.obj: ../../compile_time.c +config.obj: ../../config.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../config.h +dis.obj: ../../dis.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../disas.h +scc.obj: ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../scc.h +scc_socket_driver.obj: ../../scc_socket_driver.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../scc.h +scc_socket_os2.obj: scc_socket_os2.c +iwm.obj: ../../iwm.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../iwm_35_525.h +joystick_driver.obj: ../../joystick_driver.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h +moremem.obj: ../../moremem.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h +paddles.obj: ../../paddles.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h +parallel.obj: ../../parallel.c ../../defc.h +printer.obj: ../../printer.cpp +sim65816.obj: ../../sim65816.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h +smartport.obj: ../../smartport.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h +sound.obj: ../../sound.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h +sound_driver.obj: ../../sound_driver.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../sound.h +video.obj: ../../video.c ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h ../../superhires.h ../../gsportfont.h +os2driver.obj: os2driver.c gsportos2.h ../../scc.c ../../defc.h ../../defcomm.h ../../iwm.h ../../protos.h +os2snd_driver.obj: os2snd_driver.c diff --git a/src/arch/os2/os2snd_driver.c b/src/arch/os2/os2snd_driver.c new file mode 100644 index 0000000..6401ea0 --- /dev/null +++ b/src/arch/os2/os2snd_driver.c @@ -0,0 +1,22 @@ +/* + GSport - an Apple //gs Emulator + Copyright (C) 2010 by GSport contributors + + Based on the KEGS emulator written by and Copyright (C) 2003 Kent Dickey + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This program 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 General Public License + for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +int g_preferred_rate = 48000; \ No newline at end of file diff --git a/src/sound.c b/src/sound.c index a0f786b..82ae04a 100644 --- a/src/sound.c +++ b/src/sound.c @@ -32,11 +32,7 @@ extern int Verbose; extern int g_use_shmem; extern word32 g_vbl_count; -#ifdef __OS2__ -int g_preferred_rate; -#else extern int g_preferred_rate; -#endif extern int g_c03ef_doc_ptr; extern double g_last_vbl_dcycs;