Fixed a bunch of const issues. Trimmed some whitespace.

This commit is contained in:
Nach 2007-11-15 00:02:26 +00:00
parent 096af91b82
commit d977df497f
10 changed files with 20 additions and 20 deletions

View File

@ -79,7 +79,7 @@ extern void StartGPLink(u16);
extern void LinkSSend(u16);
extern void LinkUpdate(int);
extern int linktime2;
#endif
#endif
int SWITicks = 0;
int IRQTicks = 0;
@ -1913,7 +1913,7 @@ void CPUSoftwareInterrupt(int comment)
if(armState) comment >>= 16;
#ifdef BKPT_SUPPORT
if(comment == 0xff) {
extern void (*dbgOutput)(char *, u32);
extern void (*dbgOutput)(const char *, u32);
dbgOutput(NULL, reg[0].I);
return;
}

View File

@ -343,7 +343,7 @@ static inline u8 CPUReadByte(u32 address)
#ifdef LINK_EMULATION
if(linkenable&&(address>=0x4000120||address<=0x4000126)&&lspeed)
LinkSStop();
#endif
#endif
if((address < 0x4000400) && ioReadable[address & 0x3ff])
return ioMem[address & 0x3ff];
else goto unreadable;

View File

@ -19,7 +19,7 @@
#ifdef BKPT_SUPPORT
#define CONSOLE_OUTPUT(a,b) \
extern void (*dbgOutput)(char *, u32);\
extern void (*dbgOutput)(const char *, u32);\
if((opcode == 0xe0000000) && (reg[0].I == 0xC0DED00D)) {\
dbgOutput((a), (b));\
}

View File

@ -1,6 +1,6 @@
/////// Rom Info
////// Included by SDL.m
/*struct WinGBACompanyName {
char *code;
@ -202,7 +202,7 @@ if (showInfo)
buffer[12] = 0;
NSString * name = [[NSString alloc] initWithCString:buffer];
[gSDLMain romInfoName:name];
strncpy(buffer, (const char *)&rom[0xac], 4);
buffer[4] = 0;
NSString * gameCode = [[NSString alloc] initWithCString:buffer];
@ -216,7 +216,7 @@ if (showInfo)
strcpy(maker, winGBARomInfoFindMakerCode(buffer));
NSString * makerString = [[NSString alloc] initWithCString:maker];
[gSDLMain romInfoMaker:makerString];
sprintf(buffer, "%02x", rom[0xb3]);
NSString * unitCode = [[NSString alloc] initWithCString:buffer];
[gSDLMain romInfoUnitCode:unitCode];
@ -229,6 +229,6 @@ if (showInfo)
NSString * version = [[NSString alloc] initWithCString:buffer];
[gSDLMain romInfoVersion:version];
}
///////

View File

@ -107,7 +107,7 @@ extern void remoteStubSignal(int,int);
extern void remoteOutput(char *, u32);
extern void remoteSetProtocol(int);
extern void remoteSetPort(int);
extern void debuggerOutput(char *, u32);
extern void debuggerOutput(const char *, u32);
extern void CPUUpdateRenderBuffers(bool);
extern int gbHardware;
@ -264,7 +264,7 @@ extern void debuggerMain();
void (*dbgMain)() = debuggerMain;
void (*dbgSignal)(int,int) = debuggerSignal;
void (*dbgOutput)(char *, u32) = debuggerOutput;
void (*dbgOutput)(const char *, u32) = debuggerOutput;
int mouseCounter = 0;
int autoFire = 0;

View File

@ -277,7 +277,7 @@ void remotePutPacket(const char *packet)
#define debuggerWriteByte(addr, value) \
map[(addr)>>24].address[(addr) & map[(addr)>>24].mask] = (value)
void remoteOutput(char *s, u32 addr)
void remoteOutput(const char *s, u32 addr)
{
char buffer[16384];

View File

@ -103,10 +103,10 @@ extern void remoteInit();
extern void remoteCleanUp();
extern void remoteStubMain();
extern void remoteStubSignal(int,int);
extern void remoteOutput(char *, u32);
extern void remoteOutput(const char *, u32);
extern void remoteSetProtocol(int);
extern void remoteSetPort(int);
extern void debuggerOutput(char *, u32);
extern void debuggerOutput(const char *, u32);
extern void CPUUpdateRenderBuffers(bool);
extern int gbHardware;
@ -241,7 +241,7 @@ extern void debuggerSignal(int,int);
void (*dbgMain)() = debuggerMain;
void (*dbgSignal)(int,int) = debuggerSignal;
void (*dbgOutput)(char *, u32) = debuggerOutput;
void (*dbgOutput)(const char *, u32) = debuggerOutput;
int mouseCounter = 0;
int autoFire = 0;

View File

@ -2538,7 +2538,7 @@ static bool debuggerCondEvaluate(int num)
}
}
/*extern*/ void debuggerOutput(char *s, u32 addr)
/*extern*/ void debuggerOutput(const char *s, u32 addr)
{
if(s)
printf(s);

View File

@ -1049,7 +1049,7 @@ case 0x28:
#ifdef BKPT_SUPPORT
#define THUMB_CONSOLE_OUTPUT(a,b) \
if((opcode == 0x4000) && (reg[0].I == 0xC0DED00D)) {\
extern void (*dbgOutput)(char *, u32);\
extern void (*dbgOutput)(const char *, u32);\
dbgOutput((a), (b));\
}
#else

View File

@ -154,10 +154,10 @@ int systemDebug = 0;
int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
bool soundBufferLow = 0;
void winSignal(int,int);
void winOutput(char *, u32);
void winOutput(const char *, u32);
void (*dbgSignal)(int,int) = winSignal;
void (*dbgOutput)(char *, u32) = winOutput;
void (*dbgOutput)(const char *, u32) = winOutput;
#ifdef MMX
extern "C" bool cpu_mmx;
@ -2440,7 +2440,7 @@ void winSignal(int, int)
#define CPUReadByteQuick(addr) \
map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]
void winOutput(char *s, u32 addr)
void winOutput(const char *s, u32 addr)
{
if(s) {
toolsLog(s);