lauchmelder/NESEmulator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed build warnings for gcc

Browse source
This commit is contained in:
Robert 2021-10-29 22:33:34 +02:00
parent cabc0ae639
commit a579793bd1
8 changed files with 45 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
NES Emulator/mappers/mapper000.c
View file

@ -42,8 +42,9 @@ void destroyMapper000(struct Mapper000* mapper)
free(mapper);
}
Byte Mapper000_ReadCPU(struct Mapper000* mapper, Word address)
Byte Mapper000_ReadCPU(void* mapper, Word address)
{
struct Mapper000* sMapper = (struct Mapper000*)mapper;
Byte val = 0x00;
if (address >= 0x6000 && address < 0x8000)
@ -54,9 +55,9 @@ Byte Mapper000_ReadCPU(struct Mapper000* mapper, Word address)
else if (address >= 0x8000)
{
Word effectiveAddress = address - 0x8000;
effectiveAddress %= 0x4000 * (mapper->prg_rom_size == 1);
effectiveAddress %= 0x4000 * (sMapper->prg_rom_size == 1);
val = mapper->prg_rom[effectiveAddress];
val = sMapper->prg_rom[effectiveAddress];
}
else
{
@ -67,8 +68,9 @@ Byte Mapper000_ReadCPU(struct Mapper000* mapper, Word address)
return val;
}
Byte Mapper000_ReadPPU(struct Mapper000* mapper, Word address)
Byte Mapper000_ReadPPU(void* mapper, Word address)
{
struct Mapper000* sMapper = (struct Mapper000*)mapper;
Byte val = 0x00;
if (address >= 0x2000)
@ -78,28 +80,30 @@ Byte Mapper000_ReadPPU(struct Mapper000* mapper, Word address)
}
else
{
val = mapper->chr_rom[address];
val = sMapper->chr_rom[address];
}
return val;
}
void Mapper000_WriteCPU(struct Mapper000* mapper, Word address, Byte value)
void Mapper000_WriteCPU(void* mapper, Word address, Byte value)
{
// nothing
}
void Mapper000_WritePPU(struct Mapper000* mapper, Word address, Byte value)
void Mapper000_WritePPU(void* mapper, Word address, Byte value)
{
// nothing
}
void Mapper000_GetPatternTableTexture(struct Mapper000* mapper, SDL_Texture* texture, int index)
void Mapper000_GetPatternTableTexture(void* mapper, SDL_Texture* texture, int index)
{
struct Mapper000* sMapper = (struct Mapper000*)mapper;
int pitch;
void* pixels;
SDL_LockTexture(texture, NULL, &pixels, &pitch);
SDL_memcpy(pixels, mapper->chr_rom + 0x1000 * index, 0x1000);
SDL_memcpy(pixels, sMapper->chr_rom + 0x1000 * index, 0x1000);
SDL_UnlockTexture(texture);
}

12
NES Emulator/mappers/mapper000.h
View file

@ -17,11 +17,11 @@ struct Mapper000
struct Mapper000* createMapper000(Byte prg_rom_size, Byte chr_rom_size, FILE* fp);
void destroyMapper000(struct Mapper000* mapper);
Byte Mapper000_ReadCPU(struct Mapper000* mapper, Word address);
Byte Mapper000_ReadPPU(struct Mapper000* mapper, Word address);
void Mapper000_WriteCPU(struct Mapper000* mapper, Word address, Byte value);
void Mapper000_WritePPU(struct Mapper000* mapper, Word address, Byte value);
Byte Mapper000_ReadCPU(void* mapper, Word address);
Byte Mapper000_ReadPPU(void* mapper, Word address);
void Mapper000_WriteCPU(void* mapper, Word address, Byte value);
void Mapper000_WritePPU(void* mapper, Word address, Byte value);
void Mapper000_GetPatternTableTexture(struct Mapper000* mapper, SDL_Texture* texture, int index);
void Mapper000_GetPatternTableTexture(void* mapper, SDL_Texture* texture, int index);
#endif _MAPPER_000_
#endif // _MAPPER_000_