X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Flibretro%2Flibretro.c;h=7896ffbf230d9ae178d90e881246dbafc31b0bed;hb=a90cc666d08526ada34a87c3e6d9a5312d90be84;hp=f11b5dae8aadf5353574826ce52fced2d57b4360;hpb=88d98ee0e6f1c97a89919a957f533bf79ecc5fdf;p=picodrive.git diff --git a/platform/libretro/libretro.c b/platform/libretro/libretro.c index f11b5da..7896ffb 100644 --- a/platform/libretro/libretro.c +++ b/platform/libretro/libretro.c @@ -98,6 +98,7 @@ void cache_flush_d_inval_i(void *start, void *end) { #ifdef __arm__ size_t len = (char *)end - (char *)start; + (void)len; #if defined(__BLACKBERRY_QNX__) msync(start, end - start, MS_SYNC | MS_CACHE_ONLY | MS_INVALIDATE_ICACHE); #elif defined(__MACH__) @@ -435,14 +436,25 @@ void plat_munmap(void *ptr, size_t size) } #endif +// if NULL is returned, static buffer is used +void *plat_mem_get_for_drc(size_t size) +{ + void *mem = NULL; +#ifdef VITA + sceKernelGetMemBlockBase(sceBlock, &mem); +#endif + return mem; +} + int plat_mem_set_exec(void *ptr, size_t size) { + int ret = -1; #ifdef _WIN32 - int ret = VirtualProtect(ptr,size,PAGE_EXECUTE_READWRITE,0); + ret = VirtualProtect(ptr, size, PAGE_EXECUTE_READWRITE, 0); if (ret == 0 && log_cb) - log_cb(RETRO_LOG_ERROR, "mprotect(%p, %zd) failed: %d\n", ptr, size, 0); + log_cb(RETRO_LOG_ERROR, "VirtualProtect(%p, %d) failed: %d\n", ptr, (int)size, + GetLastError()); #elif defined(_3DS) - int ret = -1; if (ctr_svchack_successful) { unsigned int currentHandle; @@ -461,9 +473,9 @@ int plat_mem_set_exec(void *ptr, size_t size) } #elif defined(VITA) - int ret = sceKernelOpenVMDomain(); + ret = sceKernelOpenVMDomain(); #else - int ret = mprotect(ptr, size, PROT_READ | PROT_WRITE | PROT_EXEC); + ret = mprotect(ptr, size, PROT_READ | PROT_WRITE | PROT_EXEC); if (ret != 0 && log_cb) log_cb(RETRO_LOG_ERROR, "mprotect(%p, %zd) failed: %d\n", ptr, size, errno); #endif @@ -472,6 +484,8 @@ int plat_mem_set_exec(void *ptr, size_t size) void emu_video_mode_change(int start_line, int line_count, int is_32cols) { + struct retro_system_av_info av_info; + memset(vout_buf, 0, 320 * 240 * 2); vout_width = is_32cols ? 256 : 320; PicoDrawSetOutBuf(vout_buf, vout_width * 2); @@ -482,7 +496,6 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols) vout_offset = vout_width * start_line; // Update the geometry - struct retro_system_av_info av_info; retro_get_system_av_info(&av_info); environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &av_info); } @@ -512,7 +525,6 @@ void retro_set_environment(retro_environment_t cb) { "picodrive_sprlim", "No sprite limit; disabled|enabled" }, { "picodrive_ramcart", "MegaCD RAM cart; disabled|enabled" }, { "picodrive_region", "Region; Auto|Japan NTSC|Japan PAL|US|Europe" }, - { "picodrive_region_fps", "Region FPS; Auto|NTSC|PAL" }, { "picodrive_aspect", "Core-provided aspect ratio; PAR|4/3|CRT" }, { "picodrive_overscan", "Show Overscan; disabled|enabled" }, #ifdef DRC_SH2 @@ -555,6 +567,8 @@ void retro_get_system_info(struct retro_system_info *info) void retro_get_system_av_info(struct retro_system_av_info *info) { + float common_width; + memset(info, 0, sizeof(*info)); info->timing.fps = Pico.m.pal ? 50 : 60; info->timing.sample_rate = 44100; @@ -563,7 +577,7 @@ void retro_get_system_av_info(struct retro_system_av_info *info) info->geometry.max_width = vout_width; info->geometry.max_height = vout_height; - float common_width = vout_width; + common_width = vout_width; if (user_vout_width != 0) common_width = user_vout_width; @@ -696,6 +710,7 @@ typedef struct patch { unsigned int addr; unsigned short data; + unsigned char comp; } patch; extern void decode(char *buff, patch *dest); @@ -728,16 +743,10 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code) int array_len = PicoPatchCount; char codeCopy[256]; char *buff; - bool multiline=0; + if (code=='\0') return; strcpy(codeCopy,code); - - if (strstr(code,"+")){ - multiline=1; - buff = strtok(codeCopy,"+"); - } else { - buff=codeCopy; - } + buff = strtok(codeCopy,"+"); while (buff != NULL) { @@ -766,14 +775,13 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code) PicoPatches[PicoPatchCount].active = enabled; PicoPatches[PicoPatchCount].addr = pt.addr; PicoPatches[PicoPatchCount].data = pt.data; + PicoPatches[PicoPatchCount].comp = pt.comp; if (PicoPatches[PicoPatchCount].addr < Pico.romsize) PicoPatches[PicoPatchCount].data_old = *(uint16_t *)(Pico.rom + PicoPatches[PicoPatchCount].addr); else PicoPatches[PicoPatchCount].data_old = (uint16_t) m68k_read16(PicoPatches[PicoPatchCount].addr); PicoPatchCount++; - if (!multiline) - break; buff = strtok(NULL,"+"); } } @@ -965,22 +973,6 @@ static const char *find_bios(int *region, const char *cd_fname) return NULL; } -static void sram_reset() -{ - SRam.data = NULL; - SRam.start = 0; - SRam.end = 0; - SRam.flags = '\0'; - SRam.unused2 = '\0'; - SRam.changed = '\0' ; - SRam.eeprom_type = '\0'; - SRam.unused3 = '\0'; - SRam.eeprom_bit_cl = '\0'; - SRam.eeprom_bit_in = '\0'; - SRam.eeprom_bit_out = '\0'; - SRam.size = 0; -} - bool retro_load_game(const struct retro_game_info *info) { enum media_type_e media_type; @@ -1037,8 +1029,6 @@ bool retro_load_game(const struct retro_game_info *info) { 0 }, }; - sram_reset(); - enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565; if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) { if (log_cb) @@ -1128,13 +1118,13 @@ void *retro_get_memory_data(unsigned type) if (PicoAHW & PAHW_MCD) data = Pico_mcd->bram; else - data = SRam.data; + data = Pico.sv.data; break; case RETRO_MEMORY_SYSTEM_RAM: if (PicoAHW & PAHW_SMS) - data = Pico.vramb; + data = PicoMem.zram; else - data = Pico.ram; + data = PicoMem.ram; break; default: data = NULL; @@ -1157,20 +1147,20 @@ size_t retro_get_memory_size(unsigned type) return 0x2000; if (Pico.m.frame_count == 0) - return SRam.size; + return Pico.sv.size; // if game doesn't write to sram, don't report it to // libretro so that RA doesn't write out zeroed .srm - for (i = 0, sum = 0; i < SRam.size; i++) - sum |= SRam.data[i]; + for (i = 0, sum = 0; i < Pico.sv.size; i++) + sum |= Pico.sv.data[i]; - return (sum != 0) ? SRam.size : 0; + return (sum != 0) ? Pico.sv.size : 0; case RETRO_MEMORY_SYSTEM_RAM: if (PicoAHW & PAHW_SMS) - return sizeof(Pico.vramb); + return 0x2000; else - return sizeof(Pico.ram); + return sizeof(PicoMem.ram); default: return 0; @@ -1221,6 +1211,8 @@ static enum input_device input_name_to_val(const char *name) static void update_variables(void) { struct retro_variable var; + int OldPicoRegionOverride; + float old_user_vout_width; var.value = NULL; var.key = "picodrive_input1"; @@ -1250,7 +1242,7 @@ static void update_variables(void) PicoOpt &= ~POPT_EN_MCD_RAMCART; } - int OldPicoRegionOverride = PicoRegionOverride; + OldPicoRegionOverride = PicoRegionOverride; var.value = NULL; var.key = "picodrive_region"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { @@ -1266,28 +1258,15 @@ static void update_variables(void) PicoRegionOverride = 8; } - int OldPicoRegionFPSOverride = PicoRegionFPSOverride; - var.value = NULL; - var.key = "picodrive_region_fps"; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - if (strcmp(var.value, "Auto") == 0) - PicoRegionFPSOverride = 0; - else if (strcmp(var.value, "NTSC") == 0) - PicoRegionFPSOverride = 1; - else if (strcmp(var.value, "PAL") == 0) - PicoRegionFPSOverride = 2; - } - // Update region, fps and sound flags if needed - if (PicoRegionOverride != OldPicoRegionOverride || - PicoRegionFPSOverride != OldPicoRegionFPSOverride) + if (Pico.rom && PicoRegionOverride != OldPicoRegionOverride) { PicoDetectRegion(); PicoLoopPrepare(); PsndRerate(1); } - float old_user_vout_width = user_vout_width; + old_user_vout_width = user_vout_width; var.value = NULL; var.key = "picodrive_aspect"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { @@ -1355,13 +1334,6 @@ void retro_run(void) vout_width, vout_height, vout_width * 2); } -static void check_system_specs(void) -{ - /* TODO - set different performance level for 32X - 6 for ARM dynarec, higher for interpreter core */ - unsigned level = 5; - environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level); -} - void retro_init(void) { struct retro_log_callback log; @@ -1425,3 +1397,5 @@ void retro_deinit(void) vout_buf = NULL; PicoExit(); } + +// vim:shiftwidth=3:ts=3:expandtab