libretro/beetle-psx-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-psx-libretro.git synced 2024-11-23 08:49:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update cdrom code

Browse Source
This commit is contained in:
twinaphex 2016-08-14 13:15:13 +02:00
parent aa0dbd3dcd
commit c508e48741
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -65,6 +65,8 @@ SOURCES_CXX += beetle_psx_griffin.cpp \
SOURCES_C += beetle_psx_griffin_c.c
endif
FLAGS += -DHAVE_PBP
ifeq ($(DEBUG), 1)
SOURCES_CXX += $(CORE_EMU_DIR)/dis.cpp
endif

5
mednafen/cdrom/CDAccess.cpp
View File

@ -44,8 +44,9 @@ CDAccess *cdaccess_open_image(bool *success, const char *path, bool image_memcac
{
if(strlen(path) >= 4 && !strcasecmp(path + strlen(path) - 4, ".ccd"))
return new CDAccess_CCD(success, path, image_memcache);
#ifdef HAVE_PBP
else if(strlen(path) >= 4 && !strcasecmp(path + strlen(path) - 4, ".pbp"))
return new CDAccess_PBP(success, path, image_memcache);
return new CDAccess_PBP(path, image_memcache);
#endif
return new CDAccess_Image(success, path, image_memcache);
}

21
mednafen/cdrom/CDAccess_PBP.cpp
View File

@ -118,7 +118,7 @@ bool CDAccess_PBP::ImageOpen(const char *path, bool image_memcache)
// check for valid pbp
if(fp->read(magic, 4, false) != 4 || magic[0] != 0 || magic[1] != 'P' || magic[2] != 'B' || magic[3] != 'P')
{
MDFN_Error(0, _("Invalid PBP header: %s"), path);
log_cb(RETRO_LOG_ERROR, "Invalid PBP header: %s\n", path);
return false;
}
@ -149,7 +149,7 @@ bool CDAccess_PBP::ImageOpen(const char *path, bool image_memcache)
if(pdg_size < 1 || pdg_size > sizeof(iso_map))
{
MDFN_Error(0, _("[PBP] Failed to decrypt multi-disc iso map"));
log_cb(RETRO_LOG_ERROR, "[PBP] Failed to decrypt multi-disc iso map\n");
return false;
}
@ -170,7 +170,7 @@ bool CDAccess_PBP::ImageOpen(const char *path, bool image_memcache)
if(PBP_DiscCount == 0)
{
MDFN_Error(0, _("Multidisk eboot has 0 images?: %s"), path);
log_cb(RETRO_LOG_ERROR, "Multidisk eboot has 0 images?: %s\n", path);
return false;
}
@ -183,7 +183,7 @@ bool CDAccess_PBP::ImageOpen(const char *path, bool image_memcache)
if(strncmp(psar_sig, "PSISOIMG0000", sizeof(psar_sig)) != 0)
{
MDFN_Error(0, _("Unexpected psar_sig: %s"), psar_sig);
log_cb(RETRO_LOG_ERROR, "Unexpected psar_sig: %s\n", psar_sig);
return false;
}
@ -219,14 +219,15 @@ void CDAccess_PBP::Cleanup(void)
free(index_table);
}
CDAccess_PBP::CDAccess_PBP(bool *success, const char *path, bool image_memcache) : NumTracks(0), FirstTrack(0), LastTrack(0), total_sectors(0)
CDAccess_PBP::CDAccess_PBP(const char *path, bool image_memcache) : NumTracks(0), FirstTrack(0), LastTrack(0), total_sectors(0)
{
is_official = false;
index_table = NULL;
fp = NULL;
kirk_init();
if (!ImageOpen(path, image_memcache))
*success = false;
{
}
}
CDAccess_PBP::~CDAccess_PBP()
@ -480,7 +481,7 @@ bool CDAccess_PBP::Read_TOC(TOC *toc)
if(!iso_header)
{
MDFN_Error(0, _("[PBP] Read_TOC() - unable to allocate memory"));
log_cb(RETRO_LOG_ERROR, "[PBP] Read_TOC() - unable to allocate memory\n");
return false;
}
@ -496,7 +497,7 @@ bool CDAccess_PBP::Read_TOC(TOC *toc)
if(pdg_size < 1 || pdg_size > 0xB6600)
{
MDFN_Error(0, _("[PBP] Failed to decrypt multi-disc iso map"));
log_cb(RETRO_LOG_ERROR, "[PBP] Failed to decrypt multi-disc iso map\n");
return false;
}
@ -575,7 +576,7 @@ bool CDAccess_PBP::Read_TOC(TOC *toc)
if(BCD_to_U8(toc_entry.track) < i || BCD_to_U8(toc_entry.track) > i)
{
MDFN_Error(0, _("Tracks out of order")); // can this happen?
log_cb(RETRO_LOG_ERROR, "Tracks out of order\n"); // can this happen?
return false;
}
}
@ -608,7 +609,7 @@ bool CDAccess_PBP::Read_TOC(TOC *toc)
index_table = (unsigned int*)malloc((index_len + 1) * sizeof(*index_table));
if (index_table == NULL)
{
MDFN_Error(0, _("Unable to allocate memory"));
log_cb(RETRO_LOG_ERROR, "Unable to allocate memory\n");
return false;
}

2
mednafen/cdrom/CDAccess_PBP.h
View File

@ -12,7 +12,7 @@ class CDAccess_PBP : public CDAccess
{
public:
CDAccess_PBP(bool *success, const char *path, bool image_memcache);
CDAccess_PBP(const char *path, bool image_memcache);
virtual ~CDAccess_PBP();
virtual bool Read_Raw_Sector(uint8_t *buf, int32_t lba);

12
msvc/msvc-2010.vcxproj
View File

@ -118,7 +118,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\libretro-common\include;$(SolutionDir)..\deps\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CORE=1;DEBUG=1;HAVE_OPENGL=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CORE=1;DEBUG=1;HAVE_OPENGL=1;HAVE_PBP=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -143,7 +143,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\libretro-common\include;$(SolutionDir)..\deps\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CORE=1;DEBUG=1;HAVE_OPENGL=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CORE=1;DEBUG=1;HAVE_OPENGL=1;HAVE_PBP=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -167,7 +167,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\libretro-common\include;$(SolutionDir)..\deps\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CORE=1;DEBUG=1;HAVE_OPENGL=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CORE=1;DEBUG=1;HAVE_OPENGL=1;HAVE_PBP=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -192,7 +192,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\libretro-common\include;$(SolutionDir)..\deps\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CORE=1;DEBUG=1;HAVE_OPENGL=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CORE=1;DEBUG=1;HAVE_OPENGL=1;HAVE_PBP=1;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -215,7 +215,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\libretro-common\include;$(SolutionDir)..\deps\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CORE=1;HAVE_OPENGL=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CORE=1;HAVE_OPENGL=1;HAVE_PBP=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@ -238,7 +238,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\libretro-common\include;$(SolutionDir)..\deps\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CORE=1;HAVE_OPENGL=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>CORE=1;HAVE_OPENGL=1;HAVE_PBP=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRETROPSX_EXPORTS;WANT_THREADING;WANT_32BPP;__LIBRETRO__;WANT_NEW_API;NEED_TREMOR;NEED_DEINTERLACER;NEED_CD;MEDNAFEN_VERSION_NUMERIC=9361;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>