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

Some more warning fixes by riccardom.

This commit is contained in:
yabause 2008-10-13 19:28:26 +00:00
parent 64f18427be
commit 744d001fb9
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
desmume/src/NDSSystem.cpp
View File

@ -433,12 +433,12 @@ void NDS_FreeROM(void)
void NDS_Reset( void) void NDS_Reset( void)
{ {
int i; unsigned int i;
u32 src; u32 src;
u32 dst; u32 dst;
NDS_header * header = NDS_getROMHeader(); NDS_header * header = NDS_getROMHeader();
if (!header) return ; if (!header) return ;
MMU_clearMem(); MMU_clearMem();
@ -601,7 +601,7 @@ int NDS_WriteBMP(const char *filename)
bmpfileheader_struct fileheader; bmpfileheader_struct fileheader;
bmpimgheader_struct imageheader; bmpimgheader_struct imageheader;
FILE *file; FILE *file;
int i,j,k; int i,j;
u16 * bmp = (u16 *)GPU_screen; u16 * bmp = (u16 *)GPU_screen;
memset(&fileheader, 0, sizeof(fileheader)); memset(&fileheader, 0, sizeof(fileheader));
@ -653,8 +653,6 @@ int NDS_WriteBMP_32bppBuffer(int width, int height, const void* buf, const char
bmpfileheader_struct fileheader; bmpfileheader_struct fileheader;
bmpimgheader_struct imageheader; bmpimgheader_struct imageheader;
FILE *file; FILE *file;
int i,j,k;
u16 * bmp = (u16 *)GPU_screen;
memset(&fileheader, 0, sizeof(fileheader)); memset(&fileheader, 0, sizeof(fileheader));
fileheader.size = sizeof(fileheader); fileheader.size = sizeof(fileheader);
@ -842,7 +840,7 @@ NDS_FillDefaultFirmwareConfigData( struct NDS_fw_config_data *fw_config) {
int NDS_LoadFirmware(const char *filename) int NDS_LoadFirmware(const char *filename)
{ {
int i; int i;
long size; unsigned long size;
FILE *file; FILE *file;
if ((file = fopen(filename, "rb")) == NULL) if ((file = fopen(filename, "rb")) == NULL)
@ -1109,7 +1107,7 @@ NDS_exec(s32 nb, BOOL force)
T1WriteWord(MMU.ARM7_REG, 6, nds.VCount); T1WriteWord(MMU.ARM7_REG, 6, nds.VCount);
vmatch = T1ReadWord(ARM9Mem.ARM9_REG, 4); vmatch = T1ReadWord(ARM9Mem.ARM9_REG, 4);
if((nds.VCount==(vmatch>>8)|((vmatch<<1)&(1<<8)))) if(nds.VCount==((vmatch>>8)|((vmatch<<1)&(1<<8))))
{ {
T1WriteWord(ARM9Mem.ARM9_REG, 4, T1ReadWord(ARM9Mem.ARM9_REG, 4) | 4); T1WriteWord(ARM9Mem.ARM9_REG, 4, T1ReadWord(ARM9Mem.ARM9_REG, 4) | 4);
if(T1ReadWord(ARM9Mem.ARM9_REG, 4) & 32) if(T1ReadWord(ARM9Mem.ARM9_REG, 4) & 32)
@ -1119,7 +1117,7 @@ NDS_exec(s32 nb, BOOL force)
T1WriteWord(ARM9Mem.ARM9_REG, 4, T1ReadWord(ARM9Mem.ARM9_REG, 4) & 0xFFFB); T1WriteWord(ARM9Mem.ARM9_REG, 4, T1ReadWord(ARM9Mem.ARM9_REG, 4) & 0xFFFB);
vmatch = T1ReadWord(MMU.ARM7_REG, 4); vmatch = T1ReadWord(MMU.ARM7_REG, 4);
if((nds.VCount==(vmatch>>8)|((vmatch<<1)&(1<<8)))) if(nds.VCount==((vmatch>>8)|((vmatch<<1)&(1<<8))))
{ {
T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 4); T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 4);
if(T1ReadWord(MMU.ARM7_REG, 4) & 32) if(T1ReadWord(MMU.ARM7_REG, 4) & 32)