From 221ba4c22d8927b0f84d94b508d48c67cb511eae Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Fri, 17 Jul 2015 23:56:51 +0200 Subject: [PATCH 1/3] s/cfgSetVitual/cfgSetVirtual --- core/cfg/cfg.cpp | 2 +- core/cfg/cfg.h | 4 ++-- core/cfg/cl.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/cfg/cfg.cpp b/core/cfg/cfg.cpp index ec286c44f..d7dc0b8fb 100644 --- a/core/cfg/cfg.cpp +++ b/core/cfg/cfg.cpp @@ -448,7 +448,7 @@ void cfgSaveInt(const wchar * Section, const wchar * Key, s32 Int) sprintf(tmp,"%d", Int); cfgSaveStr(Section,Key,tmp); } -void cfgSetVitual(const wchar * Section, const wchar * Key, const wchar * String) +void cfgSetVirtual(const wchar * Section, const wchar * Key, const wchar * String) { vlist.push_back(vitem(Section,Key,String)); //cfgdb.GetEntry(Section,CEM_VIRTUAL)->SetEntry(Key,String,CEM_VIRTUAL); diff --git a/core/cfg/cfg.h b/core/cfg/cfg.h index 77a35cc56..3278ed777 100644 --- a/core/cfg/cfg.h +++ b/core/cfg/cfg.h @@ -16,6 +16,6 @@ void cfgLoadStr(const wchar * lpSection, const wchar * lpKey, wchar * lpReturn, string cfgLoadStr(const wchar * Section, const wchar * Key, const wchar* Default); void cfgSaveStr(const wchar * lpSection, const wchar * lpKey, const wchar * lpString); s32 cfgExists(const wchar * Section, const wchar * Key); -void cfgSetVitual(const wchar * lpSection, const wchar * lpKey, const wchar * lpString); +void cfgSetVirtual(const wchar * lpSection, const wchar * lpKey, const wchar * lpString); -bool ParseCommandLine(int argc,wchar* argv[]); \ No newline at end of file +bool ParseCommandLine(int argc,wchar* argv[]); diff --git a/core/cfg/cl.cpp b/core/cfg/cl.cpp index 205fb1ea1..2343cd062 100644 --- a/core/cfg/cl.cpp +++ b/core/cfg/cl.cpp @@ -82,7 +82,7 @@ int setconfig(wchar** arg,int cl) value=""; printf("Virtual cfg %s:%s=%s\n",sect,key,value); - cfgSetVitual(sect,key,value); + cfgSetVirtual(sect,key,value); rv++; if (cl>=3 && stricmp(arg[2],",")==0) @@ -128,12 +128,12 @@ bool ParseCommandLine(int argc,wchar* argv[]) } else if (strstr(*arg, ".cdi") || strstr(*arg, ".chd")) { printf("Using '%s' as cd image\n", *arg); - cfgSetVitual("config", "image", *arg); + cfgSetVirtual("config", "image", *arg); } else if (strstr(*arg, ".elf")) { printf("Using '%s' as reios elf file\n", *arg); - cfgSetVitual("config", "reios.enabled", "1"); - cfgSetVitual("reios", "ElfFile", *arg); + cfgSetVirtual("config", "reios.enabled", "1"); + cfgSetVirtual("reios", "ElfFile", *arg); } else { @@ -144,4 +144,4 @@ bool ParseCommandLine(int argc,wchar* argv[]) } printf("\n"); return false; -} \ No newline at end of file +} From 9ff72a731f273466dff932aa55eb44feaaf1a97c Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Fri, 17 Jul 2015 23:58:46 +0200 Subject: [PATCH 2/3] Remove function declaration in the middle of a function --- core/nullDC.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/nullDC.cpp b/core/nullDC.cpp index c9df6fac5..da6144180 100755 --- a/core/nullDC.cpp +++ b/core/nullDC.cpp @@ -4,6 +4,7 @@ //initialse Emu #include "types.h" #include "oslib/oslib.h" +#include "oslib/audiostream.h" #include "hw/mem/_vmem.h" #include "stdclass.h" #include "cfg/cfg.h" @@ -196,7 +197,6 @@ int dc_init(int argc,wchar* argv[]) printf("Using Interpreter\n"); } - void InitAudio(); InitAudio(); sh4_cpu.Init(); From 8c68f4a06bea64585176d0679b436ee9e059ad40 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Fri, 31 Jul 2015 20:37:39 +0200 Subject: [PATCH 3/3] Fix a 'permissive' warning --- core/hw/sh4/dyna/driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/hw/sh4/dyna/driver.cpp b/core/hw/sh4/dyna/driver.cpp index 25aaae103..ab45fdd4e 100644 --- a/core/hw/sh4/dyna/driver.cpp +++ b/core/hw/sh4/dyna/driver.cpp @@ -308,7 +308,7 @@ void* DYNACALL rdv_LinkBlock(u8* code,u32 dpc) rbi=bm_GetStaleBlock(code); } - verify((int)rbi); + verify(rbi != NULL); u32 bcls=BET_GET_CLS(rbi->BlockType);