From 39e1ccffc7ec6bbee9bb3ed1be7cbe856792bf69 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 18 Jun 2007 20:48:37 +0000 Subject: [PATCH] still reverting r167 sound change git-svn-id: file:///home/notaz/opt/svn/fceu@170 be3aeb3a-fb24-0410-a615-afba39da0efa --- Makefile.gp2x | 2 +- Makefile.gp2x_test | 2 +- boards/187.c | 6 +----- boards/mmc3.c | 6 +----- state.c | 9 ++------- x6502.c | 6 ------ 6 files changed, 6 insertions(+), 25 deletions(-) diff --git a/Makefile.gp2x b/Makefile.gp2x index 9742dc1..fe002c1 100644 --- a/Makefile.gp2x +++ b/Makefile.gp2x @@ -31,7 +31,7 @@ include zlib/Makefile OBJDRIVER = ${B}minimal.o ${B}cpuctrl.o ${B}squidgehack.o ${B}asmutils.o ${B}gp2x.o ${B}main.o ${B}throttle.o \ ${B}unix-netplay.o ${B}gp2x-sound.o ${B}gp2x-video.o ${B}usbjoy.o ${B}menu.o ${B}fonts.o ${B}readpng.o \ drivers/common/cheat.o drivers/common/config.o drivers/common/args.o drivers/common/vidblit.o ${UNZIPOBJS} \ - ppu.o movie.o fceu098.o ppu098.o sound098.o filter098.o + ppu.o movie.o fceu098.o ppu098.o LDRIVER += -lm -lz -lpng -static -Wl,-Map=fceu.map ifeq ($(asm_6502),1) diff --git a/Makefile.gp2x_test b/Makefile.gp2x_test index 2177b43..94414bb 100644 --- a/Makefile.gp2x_test +++ b/Makefile.gp2x_test @@ -30,7 +30,7 @@ include zlib/Makefile OBJDRIVER = drivers/gp2x_test/minimal.o drivers/gp2x_test/throttle.o ${B}gp2x.o ${B}main.o \ ${B}unix-netplay.o ${B}gp2x-sound.o ${B}gp2x-video.o ${B}usbjoy.o ${B}menu.o ${B}fonts.o ${B}readpng.o \ drivers/common/cheat.o drivers/common/config.o drivers/common/args.o drivers/common/vidblit.o ${UNZIPOBJS} \ - ppu.o movie.o fceu098.o ppu098.o sound098.o filter098.o + ppu.o movie.o fceu098.o ppu098.o LDRIVER += -lm -lz -lpng `sdl-config --libs` OBJDRIVER += x6502.o diff --git a/boards/187.c b/boards/187.c index 9e9dc07..0fa4a15 100644 --- a/boards/187.c +++ b/boards/187.c @@ -86,11 +86,7 @@ static void M187Power(void) { EXPREGS[0]=EXPREGS[1]=EXPREGS[2]=0; GenMMC3Power(); - //Write_IRQFM(0x4017,0x40); - { - writefunc f = GetWriteHandler(0x4017); - f(0x4017,0x40); - } + Write_IRQFM(0x4017,0x40); SetReadHandler(0x5000,0x5FFF,M187Read); SetWriteHandler(0x5000,0x5FFF,M187WriteLo); SetWriteHandler(0x8000,0x8000,M187Write8000); diff --git a/boards/mmc3.c b/boards/mmc3.c index 7143278..bfee5cd 100644 --- a/boards/mmc3.c +++ b/boards/mmc3.c @@ -170,11 +170,7 @@ DECLFW(MMC3_CMDWrite) break; case 0xA001: A001B=V; - //Write_IRQFM(0x4017,0x40); - { - writefunc f = GetWriteHandler(0x4017); - f(0x4017,0x40); - } + Write_IRQFM(0x4017,0x40); break; } } diff --git a/state.c b/state.c index 5b68caa..deacbbf 100644 --- a/state.c +++ b/state.c @@ -33,7 +33,6 @@ #include "version.h" #include "fce.h" #include "sound.h" -#include "sound098.h" #define INESPRIV // Take this out when old save state support is removed in a future version. #include "ines.h" #include "svga.h" @@ -105,8 +104,6 @@ SFORMAT SFSND[]={ { 0, } }; -extern SFORMAT FCEUSND_STATEINFO[]; // TODO: unify? -#define get_snd_sf() (use098code ? FCEUSND_STATEINFO : SFSND) static int SubWrite(FILE *st, SFORMAT *sf) @@ -259,7 +256,7 @@ for(;;) break; case 3:if(!ReadStateChunk(st,FCEUPPU_STATEINFO,size)) ret=0;break; case 4:if(!ReadStateChunk(st,FCEUCTRL_STATEINFO,size)) ret=0;break; - case 5:if(!ReadStateChunk(st,get_snd_sf(),size)) ret=0;break; + case 5:if(!ReadStateChunk(st,SFSND,size)) ret=0;break; case 0x10:if(!ReadStateChunk(st,SFMDATA,size)) ret=0;break; default:printf("ReadStateChunks: unknown chunk: %i\n", t); if(fseek(st,size,SEEK_CUR)<0) goto endo;break; @@ -298,7 +295,6 @@ void SaveState(void) header[3]=VERSION_NUMERIC; fwrite(header,1,16,st); - FCEUSND_SaveState(); #ifdef ASM_6502 asmcpu_pack(); #endif @@ -306,7 +302,7 @@ void SaveState(void) totalsize+=WriteStateChunk(st,2,SFCPUC); totalsize+=WriteStateChunk(st,3,FCEUPPU_STATEINFO); totalsize+=WriteStateChunk(st,4,FCEUCTRL_STATEINFO); - totalsize+=WriteStateChunk(st,5,get_snd_sf()); + totalsize+=WriteStateChunk(st,5,SFSND); if(SPreSave) SPreSave(); @@ -350,7 +346,6 @@ int FCEUSS_LoadFP(FILE *st, int make_backup) if(x) { okload: - FCEUSND_LoadState(header[3]); TempAddr=TempAddrT; RefreshAddr=RefreshAddrT; diff --git a/x6502.c b/x6502.c index 786af60..c20edf9 100644 --- a/x6502.c +++ b/x6502.c @@ -24,7 +24,6 @@ #include "x6502.h" #include "fce.h" #include "sound.h" -#include "sound098.h" #include "cart.h" #include "dprintf.h" @@ -521,10 +520,6 @@ void X6502_Run_c(void/*int32 cycles*/) ADDCYC(CycTable[b1]); temp=_tcount; - if (use098code) - FCEU_SoundCPUHook098(temp); - else - { temp*=48; fhcnt-=temp; @@ -548,7 +543,6 @@ void X6502_Run_c(void/*int32 cycles*/) } } } - } #ifdef DEBUG_ASM_6502 PC_prev = _PC; -- 2.39.5