ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- had to change variable name from brk to brck in sl1632 to avoid linker conflict 

- added newline to end of sound.h
- updated Makefile to include the driver/pc stuff
- updates to the driver/pc to solve some linker errors
This commit is contained in:
soules 2006-07-28 04:00:40 +00:00
parent 4b67a59628
commit 630f04822e
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -8,6 +8,7 @@ include $(srcdir)/input/Makefile.am.inc
include $(srcdir)/mappers/Makefile.am.inc include $(srcdir)/mappers/Makefile.am.inc
# include mbshare/Makefile.am.inc # include mbshare/Makefile.am.inc
include $(srcdir)/drivers/common/Makefile.am.inc include $(srcdir)/drivers/common/Makefile.am.inc
include $(srcdir)/drivers/pc/Makefile.am.inc
fceu_SOURCES += $(sexyal_SOURCES) fceu_SOURCES += $(sexyal_SOURCES)
fceu_SOURCES += $(fceud_SOURCES) fceu_SOURCES += $(fceud_SOURCES)

10
boards/sl1632.cpp
View File

@ -21,13 +21,13 @@
#include "mapinc.h" #include "mapinc.h"
#include "mmc3.h" #include "mmc3.h"
static uint8 chrcmd[8], prg0, prg1, brk, mirr; static uint8 chrcmd[8], prg0, prg1, brck, mirr;
static SFORMAT StateRegs[]= static SFORMAT StateRegs[]=
{ {
{chrcmd, 8, "CHRCMD"}, {chrcmd, 8, "CHRCMD"},
{&prg0, 1, "PRG0"}, {&prg0, 1, "PRG0"},
{&prg1, 1, "PRG1"}, {&prg1, 1, "PRG1"},
{&brk, 1, "BRK"}, {&brck, 1, "BRK"},
{&mirr, 1, "MIRR"}, {&mirr, 1, "MIRR"},
{0} {0}
}; };
@ -54,9 +54,9 @@ static DECLFW(UNLSL1632CMDWrite)
// FCEU_printf("bs %04x %02x %3d\n",A,V,scanline); // FCEU_printf("bs %04x %02x %3d\n",A,V,scanline);
if((A&0xA131)==0xA131) if((A&0xA131)==0xA131)
{ {
brk=V; brck=V;
} }
if(brk&2) if(brck&2)
{ {
FixMMC3PRG(MMC3_cmd); FixMMC3PRG(MMC3_cmd);
FixMMC3CHR(MMC3_cmd); FixMMC3CHR(MMC3_cmd);
@ -86,7 +86,7 @@ static DECLFW(UNLSL1632CMDWrite)
static void StateRestore(int version) static void StateRestore(int version)
{ {
if(brk&2) if(brck&2)
{ {
FixMMC3PRG(MMC3_cmd); FixMMC3PRG(MMC3_cmd);
FixMMC3CHR(MMC3_cmd); FixMMC3CHR(MMC3_cmd);

2
drivers/pc/input.cpp
View File

@ -33,7 +33,7 @@ int UsrInputType[3]={SI_GAMEPAD,SI_GAMEPAD,SIFC_NONE};
int InputType[3]={0,0,0}; int InputType[3]={0,0,0};
static int cspec=0; static int cspec=0;
int gametype=0; extern int gametype;
/* Necessary for proper GUI functioning(configuring when a game isn't loaded). */ /* Necessary for proper GUI functioning(configuring when a game isn't loaded). */
void InputUserActiveFix(void) void InputUserActiveFix(void)

7
drivers/pc/main.cpp
View File

@ -70,7 +70,7 @@ int eoptions=0;
static void DriverKill(void); static void DriverKill(void);
static int DriverInitialize(FCEUGI *gi); static int DriverInitialize(FCEUGI *gi);
int gametype; int gametype = 0;
FCEUGI *CurGame=NULL; FCEUGI *CurGame=NULL;
@ -543,11 +543,8 @@ void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count)
/* Maybe ifndef WXWINDOWS would be better? ^_^ */ /* Maybe ifndef WXWINDOWS would be better? ^_^ */
#ifndef EXTGUI
FILE *FCEUD_UTF8fopen(const char *fn, const char *mode) FILE *FCEUD_UTF8fopen(const char *fn, const char *mode)
{ {
return(fopen(fn,mode)); return(fopen(fn,mode));
} }
#endif

2
sound.h
View File

@ -65,4 +65,4 @@ void FCEUSND_LoadState(int version);
void FASTAPASS(1) FCEU_SoundCPUHook(int); void FASTAPASS(1) FCEU_SoundCPUHook(int);
void FP_FASTAPASS(2) Write_IRQFM (uint32 A, uint8 V); //mbg merge 7/17/06 brought over from latest mmbuild void FP_FASTAPASS(2) Write_IRQFM (uint32 A, uint8 V); //mbg merge 7/17/06 brought over from latest mmbuild
#endif #endif