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

save ram handling for dual mode

Browse Source
This commit is contained in:
radius 2018-02-03 16:48:40 -05:00
parent 792087276e
commit 8dd94505a8
1 changed files with 115 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
libretro/libretro.c
View File

@ -33,9 +33,9 @@ static const char slash = '/';
#define VIDEO_HEIGHT 144 #define VIDEO_HEIGHT 144
#define VIDEO_PIXELS (VIDEO_WIDTH * VIDEO_HEIGHT) #define VIDEO_PIXELS (VIDEO_WIDTH * VIDEO_HEIGHT)
#define RETRO_MEMORY_GAMEBOY_1_RAM ((1 << 8) | RETRO_MEMORY_SAVE_RAM) #define RETRO_MEMORY_GAMEBOY_1_SRAM ((1 << 8) | RETRO_MEMORY_SAVE_RAM)
#define RETRO_MEMORY_GAMEBOY_1_RTC ((2 << 8) | RETRO_MEMORY_RTC) #define RETRO_MEMORY_GAMEBOY_1_RTC ((2 << 8) | RETRO_MEMORY_RTC)
#define RETRO_MEMORY_GAMEBOY_2_RAM ((3 << 8) | RETRO_MEMORY_SAVE_RAM) #define RETRO_MEMORY_GAMEBOY_2_SRAM ((3 << 8) | RETRO_MEMORY_SAVE_RAM)
#define RETRO_MEMORY_GAMEBOY_2_RTC ((3 << 8) | RETRO_MEMORY_RTC) #define RETRO_MEMORY_GAMEBOY_2_RTC ((3 << 8) | RETRO_MEMORY_RTC)
#define RETRO_GAME_TYPE_GAMEBOY_LINK_2P 0x101 #define RETRO_GAME_TYPE_GAMEBOY_LINK_2P 0x101
@ -60,6 +60,12 @@ enum audio_out {
GB_2 GB_2
}; };
enum mode{
MODE_SINGLE_GAME,
MODE_SINGLE_GAME_DUAL,
MODE_DUAL_GAME
};
static enum model model[2]; static enum model model[2];
static enum model auto_model = MODEL_CGB; static enum model auto_model = MODEL_CGB;
@ -78,6 +84,8 @@ static unsigned pre_init = 1;
static unsigned screen_layout = 0; static unsigned screen_layout = 0;
static unsigned audio_out = 0; static unsigned audio_out = 0;
static enum mode mode = MODE_SINGLE_GAME;
static bool geometry_updated = false; static bool geometry_updated = false;
static bool sameboy_dual = false; static bool sameboy_dual = false;
@ -230,12 +238,12 @@ static const struct retro_variable vars_link_dual[] = {
}; };
static const struct retro_subsystem_memory_info gb1_memory[] = { static const struct retro_subsystem_memory_info gb1_memory[] = {
{ "srm", RETRO_MEMORY_GAMEBOY_1_RAM }, { "srm.slot1", RETRO_MEMORY_GAMEBOY_1_SRAM },
{ "rtc", RETRO_MEMORY_GAMEBOY_1_RTC }, { "rtc", RETRO_MEMORY_GAMEBOY_1_RTC },
}; };
static const struct retro_subsystem_memory_info gb2_memory[] = { static const struct retro_subsystem_memory_info gb2_memory[] = {
{ "srm", RETRO_MEMORY_GAMEBOY_2_RAM }, { "srm.slot2", RETRO_MEMORY_GAMEBOY_2_SRAM },
{ "rtc", RETRO_MEMORY_GAMEBOY_2_RTC }, { "rtc", RETRO_MEMORY_GAMEBOY_2_RTC },
}; };
@ -767,9 +775,12 @@ bool retro_load_game(const struct retro_game_info *info)
if (sameboy_dual) if (sameboy_dual)
{ {
emulated_devices = 2; emulated_devices = 2;
mode = MODE_SINGLE_GAME_DUAL;
environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars_sameboy_dual); environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars_sameboy_dual);
check_variables(true); check_variables(true);
} }
else
mode = MODE_SINGLE_GAME;
frame_buf = (uint32_t*)malloc(emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); frame_buf = (uint32_t*)malloc(emulated_devices * VIDEO_PIXELS * sizeof(uint32_t));
frame_buf_copy = (uint32_t*)malloc(emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); frame_buf_copy = (uint32_t*)malloc(emulated_devices * VIDEO_PIXELS * sizeof(uint32_t));
@ -825,7 +836,10 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info,
{ {
if (type == RETRO_GAME_TYPE_GAMEBOY_LINK_2P) if (type == RETRO_GAME_TYPE_GAMEBOY_LINK_2P)
{
emulated_devices = 2; emulated_devices = 2;
mode = MODE_DUAL_GAME;
}
else else
return false; /* all other types are unhandled for now */ return false; /* all other types are unhandled for now */
@ -925,62 +939,119 @@ bool retro_unserialize(const void *data, size_t size)
void *retro_get_memory_data(unsigned type) void *retro_get_memory_data(unsigned type)
{ {
void* data; void* data = NULL;
switch(type) switch(mode)
{ {
case RETRO_MEMORY_SYSTEM_RAM: case MODE_SINGLE_GAME:
data = gameboy[0].ram; case MODE_SINGLE_GAME_DUAL: /* todo: hook this properly */
break;
case RETRO_MEMORY_SAVE_RAM:
if (gameboy[0].cartridge_type->has_battery && gameboy[0].mbc_ram_size != 0)
{ {
data = gameboy[0].mbc_ram; switch(type)
/* let's copy the save to gameboy[1] so it can save independently */ {
//memcpy(gameboy[1].mbc_ram, gameboy[0].mbc_ram, gameboy[0].mbc_ram_size); case RETRO_MEMORY_SYSTEM_RAM:
data = gameboy[0].ram;
break;
case RETRO_MEMORY_SAVE_RAM:
if (gameboy[0].cartridge_type->has_battery && gameboy[0].mbc_ram_size != 0)
data = gameboy[0].mbc_ram;
else
data = NULL;
break;
case RETRO_MEMORY_VIDEO_RAM:
data = gameboy[0].vram;
break;
case RETRO_MEMORY_RTC:
if(gameboy[0].cartridge_type->has_battery)
data = &gameboy[0].rtc_real;
else
data = NULL;
break;
default:
break;
}
} }
else
data = NULL;
break; break;
case RETRO_MEMORY_VIDEO_RAM: case MODE_DUAL_GAME: /* todo: hook up other memory types */
data = gameboy[0].vram; {
break; switch (type)
case RETRO_MEMORY_RTC: {
if(gameboy[0].cartridge_type->has_battery) case RETRO_MEMORY_GAMEBOY_1_SRAM:
data = &gameboy[0].rtc_real; if (gameboy[0].cartridge_type->has_battery && gameboy[0].mbc_ram_size != 0)
else data = gameboy[0].mbc_ram;
data = NULL; else
data = NULL;
break;
case RETRO_MEMORY_GAMEBOY_2_SRAM:
if (gameboy[1].cartridge_type->has_battery && gameboy[1].mbc_ram_size != 0)
data = gameboy[1].mbc_ram;
else
data = NULL;
break;
default:
break;
}
}
break; break;
default: default:
data = NULL; break;
} }
return data; return data;
} }
size_t retro_get_memory_size(unsigned type) size_t retro_get_memory_size(unsigned type)
{ {
size_t size; size_t size = 0;
switch(type) switch(mode)
{ {
case RETRO_MEMORY_SYSTEM_RAM: case MODE_SINGLE_GAME:
size = gameboy[0].ram_size; case MODE_SINGLE_GAME_DUAL: /* todo: hook this properly */
{
switch(type)
{
case RETRO_MEMORY_SYSTEM_RAM:
size = gameboy[0].ram_size;
break;
case RETRO_MEMORY_SAVE_RAM:
if (gameboy[0].cartridge_type->has_battery && gameboy[0].mbc_ram_size != 0)
size = gameboy[0].mbc_ram_size;
else
size = 0;
break;
case RETRO_MEMORY_VIDEO_RAM:
size = gameboy[0].vram_size;
break;
case RETRO_MEMORY_RTC:
if(gameboy[0].cartridge_type->has_battery)
size = sizeof (gameboy[0].rtc_real);
else
size = 0;
break;
default:
break;
}
}
break; break;
case RETRO_MEMORY_SAVE_RAM: case MODE_DUAL_GAME: /* todo: hook up other memory types */
if (gameboy[0].cartridge_type->has_battery && gameboy[0].mbc_ram_size != 0) {
size = gameboy[0].mbc_ram_size; switch (type)
else {
size = 0; case RETRO_MEMORY_GAMEBOY_1_SRAM:
break; if (gameboy[0].cartridge_type->has_battery && gameboy[0].mbc_ram_size != 0)
case RETRO_MEMORY_VIDEO_RAM: size = gameboy[0].mbc_ram_size;
size = gameboy[0].vram_size; else
break; size = 0;
case RETRO_MEMORY_RTC: break;
if(gameboy[0].cartridge_type->has_battery) case RETRO_MEMORY_GAMEBOY_2_SRAM:
size = sizeof (gameboy[0].rtc_real); if (gameboy[1].cartridge_type->has_battery && gameboy[1].mbc_ram_size != 0)
else size = gameboy[1].mbc_ram_size;
size = 0; else
size = 0;
break;
default:
break;;
}
}
break; break;
default: default:
size = 0;
break; break;
} }