From ebde7d27f12cb4e1002670fd481076fb9ba509ff Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 30 Sep 2012 18:02:12 +0300 Subject: [PATCH] compat hacks for this old version of fceu --- boards/Makefile | 1 - boards/addrlatch.c | 2 +- boards/bandai.c | 2 +- boards/mapinc.h | 1 + boards/mmc3.c | 9 +++++++++ drivers/common/input.c | 6 ++++++ mappers/mapinc.h | 1 + sound.c | 1 + sound.h | 1 + 9 files changed, 21 insertions(+), 3 deletions(-) diff --git a/boards/Makefile b/boards/Makefile index 33f1c5f..d85a466 100644 --- a/boards/Makefile +++ b/boards/Makefile @@ -102,7 +102,6 @@ B_C += boards/KS7032.c B_C += boards/KS7037.c B_C += boards/KS7057.c B_C += boards/SA-9602B.c -B_C += boards/__serial.c B_C += boards/ac-08.c B_C += boards/bb.c B_C += boards/cityfighter.c diff --git a/boards/addrlatch.c b/boards/addrlatch.c index afd0919..031315a 100644 --- a/boards/addrlatch.c +++ b/boards/addrlatch.c @@ -128,7 +128,7 @@ static void UNL43272Sync(void) setprg32(0x8000,(latche&0x38)>>3); } else - FCEU_printf("unrecognized command %04!\n",latche); + FCEU_printf("unrecognized command %04x!\n",latche); setchr8(0); setmirror(0); } diff --git a/boards/bandai.c b/boards/bandai.c index 8928bfb..b1f4dde 100644 --- a/boards/bandai.c +++ b/boards/bandai.c @@ -349,7 +349,7 @@ void Mapper157_Init(CartInfo *info) info->Power=M157Power; MapIRQHook=BarcodeIRQHook; - FCEUGameInfo->cspecial = SIS_DATACH; + GameInfo->cspecial = SIS_DATACH; GameStateRestore=StateRestore; AddExState(&StateRegs, ~0, 0, 0); diff --git a/boards/mapinc.h b/boards/mapinc.h index e305e30..7c2b042 100644 --- a/boards/mapinc.h +++ b/boards/mapinc.h @@ -8,4 +8,5 @@ #include "../cart.h" #include "../cheat.h" #include "../unif.h" +#include "../svga.h" #include diff --git a/boards/mmc3.c b/boards/mmc3.c index 6d3af95..415e3bf 100644 --- a/boards/mmc3.c +++ b/boards/mmc3.c @@ -276,6 +276,11 @@ void GenMMC3Power(void) FCEU_CheatAddRAM(1,0x7000,WRAM); SetReadHandler(0x7000,0x7FFF,MAWRAMMMC6); SetWriteHandler(0x7000,0x7FFF,MBWRAMMMC6); +#ifdef ASM_6502 + // asm code needs pages to be set again.. + Page[14]=WRAM-0x7000; + Page[15]=WRAM-0x7800; +#endif } else { @@ -1374,6 +1379,10 @@ static void M254_Power(void) GenMMC3Power(); SetWriteHandler(0x8000,0xBFFF,M254Write); SetReadHandler(0x6000,0x7FFF,MR254WRAM); +#ifdef ASM_6502 + // hrrr.. can't handle those evil xors here.. + Page[12]=Page[13]=Page[14]=Page[15]=WRAM-0x6000; +#endif } void Mapper254_Init(CartInfo *info) diff --git a/drivers/common/input.c b/drivers/common/input.c index e4d0466..10c6efa 100644 --- a/drivers/common/input.c +++ b/drivers/common/input.c @@ -380,3 +380,9 @@ static void PrepareOtherInput(void) // printf("generated combo_acts: %08x, combo_keys: %08x\n", combo_acts, combo_keys); } +// TODO? +char *GetKeyboard(void) +{ + static char dummy[256]; + return dummy; +} diff --git a/mappers/mapinc.h b/mappers/mapinc.h index 2c7acf0..7e2f5e3 100644 --- a/mappers/mapinc.h +++ b/mappers/mapinc.h @@ -8,4 +8,5 @@ #include "../memory.h" #include "../sound.h" #include "../state.h" +#include "../svga.h" #include diff --git a/sound.c b/sound.c index f95b050..70ce2d4 100644 --- a/sound.c +++ b/sound.c @@ -40,6 +40,7 @@ #include "sound.h" uint32 Wave[2048+512]; +int32 WaveHi[40000]; // unused int16 WaveFinalMono[2048+512]; EXPSOUND GameExpSound={0,0,0,0,0,0}; diff --git a/sound.h b/sound.h index fcaaf16..223aa6d 100644 --- a/sound.h +++ b/sound.h @@ -74,6 +74,7 @@ int GetSoundBuffer(int16 **W); int FlushEmulateSound(void); extern uint32 Wave[2048+512]; extern int16 WaveFinalMono[2048+512]; +extern int32 WaveHi[]; extern uint32 soundtsinc; extern uint32 soundtsoffs; -- 2.39.5