From d0fee54834176f8888e291c23a6fc14ede9d2bd4 Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 20 Jul 2015 17:59:34 -0500 Subject: [PATCH] enable backup identification of PSX discs through ISO filesystem --- BizHawk.Emulation.DiscSystem/DiscIdentifier.cs | 15 +++++++++++---- BizHawk.Emulation.DiscSystem/DiscStream.cs | 16 ++++++++++++---- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/BizHawk.Emulation.DiscSystem/DiscIdentifier.cs b/BizHawk.Emulation.DiscSystem/DiscIdentifier.cs index 5ecd22d09b..9918b7c470 100644 --- a/BizHawk.Emulation.DiscSystem/DiscIdentifier.cs +++ b/BizHawk.Emulation.DiscSystem/DiscIdentifier.cs @@ -87,15 +87,22 @@ namespace BizHawk.Emulation.DiscSystem //an emulator frontend will likely just guess TurboCD if the disc is UnknownFormat //(we can also have a gameDB!) + var discView = EDiscStreamView.DiscStreamView_Mode1_2048; + if (disc.TOC.Session1Format == SessionFormat.Type20_CDXA) + discView = EDiscStreamView.DiscStreamView_Mode2_Form1_2048; + var iso = new ISOFile(); - bool isIso = iso.Parse(new DiscStream(disc, EDiscStreamView.DiscStreamView_Mode1_2048, 0)); + bool isIso = iso.Parse(new DiscStream(disc, discView, 0)); if (isIso) { var appId = System.Text.Encoding.ASCII.GetString(iso.VolumeDescriptors[0].ApplicationIdentifier).TrimEnd('\0', ' '); - //NOTE: PSX magical drop F (JP SLPS_02337) doesn't have the correct iso PVD fields - //if (appId == "PLAYSTATION") - // return DiscType.SonyPSX; + + //for example: PSX magical drop F (JP SLPS_02337) doesn't have the correct iso PVD fields + //but, some PSX games (junky rips) don't have the 'licensed by string' so we'll hope they get caught here + if (appId == "PLAYSTATION") + return DiscType.SonyPSX; + if(appId == "PSP GAME") return DiscType.SonyPSP; diff --git a/BizHawk.Emulation.DiscSystem/DiscStream.cs b/BizHawk.Emulation.DiscSystem/DiscStream.cs index 95db67d0db..c2f8267b3a 100644 --- a/BizHawk.Emulation.DiscSystem/DiscStream.cs +++ b/BizHawk.Emulation.DiscSystem/DiscStream.cs @@ -65,16 +65,24 @@ namespace BizHawk.Emulation.DiscSystem public DiscStream(Disc disc, EDiscStreamView view, int from_lba) { - if (view != EDiscStreamView.DiscStreamView_Mode1_2048) - throw new NotSupportedException("disc streams of not mode 1 are currently unsupported"); - SectorSize = 2048; Disc = disc; NumSectors = disc.Session1.LeadoutLBA; dsr = new DiscSectorReader(disc); //following the provided view - dsr.Policy.UserData2048Mode = DiscSectorReaderPolicy.EUserData2048Mode.AssumeMode1; + switch (view) + { + case EDiscStreamView.DiscStreamView_Mode1_2048: + dsr.Policy.UserData2048Mode = DiscSectorReaderPolicy.EUserData2048Mode.AssumeMode1; + break; + case EDiscStreamView.DiscStreamView_Mode2_Form1_2048: + dsr.Policy.UserData2048Mode = DiscSectorReaderPolicy.EUserData2048Mode.AssumeMode2_Form1; + break; + default: + throw new NotSupportedException("Unsupported EDiscStreamView"); + } + currPosition = from_lba * SectorSize; cachedSector = -1;