Max
/
SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renaming MBC constants

This commit is contained in:
Lior Halphon 2016-07-09 14:45:25 +03:00
parent b4208be4f4
commit 78a809795e
4 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/debugger.c
View File

@ -854,7 +854,7 @@ static bool mbc(GB_gameboy_t *gb, char *arguments)
GB_log(gb, "Current mapped RAM bank: %x\n", gb->mbc_ram_bank); GB_log(gb, "Current mapped RAM bank: %x\n", gb->mbc_ram_bank);
GB_log(gb, "RAM is curently %s\n", gb->mbc_ram_enable? "enabled" : "disabled"); GB_log(gb, "RAM is curently %s\n", gb->mbc_ram_enable? "enabled" : "disabled");
} }
if (cartridge->mbc_type == MBC1) { if (cartridge->mbc_type == GB_MBC1) {
GB_log(gb, "MBC1 banking mode is %s\n", gb->mbc_ram_banking? "RAM" : "ROM"); GB_log(gb, "MBC1 banking mode is %s\n", gb->mbc_ram_banking? "RAM" : "ROM");
} }

58
Core/gb.c
View File

@ -18,45 +18,45 @@
static const GB_cartridge_t cart_defs[256] = { static const GB_cartridge_t cart_defs[256] = {
// From http://gbdev.gg8.se/wiki/articles/The_Cartridge_Header#0147_-_Cartridge_Type // From http://gbdev.gg8.se/wiki/articles/The_Cartridge_Header#0147_-_Cartridge_Type
/* MBC RAM BAT. RTC RUMB. */ /* MBC RAM BAT. RTC RUMB. */
{ NO_MBC, false, false, false, false}, // 00h ROM ONLY { GB_NO_MBC, false, false, false, false}, // 00h ROM ONLY
{ MBC1 , false, false, false, false}, // 01h MBC1 { GB_MBC1 , false, false, false, false}, // 01h MBC1
{ MBC1 , true , false, false, false}, // 02h MBC1+RAM { GB_MBC1 , true , false, false, false}, // 02h MBC1+RAM
{ MBC1 , true , true , false, false}, // 03h MBC1+RAM+BATTERY { GB_MBC1 , true , true , false, false}, // 03h MBC1+RAM+BATTERY
[5] = [5] =
{ MBC2 , true , false, false, false}, // 05h MBC2 { GB_MBC2 , true , false, false, false}, // 05h MBC2
{ MBC2 , true , true , false, false}, // 06h MBC2+BATTERY { GB_MBC2 , true , true , false, false}, // 06h MBC2+BATTERY
[8] = [8] =
{ NO_MBC, true , false, false, false}, // 08h ROM+RAM { GB_NO_MBC, true , false, false, false}, // 08h ROM+RAM
{ NO_MBC, true , true , false, false}, // 09h ROM+RAM+BATTERY { GB_NO_MBC, true , true , false, false}, // 09h ROM+RAM+BATTERY
[0xB] = [0xB] =
// Todo: What are these? // Todo: What are these?
{ NO_MBC, false, false, false, false}, // 0Bh MMM01 { GB_NO_MBC, false, false, false, false}, // 0Bh MMM01
{ NO_MBC, false, false, false, false}, // 0Ch MMM01+RAM { GB_NO_MBC, false, false, false, false}, // 0Ch MMM01+RAM
{ NO_MBC, false, false, false, false}, // 0Dh MMM01+RAM+BATTERY { GB_NO_MBC, false, false, false, false}, // 0Dh MMM01+RAM+BATTERY
[0xF] = [0xF] =
{ MBC3 , false, true, true , false}, // 0Fh MBC3+TIMER+BATTERY { GB_MBC3 , false, true, true , false}, // 0Fh MBC3+TIMER+BATTERY
{ MBC3 , true , true, true , false}, // 10h MBC3+TIMER+RAM+BATTERY { GB_MBC3 , true , true, true , false}, // 10h MBC3+TIMER+RAM+BATTERY
{ MBC3 , false, false, false, false}, // 11h MBC3 { GB_MBC3 , false, false, false, false}, // 11h MBC3
{ MBC3 , true , false, false, false}, // 12h MBC3+RAM { GB_MBC3 , true , false, false, false}, // 12h MBC3+RAM
{ MBC3 , true , true , false, false}, // 13h MBC3+RAM+BATTERY { GB_MBC3 , true , true , false, false}, // 13h MBC3+RAM+BATTERY
[0x15] = [0x15] =
// Todo: Do these exist? // Todo: Do these exist?
{ MBC4 , false, false, false, false}, // 15h MBC4 { GB_MBC4 , false, false, false, false}, // 15h MBC4
{ MBC4 , true , false, false, false}, // 16h MBC4+RAM { GB_MBC4 , true , false, false, false}, // 16h MBC4+RAM
{ MBC4 , true , true , false, false}, // 17h MBC4+RAM+BATTERY { GB_MBC4 , true , true , false, false}, // 17h MBC4+RAM+BATTERY
[0x19] = [0x19] =
{ MBC5 , false, false, false, false}, // 19h MBC5 { GB_MBC5 , false, false, false, false}, // 19h MBC5
{ MBC5 , true , false, false, false}, // 1Ah MBC5+RAM { GB_MBC5 , true , false, false, false}, // 1Ah MBC5+RAM
{ MBC5 , true , true , false, false}, // 1Bh MBC5+RAM+BATTERY { GB_MBC5 , true , true , false, false}, // 1Bh MBC5+RAM+BATTERY
{ MBC5 , false, false, false, true }, // 1Ch MBC5+RUMBLE { GB_MBC5 , false, false, false, true }, // 1Ch MBC5+RUMBLE
{ MBC5 , true , false, false, true }, // 1Dh MBC5+RUMBLE+RAM { GB_MBC5 , true , false, false, true }, // 1Dh MBC5+RUMBLE+RAM
{ MBC5 , true , true , false, true }, // 1Eh MBC5+RUMBLE+RAM+BATTERY { GB_MBC5 , true , true , false, true }, // 1Eh MBC5+RUMBLE+RAM+BATTERY
[0xFC] = [0xFC] =
// Todo: What are these? // Todo: What are these?
{ NO_MBC, false, false, false, false}, // FCh POCKET CAMERA { GB_NO_MBC, false, false, false, false}, // FCh POCKET CAMERA
{ NO_MBC, false, false, false, false}, // FDh BANDAI TAMA5 { GB_NO_MBC, false, false, false, false}, // FDh BANDAI TAMA5
{ NO_MBC, false, false, false, false}, // FEh HuC3 { GB_NO_MBC, false, false, false, false}, // FEh HuC3
{ NO_MBC, true , true , false, false}, // FFh HuC1+RAM+BATTERY { GB_NO_MBC, true , true , false, false}, // FFh HuC1+RAM+BATTERY
}; };
void GB_attributed_logv(GB_gameboy_t *gb, GB_log_attributes attributes, const char *fmt, va_list args) void GB_attributed_logv(GB_gameboy_t *gb, GB_log_attributes attributes, const char *fmt, va_list args)

12
Core/gb.h
View File

@ -157,12 +157,12 @@ typedef uint32_t (*GB_rgb_encode_callback_t)(GB_gameboy_t *gb, uint8_t r, uint8_
typedef struct { typedef struct {
enum { enum {
NO_MBC, GB_NO_MBC,
MBC1, GB_MBC1,
MBC2, GB_MBC2,
MBC3, GB_MBC3,
MBC4, // Does this exist??? GB_MBC4, // Does this exist???
MBC5, GB_MBC5,
} mbc_type; } mbc_type;
bool has_ram; bool has_ram;
bool has_battery; bool has_battery;

14
Core/memory.c
View File

@ -205,7 +205,7 @@ uint8_t GB_read_memory(GB_gameboy_t *gb, uint16_t addr)
static void write_mbc(GB_gameboy_t *gb, uint16_t addr, uint8_t value) static void write_mbc(GB_gameboy_t *gb, uint16_t addr, uint8_t value)
{ {
if (gb->cartridge_type->mbc_type == NO_MBC) return; if (gb->cartridge_type->mbc_type == GB_NO_MBC) return;
switch (addr >> 12) { switch (addr >> 12) {
case 0: case 0:
case 1: case 1:
@ -214,16 +214,16 @@ static void write_mbc(GB_gameboy_t *gb, uint16_t addr, uint8_t value)
case 2: case 2:
bank_low: bank_low:
/* Bank number, lower bits */ /* Bank number, lower bits */
if (gb->cartridge_type->mbc_type == MBC1) { if (gb->cartridge_type->mbc_type == GB_MBC1) {
value &= 0x1F; value &= 0x1F;
} }
if (gb->cartridge_type->mbc_type != MBC5 && !value) { if (gb->cartridge_type->mbc_type != GB_MBC5 && !value) {
value++; value++;
} }
gb->mbc_rom_bank = (gb->mbc_rom_bank & 0x100) | value; gb->mbc_rom_bank = (gb->mbc_rom_bank & 0x100) | value;
break; break;
case 3: case 3:
if (gb->cartridge_type->mbc_type != MBC5) goto bank_low; if (gb->cartridge_type->mbc_type != GB_MBC5) goto bank_low;
if (value > 1) { if (value > 1) {
GB_log(gb, "Bank overflow: [%x] <- %d\n", addr, value); GB_log(gb, "Bank overflow: [%x] <- %d\n", addr, value);
} }
@ -231,7 +231,7 @@ static void write_mbc(GB_gameboy_t *gb, uint16_t addr, uint8_t value)
break; break;
case 4: case 4:
case 5: case 5:
if (gb->cartridge_type->mbc_type == MBC1) { if (gb->cartridge_type->mbc_type == GB_MBC1) {
if (gb->mbc_ram_banking) { if (gb->mbc_ram_banking) {
gb->mbc_ram_bank = value & 0x3; gb->mbc_ram_bank = value & 0x3;
} }
@ -249,7 +249,7 @@ static void write_mbc(GB_gameboy_t *gb, uint16_t addr, uint8_t value)
break; break;
case 6: case 6:
case 7: case 7:
if (gb->cartridge_type->mbc_type == MBC1) { if (gb->cartridge_type->mbc_type == GB_MBC1) {
value &= 1; value &= 1;
if (value & !gb->mbc_ram_banking) { if (value & !gb->mbc_ram_banking) {
@ -271,7 +271,7 @@ static void write_mbc(GB_gameboy_t *gb, uint16_t addr, uint8_t value)
gb->mbc_rom_bank %= gb->rom_size / 0x4000; gb->mbc_rom_bank %= gb->rom_size / 0x4000;
} }
if (gb->cartridge_type->mbc_type != MBC5 && !gb->mbc_rom_bank) { if (gb->cartridge_type->mbc_type != GB_MBC5 && !gb->mbc_rom_bank) {
gb->mbc_rom_bank = 1; gb->mbc_rom_bank = 1;
} }
} }