From 78a809795ed0c4020f320ee22fa3dd725325970c Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Sat, 9 Jul 2016 14:45:25 +0300 Subject: [PATCH] Renaming MBC constants --- Core/debugger.c | 2 +- Core/gb.c | 60 ++++++++++++++++++++++++------------------------- Core/gb.h | 12 +++++----- Core/memory.c | 14 ++++++------ 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Core/debugger.c b/Core/debugger.c index 3b09c35..f289b55 100644 --- a/Core/debugger.c +++ b/Core/debugger.c @@ -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, "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"); } diff --git a/Core/gb.c b/Core/gb.c index b1b3f8b..33230ed 100644 --- a/Core/gb.c +++ b/Core/gb.c @@ -17,46 +17,46 @@ static const GB_cartridge_t cart_defs[256] = { // From http://gbdev.gg8.se/wiki/articles/The_Cartridge_Header#0147_-_Cartridge_Type - /* MBC RAM BAT. RTC RUMB. */ - { NO_MBC, false, false, false, false}, // 00h ROM ONLY - { MBC1 , false, false, false, false}, // 01h MBC1 - { MBC1 , true , false, false, false}, // 02h MBC1+RAM - { MBC1 , true , true , false, false}, // 03h MBC1+RAM+BATTERY + /* MBC RAM BAT. RTC RUMB. */ + { GB_NO_MBC, false, false, false, false}, // 00h ROM ONLY + { GB_MBC1 , false, false, false, false}, // 01h MBC1 + { GB_MBC1 , true , false, false, false}, // 02h MBC1+RAM + { GB_MBC1 , true , true , false, false}, // 03h MBC1+RAM+BATTERY [5] = - { MBC2 , true , false, false, false}, // 05h MBC2 - { MBC2 , true , true , false, false}, // 06h MBC2+BATTERY + { GB_MBC2 , true , false, false, false}, // 05h MBC2 + { GB_MBC2 , true , true , false, false}, // 06h MBC2+BATTERY [8] = - { NO_MBC, true , false, false, false}, // 08h ROM+RAM - { NO_MBC, true , true , false, false}, // 09h ROM+RAM+BATTERY + { GB_NO_MBC, true , false, false, false}, // 08h ROM+RAM + { GB_NO_MBC, true , true , false, false}, // 09h ROM+RAM+BATTERY [0xB] = // Todo: What are these? - { NO_MBC, false, false, false, false}, // 0Bh MMM01 - { 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}, // 0Bh MMM01 + { GB_NO_MBC, false, false, false, false}, // 0Ch MMM01+RAM + { GB_NO_MBC, false, false, false, false}, // 0Dh MMM01+RAM+BATTERY [0xF] = - { MBC3 , false, true, true , false}, // 0Fh MBC3+TIMER+BATTERY - { MBC3 , true , true, true , false}, // 10h MBC3+TIMER+RAM+BATTERY - { MBC3 , false, false, false, false}, // 11h MBC3 - { MBC3 , true , false, false, false}, // 12h MBC3+RAM - { MBC3 , true , true , false, false}, // 13h MBC3+RAM+BATTERY + { GB_MBC3 , false, true, true , false}, // 0Fh MBC3+TIMER+BATTERY + { GB_MBC3 , true , true, true , false}, // 10h MBC3+TIMER+RAM+BATTERY + { GB_MBC3 , false, false, false, false}, // 11h MBC3 + { GB_MBC3 , true , false, false, false}, // 12h MBC3+RAM + { GB_MBC3 , true , true , false, false}, // 13h MBC3+RAM+BATTERY [0x15] = // Todo: Do these exist? - { MBC4 , false, false, false, false}, // 15h MBC4 - { MBC4 , true , false, false, false}, // 16h MBC4+RAM - { MBC4 , true , true , false, false}, // 17h MBC4+RAM+BATTERY + { GB_MBC4 , false, false, false, false}, // 15h MBC4 + { GB_MBC4 , true , false, false, false}, // 16h MBC4+RAM + { GB_MBC4 , true , true , false, false}, // 17h MBC4+RAM+BATTERY [0x19] = - { MBC5 , false, false, false, false}, // 19h MBC5 - { MBC5 , true , false, false, false}, // 1Ah MBC5+RAM - { MBC5 , true , true , false, false}, // 1Bh MBC5+RAM+BATTERY - { MBC5 , false, false, false, true }, // 1Ch MBC5+RUMBLE - { MBC5 , true , false, false, true }, // 1Dh MBC5+RUMBLE+RAM - { MBC5 , true , true , false, true }, // 1Eh MBC5+RUMBLE+RAM+BATTERY + { GB_MBC5 , false, false, false, false}, // 19h MBC5 + { GB_MBC5 , true , false, false, false}, // 1Ah MBC5+RAM + { GB_MBC5 , true , true , false, false}, // 1Bh MBC5+RAM+BATTERY + { GB_MBC5 , false, false, false, true }, // 1Ch MBC5+RUMBLE + { GB_MBC5 , true , false, false, true }, // 1Dh MBC5+RUMBLE+RAM + { GB_MBC5 , true , true , false, true }, // 1Eh MBC5+RUMBLE+RAM+BATTERY [0xFC] = // Todo: What are these? - { NO_MBC, false, false, false, false}, // FCh POCKET CAMERA - { NO_MBC, false, false, false, false}, // FDh BANDAI TAMA5 - { NO_MBC, false, false, false, false}, // FEh HuC3 - { NO_MBC, true , true , false, false}, // FFh HuC1+RAM+BATTERY + { GB_NO_MBC, false, false, false, false}, // FCh POCKET CAMERA + { GB_NO_MBC, false, false, false, false}, // FDh BANDAI TAMA5 + { GB_NO_MBC, false, false, false, false}, // FEh HuC3 + { 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) diff --git a/Core/gb.h b/Core/gb.h index a71b20f..168a5cf 100644 --- a/Core/gb.h +++ b/Core/gb.h @@ -157,12 +157,12 @@ typedef uint32_t (*GB_rgb_encode_callback_t)(GB_gameboy_t *gb, uint8_t r, uint8_ typedef struct { enum { - NO_MBC, - MBC1, - MBC2, - MBC3, - MBC4, // Does this exist??? - MBC5, + GB_NO_MBC, + GB_MBC1, + GB_MBC2, + GB_MBC3, + GB_MBC4, // Does this exist??? + GB_MBC5, } mbc_type; bool has_ram; bool has_battery; diff --git a/Core/memory.c b/Core/memory.c index 845e714..01803fc 100644 --- a/Core/memory.c +++ b/Core/memory.c @@ -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) { - if (gb->cartridge_type->mbc_type == NO_MBC) return; + if (gb->cartridge_type->mbc_type == GB_NO_MBC) return; switch (addr >> 12) { case 0: case 1: @@ -214,16 +214,16 @@ static void write_mbc(GB_gameboy_t *gb, uint16_t addr, uint8_t value) case 2: bank_low: /* Bank number, lower bits */ - if (gb->cartridge_type->mbc_type == MBC1) { + if (gb->cartridge_type->mbc_type == GB_MBC1) { value &= 0x1F; } - if (gb->cartridge_type->mbc_type != MBC5 && !value) { + if (gb->cartridge_type->mbc_type != GB_MBC5 && !value) { value++; } gb->mbc_rom_bank = (gb->mbc_rom_bank & 0x100) | value; break; 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) { 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; case 4: case 5: - if (gb->cartridge_type->mbc_type == MBC1) { + if (gb->cartridge_type->mbc_type == GB_MBC1) { if (gb->mbc_ram_banking) { 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; case 6: case 7: - if (gb->cartridge_type->mbc_type == MBC1) { + if (gb->cartridge_type->mbc_type == GB_MBC1) { value &= 1; 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; } - 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; } }