From: hizzlekizzle Date: Fri, 2 Aug 2019 13:38:48 +0000 (-0500) Subject: Merge pull request #325 from retro-wertz/SysPrintf_to_retro_log X-Git-Tag: r24l~707 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcb84f0c6ad095c355d8c0835fc6c5fcdc2a6813;hp=735de186017c42bb563933b77165f8827dbb6d7a;p=pcsx_rearmed.git Merge pull request #325 from retro-wertz/SysPrintf_to_retro_log SysPrintf to retro_log and silence some warnings --- diff --git a/frontend/libretro.c b/frontend/libretro.c index e48069a9..b8d17ab9 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -2286,3 +2286,15 @@ int usleep (unsigned long us) sceKernelDelayThread(us); } #endif + +void SysPrintf(const char *fmt, ...) { + va_list list; + char msg[512]; + + va_start(list, fmt); + vsprintf(msg, fmt, list); + va_end(list); + + if (log_cb) + log_cb(RETRO_LOG_INFO, "%s", msg); +} diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h index bdc214f7..6513e1c4 100644 --- a/frontend/libretro_core_options.h +++ b/frontend/libretro_core_options.h @@ -663,7 +663,7 @@ struct retro_core_option_definition option_defs_us[] = { }, #endif /* DRC_DISABLE */ - { NULL, NULL, NULL, { NULL, NULL }, NULL }, + { NULL, NULL, NULL, { {0} }, NULL }, }; /* RETRO_LANGUAGE_JAPANESE */ @@ -1183,7 +1183,7 @@ struct retro_core_option_definition option_defs_tr[] = { }, #endif /* DRC_DISABLE */ - { NULL, NULL, NULL, { NULL, NULL }, NULL }, + { NULL, NULL, NULL, { {0} }, NULL }, }; diff --git a/frontend/main.c b/frontend/main.c index 860dec0d..c0bfd0fd 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -795,6 +795,7 @@ int emu_load_state(int slot) return LoadState(fname); } +#ifndef HAVE_LIBRETRO #ifndef ANDROID void SysPrintf(const char *fmt, ...) { @@ -819,6 +820,7 @@ void SysPrintf(const char *fmt, ...) { } #endif +#endif /* HAVE_LIBRETRO */ void SysMessage(const char *fmt, ...) { va_list list; diff --git a/include/config.h b/include/config.h index ce2f3ea1..362e4a4c 100644 --- a/include/config.h +++ b/include/config.h @@ -1,2 +1,2 @@ #define MAXPATHLEN 256 -#define PACKAGE_VERSION "1.9" +#define PCSX_VERSION "1.9" diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 975105ed..daed921e 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -1349,6 +1349,7 @@ static long CALLBACK ISOopen(void) { boolean isMode1ISO = FALSE; char alt_bin_filename[MAXPATHLEN]; const char *bin_filename; + char image_str[1024] = {0}; if (cdHandle != NULL) { return 0; // it's already open @@ -1361,7 +1362,7 @@ static long CALLBACK ISOopen(void) { return -1; } - SysPrintf(_("Loaded CD Image: %s"), GetIsoFile()); + sprintf(image_str, "Loaded CD Image: %s", GetIsoFile()); cddaBigEndian = FALSE; subChanMixed = FALSE; @@ -1374,40 +1375,40 @@ static long CALLBACK ISOopen(void) { cdimg_read_func = cdread_normal; if (parsetoc(GetIsoFile()) == 0) { - SysPrintf("[+toc]"); + strcat(image_str, "[+toc]"); } else if (parseccd(GetIsoFile()) == 0) { - SysPrintf("[+ccd]"); + strcat(image_str, "[+ccd]"); } else if (parsemds(GetIsoFile()) == 0) { - SysPrintf("[+mds]"); + strcat(image_str, "[+mds]"); } else if (parsecue(GetIsoFile()) == 0) { - SysPrintf("[+cue]"); + strcat(image_str, "[+cue]"); } if (handlepbp(GetIsoFile()) == 0) { - SysPrintf("[pbp]"); + strcat(image_str, "[+pbp]"); CDR_getBuffer = ISOgetBuffer_compr; cdimg_read_func = cdread_compressed; } else if (handlecbin(GetIsoFile()) == 0) { - SysPrintf("[cbin]"); + strcat(image_str, "[+cbin]"); CDR_getBuffer = ISOgetBuffer_compr; cdimg_read_func = cdread_compressed; } #ifdef HAVE_CHD else if (handlechd(GetIsoFile()) == 0) { - SysPrintf("[chd]"); + strcat(image_str, "[+chd]"); CDR_getBuffer = ISOgetBuffer_chd; cdimg_read_func = cdread_chd; } #endif if (!subChanMixed && opensubfile(GetIsoFile()) == 0) { - SysPrintf("[+sub]"); + strcat(image_str, "[+sub]"); } if (opensbifile(GetIsoFile()) == 0) { - SysPrintf("[+sbi]"); + strcat(image_str, "[+sbi]"); } fseeko(cdHandle, 0, SEEK_END); @@ -1445,13 +1446,13 @@ static long CALLBACK ISOopen(void) { fseek(cdHandle, 0, SEEK_SET); fread(&modeTest, 4, 1, cdHandle); if (SWAP32(modeTest) != 0xffffff00) { - SysPrintf("[2048]"); + strcat(image_str, "[2048]"); isMode1ISO = TRUE; } } fseek(cdHandle, 0, SEEK_SET); - SysPrintf(".\n"); + SysPrintf("%s.\n", image_str); PrintTracks(); diff --git a/libpcsxcore/debug.c b/libpcsxcore/debug.c index 763dc453..4ba7f570 100644 --- a/libpcsxcore/debug.c +++ b/libpcsxcore/debug.c @@ -445,7 +445,7 @@ static void ProcessCommands() { sprintf(reply, "200 %s\r\n", arguments == NULL ? "OK" : arguments); break; case 0x101: - sprintf(reply, "201 %s\r\n", PACKAGE_VERSION); + sprintf(reply, "201 %s\r\n", PCSX_VERSION); break; case 0x102: sprintf(reply, "202 1.0\r\n"); diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c index bb34e5bd..433d4be5 100644 --- a/libpcsxcore/misc.c +++ b/libpcsxcore/misc.c @@ -557,7 +557,7 @@ struct PcsxSaveFuncs SaveFuncs = { zlib_open, zlib_read, zlib_write, zlib_seek, zlib_close }; -static const char PcsxHeader[32] = "STv4 PCSX v" PACKAGE_VERSION; +static const char PcsxHeader[32] = "STv4 PCSX v" PCSX_VERSION; // Savestate Versioning! // If you make changes to the savestate version, please increment the value below. diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c index afe3f3b8..4f52ed2c 100644 --- a/libpcsxcore/plugins.c +++ b/libpcsxcore/plugins.c @@ -1141,11 +1141,11 @@ void ReleasePlugins() { if (Config.UseNet && hNETDriver != NULL) NET_shutdown(); - if (hCDRDriver != NULL) SysCloseLibrary(hCDRDriver); hCDRDriver = NULL; - if (hGPUDriver != NULL) SysCloseLibrary(hGPUDriver); hGPUDriver = NULL; - if (hSPUDriver != NULL) SysCloseLibrary(hSPUDriver); hSPUDriver = NULL; - if (hPAD1Driver != NULL) SysCloseLibrary(hPAD1Driver); hPAD1Driver = NULL; - if (hPAD2Driver != NULL) SysCloseLibrary(hPAD2Driver); hPAD2Driver = NULL; + if (hCDRDriver != NULL) { SysCloseLibrary(hCDRDriver); hCDRDriver = NULL; } + if (hGPUDriver != NULL) { SysCloseLibrary(hGPUDriver); hGPUDriver = NULL; } + if (hSPUDriver != NULL) { SysCloseLibrary(hSPUDriver); hSPUDriver = NULL; } + if (hPAD1Driver != NULL) { SysCloseLibrary(hPAD1Driver); hPAD1Driver = NULL; } + if (hPAD2Driver != NULL) { SysCloseLibrary(hPAD2Driver); hPAD2Driver = NULL; } if (Config.UseNet && hNETDriver != NULL) { SysCloseLibrary(hNETDriver); hNETDriver = NULL; @@ -1164,7 +1164,7 @@ void ReleasePlugins() { int ReloadCdromPlugin() { if (hCDRDriver != NULL || cdrIsoActive()) CDR_shutdown(); - if (hCDRDriver != NULL) SysCloseLibrary(hCDRDriver); hCDRDriver = NULL; + if (hCDRDriver != NULL) { SysCloseLibrary(hCDRDriver); hCDRDriver = NULL; } if (UsingIso()) { LoadCDRplugin(NULL); diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c index 22341c54..0433c207 100644 --- a/libpcsxcore/r3000a.c +++ b/libpcsxcore/r3000a.c @@ -30,7 +30,7 @@ R3000Acpu *psxCpu = NULL; psxRegisters psxRegs; int psxInit() { - SysPrintf(_("Running PCSX Version %s (%s).\n"), PACKAGE_VERSION, __DATE__); + SysPrintf(_("Running PCSX Version %s (%s).\n"), PCSX_VERSION, __DATE__); #ifdef PSXREC if (Config.Cpu == CPU_INTERPRETER) { diff --git a/libpcsxcore/socket.c b/libpcsxcore/socket.c index c408bc32..df768e68 100644 --- a/libpcsxcore/socket.c +++ b/libpcsxcore/socket.c @@ -135,7 +135,7 @@ void GetClient() { } #endif - sprintf(hello, "000 PCSX Version %s - Debug console\r\n", PACKAGE_VERSION); + sprintf(hello, "000 PCSX Version %s - Debug console\r\n", PCSX_VERSION); WriteSocket(hello, strlen(hello)); ptr = 0; } diff --git a/maemo/main.c b/maemo/main.c index c382c511..50e129ec 100644 --- a/maemo/main.c +++ b/maemo/main.c @@ -54,7 +54,7 @@ static void ChangeWorkingDirectory(char *exe) void PrintHelp() { - printf("PCSX-ReARMed version %s for Maemo\n\n", PACKAGE_VERSION); + printf("PCSX-ReARMed version %s for Maemo\n\n", PCSX_VERSION); printf("Usage:\n"); printf(" pcsx [options] -cdfile FILE\n\n"); diff --git a/plugins/dfxvideo/soft.c b/plugins/dfxvideo/soft.c index c1c3beff..1b22ed50 100644 --- a/plugins/dfxvideo/soft.c +++ b/plugins/dfxvideo/soft.c @@ -6316,6 +6316,7 @@ static void DrawSoftwareSpriteMirror(unsigned char * baseAddr,int32_t w,int32_t sprtYa=(sprtY<<10); clutP=(clutY0<<10)+clutX0; for (sprCY=0;sprCY>4)&0xf)])); GetTextureTransColG_SPR(&psxVuw[sprA+1],GETLE16(&psxVuw[clutP+(tC&0xf)])); } + } return; case 1: clutP>>=1; for(sprCY=0;sprCY