From ff4168b8f6af714a98fab3b1f52c73e8b032cb54 Mon Sep 17 00:00:00 2001 From: radius Date: Fri, 26 Jan 2018 22:27:58 -0500 Subject: [PATCH 01/31] fix warning --- libretro/libretro.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 3ab408c..ac01434 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -486,7 +486,9 @@ void *retro_get_memory_data(unsigned type) break; default: data = NULL; - break; + break; + default: + data = NULL; } return data; } From 3b858fb6afe4992efc168110f87805f653c04833 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 27 Jan 2018 14:59:18 -0500 Subject: [PATCH 02/31] initial link cable implementation --- libretro/libretro.c | 322 ++++++++++++++++++++++++++++---------------- 1 file changed, 206 insertions(+), 116 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index ac01434..2c53e5a 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -31,7 +31,7 @@ static const char slash = '/'; #define VIDEO_WIDTH 160 #define VIDEO_HEIGHT 144 -#define VIDEO_PIXELS VIDEO_WIDTH * VIDEO_HEIGHT +#define VIDEO_PIXELS (VIDEO_WIDTH * VIDEO_HEIGHT) char battery_save_path[512]; char symbols_path[512]; @@ -46,6 +46,8 @@ enum model { static enum model model = MODEL_AUTO; static enum model auto_model = MODEL_CGB; static uint32_t *frame_buf; + +static uint32_t *frame_buf = NULL; static struct retro_log_callback logging; static retro_log_printf_t log_cb; @@ -60,7 +62,8 @@ char retro_system_directory[4096]; char retro_save_directory[4096]; char retro_game_path[4096]; -GB_gameboy_t gb; +GB_gameboy_t gb1; +GB_gameboy_t gb2; extern const unsigned char dmg_boot[], cgb_boot[], agb_boot[]; extern const unsigned dmg_boot_length, cgb_boot_length, agb_boot_length; @@ -75,25 +78,25 @@ static void fallback_log(enum retro_log_level level, const char *fmt, ...) static struct retro_rumble_interface rumble; -static void GB_update_keys_status(GB_gameboy_t *gb) +static void GB_update_keys_status(GB_gameboy_t *gb, unsigned port) { input_poll_cb(); - - GB_set_key_state(gb, GB_KEY_RIGHT,input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT)); - GB_set_key_state(gb, GB_KEY_LEFT, input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT)); - GB_set_key_state(gb, GB_KEY_UP,input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP) ); - GB_set_key_state(gb, GB_KEY_DOWN,input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN)); - GB_set_key_state(gb, GB_KEY_A,input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A) ); - GB_set_key_state(gb, GB_KEY_B,input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B) ); - GB_set_key_state(gb, GB_KEY_SELECT,input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT)); - GB_set_key_state(gb, GB_KEY_START,input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START) ); - + + GB_set_key_state(gb, GB_KEY_RIGHT,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT)); + GB_set_key_state(gb, GB_KEY_LEFT, input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT)); + GB_set_key_state(gb, GB_KEY_UP,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP) ); + GB_set_key_state(gb, GB_KEY_DOWN,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN)); + GB_set_key_state(gb, GB_KEY_A,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A) ); + GB_set_key_state(gb, GB_KEY_B,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B) ); + GB_set_key_state(gb, GB_KEY_SELECT,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT)); + GB_set_key_state(gb, GB_KEY_START,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START) ); + if (gb->rumble_state) - rumble.set_rumble_state(0, RETRO_RUMBLE_STRONG, 65535); + rumble.set_rumble_state(port, RETRO_RUMBLE_STRONG, 65535); else - rumble.set_rumble_state(0, RETRO_RUMBLE_STRONG, 0); - + rumble.set_rumble_state(port, RETRO_RUMBLE_STRONG, 0); + } @@ -114,11 +117,18 @@ static void audio_callback(void *gb) } -static void vblank(GB_gameboy_t *gb) +static void vblank1(GB_gameboy_t *gb) { + GB_update_keys_status(gb, 0); audio_callback(gb); } +static void vblank2(GB_gameboy_t *gb) +{ + GB_update_keys_status(gb, 1); + //audio_callback(gb); +} + static uint32_t rgb_encode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b) { return r<<16|g<<8|b; @@ -128,7 +138,7 @@ static retro_environment_t environ_cb; void retro_init(void) { - frame_buf = (uint32_t*)malloc(VIDEO_PIXELS * sizeof(uint32_t)); + frame_buf = (uint32_t*)malloc(2 * VIDEO_PIXELS * sizeof(uint32_t)); const char *dir = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir) @@ -173,7 +183,7 @@ void retro_get_system_info(struct retro_system_info *info) void retro_get_system_av_info(struct retro_system_av_info *info) { - struct retro_game_geometry geom = { VIDEO_WIDTH, VIDEO_HEIGHT,VIDEO_WIDTH, VIDEO_HEIGHT ,160.0 / 144.0 }; + struct retro_game_geometry geom = { VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH, VIDEO_HEIGHT * 2 ,160.0 / 288.0 }; struct retro_system_timing timing = { FRAME_RATE, AUDIO_FREQUENCY }; info->geometry = geom; @@ -227,7 +237,28 @@ void retro_set_video_refresh(retro_video_refresh_t cb) void retro_reset(void) { - GB_reset(&gb); + GB_reset(&gb1); + GB_reset(&gb2); +} + +static void serial_start1(GB_gameboy_t *gb, uint8_t byte_received) +{ + GB_serial_set_data(&gb2, byte_received); +} + +static uint8_t serial_end1(GB_gameboy_t *gb) +{ + return GB_serial_get_data(&gb2); +} + +static void serial_start2(GB_gameboy_t *gb, uint8_t byte_received) +{ + GB_serial_set_data(&gb1, byte_received); +} + +static uint8_t serial_end2(GB_gameboy_t *gb) +{ + return GB_serial_get_data(&gb1); } static void init_for_current_model(void) @@ -236,17 +267,29 @@ static void init_for_current_model(void) if (effective_model == MODEL_AUTO) { effective_model = auto_model; } - if (GB_is_inited(&gb)) { - GB_switch_model_and_reset(&gb, effective_model != MODEL_DMG); + if (GB_is_inited(&gb1)) { + GB_switch_model_and_reset(&gb1, effective_model != MODEL_DMG); } else { if (effective_model == MODEL_DMG) { - GB_init(&gb); + GB_init(&gb1); } else { - GB_init_cgb(&gb); + GB_init_cgb(&gb1); } } + if (GB_is_inited(&gb2)) { + GB_switch_model_and_reset(&gb2, effective_model != MODEL_DMG); + } + else { + if (effective_model == MODEL_DMG) { + GB_init(&gb2); + } + else { + GB_init_cgb(&gb2); + } + } + const char *model_name = (const char *[]){"dmg", "cgb", "agb"}[effective_model]; const unsigned char *boot_code = (const unsigned char *[]){dmg_boot, cgb_boot, agb_boot}[effective_model]; unsigned boot_length = (unsigned []){dmg_boot_length, cgb_boot_length, agb_boot_length}[effective_model]; @@ -254,49 +297,61 @@ static void init_for_current_model(void) char buf[256]; snprintf(buf, sizeof(buf), "%s%c%s_boot.bin", retro_system_directory, slash, model_name); log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf); - - if (GB_load_boot_rom(&gb, buf)) { - GB_load_boot_rom_from_buffer(&gb, boot_code, boot_length); + + if (GB_load_boot_rom(&gb1, buf)) { + GB_load_boot_rom_from_buffer(&gb1, boot_code, boot_length); } - - GB_set_vblank_callback(&gb, (GB_vblank_callback_t) vblank); - GB_set_user_data(&gb, (void*)NULL); - GB_set_pixels_output(&gb,(unsigned int*)frame_buf); - GB_set_rgb_encode_callback(&gb, rgb_encode); - GB_set_sample_rate(&gb, AUDIO_FREQUENCY); + if (GB_load_boot_rom(&gb2, buf)) { + GB_load_boot_rom_from_buffer(&gb2, boot_code, boot_length); + } + + GB_set_vblank_callback(&gb1, (GB_vblank_callback_t) vblank1); + GB_set_vblank_callback(&gb2, (GB_vblank_callback_t) vblank2); + GB_set_user_data(&gb1, (void*)NULL); + GB_set_user_data(&gb2, (void*)NULL); + GB_set_pixels_output(&gb1,(unsigned int*)frame_buf); + GB_set_rgb_encode_callback(&gb1, rgb_encode); + GB_set_pixels_output(&gb2,(unsigned int*)(frame_buf + VIDEO_PIXELS)); + GB_set_rgb_encode_callback(&gb2, rgb_encode); + GB_set_sample_rate(&gb1, AUDIO_FREQUENCY); + GB_set_sample_rate(&gb2, AUDIO_FREQUENCY); + GB_set_serial_transfer_start_callback(&gb1, serial_start1); + GB_set_serial_transfer_end_callback(&gb1, serial_end1); + GB_set_serial_transfer_start_callback(&gb2, serial_start2); + GB_set_serial_transfer_end_callback(&gb2, serial_end2); struct retro_memory_descriptor descs[7]; size_t size; uint16_t bank; memset(descs, 0, sizeof(descs)); - - descs[0].ptr = GB_get_direct_access(&gb, GB_DIRECT_ACCESS_IE, &size, &bank); + + descs[0].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_IE, &size, &bank); descs[0].start = 0xFFFF; descs[0].len = 1; - - descs[1].ptr = GB_get_direct_access(&gb, GB_DIRECT_ACCESS_HRAM, &size, &bank); + + descs[1].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_HRAM, &size, &bank); descs[1].start = 0xFF80; descs[1].len = 0x0080; - - descs[2].ptr = GB_get_direct_access(&gb, GB_DIRECT_ACCESS_RAM, &size, &bank); + + descs[2].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_RAM, &size, &bank); descs[2].start = 0xC000; descs[2].len = 0x2000; - - descs[3].ptr = GB_get_direct_access(&gb, GB_DIRECT_ACCESS_CART_RAM, &size, &bank); + + descs[3].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_CART_RAM, &size, &bank); descs[3].start = 0xA000; descs[3].len = 0x2000; - - descs[4].ptr = GB_get_direct_access(&gb, GB_DIRECT_ACCESS_VRAM, &size, &bank); + + descs[4].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_VRAM, &size, &bank); descs[4].start = 0x8000; descs[4].len = 0x2000; - - descs[5].ptr = GB_get_direct_access(&gb, GB_DIRECT_ACCESS_ROM, &size, &bank); + + descs[5].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_ROM, &size, &bank); descs[5].start = 0x0000; descs[5].len = 0x4000; descs[5].flags = RETRO_MEMDESC_CONST; - - descs[6].ptr = GB_get_direct_access(&gb, GB_DIRECT_ACCESS_OAM, &size, &bank); + + descs[6].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_OAM, &size, &bank); descs[6].start = 0xFE00; descs[6].len = 0x00A0; @@ -312,16 +367,28 @@ static void check_variables(void) var.key = "sameboy_color_correction_mode"; var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb)) + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb1)) { if (strcmp(var.value, "off") == 0) - GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_DISABLED); + { + GB_set_color_correction_mode(&gb1, GB_COLOR_CORRECTION_DISABLED); + GB_set_color_correction_mode(&gb2, GB_COLOR_CORRECTION_DISABLED); + } else if (strcmp(var.value, "correct curves") == 0) - GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_CORRECT_CURVES); + { + GB_set_color_correction_mode(&gb1, GB_COLOR_CORRECTION_CORRECT_CURVES); + GB_set_color_correction_mode(&gb2, GB_COLOR_CORRECTION_CORRECT_CURVES); + } else if (strcmp(var.value, "emulate hardware") == 0) - GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_EMULATE_HARDWARE); + { + GB_set_color_correction_mode(&gb1, GB_COLOR_CORRECTION_EMULATE_HARDWARE); + GB_set_color_correction_mode(&gb2, GB_COLOR_CORRECTION_EMULATE_HARDWARE); + } else if (strcmp(var.value, "preserve brightness") == 0) - GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + { + GB_set_color_correction_mode(&gb1, GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + GB_set_color_correction_mode(&gb2, GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + } } var.key = "sameboy_high_pass_filter_mode"; @@ -329,11 +396,20 @@ static void check_variables(void) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "off") == 0) - GB_set_highpass_filter_mode(&gb, GB_HIGHPASS_OFF); + { + GB_set_highpass_filter_mode(&gb1, GB_HIGHPASS_OFF); + GB_set_highpass_filter_mode(&gb2, GB_HIGHPASS_OFF); + } else if (strcmp(var.value, "accurate") == 0) - GB_set_highpass_filter_mode(&gb, GB_HIGHPASS_ACCURATE); + { + GB_set_highpass_filter_mode(&gb1, GB_HIGHPASS_ACCURATE); + GB_set_highpass_filter_mode(&gb2, GB_HIGHPASS_ACCURATE); + } else if (strcmp(var.value, "remove dc offset") == 0) - GB_set_highpass_filter_mode(&gb, GB_HIGHPASS_REMOVE_DC_OFFSET); + { + GB_set_highpass_filter_mode(&gb1, GB_HIGHPASS_REMOVE_DC_OFFSET); + GB_set_highpass_filter_mode(&gb2, GB_HIGHPASS_REMOVE_DC_OFFSET); + } } var.key = "sameboy_model"; @@ -349,7 +425,11 @@ static void check_variables(void) new_model = MODEL_AGB; else if (strcmp(var.value, "Auto") == 0) new_model = MODEL_AUTO; - if (GB_is_inited(&gb) && new_model != model) { + if (GB_is_inited(&gb1) && new_model != model) { + model = new_model; + init_for_current_model(); + } + if (GB_is_inited(&gb2) && new_model != model) { model = new_model; init_for_current_model(); } @@ -359,15 +439,23 @@ static void check_variables(void) } } +int frames = 0; void retro_run(void) { - bool updated = false; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) - check_variables(); - GB_update_keys_status(&gb); - GB_run_frame(&gb); + bool updated = false; - video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT, VIDEO_WIDTH * sizeof(uint32_t)); + if (!frame_buf) + return; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) + check_variables(); + + GB_run_frame(&gb1); + GB_run_frame(&gb2); + + video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH * sizeof(uint32_t)); + + frames++; } bool retro_load_game(const struct retro_game_info *info) @@ -397,12 +485,15 @@ bool retro_load_game(const struct retro_game_info *info) auto_model = (info->path[strlen(info->path) - 1] & ~0x20) == 'C' ? MODEL_CGB : MODEL_DMG; init_for_current_model(); - - if (GB_load_rom(&gb,info->path)) { + + if (GB_load_rom(&gb1,info->path)) { + log_cb(RETRO_LOG_INFO, "Failed to load ROM\n"); + return false; + } + if (GB_load_rom(&gb2,info->path)) { log_cb(RETRO_LOG_INFO, "Failed to load ROM\n"); return false; } - bool yes = true; environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &yes); @@ -426,7 +517,8 @@ bool retro_load_game(const struct retro_game_info *info) void retro_unload_game(void) { - GB_free(&gb); + GB_free(&gb1); + GB_free(&gb2); } unsigned retro_get_region(void) @@ -441,12 +533,12 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t retro_serialize_size(void) { - return GB_get_save_state_size(&gb); + return GB_get_save_state_size(&gb1); } bool retro_serialize(void *data, size_t size) { - GB_save_state_to_buffer(&gb, (uint8_t*) data); + GB_save_state_to_buffer(&gb1, (uint8_t*) data); if (data) return true; else @@ -455,7 +547,7 @@ bool retro_serialize(void *data, size_t size) bool retro_unserialize(const void *data, size_t size) { - if (GB_load_state_from_buffer(&gb, (uint8_t*) data, size) == 0) + if (GB_load_state_from_buffer(&gb1, (uint8_t*) data, size) == 0) return true; else return false; @@ -463,28 +555,25 @@ bool retro_unserialize(const void *data, size_t size) void *retro_get_memory_data(unsigned type) { - void* data; - switch(type) - { - case RETRO_MEMORY_SYSTEM_RAM: - data = gb.ram; - break; - case RETRO_MEMORY_SAVE_RAM: - if (gb.cartridge_type->has_battery && gb.mbc_ram_size != 0) - data = gb.mbc_ram; - else - data = NULL; - break; - case RETRO_MEMORY_VIDEO_RAM: - data = gb.vram; - break; - case RETRO_MEMORY_RTC: - if(gb.cartridge_type->has_battery) - data = &gb.rtc_real; - else - data = NULL; - break; - default: + void* data; + switch(type) + { + case RETRO_MEMORY_SYSTEM_RAM: + data = gb1.ram; + break; + case RETRO_MEMORY_SAVE_RAM: + if (gb1.cartridge_type->has_battery && gb1.mbc_ram_size != 0) + data = gb1.mbc_ram; + else + data = NULL; + break; + case RETRO_MEMORY_VIDEO_RAM: + data = gb1.vram; + break; + case RETRO_MEMORY_RTC: + if(gb1.cartridge_type->has_battery) + data = &gb1.rtc_real; + else data = NULL; break; default: @@ -495,32 +584,33 @@ void *retro_get_memory_data(unsigned type) size_t retro_get_memory_size(unsigned type) { - size_t size; - switch(type) - { - case RETRO_MEMORY_SYSTEM_RAM: - size = gb.ram_size; - break; - case RETRO_MEMORY_SAVE_RAM: - if (gb.cartridge_type->has_battery && gb.mbc_ram_size != 0) - size = gb.mbc_ram_size; - else - size = 0; - break; - case RETRO_MEMORY_VIDEO_RAM: - size = gb.vram_size; - break; - case RETRO_MEMORY_RTC: - if(gb.cartridge_type->has_battery) - size = sizeof (gb.rtc_real); - else - size = 0; - break; - default: + size_t size; + switch(type) + { + case RETRO_MEMORY_SYSTEM_RAM: + size = gb1.ram_size; + break; + case RETRO_MEMORY_SAVE_RAM: + if (gb1.cartridge_type->has_battery && gb1.mbc_ram_size != 0) + size = gb1.mbc_ram_size; + else size = 0; - break; - } - return size; + break; + case RETRO_MEMORY_VIDEO_RAM: + size = gb1.vram_size; + break; + case RETRO_MEMORY_RTC: + if(gb1.cartridge_type->has_battery) + size = sizeof (gb1.rtc_real); + else + size = 0; + break; + default: + size = 0; + break; + } + + return size; } void retro_cheat_reset(void) From 45e0a754915f3d52a253cdd77d3b89500c7d1fc9 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 27 Jan 2018 15:24:27 -0500 Subject: [PATCH 03/31] savefile hack for slot 2, both load from the same SRM file but gb2 doesn't save --- libretro/libretro.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libretro/libretro.c b/libretro/libretro.c index 2c53e5a..e909f11 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -563,7 +563,11 @@ void *retro_get_memory_data(unsigned type) break; case RETRO_MEMORY_SAVE_RAM: if (gb1.cartridge_type->has_battery && gb1.mbc_ram_size != 0) + { data = gb1.mbc_ram; + /* let's copy the save to gb2 so it can save independently */ + memcpy(gb2.mbc_ram, gb1.mbc_ram, gb1.mbc_ram_size); + } else data = NULL; break; From 91816c30b56a719a00d0e1be51d2ce35d94e6cef Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 31 Jan 2018 15:33:46 -0500 Subject: [PATCH 04/31] fix gameboy synchronization thanks to @LIJI32 --- libretro/libretro.c | 157 ++++++++++++++++++++++++-------------------- 1 file changed, 87 insertions(+), 70 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index e909f11..1573cd0 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -66,6 +66,7 @@ GB_gameboy_t gb1; GB_gameboy_t gb2; extern const unsigned char dmg_boot[], cgb_boot[], agb_boot[]; extern const unsigned dmg_boot_length, cgb_boot_length, agb_boot_length; +bool vblank1_occurred = false, vblank2_occurred = false; static void fallback_log(enum retro_log_level level, const char *fmt, ...) { @@ -119,12 +120,14 @@ static void audio_callback(void *gb) static void vblank1(GB_gameboy_t *gb) { + vblank1_occurred = true; GB_update_keys_status(gb, 0); audio_callback(gb); } static void vblank2(GB_gameboy_t *gb) { + vblank2_occurred = true; GB_update_keys_status(gb, 1); //audio_callback(gb); } @@ -241,24 +244,30 @@ void retro_reset(void) GB_reset(&gb2); } +static uint8_t byte_to_send1 = 0xFF, byte_to_send2 = 0xFF; + static void serial_start1(GB_gameboy_t *gb, uint8_t byte_received) { - GB_serial_set_data(&gb2, byte_received); + byte_to_send1 = byte_received; } static uint8_t serial_end1(GB_gameboy_t *gb) { - return GB_serial_get_data(&gb2); + uint8_t ret = GB_serial_get_data(&gb2); + GB_serial_set_data(&gb2, byte_to_send1); + return ret; } static void serial_start2(GB_gameboy_t *gb, uint8_t byte_received) { - GB_serial_set_data(&gb1, byte_received); + byte_to_send2 = byte_received; } static uint8_t serial_end2(GB_gameboy_t *gb) { - return GB_serial_get_data(&gb1); + uint8_t ret = GB_serial_get_data(&gb1); + GB_serial_set_data(&gb1, byte_to_send2); + return ret; } static void init_for_current_model(void) @@ -442,20 +451,28 @@ static void check_variables(void) int frames = 0; void retro_run(void) { - bool updated = false; - - if (!frame_buf) - return; - - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) - check_variables(); - - GB_run_frame(&gb1); - GB_run_frame(&gb2); - - video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH * sizeof(uint32_t)); - - frames++; + bool updated = false; + + if (!frame_buf) + return; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) + check_variables(); + + vblank1_occurred = vblank2_occurred = false; + signed delta = 0; + while (!vblank1_occurred || !vblank2_occurred) { + if (delta >= 0) { + delta -= GB_run(&gb1); + } + else { + delta += GB_run(&gb2); + } + } + + video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH * sizeof(uint32_t)); + + frames++; } bool retro_load_game(const struct retro_game_info *info) @@ -555,66 +572,66 @@ bool retro_unserialize(const void *data, size_t size) void *retro_get_memory_data(unsigned type) { - void* data; - switch(type) - { - case RETRO_MEMORY_SYSTEM_RAM: - data = gb1.ram; - break; - case RETRO_MEMORY_SAVE_RAM: - if (gb1.cartridge_type->has_battery && gb1.mbc_ram_size != 0) - { - data = gb1.mbc_ram; - /* let's copy the save to gb2 so it can save independently */ - memcpy(gb2.mbc_ram, gb1.mbc_ram, gb1.mbc_ram_size); - } - else + void* data; + switch(type) + { + case RETRO_MEMORY_SYSTEM_RAM: + data = gb1.ram; + break; + case RETRO_MEMORY_SAVE_RAM: + if (gb1.cartridge_type->has_battery && gb1.mbc_ram_size != 0) + { + data = gb1.mbc_ram; + /* let's copy the save to gb2 so it can save independently */ + memcpy(gb2.mbc_ram, gb1.mbc_ram, gb1.mbc_ram_size); + } + else + data = NULL; + break; + case RETRO_MEMORY_VIDEO_RAM: + data = gb1.vram; + break; + case RETRO_MEMORY_RTC: + if(gb1.cartridge_type->has_battery) + data = &gb1.rtc_real; + else + data = NULL; + break; + default: data = NULL; - break; - case RETRO_MEMORY_VIDEO_RAM: - data = gb1.vram; - break; - case RETRO_MEMORY_RTC: - if(gb1.cartridge_type->has_battery) - data = &gb1.rtc_real; - else - data = NULL; - break; - default: - data = NULL; } return data; } size_t retro_get_memory_size(unsigned type) { - size_t size; - switch(type) - { - case RETRO_MEMORY_SYSTEM_RAM: - size = gb1.ram_size; - break; - case RETRO_MEMORY_SAVE_RAM: - if (gb1.cartridge_type->has_battery && gb1.mbc_ram_size != 0) - size = gb1.mbc_ram_size; - else + size_t size; + switch(type) + { + case RETRO_MEMORY_SYSTEM_RAM: + size = gb1.ram_size; + break; + case RETRO_MEMORY_SAVE_RAM: + if (gb1.cartridge_type->has_battery && gb1.mbc_ram_size != 0) + size = gb1.mbc_ram_size; + else + size = 0; + break; + case RETRO_MEMORY_VIDEO_RAM: + size = gb1.vram_size; + break; + case RETRO_MEMORY_RTC: + if(gb1.cartridge_type->has_battery) + size = sizeof (gb1.rtc_real); + else + size = 0; + break; + default: size = 0; - break; - case RETRO_MEMORY_VIDEO_RAM: - size = gb1.vram_size; - break; - case RETRO_MEMORY_RTC: - if(gb1.cartridge_type->has_battery) - size = sizeof (gb1.rtc_real); - else - size = 0; - break; - default: - size = 0; - break; - } - - return size; + break; + } + + return size; } void retro_cheat_reset(void) From 49a8cd0bb5663b4223862de4289223e6ed98d526 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 31 Jan 2018 16:27:56 -0500 Subject: [PATCH 05/31] hook up savestates for GB#2 --- libretro/libretro.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 1573cd0..dd986b1 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -550,12 +550,20 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t retro_serialize_size(void) { - return GB_get_save_state_size(&gb1); + return 2 * GB_get_save_state_size(&gb1); } bool retro_serialize(void *data, size_t size) { - GB_save_state_to_buffer(&gb1, (uint8_t*) data); + void* gb1_data = (uint8_t*)malloc(0.5 * size * sizeof(uint8_t)); + void* gb2_data = (uint8_t*)malloc(0.5 * size * sizeof(uint8_t)); + + GB_save_state_to_buffer(&gb1, (uint8_t*) gb1_data); + GB_save_state_to_buffer(&gb2, (uint8_t*) gb2_data); + + memcpy(data, gb1_data, size / 2); + memcpy(data + (size / 2), gb2_data, size / 2); + if (data) return true; else @@ -564,7 +572,16 @@ bool retro_serialize(void *data, size_t size) bool retro_unserialize(const void *data, size_t size) { - if (GB_load_state_from_buffer(&gb1, (uint8_t*) data, size) == 0) + void* gb1_data = (uint8_t*)malloc(0.5 * size * sizeof(uint8_t)); + void* gb2_data = (uint8_t*)malloc(0.5 * size * sizeof(uint8_t)); + + memcpy (gb1_data, data, size / 2); + memcpy (gb2_data, data + (size / 2), size / 2); + + int ret1 = GB_load_state_from_buffer(&gb1, gb1_data, size / 2); + int ret2 = GB_load_state_from_buffer(&gb2, gb2_data, size / 2); + + if (ret1 == 0 && ret2 ==0) return true; else return false; From b573fbcdc4545906fe25027f9e6e7e75c7234e7a Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 31 Jan 2018 21:09:47 -0500 Subject: [PATCH 06/31] reduce code duplication --- libretro/libretro.c | 246 ++++++++++++++++++++++---------------------- 1 file changed, 125 insertions(+), 121 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index dd986b1..38d8a9f 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -56,14 +56,16 @@ static retro_audio_sample_batch_t audio_batch_cb; static retro_input_poll_t input_poll_cb; static retro_input_state_t input_state_cb; +static unsigned emulated_gbs = 2; + signed short soundbuf[1024 * 2]; char retro_system_directory[4096]; char retro_save_directory[4096]; char retro_game_path[4096]; -GB_gameboy_t gb1; -GB_gameboy_t gb2; +GB_gameboy_t gb[2]; + extern const unsigned char dmg_boot[], cgb_boot[], agb_boot[]; extern const unsigned dmg_boot_length, cgb_boot_length, agb_boot_length; bool vblank1_occurred = false, vblank2_occurred = false; @@ -240,8 +242,9 @@ void retro_set_video_refresh(retro_video_refresh_t cb) void retro_reset(void) { - GB_reset(&gb1); - GB_reset(&gb2); + for (int i = 0; i < emulated_gbs; i++) + GB_reset(&gb[i]); + } static uint8_t byte_to_send1 = 0xFF, byte_to_send2 = 0xFF; @@ -253,8 +256,8 @@ static void serial_start1(GB_gameboy_t *gb, uint8_t byte_received) static uint8_t serial_end1(GB_gameboy_t *gb) { - uint8_t ret = GB_serial_get_data(&gb2); - GB_serial_set_data(&gb2, byte_to_send1); + uint8_t ret = GB_serial_get_data(&gb[1]); + GB_serial_set_data(&gb[1], byte_to_send1); return ret; } @@ -265,8 +268,8 @@ static void serial_start2(GB_gameboy_t *gb, uint8_t byte_received) static uint8_t serial_end2(GB_gameboy_t *gb) { - uint8_t ret = GB_serial_get_data(&gb1); - GB_serial_set_data(&gb1, byte_to_send2); + uint8_t ret = GB_serial_get_data(&gb[0]); + GB_serial_set_data(&gb[0], byte_to_send2); return ret; } @@ -276,91 +279,82 @@ static void init_for_current_model(void) if (effective_model == MODEL_AUTO) { effective_model = auto_model; } - if (GB_is_inited(&gb1)) { - GB_switch_model_and_reset(&gb1, effective_model != MODEL_DMG); - } - else { - if (effective_model == MODEL_DMG) { - GB_init(&gb1); - } - else { - GB_init_cgb(&gb1); - } - } - if (GB_is_inited(&gb2)) { - GB_switch_model_and_reset(&gb2, effective_model != MODEL_DMG); - } - else { - if (effective_model == MODEL_DMG) { - GB_init(&gb2); - } - else { - GB_init_cgb(&gb2); + + for (i = 0; i < emulated_gbs; i++) + { + if (GB_is_inited(&gb[i])) + GB_switch_model_and_reset(&gb1, effective_model != MODEL_DMG); + + else + { + if (effective_model == MODEL_DMG) + GB_init(&gb[i]); + else + GB_init_cgb(&gb[i]); } } - const char *model_name = (const char *[]){"dmg", "cgb", "agb"}[effective_model]; - const unsigned char *boot_code = (const unsigned char *[]){dmg_boot, cgb_boot, agb_boot}[effective_model]; - unsigned boot_length = (unsigned []){dmg_boot_length, cgb_boot_length, agb_boot_length}[effective_model]; - + const char *model_name = (const char *[]){"dmg", "cgb", "agb"}[model]; + const unsigned char *boot_code = (const unsigned char *[]){dmg_boot, cgb_boot, agb_boot}[model]; + unsigned boot_length = (unsigned []){dmg_boot_length, cgb_boot_length, agb_boot_length}[model]; + char buf[256]; snprintf(buf, sizeof(buf), "%s%c%s_boot.bin", retro_system_directory, slash, model_name); log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf); - - if (GB_load_boot_rom(&gb1, buf)) { - GB_load_boot_rom_from_buffer(&gb1, boot_code, boot_length); + + for (i = 0; i < emulated_gbs; i++) + { + if (GB_load_boot_rom(&gb[i], buf)) + GB_load_boot_rom_from_buffer(&gb[i], boot_code, boot_length); + GB_set_user_data(&gb[i], (void*)NULL); + GB_set_pixels_output(&gb[i],(unsigned int*)(frame_buf + i * VIDEO_PIXELS)); + GB_set_rgb_encode_callback(&gb[i], rgb_encode); + GB_set_sample_rate(&gb[i], AUDIO_FREQUENCY); } - if (GB_load_boot_rom(&gb2, buf)) { - GB_load_boot_rom_from_buffer(&gb2, boot_code, boot_length); - } - - GB_set_vblank_callback(&gb1, (GB_vblank_callback_t) vblank1); - GB_set_vblank_callback(&gb2, (GB_vblank_callback_t) vblank2); - GB_set_user_data(&gb1, (void*)NULL); - GB_set_user_data(&gb2, (void*)NULL); - GB_set_pixels_output(&gb1,(unsigned int*)frame_buf); - GB_set_rgb_encode_callback(&gb1, rgb_encode); - GB_set_pixels_output(&gb2,(unsigned int*)(frame_buf + VIDEO_PIXELS)); - GB_set_rgb_encode_callback(&gb2, rgb_encode); - GB_set_sample_rate(&gb1, AUDIO_FREQUENCY); - GB_set_sample_rate(&gb2, AUDIO_FREQUENCY); - GB_set_serial_transfer_start_callback(&gb1, serial_start1); - GB_set_serial_transfer_end_callback(&gb1, serial_end1); - GB_set_serial_transfer_start_callback(&gb2, serial_start2); - GB_set_serial_transfer_end_callback(&gb2, serial_end2); + + /* todo: attempt to make these more generic */ + GB_set_vblank_callback(&gb[0], (GB_vblank_callback_t) vblank1); + GB_set_vblank_callback(&gb[1], (GB_vblank_callback_t) vblank2); + GB_set_serial_transfer_start_callback(&gb[0], serial_start1); + GB_set_serial_transfer_end_callback(&gb[0], serial_end1); + GB_set_serial_transfer_start_callback(&gb[1], serial_start2); + GB_set_serial_transfer_end_callback(&gb[1], serial_end2); struct retro_memory_descriptor descs[7]; size_t size; uint16_t bank; + + /* todo: add netplay awareness for this so achievements can be granted on the respective client */ + i = 0; memset(descs, 0, sizeof(descs)); - - descs[0].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_IE, &size, &bank); + + descs[0].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_IE, &size, &bank); descs[0].start = 0xFFFF; descs[0].len = 1; - - descs[1].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_HRAM, &size, &bank); + + descs[1].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_HRAM, &size, &bank); descs[1].start = 0xFF80; descs[1].len = 0x0080; - - descs[2].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_RAM, &size, &bank); + + descs[2].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_RAM, &size, &bank); descs[2].start = 0xC000; descs[2].len = 0x2000; - - descs[3].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_CART_RAM, &size, &bank); + + descs[3].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_CART_RAM, &size, &bank); descs[3].start = 0xA000; descs[3].len = 0x2000; - - descs[4].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_VRAM, &size, &bank); + + descs[4].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_VRAM, &size, &bank); descs[4].start = 0x8000; descs[4].len = 0x2000; - - descs[5].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_ROM, &size, &bank); + + descs[5].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_ROM, &size, &bank); descs[5].start = 0x0000; descs[5].len = 0x4000; descs[5].flags = RETRO_MEMDESC_CONST; - - descs[6].ptr = GB_get_direct_access(&gb1, GB_DIRECT_ACCESS_OAM, &size, &bank); + + descs[6].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_OAM, &size, &bank); descs[6].start = 0xFE00; descs[6].len = 0x00A0; @@ -376,27 +370,27 @@ static void check_variables(void) var.key = "sameboy_color_correction_mode"; var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb1)) + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb[0])) { if (strcmp(var.value, "off") == 0) { - GB_set_color_correction_mode(&gb1, GB_COLOR_CORRECTION_DISABLED); - GB_set_color_correction_mode(&gb2, GB_COLOR_CORRECTION_DISABLED); + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_DISABLED); + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_DISABLED); } else if (strcmp(var.value, "correct curves") == 0) { - GB_set_color_correction_mode(&gb1, GB_COLOR_CORRECTION_CORRECT_CURVES); - GB_set_color_correction_mode(&gb2, GB_COLOR_CORRECTION_CORRECT_CURVES); + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_CORRECT_CURVES); + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_CORRECT_CURVES); } else if (strcmp(var.value, "emulate hardware") == 0) { - GB_set_color_correction_mode(&gb1, GB_COLOR_CORRECTION_EMULATE_HARDWARE); - GB_set_color_correction_mode(&gb2, GB_COLOR_CORRECTION_EMULATE_HARDWARE); + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_EMULATE_HARDWARE); + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_EMULATE_HARDWARE); } else if (strcmp(var.value, "preserve brightness") == 0) { - GB_set_color_correction_mode(&gb1, GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); - GB_set_color_correction_mode(&gb2, GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); } } @@ -406,18 +400,18 @@ static void check_variables(void) { if (strcmp(var.value, "off") == 0) { - GB_set_highpass_filter_mode(&gb1, GB_HIGHPASS_OFF); - GB_set_highpass_filter_mode(&gb2, GB_HIGHPASS_OFF); + GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_OFF); + GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_OFF); } else if (strcmp(var.value, "accurate") == 0) { - GB_set_highpass_filter_mode(&gb1, GB_HIGHPASS_ACCURATE); - GB_set_highpass_filter_mode(&gb2, GB_HIGHPASS_ACCURATE); + GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_ACCURATE); + GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_ACCURATE); } else if (strcmp(var.value, "remove dc offset") == 0) { - GB_set_highpass_filter_mode(&gb1, GB_HIGHPASS_REMOVE_DC_OFFSET); - GB_set_highpass_filter_mode(&gb2, GB_HIGHPASS_REMOVE_DC_OFFSET); + GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_REMOVE_DC_OFFSET); + GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_REMOVE_DC_OFFSET); } } @@ -434,11 +428,11 @@ static void check_variables(void) new_model = MODEL_AGB; else if (strcmp(var.value, "Auto") == 0) new_model = MODEL_AUTO; - if (GB_is_inited(&gb1) && new_model != model) { + if (GB_is_inited(&gb[0]) && new_model != model) { model = new_model; init_for_current_model(); } - if (GB_is_inited(&gb2) && new_model != model) { + if (GB_is_inited(&gb[1]) && new_model != model) { model = new_model; init_for_current_model(); } @@ -446,33 +440,40 @@ static void check_variables(void) model = new_model; } } + + var.key = "sameboy_link"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "enabled") == 0) + emulated_gbs = 2; + else + emulated_gbs = 2; + } } -int frames = 0; void retro_run(void) { bool updated = false; if (!frame_buf) return; - + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) check_variables(); - + vblank1_occurred = vblank2_occurred = false; signed delta = 0; while (!vblank1_occurred || !vblank2_occurred) { if (delta >= 0) { - delta -= GB_run(&gb1); + delta -= GB_run(&gb[0]); } else { - delta += GB_run(&gb2); + delta += GB_run(&gb[1]); } } - + video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH * sizeof(uint32_t)); - - frames++; } bool retro_load_game(const struct retro_game_info *info) @@ -502,15 +503,17 @@ bool retro_load_game(const struct retro_game_info *info) auto_model = (info->path[strlen(info->path) - 1] & ~0x20) == 'C' ? MODEL_CGB : MODEL_DMG; init_for_current_model(); - - if (GB_load_rom(&gb1,info->path)) { - log_cb(RETRO_LOG_INFO, "Failed to load ROM\n"); - return false; - } - if (GB_load_rom(&gb2,info->path)) { - log_cb(RETRO_LOG_INFO, "Failed to load ROM\n"); - return false; + + for (int i = 0; i < emulated_gbs; i++) + { + if (GB_load_rom(&gb[i],info->path)) + { + log_cb(RETRO_LOG_INFO, "Failed to load ROM\n"); + return false; + } } + + bool yes = true; environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &yes); @@ -523,6 +526,7 @@ bool retro_load_game(const struct retro_game_info *info) { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, { "sameboy_model", "Emulated Model; Auto|Game Boy|Game Boy Color|Game Boy Advance" }, + { "sameboy_link", "Link Cable; disabled|enabled" }, { NULL } }; @@ -534,8 +538,8 @@ bool retro_load_game(const struct retro_game_info *info) void retro_unload_game(void) { - GB_free(&gb1); - GB_free(&gb2); + for (int i = 0; i < emulated_gbs; i++) + GB_free(&gb[i]); } unsigned retro_get_region(void) @@ -550,7 +554,7 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t retro_serialize_size(void) { - return 2 * GB_get_save_state_size(&gb1); + return 2 * GB_get_save_state_size(&gb[0]); } bool retro_serialize(void *data, size_t size) @@ -558,8 +562,8 @@ bool retro_serialize(void *data, size_t size) void* gb1_data = (uint8_t*)malloc(0.5 * size * sizeof(uint8_t)); void* gb2_data = (uint8_t*)malloc(0.5 * size * sizeof(uint8_t)); - GB_save_state_to_buffer(&gb1, (uint8_t*) gb1_data); - GB_save_state_to_buffer(&gb2, (uint8_t*) gb2_data); + GB_save_state_to_buffer(&gb[0], (uint8_t*) gb1_data); + GB_save_state_to_buffer(&gb[1], (uint8_t*) gb2_data); memcpy(data, gb1_data, size / 2); memcpy(data + (size / 2), gb2_data, size / 2); @@ -578,8 +582,8 @@ bool retro_unserialize(const void *data, size_t size) memcpy (gb1_data, data, size / 2); memcpy (gb2_data, data + (size / 2), size / 2); - int ret1 = GB_load_state_from_buffer(&gb1, gb1_data, size / 2); - int ret2 = GB_load_state_from_buffer(&gb2, gb2_data, size / 2); + int ret1 = GB_load_state_from_buffer(&gb[0], gb1_data, size / 2); + int ret2 = GB_load_state_from_buffer(&gb[1], gb2_data, size / 2); if (ret1 == 0 && ret2 ==0) return true; @@ -593,24 +597,24 @@ void *retro_get_memory_data(unsigned type) switch(type) { case RETRO_MEMORY_SYSTEM_RAM: - data = gb1.ram; + data = gb[0].ram; break; case RETRO_MEMORY_SAVE_RAM: - if (gb1.cartridge_type->has_battery && gb1.mbc_ram_size != 0) + if (gb[0].cartridge_type->has_battery && gb[0].mbc_ram_size != 0) { - data = gb1.mbc_ram; - /* let's copy the save to gb2 so it can save independently */ - memcpy(gb2.mbc_ram, gb1.mbc_ram, gb1.mbc_ram_size); + data = gb[0].mbc_ram; + /* let's copy the save to gb[1] so it can save independently */ + memcpy(gb[1].mbc_ram, gb[0].mbc_ram, gb[0].mbc_ram_size); } else data = NULL; break; case RETRO_MEMORY_VIDEO_RAM: - data = gb1.vram; + data = gb[0].vram; break; case RETRO_MEMORY_RTC: - if(gb1.cartridge_type->has_battery) - data = &gb1.rtc_real; + if(gb[0].cartridge_type->has_battery) + data = &gb[0].rtc_real; else data = NULL; break; @@ -626,20 +630,20 @@ size_t retro_get_memory_size(unsigned type) switch(type) { case RETRO_MEMORY_SYSTEM_RAM: - size = gb1.ram_size; + size = gb[0].ram_size; break; case RETRO_MEMORY_SAVE_RAM: - if (gb1.cartridge_type->has_battery && gb1.mbc_ram_size != 0) - size = gb1.mbc_ram_size; + if (gb[0].cartridge_type->has_battery && gb[0].mbc_ram_size != 0) + size = gb[0].mbc_ram_size; else size = 0; break; case RETRO_MEMORY_VIDEO_RAM: - size = gb1.vram_size; + size = gb[0].vram_size; break; case RETRO_MEMORY_RTC: - if(gb1.cartridge_type->has_battery) - size = sizeof (gb1.rtc_real); + if(gb[0].cartridge_type->has_battery) + size = sizeof (gb[0].rtc_real); else size = 0; break; From 52634b80230226c5a9fdbc60bf4796106595dcb4 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 31 Jan 2018 21:13:44 -0500 Subject: [PATCH 07/31] add layout core option --- libretro/libretro.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 38d8a9f..fad47e6 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -45,7 +45,11 @@ enum model { static enum model model = MODEL_AUTO; static enum model auto_model = MODEL_CGB; -static uint32_t *frame_buf; + +enum layout { + LAYOUT_TOP_DOWN, + LAYOUT_LEFT_RIGHT +}; static uint32_t *frame_buf = NULL; static struct retro_log_callback logging; @@ -56,7 +60,8 @@ static retro_audio_sample_batch_t audio_batch_cb; static retro_input_poll_t input_poll_cb; static retro_input_state_t input_state_cb; -static unsigned emulated_gbs = 2; +static unsigned emulated_devices = 2; +static unsigned layout = 0; signed short soundbuf[1024 * 2]; @@ -242,7 +247,7 @@ void retro_set_video_refresh(retro_video_refresh_t cb) void retro_reset(void) { - for (int i = 0; i < emulated_gbs; i++) + for (int i = 0; i < emulated_devices; i++) GB_reset(&gb[i]); } @@ -280,7 +285,7 @@ static void init_for_current_model(void) effective_model = auto_model; } - for (i = 0; i < emulated_gbs; i++) + for (i = 0; i < emulated_devices; i++) { if (GB_is_inited(&gb[i])) GB_switch_model_and_reset(&gb1, effective_model != MODEL_DMG); @@ -302,7 +307,7 @@ static void init_for_current_model(void) snprintf(buf, sizeof(buf), "%s%c%s_boot.bin", retro_system_directory, slash, model_name); log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf); - for (i = 0; i < emulated_gbs; i++) + for (i = 0; i < emulated_devices; i++) { if (GB_load_boot_rom(&gb[i], buf)) GB_load_boot_rom_from_buffer(&gb[i], boot_code, boot_length); @@ -446,9 +451,19 @@ static void check_variables(void) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - emulated_gbs = 2; + emulated_devices = 2; else - emulated_gbs = 2; + emulated_devices = 2; + } + + var.key = "sameboy_link_layout"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "top-down") == 0) + layout = LAYOUT_TOP_DOWN; + else + layout = LAYOUT_LEFT_RIGHT; } } @@ -504,7 +519,7 @@ bool retro_load_game(const struct retro_game_info *info) auto_model = (info->path[strlen(info->path) - 1] & ~0x20) == 'C' ? MODEL_CGB : MODEL_DMG; init_for_current_model(); - for (int i = 0; i < emulated_gbs; i++) + for (int i = 0; i < emulated_devices; i++) { if (GB_load_rom(&gb[i],info->path)) { @@ -527,6 +542,7 @@ bool retro_load_game(const struct retro_game_info *info) { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, { "sameboy_model", "Emulated Model; Auto|Game Boy|Game Boy Color|Game Boy Advance" }, { "sameboy_link", "Link Cable; disabled|enabled" }, + { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, { NULL } }; @@ -538,7 +554,7 @@ bool retro_load_game(const struct retro_game_info *info) void retro_unload_game(void) { - for (int i = 0; i < emulated_gbs; i++) + for (int i = 0; i < emulated_devices; i++) GB_free(&gb[i]); } From f7d129bd2434c110d7da2c3a5c25e3861ad77ee7 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 31 Jan 2018 22:06:41 -0500 Subject: [PATCH 08/31] separate core options for single and linked mode --- libretro/libretro.c | 261 +++++++++++++++++++++++++++++++------------- 1 file changed, 186 insertions(+), 75 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index fad47e6..2eaef49 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -51,6 +51,7 @@ enum layout { LAYOUT_LEFT_RIGHT }; +static enum model model[2]; static uint32_t *frame_buf = NULL; static struct retro_log_callback logging; static retro_log_printf_t log_cb; @@ -288,29 +289,30 @@ static void init_for_current_model(void) for (i = 0; i < emulated_devices; i++) { if (GB_is_inited(&gb[i])) - GB_switch_model_and_reset(&gb1, effective_model != MODEL_DMG); + GB_switch_model_and_reset(&gb[i], effective_model[i] != MODEL_DMG); else { - if (effective_model == MODEL_DMG) + if (effective_model[i] == MODEL_DMG) GB_init(&gb[i]); else GB_init_cgb(&gb[i]); } + const char *model_name = (const char *[]){"dmg", "cgb", "agb"}[model[i]]; + const unsigned char *boot_code = (const unsigned char *[]){dmg_boot, cgb_boot, agb_boot}[model[i]]; + unsigned boot_length = (unsigned []){dmg_boot_length, cgb_boot_length, agb_boot_length}[model[i]]; + + char buf[256]; + snprintf(buf, sizeof(buf), "%s%c%s_boot.bin", retro_system_directory, slash, model_name); + log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf); + if (GB_load_boot_rom(&gb[i], buf)) + GB_load_boot_rom_from_buffer(&gb[i], boot_code, boot_length); } - const char *model_name = (const char *[]){"dmg", "cgb", "agb"}[model]; - const unsigned char *boot_code = (const unsigned char *[]){dmg_boot, cgb_boot, agb_boot}[model]; - unsigned boot_length = (unsigned []){dmg_boot_length, cgb_boot_length, agb_boot_length}[model]; - - char buf[256]; - snprintf(buf, sizeof(buf), "%s%c%s_boot.bin", retro_system_directory, slash, model_name); - log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf); + for (i = 0; i < emulated_devices; i++) { - if (GB_load_boot_rom(&gb[i], buf)) - GB_load_boot_rom_from_buffer(&gb[i], boot_code, boot_length); GB_set_user_data(&gb[i], (void*)NULL); GB_set_pixels_output(&gb[i],(unsigned int*)(frame_buf + i * VIDEO_PIXELS)); GB_set_rgb_encode_callback(&gb[i], rgb_encode); @@ -369,83 +371,172 @@ static void init_for_current_model(void) environ_cb(RETRO_ENVIRONMENT_SET_MEMORY_MAPS, &mmaps); } -static void check_variables(void) +static void check_variables(bool link) { struct retro_variable var = {0}; - var.key = "sameboy_color_correction_mode"; - var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb[0])) + if (!link) { - if (strcmp(var.value, "off") == 0) + var.key = "sameboy_color_correction_mode"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb[0])) { - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_DISABLED); - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_DISABLED); + if (strcmp(var.value, "off") == 0) + { + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_DISABLED); + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_DISABLED); + } + else if (strcmp(var.value, "correct curves") == 0) + { + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_CORRECT_CURVES); + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_CORRECT_CURVES); + } + else if (strcmp(var.value, "emulate hardware") == 0) + { + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_EMULATE_HARDWARE); + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_EMULATE_HARDWARE); + } + else if (strcmp(var.value, "preserve brightness") == 0) + { + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + } } - else if (strcmp(var.value, "correct curves") == 0) + + var.key = "sameboy_high_pass_filter_mode"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_CORRECT_CURVES); - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_CORRECT_CURVES); + if (strcmp(var.value, "off") == 0) + { + GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_OFF); + GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_OFF); + } + else if (strcmp(var.value, "accurate") == 0) + { + GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_ACCURATE); + GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_ACCURATE); + } + else if (strcmp(var.value, "remove dc offset") == 0) + { + GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_REMOVE_DC_OFFSET); + GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_REMOVE_DC_OFFSET); + } } - else if (strcmp(var.value, "emulate hardware") == 0) + + var.key = "sameboy_model"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_EMULATE_HARDWARE); - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_EMULATE_HARDWARE); - } - else if (strcmp(var.value, "preserve brightness") == 0) - { - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + enum model new_model = model[0]; + if (strcmp(var.value, "Game Boy") == 0) + new_model = MODEL_DMG; + else if (strcmp(var.value, "Game Boy Color") == 0) + new_model = MODEL_CGB; + else if (strcmp(var.value, "Game Boy Advance") == 0) + new_model = MODEL_AGB; + else if (strcmp(var.value, "Auto") == 0) + new_model = MODEL_AUTO; + if (GB_is_inited(&gb[0]) && new_model != model[0]) { + model[0] = new_model; + init_for_current_model(); + } + if (GB_is_inited(&gb[1]) && new_model != model[0]) { + model[0] = new_model; + init_for_current_model(); + } } } - - var.key = "sameboy_high_pass_filter_mode"; - var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + else { - if (strcmp(var.value, "off") == 0) + var.key = "sameboy_color_correction_mode_1"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb[0])) { - GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_OFF); - GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_OFF); + if (strcmp(var.value, "off") == 0) + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_DISABLED); + else if (strcmp(var.value, "correct curves") == 0) + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_CORRECT_CURVES); + else if (strcmp(var.value, "emulate hardware") == 0) + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_EMULATE_HARDWARE); + else if (strcmp(var.value, "preserve brightness") == 0) + GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); } - else if (strcmp(var.value, "accurate") == 0) - { - GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_ACCURATE); - GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_ACCURATE); - } - else if (strcmp(var.value, "remove dc offset") == 0) - { - GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_REMOVE_DC_OFFSET); - GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_REMOVE_DC_OFFSET); - } - } - var.key = "sameboy_model"; - var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - { - enum model new_model = model; - if (strcmp(var.value, "Game Boy") == 0) - new_model = MODEL_DMG; - else if (strcmp(var.value, "Game Boy Color") == 0) - new_model = MODEL_CGB; - else if (strcmp(var.value, "Game Boy Advance") == 0) - new_model = MODEL_AGB; - else if (strcmp(var.value, "Auto") == 0) - new_model = MODEL_AUTO; - if (GB_is_inited(&gb[0]) && new_model != model) { - model = new_model; - init_for_current_model(); + var.key = "sameboy_color_correction_mode_2"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb[1])) + { + if (strcmp(var.value, "off") == 0) + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_DISABLED); + else if (strcmp(var.value, "correct curves") == 0) + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_CORRECT_CURVES); + else if (strcmp(var.value, "emulate hardware") == 0) + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_EMULATE_HARDWARE); + else if (strcmp(var.value, "preserve brightness") == 0) + GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); } - if (GB_is_inited(&gb[1]) && new_model != model) { - model = new_model; - init_for_current_model(); - } - else { - model = new_model; - } - } + var.key = "sameboy_high_pass_filter_mode_1"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "off") == 0) + GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_OFF); + else if (strcmp(var.value, "accurate") == 0) + GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_ACCURATE); + else if (strcmp(var.value, "remove dc offset") == 0) + GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_REMOVE_DC_OFFSET); + } + + var.key = "sameboy_high_pass_filter_mode_2"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "off") == 0) + GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_OFF); + else if (strcmp(var.value, "accurate") == 0) + GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_ACCURATE); + else if (strcmp(var.value, "remove dc offset") == 0) + GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_REMOVE_DC_OFFSET); + } + + var.key = "sameboy_model_1"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + enum model new_model = model[0]; + if (strcmp(var.value, "Game Boy") == 0) + new_model = MODEL_DMG; + else if (strcmp(var.value, "Game Boy Color") == 0) + new_model = MODEL_CGB; + else if (strcmp(var.value, "Game Boy Advance") == 0) + new_model = MODEL_AGB; + if (GB_is_inited(&gb[0]) && new_model != model[0]) { + model[0] = new_model; + init_for_current_model(); + } + } + + var.key = "sameboy_model_2"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + enum model new_model = model[0]; + if (strcmp(var.value, "Game Boy") == 0) + new_model = MODEL_DMG; + else if (strcmp(var.value, "Game Boy Color") == 0) + new_model = MODEL_CGB; + else if (strcmp(var.value, "Game Boy Advance") == 0) + new_model = MODEL_AGB; + if (GB_is_inited(&gb[1]) && new_model != model[0]) { + model[0] = new_model; + init_for_current_model(); + } + } + + } + var.key = "sameboy_link"; var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) @@ -475,7 +566,7 @@ void retro_run(void) return; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) - check_variables(); + check_variables(emulated_devices == 2 ? true : false); vblank1_occurred = vblank2_occurred = false; signed delta = 0; @@ -491,6 +582,27 @@ void retro_run(void) video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH * sizeof(uint32_t)); } +static const struct retro_variable vars[] = { + { "sameboy_link", "Link Cable; disabled|enabled" }, + { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, + { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, + { "sameboy_model", "Emulated Model; Game Boy Color|Game Boy Advance|Game Boy" }, + { NULL } +}; +static const struct retro_variable vars_link[] = { + { "sameboy_link", "Link Cable; disabled|enabled" }, + { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, + { "sameboy_model_1", "Emulated Model for GB #1; Game Boy Color|Game Boy Advance|Game Boy" }, + { "sameboy_model_2", "Emulated Model for GB #2; Game Boy Color|Game Boy Advance|Game Boy" }, + { "sameboy_color_correction_mode_1", "Color Correction for GB #1; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_color_correction_mode_2", "Color Correction for GB #2; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_high_pass_filter_mode_1", "High Pass Filter for GB #1; off|accurate|remove dc offset" }, + { "sameboy_high_pass_filter_mode_2", "High Pass Filter for GB #2; off|accurate|remove dc offset" }, + + { NULL } +}; + bool retro_load_game(const struct retro_game_info *info) { struct retro_input_descriptor desc[] = { @@ -528,7 +640,6 @@ bool retro_load_game(const struct retro_game_info *info) } } - bool yes = true; environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &yes); @@ -546,8 +657,8 @@ bool retro_load_game(const struct retro_game_info *info) { NULL } }; - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars); - check_variables(); + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); + check_variables(emulated_devices == 2 ? true : false); return true; } From 7ee063da28802eaa2539ec0b15f1bf43cedd4c4b Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 31 Jan 2018 22:42:26 -0500 Subject: [PATCH 09/31] single mode works --- libretro/libretro.c | 382 +++++++++++++++++++++----------------------- 1 file changed, 183 insertions(+), 199 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 2eaef49..2ca3ecb 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -61,7 +61,7 @@ static retro_audio_sample_batch_t audio_batch_cb; static retro_input_poll_t input_poll_cb; static retro_input_state_t input_state_cb; -static unsigned emulated_devices = 2; +static unsigned emulated_devices = 1; static unsigned layout = 0; signed short soundbuf[1024 * 2]; @@ -125,7 +125,6 @@ static void audio_callback(void *gb) } } - static void vblank1(GB_gameboy_t *gb) { vblank1_occurred = true; @@ -140,119 +139,6 @@ static void vblank2(GB_gameboy_t *gb) //audio_callback(gb); } -static uint32_t rgb_encode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b) -{ - return r<<16|g<<8|b; -} - -static retro_environment_t environ_cb; - -void retro_init(void) -{ - frame_buf = (uint32_t*)malloc(2 * VIDEO_PIXELS * sizeof(uint32_t)); - const char *dir = NULL; - - if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir) - snprintf(retro_system_directory, sizeof(retro_system_directory), "%s", dir); - else - snprintf(retro_system_directory, sizeof(retro_system_directory), "%s", "."); - - if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) - snprintf(retro_save_directory, sizeof(retro_save_directory), "%s", dir); - else - snprintf(retro_save_directory, sizeof(retro_save_directory), "%s", "."); -} - -void retro_deinit(void) -{ - free(frame_buf); - frame_buf = NULL; -} - -unsigned retro_api_version(void) -{ - return RETRO_API_VERSION; -} - -void retro_set_controller_port_device(unsigned port, unsigned device) -{ - log_cb(RETRO_LOG_INFO, "Plugging device %u into port %u.\n", device, port); -} - -void retro_get_system_info(struct retro_system_info *info) -{ - memset(info, 0, sizeof(*info)); - info->library_name = "SameBoy"; -#ifdef GIT_VERSION - info->library_version = SAMEBOY_CORE_VERSION GIT_VERSION; -#else - info->library_version = SAMEBOY_CORE_VERSION; -#endif - info->need_fullpath = true; - info->valid_extensions = "gb|gbc"; -} - -void retro_get_system_av_info(struct retro_system_av_info *info) -{ - struct retro_game_geometry geom = { VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH, VIDEO_HEIGHT * 2 ,160.0 / 288.0 }; - struct retro_system_timing timing = { FRAME_RATE, AUDIO_FREQUENCY }; - - info->geometry = geom; - info->timing = timing; - -} - -void retro_set_environment(retro_environment_t cb) -{ - environ_cb = cb; - - if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging)) - log_cb = logging.log; - else - log_cb = fallback_log; - - static const struct retro_controller_description controllers[] = { - { "Nintendo Gameboy", RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 0) }, - }; - - static const struct retro_controller_info ports[] = { - { controllers, 1 }, - { NULL, 0 }, - }; - cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); -} - -void retro_set_audio_sample(retro_audio_sample_t cb) -{ -} - -void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb) -{ - audio_batch_cb = cb; -} - -void retro_set_input_poll(retro_input_poll_t cb) -{ - input_poll_cb = cb; -} - -void retro_set_input_state(retro_input_state_t cb) -{ - input_state_cb = cb; -} - -void retro_set_video_refresh(retro_video_refresh_t cb) -{ - video_cb = cb; -} - -void retro_reset(void) -{ - for (int i = 0; i < emulated_devices; i++) - GB_reset(&gb[i]); - -} - static uint8_t byte_to_send1 = 0xFF, byte_to_send2 = 0xFF; static void serial_start1(GB_gameboy_t *gb, uint8_t byte_received) @@ -279,6 +165,33 @@ static uint8_t serial_end2(GB_gameboy_t *gb) return ret; } +static uint32_t rgb_encode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b) +{ + return r<<16|g<<8|b; +} + +static retro_environment_t environ_cb; + +static const struct retro_variable vars[] = { + { "sameboy_link", "Link Cable; disabled|enabled" }, + { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, + { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, + { "sameboy_model", "Emulated Model; Game Boy Color|Game Boy Advance|Game Boy" }, + { NULL } +}; +static const struct retro_variable vars_link[] = { + { "sameboy_link", "Link Cable; disabled|enabled" }, + { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, + { "sameboy_model_1", "Emulated Model for GB #1; Game Boy Color|Game Boy Advance|Game Boy" }, + { "sameboy_model_2", "Emulated Model for GB #2; Game Boy Color|Game Boy Advance|Game Boy" }, + { "sameboy_color_correction_mode_1", "Color Correction for GB #1; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_color_correction_mode_2", "Color Correction for GB #2; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_high_pass_filter_mode_1", "High Pass Filter for GB #1; off|accurate|remove dc offset" }, + { "sameboy_high_pass_filter_mode_2", "High Pass Filter for GB #2; off|accurate|remove dc offset" }, + { NULL } +}; + static void init_for_current_model(void) { enum model effective_model = model; @@ -307,12 +220,6 @@ static void init_for_current_model(void) log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf); if (GB_load_boot_rom(&gb[i], buf)) GB_load_boot_rom_from_buffer(&gb[i], boot_code, boot_length); - } - - - - for (i = 0; i < emulated_devices; i++) - { GB_set_user_data(&gb[i], (void*)NULL); GB_set_pixels_output(&gb[i],(unsigned int*)(frame_buf + i * VIDEO_PIXELS)); GB_set_rgb_encode_callback(&gb[i], rgb_encode); @@ -321,11 +228,14 @@ static void init_for_current_model(void) /* todo: attempt to make these more generic */ GB_set_vblank_callback(&gb[0], (GB_vblank_callback_t) vblank1); - GB_set_vblank_callback(&gb[1], (GB_vblank_callback_t) vblank2); - GB_set_serial_transfer_start_callback(&gb[0], serial_start1); - GB_set_serial_transfer_end_callback(&gb[0], serial_end1); - GB_set_serial_transfer_start_callback(&gb[1], serial_start2); - GB_set_serial_transfer_end_callback(&gb[1], serial_end2); + if (emulated_devices == 2) + { + GB_set_vblank_callback(&gb[1], (GB_vblank_callback_t) vblank2); + GB_set_serial_transfer_start_callback(&gb[0], serial_start1); + GB_set_serial_transfer_end_callback(&gb[0], serial_end1); + GB_set_serial_transfer_start_callback(&gb[1], serial_start2); + GB_set_serial_transfer_end_callback(&gb[1], serial_end2); + } struct retro_memory_descriptor descs[7]; size_t size; @@ -382,25 +292,13 @@ static void check_variables(bool link) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb[0])) { if (strcmp(var.value, "off") == 0) - { GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_DISABLED); - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_DISABLED); - } else if (strcmp(var.value, "correct curves") == 0) - { GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_CORRECT_CURVES); - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_CORRECT_CURVES); - } else if (strcmp(var.value, "emulate hardware") == 0) - { GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_EMULATE_HARDWARE); - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_EMULATE_HARDWARE); - } else if (strcmp(var.value, "preserve brightness") == 0) - { GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); - } } var.key = "sameboy_high_pass_filter_mode"; @@ -408,20 +306,11 @@ static void check_variables(bool link) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "off") == 0) - { GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_OFF); - GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_OFF); - } else if (strcmp(var.value, "accurate") == 0) - { GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_ACCURATE); - GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_ACCURATE); - } else if (strcmp(var.value, "remove dc offset") == 0) - { GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_REMOVE_DC_OFFSET); - GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_REMOVE_DC_OFFSET); - } } var.key = "sameboy_model"; @@ -441,10 +330,6 @@ static void check_variables(bool link) model[0] = new_model; init_for_current_model(); } - if (GB_is_inited(&gb[1]) && new_model != model[0]) { - model[0] = new_model; - init_for_current_model(); - } } } else @@ -544,7 +429,7 @@ static void check_variables(bool link) if (strcmp(var.value, "enabled") == 0) emulated_devices = 2; else - emulated_devices = 2; + emulated_devices = 1; } var.key = "sameboy_link_layout"; @@ -558,6 +443,115 @@ static void check_variables(bool link) } } +void retro_init(void) +{ + frame_buf = (uint32_t*)malloc(2 * VIDEO_PIXELS * sizeof(uint32_t)); + const char *dir = NULL; + + if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir) + snprintf(retro_system_directory, sizeof(retro_system_directory), "%s", dir); + else + snprintf(retro_system_directory, sizeof(retro_system_directory), "%s", "."); + + if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) + snprintf(retro_save_directory, sizeof(retro_save_directory), "%s", dir); + else + snprintf(retro_save_directory, sizeof(retro_save_directory), "%s", "."); + + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); + check_variables(emulated_devices == 2 ? true : false); +} + +void retro_deinit(void) +{ + free(frame_buf); + frame_buf = NULL; +} + +unsigned retro_api_version(void) +{ + return RETRO_API_VERSION; +} + +void retro_set_controller_port_device(unsigned port, unsigned device) +{ + log_cb(RETRO_LOG_INFO, "Plugging device %u into port %u.\n", device, port); +} + +void retro_get_system_info(struct retro_system_info *info) +{ + memset(info, 0, sizeof(*info)); + info->library_name = "SameBoy"; +#ifdef GIT_VERSION + info->library_version = SAMEBOY_CORE_VERSION GIT_VERSION; +#else + info->library_version = SAMEBOY_CORE_VERSION; +#endif + info->need_fullpath = true; + info->valid_extensions = "gb|gbc"; +} + +void retro_get_system_av_info(struct retro_system_av_info *info) +{ + struct retro_game_geometry geom = { VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH, VIDEO_HEIGHT * 2 ,160.0 / 288.0 }; + struct retro_system_timing timing = { FRAME_RATE, AUDIO_FREQUENCY }; + + info->geometry = geom; + info->timing = timing; + +} + +void retro_set_environment(retro_environment_t cb) +{ + environ_cb = cb; + + if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging)) + log_cb = logging.log; + else + log_cb = fallback_log; + + static const struct retro_controller_description controllers[] = { + { "Nintendo Gameboy", RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 0) }, + }; + + static const struct retro_controller_info ports[] = { + { controllers, 1 }, + { NULL, 0 }, + }; + cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); +} + +void retro_set_audio_sample(retro_audio_sample_t cb) +{ +} + +void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb) +{ + audio_batch_cb = cb; +} + +void retro_set_input_poll(retro_input_poll_t cb) +{ + input_poll_cb = cb; +} + +void retro_set_input_state(retro_input_state_t cb) +{ + input_state_cb = cb; +} + +void retro_set_video_refresh(retro_video_refresh_t cb) +{ + video_cb = cb; +} + +void retro_reset(void) +{ + for (int i = 0; i < emulated_devices; i++) + GB_reset(&gb[i]); + +} + void retro_run(void) { bool updated = false; @@ -570,39 +564,23 @@ void retro_run(void) vblank1_occurred = vblank2_occurred = false; signed delta = 0; + if (emulated_devices == 2) + { while (!vblank1_occurred || !vblank2_occurred) { - if (delta >= 0) { - delta -= GB_run(&gb[0]); - } - else { - delta += GB_run(&gb[1]); + if (delta >= 0) { + delta -= GB_run(&gb[0]); + } + else { + delta += GB_run(&gb[1]); + } } } + else + GB_run_frame(&gb[0]); video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH * sizeof(uint32_t)); } -static const struct retro_variable vars[] = { - { "sameboy_link", "Link Cable; disabled|enabled" }, - { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, - { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, - { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, - { "sameboy_model", "Emulated Model; Game Boy Color|Game Boy Advance|Game Boy" }, - { NULL } -}; -static const struct retro_variable vars_link[] = { - { "sameboy_link", "Link Cable; disabled|enabled" }, - { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, - { "sameboy_model_1", "Emulated Model for GB #1; Game Boy Color|Game Boy Advance|Game Boy" }, - { "sameboy_model_2", "Emulated Model for GB #2; Game Boy Color|Game Boy Advance|Game Boy" }, - { "sameboy_color_correction_mode_1", "Color Correction for GB #1; off|correct curves|emulate hardware|preserve brightness" }, - { "sameboy_color_correction_mode_2", "Color Correction for GB #2; off|correct curves|emulate hardware|preserve brightness" }, - { "sameboy_high_pass_filter_mode_1", "High Pass Filter for GB #1; off|accurate|remove dc offset" }, - { "sameboy_high_pass_filter_mode_2", "High Pass Filter for GB #2; off|accurate|remove dc offset" }, - - { NULL } -}; - bool retro_load_game(const struct retro_game_info *info) { struct retro_input_descriptor desc[] = { @@ -659,7 +637,6 @@ bool retro_load_game(const struct retro_game_info *info) environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); check_variables(emulated_devices == 2 ? true : false); - return true; } @@ -681,19 +658,23 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t retro_serialize_size(void) { - return 2 * GB_get_save_state_size(&gb[0]); + size_t size = 0; + for (int i = 0; i < emulated_devices; i++) + size += GB_get_save_state_size(&gb[i]); + + return size; } bool retro_serialize(void *data, size_t size) { - void* gb1_data = (uint8_t*)malloc(0.5 * size * sizeof(uint8_t)); - void* gb2_data = (uint8_t*)malloc(0.5 * size * sizeof(uint8_t)); - - GB_save_state_to_buffer(&gb[0], (uint8_t*) gb1_data); - GB_save_state_to_buffer(&gb[1], (uint8_t*) gb2_data); - - memcpy(data, gb1_data, size / 2); - memcpy(data + (size / 2), gb2_data, size / 2); + void* save_data[2]; + for (int i = 0; i < emulated_devices; i++) + { + save_data[i] = (uint8_t*)malloc(size * sizeof(uint8_t) / emulated_devices); + GB_save_state_to_buffer(&gb[i], (uint8_t*) save_data[i]); + memcpy(data + (size * i / emulated_devices), save_data[i], size / emulated_devices); + free(save_data[i]); + } if (data) return true; @@ -703,19 +684,22 @@ bool retro_serialize(void *data, size_t size) bool retro_unserialize(const void *data, size_t size) { - void* gb1_data = (uint8_t*)malloc(0.5 * size * sizeof(uint8_t)); - void* gb2_data = (uint8_t*)malloc(0.5 * size * sizeof(uint8_t)); + void* save_data[2]; + int ret; - memcpy (gb1_data, data, size / 2); - memcpy (gb2_data, data + (size / 2), size / 2); + for (int i = 0; i < emulated_devices; i++) + { + save_data[i] = (uint8_t*)malloc(size * sizeof(uint8_t)/ emulated_devices); + memcpy (save_data[i], data + (size * i / emulated_devices), size / emulated_devices); + ret = GB_load_state_from_buffer(&gb[i], save_data[i], size / emulated_devices); + free(save_data[i]); - int ret1 = GB_load_state_from_buffer(&gb[0], gb1_data, size / 2); - int ret2 = GB_load_state_from_buffer(&gb[1], gb2_data, size / 2); + if (ret != 0) + return false; + } + + return true; - if (ret1 == 0 && ret2 ==0) - return true; - else - return false; } void *retro_get_memory_data(unsigned type) @@ -731,7 +715,7 @@ void *retro_get_memory_data(unsigned type) { data = gb[0].mbc_ram; /* let's copy the save to gb[1] so it can save independently */ - memcpy(gb[1].mbc_ram, gb[0].mbc_ram, gb[0].mbc_ram_size); + //memcpy(gb[1].mbc_ram, gb[0].mbc_ram, gb[0].mbc_ram_size); } else data = NULL; From 8b506e84fdb76b3f1517305934342819d1262371 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 31 Jan 2018 23:06:14 -0500 Subject: [PATCH 10/31] fix changing mode between link enabled and disabled --- libretro/libretro.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 2ca3ecb..741ee79 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -62,6 +62,7 @@ static retro_input_poll_t input_poll_cb; static retro_input_state_t input_state_cb; static unsigned emulated_devices = 1; +static unsigned pre_init = 1; static unsigned layout = 0; signed short soundbuf[1024 * 2]; @@ -173,7 +174,7 @@ static uint32_t rgb_encode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b) static retro_environment_t environ_cb; static const struct retro_variable vars[] = { - { "sameboy_link", "Link Cable; disabled|enabled" }, + { "sameboy_link", "Link Cable (restart); disabled|enabled" }, { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, @@ -421,15 +422,18 @@ static void check_variables(bool link) } } - + var.key = "sameboy_link"; var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { + int old_emulated_devices = emulated_devices; if (strcmp(var.value, "enabled") == 0) emulated_devices = 2; else emulated_devices = 1; + if (pre_init == 0 && emulated_devices != old_emulated_devices) + emulated_devices = old_emulated_devices; } var.key = "sameboy_link_layout"; @@ -460,6 +464,7 @@ void retro_init(void) environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); check_variables(emulated_devices == 2 ? true : false); + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); } void retro_deinit(void) @@ -555,6 +560,7 @@ void retro_reset(void) void retro_run(void) { bool updated = false; + pre_init = 0; if (!frame_buf) return; @@ -658,15 +664,14 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t retro_serialize_size(void) { - size_t size = 0; - for (int i = 0; i < emulated_devices; i++) - size += GB_get_save_state_size(&gb[i]); - - return size; + return 2 * GB_get_save_state_size(&gb[0]); } bool retro_serialize(void *data, size_t size) { + if (pre_init == 1) + return false; + void* save_data[2]; for (int i = 0; i < emulated_devices; i++) { From 457b3b3f065a8eebbd91a9558424865684f39dd4 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 31 Jan 2018 23:09:40 -0500 Subject: [PATCH 11/31] change viewport size --- libretro/libretro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 741ee79..fe6235c 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -498,7 +498,7 @@ void retro_get_system_info(struct retro_system_info *info) void retro_get_system_av_info(struct retro_system_av_info *info) { - struct retro_game_geometry geom = { VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH, VIDEO_HEIGHT * 2 ,160.0 / 288.0 }; + struct retro_game_geometry geom = { VIDEO_WIDTH, VIDEO_HEIGHT * emulated_devices, VIDEO_WIDTH, VIDEO_HEIGHT * emulated_devices , VIDEO_WIDTH / (emulated_devices * VIDEO_HEIGHT) }; struct retro_system_timing timing = { FRAME_RATE, AUDIO_FREQUENCY }; info->geometry = geom; @@ -584,7 +584,7 @@ void retro_run(void) else GB_run_frame(&gb[0]); - video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * 2, VIDEO_WIDTH * sizeof(uint32_t)); + video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * emulated_devices, VIDEO_WIDTH * sizeof(uint32_t)); } bool retro_load_game(const struct retro_game_info *info) From 88dfb9a1594f2541c3c05266c463d45ad89915e5 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 31 Jan 2018 23:21:29 -0500 Subject: [PATCH 12/31] fix emulated model for slot 2 --- libretro/libretro.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index fe6235c..7e2c60a 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -408,15 +408,15 @@ static void check_variables(bool link) var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - enum model new_model = model[0]; + enum model new_model = model[1]; if (strcmp(var.value, "Game Boy") == 0) new_model = MODEL_DMG; else if (strcmp(var.value, "Game Boy Color") == 0) new_model = MODEL_CGB; else if (strcmp(var.value, "Game Boy Advance") == 0) new_model = MODEL_AGB; - if (GB_is_inited(&gb[1]) && new_model != model[0]) { - model[0] = new_model; + if (GB_is_inited(&gb[1]) && new_model != model[1]) { + model[1] = new_model; init_for_current_model(); } } From 945ee0bdb39e0ef2c6f096e12274d64197cbd576 Mon Sep 17 00:00:00 2001 From: radius Date: Thu, 1 Feb 2018 09:15:22 -0500 Subject: [PATCH 13/31] rename the array so it doesn't conflict with the function signature --- libretro/libretro.c | 156 ++++++++++++++++++++++---------------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 7e2c60a..9f937bc 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -71,7 +71,7 @@ char retro_system_directory[4096]; char retro_save_directory[4096]; char retro_game_path[4096]; -GB_gameboy_t gb[2]; +GB_gameboy_t gameboy[2]; extern const unsigned char dmg_boot[], cgb_boot[], agb_boot[]; extern const unsigned dmg_boot_length, cgb_boot_length, agb_boot_length; @@ -149,8 +149,8 @@ static void serial_start1(GB_gameboy_t *gb, uint8_t byte_received) static uint8_t serial_end1(GB_gameboy_t *gb) { - uint8_t ret = GB_serial_get_data(&gb[1]); - GB_serial_set_data(&gb[1], byte_to_send1); + uint8_t ret = GB_serial_get_data(&gameboy[1]); + GB_serial_set_data(&gameboy[1], byte_to_send1); return ret; } @@ -161,8 +161,8 @@ static void serial_start2(GB_gameboy_t *gb, uint8_t byte_received) static uint8_t serial_end2(GB_gameboy_t *gb) { - uint8_t ret = GB_serial_get_data(&gb[0]); - GB_serial_set_data(&gb[0], byte_to_send2); + uint8_t ret = GB_serial_get_data(&gameboy[0]); + GB_serial_set_data(&gameboy[0], byte_to_send2); return ret; } @@ -202,15 +202,15 @@ static void init_for_current_model(void) for (i = 0; i < emulated_devices; i++) { - if (GB_is_inited(&gb[i])) - GB_switch_model_and_reset(&gb[i], effective_model[i] != MODEL_DMG); + if (GB_is_inited(&gameboy[i])) + GB_switch_model_and_reset(&gameboy[i], effective_model[i] != MODEL_DMG); else { if (effective_model[i] == MODEL_DMG) - GB_init(&gb[i]); + GB_init(&gameboy[i]); else - GB_init_cgb(&gb[i]); + GB_init_cgb(&gameboy[i]); } const char *model_name = (const char *[]){"dmg", "cgb", "agb"}[model[i]]; const unsigned char *boot_code = (const unsigned char *[]){dmg_boot, cgb_boot, agb_boot}[model[i]]; @@ -219,23 +219,23 @@ static void init_for_current_model(void) char buf[256]; snprintf(buf, sizeof(buf), "%s%c%s_boot.bin", retro_system_directory, slash, model_name); log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf); - if (GB_load_boot_rom(&gb[i], buf)) - GB_load_boot_rom_from_buffer(&gb[i], boot_code, boot_length); - GB_set_user_data(&gb[i], (void*)NULL); - GB_set_pixels_output(&gb[i],(unsigned int*)(frame_buf + i * VIDEO_PIXELS)); - GB_set_rgb_encode_callback(&gb[i], rgb_encode); - GB_set_sample_rate(&gb[i], AUDIO_FREQUENCY); + if (GB_load_boot_rom(&gameboy[i], buf)) + GB_load_boot_rom_from_buffer(&gameboy[i], boot_code, boot_length); + GB_set_user_data(&gameboy[i], (void*)NULL); + GB_set_pixels_output(&gameboy[i],(unsigned int*)(frame_buf + i * VIDEO_PIXELS)); + GB_set_rgb_encode_callback(&gameboy[i], rgb_encode); + GB_set_sample_rate(&gameboy[i], AUDIO_FREQUENCY); } /* todo: attempt to make these more generic */ - GB_set_vblank_callback(&gb[0], (GB_vblank_callback_t) vblank1); + GB_set_vblank_callback(&gameboy[0], (GB_vblank_callback_t) vblank1); if (emulated_devices == 2) { - GB_set_vblank_callback(&gb[1], (GB_vblank_callback_t) vblank2); - GB_set_serial_transfer_start_callback(&gb[0], serial_start1); - GB_set_serial_transfer_end_callback(&gb[0], serial_end1); - GB_set_serial_transfer_start_callback(&gb[1], serial_start2); - GB_set_serial_transfer_end_callback(&gb[1], serial_end2); + GB_set_vblank_callback(&gameboy[1], (GB_vblank_callback_t) vblank2); + GB_set_serial_transfer_start_callback(&gameboy[0], serial_start1); + GB_set_serial_transfer_end_callback(&gameboy[0], serial_end1); + GB_set_serial_transfer_start_callback(&gameboy[1], serial_start2); + GB_set_serial_transfer_end_callback(&gameboy[1], serial_end2); } struct retro_memory_descriptor descs[7]; @@ -247,32 +247,32 @@ static void init_for_current_model(void) i = 0; memset(descs, 0, sizeof(descs)); - descs[0].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_IE, &size, &bank); + descs[0].ptr = GB_get_direct_access(&gameboy[i], GB_DIRECT_ACCESS_IE, &size, &bank); descs[0].start = 0xFFFF; descs[0].len = 1; - descs[1].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_HRAM, &size, &bank); + descs[1].ptr = GB_get_direct_access(&gameboy[i], GB_DIRECT_ACCESS_HRAM, &size, &bank); descs[1].start = 0xFF80; descs[1].len = 0x0080; - descs[2].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_RAM, &size, &bank); + descs[2].ptr = GB_get_direct_access(&gameboy[i], GB_DIRECT_ACCESS_RAM, &size, &bank); descs[2].start = 0xC000; descs[2].len = 0x2000; - descs[3].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_CART_RAM, &size, &bank); + descs[3].ptr = GB_get_direct_access(&gameboy[i], GB_DIRECT_ACCESS_CART_RAM, &size, &bank); descs[3].start = 0xA000; descs[3].len = 0x2000; - descs[4].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_VRAM, &size, &bank); + descs[4].ptr = GB_get_direct_access(&gameboy[i], GB_DIRECT_ACCESS_VRAM, &size, &bank); descs[4].start = 0x8000; descs[4].len = 0x2000; - descs[5].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_ROM, &size, &bank); + descs[5].ptr = GB_get_direct_access(&gameboy[i], GB_DIRECT_ACCESS_ROM, &size, &bank); descs[5].start = 0x0000; descs[5].len = 0x4000; descs[5].flags = RETRO_MEMDESC_CONST; - descs[6].ptr = GB_get_direct_access(&gb[i], GB_DIRECT_ACCESS_OAM, &size, &bank); + descs[6].ptr = GB_get_direct_access(&gameboy[i], GB_DIRECT_ACCESS_OAM, &size, &bank); descs[6].start = 0xFE00; descs[6].len = 0x00A0; @@ -290,16 +290,16 @@ static void check_variables(bool link) { var.key = "sameboy_color_correction_mode"; var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb[0])) + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gameboy[0])) { if (strcmp(var.value, "off") == 0) - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_DISABLED); + GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_DISABLED); else if (strcmp(var.value, "correct curves") == 0) - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_CORRECT_CURVES); + GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_CORRECT_CURVES); else if (strcmp(var.value, "emulate hardware") == 0) - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_EMULATE_HARDWARE); + GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_EMULATE_HARDWARE); else if (strcmp(var.value, "preserve brightness") == 0) - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); } var.key = "sameboy_high_pass_filter_mode"; @@ -307,11 +307,11 @@ static void check_variables(bool link) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "off") == 0) - GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_OFF); + GB_set_highpass_filter_mode(&gameboy[0], GB_HIGHPASS_OFF); else if (strcmp(var.value, "accurate") == 0) - GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_ACCURATE); + GB_set_highpass_filter_mode(&gameboy[0], GB_HIGHPASS_ACCURATE); else if (strcmp(var.value, "remove dc offset") == 0) - GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_REMOVE_DC_OFFSET); + GB_set_highpass_filter_mode(&gameboy[0], GB_HIGHPASS_REMOVE_DC_OFFSET); } var.key = "sameboy_model"; @@ -327,7 +327,7 @@ static void check_variables(bool link) new_model = MODEL_AGB; else if (strcmp(var.value, "Auto") == 0) new_model = MODEL_AUTO; - if (GB_is_inited(&gb[0]) && new_model != model[0]) { + if (GB_is_inited(&gameboy[0]) && new_model != model[0]) { model[0] = new_model; init_for_current_model(); } @@ -337,30 +337,30 @@ static void check_variables(bool link) { var.key = "sameboy_color_correction_mode_1"; var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb[0])) + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gameboy[0])) { if (strcmp(var.value, "off") == 0) - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_DISABLED); + GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_DISABLED); else if (strcmp(var.value, "correct curves") == 0) - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_CORRECT_CURVES); + GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_CORRECT_CURVES); else if (strcmp(var.value, "emulate hardware") == 0) - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_EMULATE_HARDWARE); + GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_EMULATE_HARDWARE); else if (strcmp(var.value, "preserve brightness") == 0) - GB_set_color_correction_mode(&gb[0], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); } var.key = "sameboy_color_correction_mode_2"; var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb[1])) + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gameboy[1])) { if (strcmp(var.value, "off") == 0) - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_DISABLED); + GB_set_color_correction_mode(&gameboy[1], GB_COLOR_CORRECTION_DISABLED); else if (strcmp(var.value, "correct curves") == 0) - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_CORRECT_CURVES); + GB_set_color_correction_mode(&gameboy[1], GB_COLOR_CORRECTION_CORRECT_CURVES); else if (strcmp(var.value, "emulate hardware") == 0) - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_EMULATE_HARDWARE); + GB_set_color_correction_mode(&gameboy[1], GB_COLOR_CORRECTION_EMULATE_HARDWARE); else if (strcmp(var.value, "preserve brightness") == 0) - GB_set_color_correction_mode(&gb[1], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); + GB_set_color_correction_mode(&gameboy[1], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); } var.key = "sameboy_high_pass_filter_mode_1"; @@ -368,11 +368,11 @@ static void check_variables(bool link) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "off") == 0) - GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_OFF); + GB_set_highpass_filter_mode(&gameboy[0], GB_HIGHPASS_OFF); else if (strcmp(var.value, "accurate") == 0) - GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_ACCURATE); + GB_set_highpass_filter_mode(&gameboy[0], GB_HIGHPASS_ACCURATE); else if (strcmp(var.value, "remove dc offset") == 0) - GB_set_highpass_filter_mode(&gb[0], GB_HIGHPASS_REMOVE_DC_OFFSET); + GB_set_highpass_filter_mode(&gameboy[0], GB_HIGHPASS_REMOVE_DC_OFFSET); } var.key = "sameboy_high_pass_filter_mode_2"; @@ -380,11 +380,11 @@ static void check_variables(bool link) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "off") == 0) - GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_OFF); + GB_set_highpass_filter_mode(&gameboy[1], GB_HIGHPASS_OFF); else if (strcmp(var.value, "accurate") == 0) - GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_ACCURATE); + GB_set_highpass_filter_mode(&gameboy[1], GB_HIGHPASS_ACCURATE); else if (strcmp(var.value, "remove dc offset") == 0) - GB_set_highpass_filter_mode(&gb[1], GB_HIGHPASS_REMOVE_DC_OFFSET); + GB_set_highpass_filter_mode(&gameboy[1], GB_HIGHPASS_REMOVE_DC_OFFSET); } var.key = "sameboy_model_1"; @@ -398,7 +398,7 @@ static void check_variables(bool link) new_model = MODEL_CGB; else if (strcmp(var.value, "Game Boy Advance") == 0) new_model = MODEL_AGB; - if (GB_is_inited(&gb[0]) && new_model != model[0]) { + if (GB_is_inited(&gameboy[0]) && new_model != model[0]) { model[0] = new_model; init_for_current_model(); } @@ -415,7 +415,7 @@ static void check_variables(bool link) new_model = MODEL_CGB; else if (strcmp(var.value, "Game Boy Advance") == 0) new_model = MODEL_AGB; - if (GB_is_inited(&gb[1]) && new_model != model[1]) { + if (GB_is_inited(&gameboy[1]) && new_model != model[1]) { model[1] = new_model; init_for_current_model(); } @@ -553,7 +553,7 @@ void retro_set_video_refresh(retro_video_refresh_t cb) void retro_reset(void) { for (int i = 0; i < emulated_devices; i++) - GB_reset(&gb[i]); + GB_reset(&gameboy[i]); } @@ -574,15 +574,15 @@ void retro_run(void) { while (!vblank1_occurred || !vblank2_occurred) { if (delta >= 0) { - delta -= GB_run(&gb[0]); + delta -= GB_run(&gameboy[0]); } else { - delta += GB_run(&gb[1]); + delta += GB_run(&gameboy[1]); } } } else - GB_run_frame(&gb[0]); + GB_run_frame(&gameboy[0]); video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * emulated_devices, VIDEO_WIDTH * sizeof(uint32_t)); } @@ -617,7 +617,7 @@ bool retro_load_game(const struct retro_game_info *info) for (int i = 0; i < emulated_devices; i++) { - if (GB_load_rom(&gb[i],info->path)) + if (GB_load_rom(&gameboy[i],info->path)) { log_cb(RETRO_LOG_INFO, "Failed to load ROM\n"); return false; @@ -649,7 +649,7 @@ bool retro_load_game(const struct retro_game_info *info) void retro_unload_game(void) { for (int i = 0; i < emulated_devices; i++) - GB_free(&gb[i]); + GB_free(&gameboy[i]); } unsigned retro_get_region(void) @@ -664,7 +664,7 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t retro_serialize_size(void) { - return 2 * GB_get_save_state_size(&gb[0]); + return 2 * GB_get_save_state_size(&gameboy[0]); } bool retro_serialize(void *data, size_t size) @@ -676,7 +676,7 @@ bool retro_serialize(void *data, size_t size) for (int i = 0; i < emulated_devices; i++) { save_data[i] = (uint8_t*)malloc(size * sizeof(uint8_t) / emulated_devices); - GB_save_state_to_buffer(&gb[i], (uint8_t*) save_data[i]); + GB_save_state_to_buffer(&gameboy[i], (uint8_t*) save_data[i]); memcpy(data + (size * i / emulated_devices), save_data[i], size / emulated_devices); free(save_data[i]); } @@ -696,7 +696,7 @@ bool retro_unserialize(const void *data, size_t size) { save_data[i] = (uint8_t*)malloc(size * sizeof(uint8_t)/ emulated_devices); memcpy (save_data[i], data + (size * i / emulated_devices), size / emulated_devices); - ret = GB_load_state_from_buffer(&gb[i], save_data[i], size / emulated_devices); + ret = GB_load_state_from_buffer(&gameboy[i], save_data[i], size / emulated_devices); free(save_data[i]); if (ret != 0) @@ -713,24 +713,24 @@ void *retro_get_memory_data(unsigned type) switch(type) { case RETRO_MEMORY_SYSTEM_RAM: - data = gb[0].ram; + data = gameboy[0].ram; break; case RETRO_MEMORY_SAVE_RAM: - if (gb[0].cartridge_type->has_battery && gb[0].mbc_ram_size != 0) + if (gameboy[0].cartridge_type->has_battery && gameboy[0].mbc_ram_size != 0) { - data = gb[0].mbc_ram; - /* let's copy the save to gb[1] so it can save independently */ - //memcpy(gb[1].mbc_ram, gb[0].mbc_ram, gb[0].mbc_ram_size); + data = gameboy[0].mbc_ram; + /* 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); } else data = NULL; break; case RETRO_MEMORY_VIDEO_RAM: - data = gb[0].vram; + data = gameboy[0].vram; break; case RETRO_MEMORY_RTC: - if(gb[0].cartridge_type->has_battery) - data = &gb[0].rtc_real; + if(gameboy[0].cartridge_type->has_battery) + data = &gameboy[0].rtc_real; else data = NULL; break; @@ -746,20 +746,20 @@ size_t retro_get_memory_size(unsigned type) switch(type) { case RETRO_MEMORY_SYSTEM_RAM: - size = gb[0].ram_size; + size = gameboy[0].ram_size; break; case RETRO_MEMORY_SAVE_RAM: - if (gb[0].cartridge_type->has_battery && gb[0].mbc_ram_size != 0) - size = gb[0].mbc_ram_size; + 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 = gb[0].vram_size; + size = gameboy[0].vram_size; break; case RETRO_MEMORY_RTC: - if(gb[0].cartridge_type->has_battery) - size = sizeof (gb[0].rtc_real); + if(gameboy[0].cartridge_type->has_battery) + size = sizeof (gameboy[0].rtc_real); else size = 0; break; From 408bf5baab5d5a00b7698d766becb04460b03c39 Mon Sep 17 00:00:00 2001 From: radius Date: Thu, 1 Feb 2018 10:03:40 -0500 Subject: [PATCH 14/31] add audio output selection --- libretro/libretro.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 9f937bc..92c4cc7 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -46,11 +46,16 @@ enum model { static enum model model = MODEL_AUTO; static enum model auto_model = MODEL_CGB; -enum layout { +enum screen_layout { LAYOUT_TOP_DOWN, LAYOUT_LEFT_RIGHT }; +enum audio_out { + GB_1, + GB_2 +}; + static enum model model[2]; static uint32_t *frame_buf = NULL; static struct retro_log_callback logging; @@ -63,7 +68,8 @@ static retro_input_state_t input_state_cb; static unsigned emulated_devices = 1; static unsigned pre_init = 1; -static unsigned layout = 0; +static unsigned screen_layout = 0; +static unsigned audio_out = 0; signed short soundbuf[1024 * 2]; @@ -130,14 +136,16 @@ static void vblank1(GB_gameboy_t *gb) { vblank1_occurred = true; GB_update_keys_status(gb, 0); - audio_callback(gb); + if (audio_out == GB_1) + audio_callback(gb); } static void vblank2(GB_gameboy_t *gb) { vblank2_occurred = true; GB_update_keys_status(gb, 1); - //audio_callback(gb); + if (audio_out == GB_2) + audio_callback(gb); } static uint8_t byte_to_send1 = 0xFF, byte_to_send2 = 0xFF; @@ -175,7 +183,6 @@ static retro_environment_t environ_cb; static const struct retro_variable vars[] = { { "sameboy_link", "Link Cable (restart); disabled|enabled" }, - { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, { "sameboy_model", "Emulated Model; Game Boy Color|Game Boy Advance|Game Boy" }, @@ -184,6 +191,7 @@ static const struct retro_variable vars[] = { static const struct retro_variable vars_link[] = { { "sameboy_link", "Link Cable; disabled|enabled" }, { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, + { "sameboy_audio_output", "Audio output; GB #1|GB #2" }, { "sameboy_model_1", "Emulated Model for GB #1; Game Boy Color|Game Boy Advance|Game Boy" }, { "sameboy_model_2", "Emulated Model for GB #2; Game Boy Color|Game Boy Advance|Game Boy" }, { "sameboy_color_correction_mode_1", "Color Correction for GB #1; off|correct curves|emulate hardware|preserve brightness" }, @@ -441,9 +449,19 @@ static void check_variables(bool link) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "top-down") == 0) - layout = LAYOUT_TOP_DOWN; + screen_layout = LAYOUT_TOP_DOWN; else - layout = LAYOUT_LEFT_RIGHT; + screen_layout = LAYOUT_LEFT_RIGHT; + } + + var.key = "sameboy_audio_output"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "GB #1") == 0) + audio_out = GB_1; + else + audio_out = GB_2; } } From 5e04600ab15d7b759fca147983be21d0faf3579a Mon Sep 17 00:00:00 2001 From: radius Date: Thu, 1 Feb 2018 10:08:00 -0500 Subject: [PATCH 15/31] add descriptors to P2 --- libretro/libretro.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libretro/libretro.c b/libretro/libretro.c index 92c4cc7..cfb87f6 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -539,6 +539,7 @@ void retro_set_environment(retro_environment_t cb) static const struct retro_controller_info ports[] = { { controllers, 1 }, + { controllers, 2 }, { NULL, 0 }, }; cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); From ef143261e560a7a9ef2de9ea15916266627b58e0 Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Thu, 1 Feb 2018 13:26:58 -0500 Subject: [PATCH 16/31] implement left-right screen layout option, add ASAN to Makefile --- libretro/libretro.c | 60 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index cfb87f6..20bb3d5 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -58,6 +58,7 @@ enum audio_out { static enum model model[2]; static uint32_t *frame_buf = NULL; +static uint32_t *frame_buf_copy = NULL; static struct retro_log_callback logging; static retro_log_printf_t log_cb; @@ -71,6 +72,8 @@ static unsigned pre_init = 1; static unsigned screen_layout = 0; static unsigned audio_out = 0; +static bool geometry_updated = false; + signed short soundbuf[1024 * 2]; char retro_system_directory[4096]; @@ -452,6 +455,8 @@ static void check_variables(bool link) screen_layout = LAYOUT_TOP_DOWN; else screen_layout = LAYOUT_LEFT_RIGHT; + + geometry_updated = true; } var.key = "sameboy_audio_output"; @@ -467,7 +472,6 @@ static void check_variables(bool link) void retro_init(void) { - frame_buf = (uint32_t*)malloc(2 * VIDEO_PIXELS * sizeof(uint32_t)); const char *dir = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir) @@ -483,12 +487,20 @@ void retro_init(void) environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); check_variables(emulated_devices == 2 ? true : false); environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); + + 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)); + + memset(frame_buf, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); + memset(frame_buf_copy, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); } void retro_deinit(void) { free(frame_buf); + free(frame_buf_copy); frame_buf = NULL; + frame_buf_copy = NULL; } unsigned retro_api_version(void) @@ -516,12 +528,24 @@ void retro_get_system_info(struct retro_system_info *info) void retro_get_system_av_info(struct retro_system_av_info *info) { - struct retro_game_geometry geom = { VIDEO_WIDTH, VIDEO_HEIGHT * emulated_devices, VIDEO_WIDTH, VIDEO_HEIGHT * emulated_devices , VIDEO_WIDTH / (emulated_devices * VIDEO_HEIGHT) }; + struct retro_game_geometry geom; struct retro_system_timing timing = { FRAME_RATE, AUDIO_FREQUENCY }; - + + if (screen_layout == LAYOUT_TOP_DOWN) { + geom.base_width = VIDEO_WIDTH; + geom.base_height = VIDEO_HEIGHT * emulated_devices; + geom.aspect_ratio = VIDEO_WIDTH / (emulated_devices * VIDEO_HEIGHT); + }else if (screen_layout == LAYOUT_LEFT_RIGHT) { + geom.base_width = VIDEO_WIDTH * emulated_devices; + geom.base_height = VIDEO_HEIGHT; + geom.aspect_ratio = (VIDEO_WIDTH * emulated_devices) / VIDEO_HEIGHT; + } + + geom.max_width = VIDEO_WIDTH * emulated_devices; + geom.max_height = VIDEO_HEIGHT * emulated_devices; + info->geometry = geom; info->timing = timing; - } void retro_set_environment(retro_environment_t cb) @@ -539,7 +563,7 @@ void retro_set_environment(retro_environment_t cb) static const struct retro_controller_info ports[] = { { controllers, 1 }, - { controllers, 2 }, + { controllers, 1 }, { NULL, 0 }, }; cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); @@ -579,6 +603,17 @@ void retro_reset(void) void retro_run(void) { bool updated = false; + + if (pre_init) + geometry_updated = false; + + if (geometry_updated) { + struct retro_system_av_info info; + retro_get_system_av_info(&info); + geometry_updated = false; + environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &info.geometry); + } + pre_init = 0; if (!frame_buf) @@ -603,7 +638,20 @@ void retro_run(void) else GB_run_frame(&gameboy[0]); - video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * emulated_devices, VIDEO_WIDTH * sizeof(uint32_t)); + if (screen_layout == LAYOUT_TOP_DOWN) { + video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT * emulated_devices, VIDEO_WIDTH * sizeof(uint32_t)); + }else if (screen_layout == LAYOUT_LEFT_RIGHT) { + /* use slow memcpy method for now */ + for (int index = 0; index < emulated_devices; index++) { + for (int y = 0; y < VIDEO_HEIGHT; y++) { + for (int x = 0; x < VIDEO_WIDTH; x++) { + frame_buf_copy[VIDEO_WIDTH * emulated_devices * y + (x + VIDEO_WIDTH * index)] = frame_buf[VIDEO_WIDTH * (y + VIDEO_HEIGHT * index) + x]; + } + } + } + + video_cb(frame_buf_copy, VIDEO_WIDTH * emulated_devices, VIDEO_HEIGHT, VIDEO_WIDTH * emulated_devices * sizeof(uint32_t)); + } } bool retro_load_game(const struct retro_game_info *info) From 120edb6f8cc8d36f8f5391c75efd5ef6b418174b Mon Sep 17 00:00:00 2001 From: radius Date: Fri, 2 Feb 2018 22:01:27 -0500 Subject: [PATCH 17/31] rebase from master --- libretro/libretro.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 20bb3d5..1c8c35f 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -43,9 +43,6 @@ enum model { MODEL_AUTO }; -static enum model model = MODEL_AUTO; -static enum model auto_model = MODEL_CGB; - enum screen_layout { LAYOUT_TOP_DOWN, LAYOUT_LEFT_RIGHT @@ -57,6 +54,8 @@ enum audio_out { }; static enum model model[2]; +static enum model auto_model = MODEL_CGB; + static uint32_t *frame_buf = NULL; static uint32_t *frame_buf_copy = NULL; static struct retro_log_callback logging; @@ -206,9 +205,14 @@ static const struct retro_variable vars_link[] = { static void init_for_current_model(void) { - enum model effective_model = model; - if (effective_model == MODEL_AUTO) { - effective_model = auto_model; + unsigned i = 0; + enum model effective_model[2]; + for (i=0; i < emulated_devices; i++) + { + effective_model[i] = model[i]; + if (effective_model[i] == MODEL_AUTO) { + effective_model[i] = auto_model; + } } for (i = 0; i < emulated_devices; i++) From 50fd7f1140876a105d560cb6c29914c26d2f20ac Mon Sep 17 00:00:00 2001 From: radius Date: Fri, 2 Feb 2018 22:07:30 -0500 Subject: [PATCH 18/31] use set geometry instead --- libretro/libretro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 1c8c35f..d40d3c0 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -615,7 +615,7 @@ void retro_run(void) struct retro_system_av_info info; retro_get_system_av_info(&info); geometry_updated = false; - environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &info.geometry); + environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &info.geometry); } pre_init = 0; From a8741674ce32152454d7a57a2ec1ab94af2a8fcd Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 11:28:35 -0500 Subject: [PATCH 19/31] better savestate code --- libretro/libretro.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index d40d3c0..50c4406 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -735,7 +735,10 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t retro_serialize_size(void) { - return 2 * GB_get_save_state_size(&gameboy[0]); + if (emulated_devices == 2) + return GB_get_save_state_size(&gameboy[0]) + GB_get_save_state_size(&gameboy[1]); + else + return GB_get_save_state_size(&gameboy[0]); } bool retro_serialize(void *data, size_t size) @@ -744,11 +747,14 @@ bool retro_serialize(void *data, size_t size) return false; void* save_data[2]; + size_t state_size[2]; + for (int i = 0; i < emulated_devices; i++) { - save_data[i] = (uint8_t*)malloc(size * sizeof(uint8_t) / emulated_devices); + state_size[i] = GB_get_save_state_size(&gameboy[i]); + save_data[i] = (uint8_t*)malloc(state_size[i]); GB_save_state_to_buffer(&gameboy[i], (uint8_t*) save_data[i]); - memcpy(data + (size * i / emulated_devices), save_data[i], size / emulated_devices); + memcpy(data + (state_size[i] * i), save_data[i], state_size[i]); free(save_data[i]); } @@ -761,13 +767,15 @@ bool retro_serialize(void *data, size_t size) bool retro_unserialize(const void *data, size_t size) { void* save_data[2]; + size_t state_size[2]; int ret; for (int i = 0; i < emulated_devices; i++) { - save_data[i] = (uint8_t*)malloc(size * sizeof(uint8_t)/ emulated_devices); - memcpy (save_data[i], data + (size * i / emulated_devices), size / emulated_devices); - ret = GB_load_state_from_buffer(&gameboy[i], save_data[i], size / emulated_devices); + state_size[i] = GB_get_save_state_size(&gameboy[i]); + save_data[i] = (uint8_t*)malloc(state_size[i]); + memcpy (save_data[i], data + (state_size[i] * i), state_size[i]); + ret = GB_load_state_from_buffer(&gameboy[i], save_data[i], state_size[i]); free(save_data[i]); if (ret != 0) From 7459b9610c523c455c017426df4c746b06997e5c Mon Sep 17 00:00:00 2001 From: Tatsuya79 Date: Sat, 3 Feb 2018 12:32:31 +0100 Subject: [PATCH 20/31] Reduce input lag by 1 frame --- libretro/libretro.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 50c4406..7469f5a 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -137,7 +137,6 @@ static void audio_callback(void *gb) static void vblank1(GB_gameboy_t *gb) { vblank1_occurred = true; - GB_update_keys_status(gb, 0); if (audio_out == GB_1) audio_callback(gb); } @@ -145,7 +144,6 @@ static void vblank1(GB_gameboy_t *gb) static void vblank2(GB_gameboy_t *gb) { vblank2_occurred = true; - GB_update_keys_status(gb, 1); if (audio_out == GB_2) audio_callback(gb); } @@ -626,6 +624,10 @@ void retro_run(void) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) check_variables(emulated_devices == 2 ? true : false); + GB_update_keys_status(&gameboy[0], 0); + if (emulated_devices == 2) + GB_update_keys_status(&gameboy[1], 1); + vblank1_occurred = vblank2_occurred = false; signed delta = 0; if (emulated_devices == 2) From b169d86bf8f1501f217db260cd79cd330a56e4e4 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 12:38:11 -0500 Subject: [PATCH 21/31] subsystem support --- libretro/libretro.c | 101 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 95 insertions(+), 6 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 7469f5a..1b64b4a 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -33,7 +33,14 @@ static const char slash = '/'; #define VIDEO_HEIGHT 144 #define VIDEO_PIXELS (VIDEO_WIDTH * VIDEO_HEIGHT) -char battery_save_path[512]; +#define RETRO_MEMORY_GAMEBOY_1_RAM ((1 << 8) | RETRO_MEMORY_SAVE_RAM) +#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_RTC ((3 << 8) | RETRO_MEMORY_RTC) + +#define RETRO_GAME_TYPE_GAMEBOY_LINK_2P 0x101 + +char battery_save_path[512]; char symbols_path[512]; enum model { @@ -100,7 +107,7 @@ static void GB_update_keys_status(GB_gameboy_t *gb, unsigned port) { input_poll_cb(); - + GB_set_key_state(gb, GB_KEY_RIGHT,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT)); GB_set_key_state(gb, GB_KEY_LEFT, input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT)); GB_set_key_state(gb, GB_KEY_UP,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP) ); @@ -109,12 +116,12 @@ static void GB_update_keys_status(GB_gameboy_t *gb, unsigned port) GB_set_key_state(gb, GB_KEY_B,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B) ); GB_set_key_state(gb, GB_KEY_SELECT,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT)); GB_set_key_state(gb, GB_KEY_START,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START) ); - + if (gb->rumble_state) rumble.set_rumble_state(port, RETRO_RUMBLE_STRONG, 65535); else rumble.set_rumble_state(port, RETRO_RUMBLE_STRONG, 0); - + } @@ -201,6 +208,26 @@ static const struct retro_variable vars_link[] = { { NULL } }; +static const struct retro_subsystem_memory_info gb1_memory[] = { + { "srm", RETRO_MEMORY_GAMEBOY_1_RAM }, + { "rtc", RETRO_MEMORY_GAMEBOY_1_RTC }, +}; + +static const struct retro_subsystem_memory_info gb2_memory[] = { + { "srm", RETRO_MEMORY_GAMEBOY_2_RAM }, + { "rtc", RETRO_MEMORY_GAMEBOY_2_RTC }, +}; + +static const struct retro_subsystem_rom_info gb_roms[] = { + { "GameBoy #1", "gb|gbc", true, false, true, gb1_memory, 1 }, + { "GameBoy #2", "gb|gbc", true, false, true, gb2_memory, 1 }, +}; + + static const struct retro_subsystem_info subsystems[] = { + { "2 Player Gameboy Link", "gb_link_2p", gb_roms, 2, RETRO_GAME_TYPE_GAMEBOY_LINK_2P | 0x1000 }, + { NULL }, +}; + static void init_for_current_model(void) { unsigned i = 0; @@ -569,6 +596,7 @@ void retro_set_environment(retro_environment_t cb) { NULL, 0 }, }; cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); + cb(RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO, (void*)subsystems); } void retro_set_audio_sample(retro_audio_sample_t cb) @@ -730,9 +758,70 @@ unsigned retro_get_region(void) return RETRO_REGION_NTSC; } -bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t num) +bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t num_info) { - return false; + struct retro_input_descriptor desc[] = { + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "B" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "A" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "B" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "A" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, + { 0 }, + }; + + environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc); + + enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888; + if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) + { + log_cb(RETRO_LOG_INFO, "XRGB8888 is not supported.\n"); + return false; + } + + snprintf(retro_game_path, sizeof(retro_game_path), "%s", info->path); + init_for_current_model(); + for (int i = 0; i < emulated_devices; i++) + { + auto_model = (info[i].path[strlen(info[i].path) - 1] & ~0x20) == 'C' ? MODEL_CGB : MODEL_DMG; + if (GB_load_rom(&gameboy[i], info[i].path)) + { + log_cb(RETRO_LOG_INFO, "Failed to load ROM\n"); + return false; + } + } + + + bool yes = true; + environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &yes); + + if (environ_cb(RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE, &rumble)) + log_cb(RETRO_LOG_INFO, "Rumble environment supported.\n"); + else + log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n"); + + static const struct retro_variable vars[] = { + { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, + { "sameboy_model", "Emulated Model; Auto|Game Boy|Game Boy Color|Game Boy Advance" }, + { "sameboy_link", "Link Cable; disabled|enabled" }, + { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, + { NULL } + }; + + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); + check_variables(emulated_devices == 2 ? true : false); + return true; } size_t retro_serialize_size(void) From b74095a2cd2b0afbcc2ce212f531c15046f3687d Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 13:05:05 -0500 Subject: [PATCH 22/31] set emulated devices automatically --- libretro/libretro.c | 55 ++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 1b64b4a..70a2d65 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -189,14 +189,12 @@ static uint32_t rgb_encode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b) static retro_environment_t environ_cb; static const struct retro_variable vars[] = { - { "sameboy_link", "Link Cable (restart); disabled|enabled" }, { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, { "sameboy_model", "Emulated Model; Game Boy Color|Game Boy Advance|Game Boy" }, { NULL } }; static const struct retro_variable vars_link[] = { - { "sameboy_link", "Link Cable; disabled|enabled" }, { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, { "sameboy_audio_output", "Audio output; GB #1|GB #2" }, { "sameboy_model_1", "Emulated Model for GB #1; Game Boy Color|Game Boy Advance|Game Boy" }, @@ -463,19 +461,6 @@ static void check_variables(bool link) } - var.key = "sameboy_link"; - var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - { - int old_emulated_devices = emulated_devices; - if (strcmp(var.value, "enabled") == 0) - emulated_devices = 2; - else - emulated_devices = 1; - if (pre_init == 0 && emulated_devices != old_emulated_devices) - emulated_devices = old_emulated_devices; - } - var.key = "sameboy_link_layout"; var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) @@ -513,15 +498,6 @@ void retro_init(void) else snprintf(retro_save_directory, sizeof(retro_save_directory), "%s", "."); - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); - check_variables(emulated_devices == 2 ? true : false); - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); - - 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)); - - memset(frame_buf, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); - memset(frame_buf_copy, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); } void retro_deinit(void) @@ -690,6 +666,16 @@ void retro_run(void) bool retro_load_game(const struct retro_game_info *info) { + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); + check_variables(emulated_devices == 2 ? true : false); + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); + + 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)); + + memset(frame_buf, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); + memset(frame_buf_copy, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); + struct retro_input_descriptor desc[] = { { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" }, { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" }, @@ -760,6 +746,18 @@ unsigned retro_get_region(void) bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t num_info) { + emulated_devices = 2; + + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); + check_variables(emulated_devices == 2 ? true : false); + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); + + 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)); + + memset(frame_buf, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); + memset(frame_buf_copy, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); + struct retro_input_descriptor desc[] = { { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" }, { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" }, @@ -809,15 +807,6 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, log_cb(RETRO_LOG_INFO, "Rumble environment supported.\n"); else log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n"); - - static const struct retro_variable vars[] = { - { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, - { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, - { "sameboy_model", "Emulated Model; Auto|Game Boy|Game Boy Color|Game Boy Advance" }, - { "sameboy_link", "Link Cable; disabled|enabled" }, - { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, - { NULL } - }; environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); check_variables(emulated_devices == 2 ? true : false); From a5b182f0fa583071ad45fcecc0db1d5ae560acb6 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 13:59:06 -0500 Subject: [PATCH 23/31] standarize core options --- libretro/libretro.c | 108 +++++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 52 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 70a2d65..4497c2e 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -40,7 +40,7 @@ static const char slash = '/'; #define RETRO_GAME_TYPE_GAMEBOY_LINK_2P 0x101 -char battery_save_path[512]; +char battery_save_path[512]; char symbols_path[512]; enum model { @@ -107,7 +107,7 @@ static void GB_update_keys_status(GB_gameboy_t *gb, unsigned port) { input_poll_cb(); - + GB_set_key_state(gb, GB_KEY_RIGHT,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT)); GB_set_key_state(gb, GB_KEY_LEFT, input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT)); GB_set_key_state(gb, GB_KEY_UP,input_state_cb(port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP) ); @@ -222,10 +222,14 @@ static const struct retro_subsystem_rom_info gb_roms[] = { }; static const struct retro_subsystem_info subsystems[] = { - { "2 Player Gameboy Link", "gb_link_2p", gb_roms, 2, RETRO_GAME_TYPE_GAMEBOY_LINK_2P | 0x1000 }, + { "2 Player Gameboy Link", "gb_link_2p", gb_roms, 2, RETRO_GAME_TYPE_GAMEBOY_LINK_2P }, { NULL }, }; +static const struct retro_controller_description controllers[] = { + { "Nintendo Gameboy", RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 0) }, +}; + static void init_for_current_model(void) { unsigned i = 0; @@ -253,7 +257,7 @@ static void init_for_current_model(void) const char *model_name = (const char *[]){"dmg", "cgb", "agb"}[model[i]]; const unsigned char *boot_code = (const unsigned char *[]){dmg_boot, cgb_boot, agb_boot}[model[i]]; unsigned boot_length = (unsigned []){dmg_boot_length, cgb_boot_length, agb_boot_length}[model[i]]; - + char buf[256]; snprintf(buf, sizeof(buf), "%s%c%s_boot.bin", retro_system_directory, slash, model_name); log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf); @@ -339,7 +343,7 @@ static void check_variables(bool link) else if (strcmp(var.value, "preserve brightness") == 0) GB_set_color_correction_mode(&gameboy[0], GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS); } - + var.key = "sameboy_high_pass_filter_mode"; var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) @@ -351,7 +355,7 @@ static void check_variables(bool link) else if (strcmp(var.value, "remove dc offset") == 0) GB_set_highpass_filter_mode(&gameboy[0], GB_HIGHPASS_REMOVE_DC_OFFSET); } - + var.key = "sameboy_model"; var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) @@ -363,12 +367,14 @@ static void check_variables(bool link) new_model = MODEL_CGB; else if (strcmp(var.value, "Game Boy Advance") == 0) new_model = MODEL_AGB; - else if (strcmp(var.value, "Auto") == 0) + else new_model = MODEL_AUTO; + if (GB_is_inited(&gameboy[0]) && new_model != model[0]) { model[0] = new_model; init_for_current_model(); } + model[0] = new_model; } } else @@ -436,10 +442,13 @@ static void check_variables(bool link) new_model = MODEL_CGB; else if (strcmp(var.value, "Game Boy Advance") == 0) new_model = MODEL_AGB; + else + new_model = MODEL_AUTO; if (GB_is_inited(&gameboy[0]) && new_model != model[0]) { model[0] = new_model; init_for_current_model(); } + model[0] = new_model; } var.key = "sameboy_model_2"; @@ -453,10 +462,13 @@ static void check_variables(bool link) new_model = MODEL_CGB; else if (strcmp(var.value, "Game Boy Advance") == 0) new_model = MODEL_AGB; + else + new_model = MODEL_AUTO; if (GB_is_inited(&gameboy[1]) && new_model != model[1]) { model[1] = new_model; init_for_current_model(); } + model[1] = new_model; } } @@ -487,12 +499,12 @@ static void check_variables(bool link) void retro_init(void) { const char *dir = NULL; - + if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir) snprintf(retro_system_directory, sizeof(retro_system_directory), "%s", dir); else snprintf(retro_system_directory, sizeof(retro_system_directory), "%s", "."); - + if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) snprintf(retro_save_directory, sizeof(retro_save_directory), "%s", dir); else @@ -556,22 +568,12 @@ void retro_get_system_av_info(struct retro_system_av_info *info) void retro_set_environment(retro_environment_t cb) { environ_cb = cb; - + if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging)) log_cb = logging.log; else log_cb = fallback_log; - - static const struct retro_controller_description controllers[] = { - { "Nintendo Gameboy", RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 0) }, - }; - - static const struct retro_controller_info ports[] = { - { controllers, 1 }, - { controllers, 1 }, - { NULL, 0 }, - }; - cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); + cb(RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO, (void*)subsystems); } @@ -621,7 +623,7 @@ void retro_run(void) } pre_init = 0; - + if (!frame_buf) return; @@ -666,9 +668,8 @@ void retro_run(void) bool retro_load_game(const struct retro_game_info *info) { - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); - check_variables(emulated_devices == 2 ? true : false); - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars); + check_variables(false); 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)); @@ -697,9 +698,9 @@ bool retro_load_game(const struct retro_game_info *info) return false; } + auto_model = (info->path[strlen(info->path) - 1] & ~0x20) == 'C' ? MODEL_CGB : MODEL_DMG; snprintf(retro_game_path, sizeof(retro_game_path), "%s", info->path); - auto_model = (info->path[strlen(info->path) - 1] & ~0x20) == 'C' ? MODEL_CGB : MODEL_DMG; init_for_current_model(); for (int i = 0; i < emulated_devices; i++) @@ -711,25 +712,20 @@ bool retro_load_game(const struct retro_game_info *info) } } - bool yes = true; - environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &yes); + bool achievements = true; + environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &achievements); if (environ_cb(RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE, &rumble)) log_cb(RETRO_LOG_INFO, "Rumble environment supported.\n"); else log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n"); - static const struct retro_variable vars[] = { - { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, - { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, - { "sameboy_model", "Emulated Model; Auto|Game Boy|Game Boy Color|Game Boy Advance" }, - { "sameboy_link", "Link Cable; disabled|enabled" }, - { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, - { NULL } + static const struct retro_controller_info ports[] = { + { controllers, 1 }, + { NULL, 0 }, }; - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); - check_variables(emulated_devices == 2 ? true : false); + environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); return true; } @@ -746,11 +742,14 @@ unsigned retro_get_region(void) bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t num_info) { - emulated_devices = 2; - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); - check_variables(emulated_devices == 2 ? true : false); - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); + if (type == RETRO_GAME_TYPE_GAMEBOY_LINK_2P) + emulated_devices = 2; + else + return false; /* all other types are unhandled for now */ + + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars_link); + check_variables(true); 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)); @@ -777,39 +776,44 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, { 0 }, }; - + environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc); - + enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888; if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) { log_cb(RETRO_LOG_INFO, "XRGB8888 is not supported.\n"); return false; } - + + auto_model = (info->path[strlen(info->path) - 1] & ~0x20) == 'C' ? MODEL_CGB : MODEL_DMG; snprintf(retro_game_path, sizeof(retro_game_path), "%s", info->path); + init_for_current_model(); for (int i = 0; i < emulated_devices; i++) { - auto_model = (info[i].path[strlen(info[i].path) - 1] & ~0x20) == 'C' ? MODEL_CGB : MODEL_DMG; if (GB_load_rom(&gameboy[i], info[i].path)) { log_cb(RETRO_LOG_INFO, "Failed to load ROM\n"); return false; } } - - bool yes = true; - environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &yes); - + bool achievements = true; + environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &achievements); + if (environ_cb(RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE, &rumble)) log_cb(RETRO_LOG_INFO, "Rumble environment supported.\n"); else log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n"); - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, emulated_devices == 2 ? (void *)vars_link : (void *)vars); - check_variables(emulated_devices == 2 ? true : false); + static const struct retro_controller_info ports[] = { + { controllers, 1 }, + { NULL, 0 }, + }; + + environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); + return true; } @@ -926,7 +930,7 @@ size_t retro_get_memory_size(unsigned type) size = 0; break; } - + return size; } From f98b71a25750931846142cd142c41d363bdf3676 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 14:22:47 -0500 Subject: [PATCH 24/31] rename core options --- libretro/libretro.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 4497c2e..24f70a1 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -189,20 +189,35 @@ static uint32_t rgb_encode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b) static retro_environment_t environ_cb; static const struct retro_variable vars[] = { + { "sameboy_link", "Link Cable; disabled|enabled" }, { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, { "sameboy_model", "Emulated Model; Game Boy Color|Game Boy Advance|Game Boy" }, { NULL } }; -static const struct retro_variable vars_link[] = { - { "sameboy_link_layout", "Screen Layout; top-down|left-right" }, - { "sameboy_audio_output", "Audio output; GB #1|GB #2" }, - { "sameboy_model_1", "Emulated Model for GB #1; Game Boy Color|Game Boy Advance|Game Boy" }, - { "sameboy_model_2", "Emulated Model for GB #2; Game Boy Color|Game Boy Advance|Game Boy" }, - { "sameboy_color_correction_mode_1", "Color Correction for GB #1; off|correct curves|emulate hardware|preserve brightness" }, - { "sameboy_color_correction_mode_2", "Color Correction for GB #2; off|correct curves|emulate hardware|preserve brightness" }, - { "sameboy_high_pass_filter_mode_1", "High Pass Filter for GB #1; off|accurate|remove dc offset" }, - { "sameboy_high_pass_filter_mode_2", "High Pass Filter for GB #2; off|accurate|remove dc offset" }, + +static const struct retro_variable vars_link_single[] = { + { "sameboy_link", "Link Cable; disabled|enabled" }, + { "sameboy_screen_layout", "Screen Layout; top-down|left-right" }, + { "sameboy_audio_output", "Audio output; Game Boy #1|Game Boy #2" }, + { "sameboy_model_1", "Emulated Model for Game Boy #1; Game Boy Color|Game Boy Advance|Game Boy" }, + { "sameboy_model_2", "Emulated Model for Game Boy #2; Game Boy Color|Game Boy Advance|Game Boy" }, + { "sameboy_color_correction_mode_1", "Color Correction for Game Boy #1; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_color_correction_mode_2", "Color Correction for Game Boy #2; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_high_pass_filter_mode_1", "High Pass Filter for Game Boy #1; off|accurate|remove dc offset" }, + { "sameboy_high_pass_filter_mode_2", "High Pass Filter for Game Boy #2; off|accurate|remove dc offset" }, + { NULL } +}; + +static const struct retro_variable vars_link_dual[] = { + { "sameboy_screen_layout", "Screen Layout; top-down|left-right" }, + { "sameboy_audio_output", "Audio output; Game Boy #1|Game Boy #2" }, + { "sameboy_model_1", "Emulated Model for Game Boy #1; Game Boy Color|Game Boy Advance|Game Boy" }, + { "sameboy_model_2", "Emulated Model for Game Boy #2; Game Boy Color|Game Boy Advance|Game Boy" }, + { "sameboy_color_correction_mode_1", "Color Correction for Game Boy #1; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_color_correction_mode_2", "Color Correction for Game Boy #2; off|correct curves|emulate hardware|preserve brightness" }, + { "sameboy_high_pass_filter_mode_1", "High Pass Filter for Game Boy #1; off|accurate|remove dc offset" }, + { "sameboy_high_pass_filter_mode_2", "High Pass Filter for Game Boy #2; off|accurate|remove dc offset" }, { NULL } }; @@ -473,7 +488,7 @@ static void check_variables(bool link) } - var.key = "sameboy_link_layout"; + var.key = "sameboy_screen_layout"; var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { @@ -489,7 +504,7 @@ static void check_variables(bool link) var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - if (strcmp(var.value, "GB #1") == 0) + if (strcmp(var.value, "Game Boy #1") == 0) audio_out = GB_1; else audio_out = GB_2; @@ -748,7 +763,7 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, else return false; /* all other types are unhandled for now */ - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars_link); + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars_link_dual); check_variables(true); frame_buf = (uint32_t*)malloc(emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); From 0b96df1428570eaef5c2e3240b97c8e34f918162 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 15:16:36 -0500 Subject: [PATCH 25/31] readd single game link cable --- libretro/libretro.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 24f70a1..8616407 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -79,6 +79,7 @@ static unsigned screen_layout = 0; static unsigned audio_out = 0; static bool geometry_updated = false; +static bool link_single = false; signed short soundbuf[1024 * 2]; @@ -189,7 +190,7 @@ static uint32_t rgb_encode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b) static retro_environment_t environ_cb; static const struct retro_variable vars[] = { - { "sameboy_link", "Link Cable; disabled|enabled" }, + { "sameboy_link", "Single Game Link Cable (restart); disabled|enabled" }, { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, { "sameboy_model", "Emulated Model; Game Boy Color|Game Boy Advance|Game Boy" }, @@ -197,7 +198,7 @@ static const struct retro_variable vars[] = { }; static const struct retro_variable vars_link_single[] = { - { "sameboy_link", "Link Cable; disabled|enabled" }, + { "sameboy_link", "Single Game Link Cable (restart); disabled|enabled" }, { "sameboy_screen_layout", "Screen Layout; top-down|left-right" }, { "sameboy_audio_output", "Audio output; Game Boy #1|Game Boy #2" }, { "sameboy_model_1", "Emulated Model for Game Boy #1; Game Boy Color|Game Boy Advance|Game Boy" }, @@ -500,6 +501,16 @@ static void check_variables(bool link) geometry_updated = true; } + var.key = "sameboy_link"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "enabled") == 0) + link_single = true; + else + link_single = false; + } + var.key = "sameboy_audio_output"; var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) @@ -685,6 +696,12 @@ bool retro_load_game(const struct retro_game_info *info) { environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars); check_variables(false); + if (link_single) + { + emulated_devices = 2; + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars_link_single); + check_variables(true); + } 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)); From 567936a21d97ee49ac0ecca9214d6a0dbd24f356 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 15:21:26 -0500 Subject: [PATCH 26/31] cut code duplication a bit --- libretro/libretro.c | 79 +++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 49 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 8616407..e486cb9 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -536,6 +536,36 @@ void retro_init(void) else snprintf(retro_save_directory, sizeof(retro_save_directory), "%s", "."); + static const struct retro_controller_info ports[] = { + { controllers, 1 }, + { controllers, 1 }, + { NULL, 0 }, + }; + + environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); + + struct retro_input_descriptor desc[] = { + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "B" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "A" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "B" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "A" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" }, + { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, + { 0 }, + }; + + environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc); + } void retro_deinit(void) @@ -709,20 +739,6 @@ bool retro_load_game(const struct retro_game_info *info) memset(frame_buf, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); memset(frame_buf_copy, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); - struct retro_input_descriptor desc[] = { - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "B" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "A" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, - { 0 }, - }; - - environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc); - enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888; if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) { @@ -752,12 +768,6 @@ bool retro_load_game(const struct retro_game_info *info) else log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n"); - static const struct retro_controller_info ports[] = { - { controllers, 1 }, - { NULL, 0 }, - }; - - environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); return true; } @@ -789,28 +799,6 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, memset(frame_buf, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); memset(frame_buf_copy, 0, emulated_devices * VIDEO_PIXELS * sizeof(uint32_t)); - struct retro_input_descriptor desc[] = { - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "B" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "A" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" }, - { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" }, - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" }, - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down" }, - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" }, - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "B" }, - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "A" }, - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" }, - { 1, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, - { 0 }, - }; - - environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc); - enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888; if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) { @@ -839,13 +827,6 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, else log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n"); - static const struct retro_controller_info ports[] = { - { controllers, 1 }, - { NULL, 0 }, - }; - - environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); - return true; } From d3a67f9e190a0341f35bedfea5097409789332a0 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 15:59:31 -0500 Subject: [PATCH 27/31] make link cable a runtime option --- libretro/libretro.c | 70 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 15 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index e486cb9..b5bf509 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -79,7 +79,10 @@ static unsigned screen_layout = 0; static unsigned audio_out = 0; static bool geometry_updated = false; -static bool link_single = false; +static bool sameboy_dual = false; + +static bool link_cable_emulation = false; +static bool infrared_emulation = false; signed short soundbuf[1024 * 2]; @@ -190,15 +193,17 @@ static uint32_t rgb_encode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b) static retro_environment_t environ_cb; static const struct retro_variable vars[] = { - { "sameboy_link", "Single Game Link Cable (restart); disabled|enabled" }, + { "sameboy_dual", "Dual Game Boy Mode (restart); disabled|enabled" }, { "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" }, { "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" }, { "sameboy_model", "Emulated Model; Game Boy Color|Game Boy Advance|Game Boy" }, { NULL } }; -static const struct retro_variable vars_link_single[] = { - { "sameboy_link", "Single Game Link Cable (restart); disabled|enabled" }, +static const struct retro_variable vars_sameboy_dual[] = { + { "sameboy_dual", "Dual Game Boy Mode (restart); disabled|enabled" }, + { "sameboy_link", "Link Cable Emulation; enabled|disabled" }, + { "sameboy_ir", "Infrared Sensor Emulation; disabled|enabled" }, { "sameboy_screen_layout", "Screen Layout; top-down|left-right" }, { "sameboy_audio_output", "Audio output; Game Boy #1|Game Boy #2" }, { "sameboy_model_1", "Emulated Model for Game Boy #1; Game Boy Color|Game Boy Advance|Game Boy" }, @@ -211,6 +216,8 @@ static const struct retro_variable vars_link_single[] = { }; static const struct retro_variable vars_link_dual[] = { + { "sameboy_link", "Link Cable Emulation; enbled|disabled" }, + { "sameboy_ir", "Infrared Sensor Emulation; disabled|enabled" }, { "sameboy_screen_layout", "Screen Layout; top-down|left-right" }, { "sameboy_audio_output", "Audio output; Game Boy #1|Game Boy #2" }, { "sameboy_model_1", "Emulated Model for Game Boy #1; Game Boy Color|Game Boy Advance|Game Boy" }, @@ -238,14 +245,32 @@ static const struct retro_subsystem_rom_info gb_roms[] = { }; static const struct retro_subsystem_info subsystems[] = { - { "2 Player Gameboy Link", "gb_link_2p", gb_roms, 2, RETRO_GAME_TYPE_GAMEBOY_LINK_2P }, + { "2 Player Game Boy Link", "gb_link_2p", gb_roms, 2, RETRO_GAME_TYPE_GAMEBOY_LINK_2P }, { NULL }, }; static const struct retro_controller_description controllers[] = { - { "Nintendo Gameboy", RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 0) }, + { "Nintendo Game Boy", RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 0) }, }; +static void set_link_cable_state(bool state) +{ + if (state && emulated_devices == 2) + { + GB_set_serial_transfer_start_callback(&gameboy[0], serial_start1); + GB_set_serial_transfer_end_callback(&gameboy[0], serial_end1); + GB_set_serial_transfer_start_callback(&gameboy[1], serial_start2); + GB_set_serial_transfer_end_callback(&gameboy[1], serial_end2); + } + else if (!state) + { + GB_set_serial_transfer_start_callback(&gameboy[0], NULL); + GB_set_serial_transfer_end_callback(&gameboy[0], NULL); + GB_set_serial_transfer_start_callback(&gameboy[1], NULL); + GB_set_serial_transfer_end_callback(&gameboy[1], NULL); + } +} + static void init_for_current_model(void) { unsigned i = 0; @@ -290,10 +315,8 @@ static void init_for_current_model(void) if (emulated_devices == 2) { GB_set_vblank_callback(&gameboy[1], (GB_vblank_callback_t) vblank2); - GB_set_serial_transfer_start_callback(&gameboy[0], serial_start1); - GB_set_serial_transfer_end_callback(&gameboy[0], serial_end1); - GB_set_serial_transfer_start_callback(&gameboy[1], serial_start2); - GB_set_serial_transfer_end_callback(&gameboy[1], serial_end2); + if (link_cable_emulation) + set_link_cable_state(true); } struct retro_memory_descriptor descs[7]; @@ -501,14 +524,29 @@ static void check_variables(bool link) geometry_updated = true; } - var.key = "sameboy_link"; + var.key = "sameboy_dual"; var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "enabled") == 0) - link_single = true; + sameboy_dual = true; else - link_single = false; + sameboy_dual = false; + } + + var.key = "sameboy_link"; + var.value = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + bool tmp = link_cable_emulation; + if (strcmp(var.value, "enabled") == 0) + link_cable_emulation = true; + else + link_cable_emulation = false; + if (link_cable_emulation && link_cable_emulation != tmp) + set_link_cable_state(true); + else if (!link_cable_emulation && link_cable_emulation != tmp) + set_link_cable_state(false); } var.key = "sameboy_audio_output"; @@ -726,10 +764,10 @@ bool retro_load_game(const struct retro_game_info *info) { environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars); check_variables(false); - if (link_single) + if (sameboy_dual) { emulated_devices = 2; - environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars_link_single); + environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars_sameboy_dual); check_variables(true); } @@ -768,6 +806,7 @@ bool retro_load_game(const struct retro_game_info *info) else log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n"); + check_variables(emulated_devices == 2 ? true : false); return true; } @@ -827,6 +866,7 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, else log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n"); + check_variables(emulated_devices == 2 ? true : false); return true; } From ff8a20ef044bb304667c97fff47e7876961b2c1c Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 16:06:50 -0500 Subject: [PATCH 28/31] disable this for now --- libretro/libretro.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index b5bf509..fa958bb 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -82,7 +82,7 @@ static bool geometry_updated = false; static bool sameboy_dual = false; static bool link_cable_emulation = false; -static bool infrared_emulation = false; +/*static bool infrared_emulation = false;*/ signed short soundbuf[1024 * 2]; @@ -203,7 +203,7 @@ static const struct retro_variable vars[] = { static const struct retro_variable vars_sameboy_dual[] = { { "sameboy_dual", "Dual Game Boy Mode (restart); disabled|enabled" }, { "sameboy_link", "Link Cable Emulation; enabled|disabled" }, - { "sameboy_ir", "Infrared Sensor Emulation; disabled|enabled" }, + /*{ "sameboy_ir", "Infrared Sensor Emulation; disabled|enabled" },*/ { "sameboy_screen_layout", "Screen Layout; top-down|left-right" }, { "sameboy_audio_output", "Audio output; Game Boy #1|Game Boy #2" }, { "sameboy_model_1", "Emulated Model for Game Boy #1; Game Boy Color|Game Boy Advance|Game Boy" }, @@ -216,8 +216,8 @@ static const struct retro_variable vars_sameboy_dual[] = { }; static const struct retro_variable vars_link_dual[] = { - { "sameboy_link", "Link Cable Emulation; enbled|disabled" }, - { "sameboy_ir", "Infrared Sensor Emulation; disabled|enabled" }, + { "sameboy_link", "Link Cable Emulation; enabled|disabled" }, + /*{ "sameboy_ir", "Infrared Sensor Emulation; disabled|enabled" },*/ { "sameboy_screen_layout", "Screen Layout; top-down|left-right" }, { "sameboy_audio_output", "Audio output; Game Boy #1|Game Boy #2" }, { "sameboy_model_1", "Emulated Model for Game Boy #1; Game Boy Color|Game Boy Advance|Game Boy" }, From 792087276e8386d9ad72fab7547f93da35d48213 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 16:17:25 -0500 Subject: [PATCH 29/31] cleanup logs --- libretro/libretro.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index fa958bb..3a9bb01 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -621,7 +621,7 @@ unsigned retro_api_version(void) void retro_set_controller_port_device(unsigned port, unsigned device) { - log_cb(RETRO_LOG_INFO, "Plugging device %u into port %u.\n", device, port); + log_cb(RETRO_LOG_INFO, "Connecting device %u into port %u\n", device, port); } void retro_get_system_info(struct retro_system_info *info) @@ -780,7 +780,7 @@ bool retro_load_game(const struct retro_game_info *info) enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888; if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) { - log_cb(RETRO_LOG_INFO, "XRGB8888 is not supported.\n"); + log_cb(RETRO_LOG_INFO, "XRGB8888 is not supported\n"); return false; } @@ -793,7 +793,7 @@ bool retro_load_game(const struct retro_game_info *info) { if (GB_load_rom(&gameboy[i],info->path)) { - log_cb(RETRO_LOG_INFO, "Failed to load ROM\n"); + log_cb(RETRO_LOG_INFO, "Failed to load ROM at %s\n", info->path); return false; } } @@ -802,9 +802,9 @@ bool retro_load_game(const struct retro_game_info *info) environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &achievements); if (environ_cb(RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE, &rumble)) - log_cb(RETRO_LOG_INFO, "Rumble environment supported.\n"); + log_cb(RETRO_LOG_INFO, "Rumble environment supported\n"); else - log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n"); + log_cb(RETRO_LOG_INFO, "Rumble environment not supported\n"); check_variables(emulated_devices == 2 ? true : false); return true; @@ -841,7 +841,7 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888; if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) { - log_cb(RETRO_LOG_INFO, "XRGB8888 is not supported.\n"); + log_cb(RETRO_LOG_INFO, "XRGB8888 is not supported\n"); return false; } @@ -862,9 +862,9 @@ bool retro_load_game_special(unsigned type, const struct retro_game_info *info, environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &achievements); if (environ_cb(RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE, &rumble)) - log_cb(RETRO_LOG_INFO, "Rumble environment supported.\n"); + log_cb(RETRO_LOG_INFO, "Rumble environment supported\n"); else - log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n"); + log_cb(RETRO_LOG_INFO, "Rumble environment not supported\n"); check_variables(emulated_devices == 2 ? true : false); return true; From 8dd94505a87e1b2ba0c768f20254fec2225e73be Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 16:48:40 -0500 Subject: [PATCH 30/31] save ram handling for dual mode --- libretro/libretro.c | 159 ++++++++++++++++++++++++++++++++------------ 1 file changed, 115 insertions(+), 44 deletions(-) diff --git a/libretro/libretro.c b/libretro/libretro.c index 3a9bb01..6f05cf8 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -33,9 +33,9 @@ static const char slash = '/'; #define VIDEO_HEIGHT 144 #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_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_GAME_TYPE_GAMEBOY_LINK_2P 0x101 @@ -60,6 +60,12 @@ enum audio_out { GB_2 }; +enum mode{ + MODE_SINGLE_GAME, + MODE_SINGLE_GAME_DUAL, + MODE_DUAL_GAME +}; + static enum model model[2]; static enum model auto_model = MODEL_CGB; @@ -78,6 +84,8 @@ static unsigned pre_init = 1; static unsigned screen_layout = 0; static unsigned audio_out = 0; +static enum mode mode = MODE_SINGLE_GAME; + static bool geometry_updated = 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[] = { - { "srm", RETRO_MEMORY_GAMEBOY_1_RAM }, + { "srm.slot1", RETRO_MEMORY_GAMEBOY_1_SRAM }, { "rtc", RETRO_MEMORY_GAMEBOY_1_RTC }, }; 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 }, }; @@ -767,9 +775,12 @@ bool retro_load_game(const struct retro_game_info *info) if (sameboy_dual) { emulated_devices = 2; + mode = MODE_SINGLE_GAME_DUAL; environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars_sameboy_dual); check_variables(true); } + else + mode = MODE_SINGLE_GAME; 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)); @@ -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) + { emulated_devices = 2; + mode = MODE_DUAL_GAME; + } else 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* data; - switch(type) + void* data = NULL; + switch(mode) { - 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) + case MODE_SINGLE_GAME: + case MODE_SINGLE_GAME_DUAL: /* todo: hook this properly */ { - data = gameboy[0].mbc_ram; - /* 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); + switch(type) + { + 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; - 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; + case MODE_DUAL_GAME: /* todo: hook up other memory types */ + { + switch (type) + { + case RETRO_MEMORY_GAMEBOY_1_SRAM: + 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_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; default: - data = NULL; + break; } return data; } size_t retro_get_memory_size(unsigned type) { - size_t size; - switch(type) + size_t size = 0; + switch(mode) { - case RETRO_MEMORY_SYSTEM_RAM: - size = gameboy[0].ram_size; + case MODE_SINGLE_GAME: + 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; - 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; + case MODE_DUAL_GAME: /* todo: hook up other memory types */ + { + switch (type) + { + case RETRO_MEMORY_GAMEBOY_1_SRAM: + 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_GAMEBOY_2_SRAM: + if (gameboy[1].cartridge_type->has_battery && gameboy[1].mbc_ram_size != 0) + size = gameboy[1].mbc_ram_size; + else + size = 0; + break; + default: + break;; + } + } break; default: - size = 0; break; } From cc296a31144688d684cee00a8a0634137089c827 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 3 Feb 2018 20:23:08 -0500 Subject: [PATCH 31/31] fix savefile names --- libretro/jni/Android.mk | 7 ------- libretro/libretro.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk index 7deea1c..3401c10 100644 --- a/libretro/jni/Android.mk +++ b/libretro/jni/Android.mk @@ -27,13 +27,6 @@ CORE_DIR := ../.. include ../Makefile.common -$(CORE_DIR)/libretro/%_boot.c: $(CORE_DIR)/BootROMs/prebuilt/%_boot.bin - echo "/* AUTO-GENERATED */" > $@ - echo "const unsigned char $(notdir $(@:%.c=%))[] = {" >> $@ - hexdump -v -e '/1 "0x%02x, "' $< >> $@ - echo "};" >> $@ - echo "const unsigned $(notdir $(@:%.c=%))_length = sizeof($(notdir $(@:%.c=%)));" >> $@ - LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C) LOCAL_CFLAGS += -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DNDEBUG -D_USE_MATH_DEFINES -DGB_INTERNAL -std=c99 -I$(CORE_DIR) -DSAMEBOY_CORE_VERSION=\"$(VERSION)\" diff --git a/libretro/libretro.c b/libretro/libretro.c index 6f05cf8..dfddc6a 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -238,12 +238,12 @@ static const struct retro_variable vars_link_dual[] = { }; static const struct retro_subsystem_memory_info gb1_memory[] = { - { "srm.slot1", RETRO_MEMORY_GAMEBOY_1_SRAM }, + { "srm", RETRO_MEMORY_GAMEBOY_1_SRAM }, { "rtc", RETRO_MEMORY_GAMEBOY_1_RTC }, }; static const struct retro_subsystem_memory_info gb2_memory[] = { - { "srm.slot2", RETRO_MEMORY_GAMEBOY_2_SRAM }, + { "srm", RETRO_MEMORY_GAMEBOY_2_SRAM }, { "rtc", RETRO_MEMORY_GAMEBOY_2_RTC }, };