ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert psx fast boot stuff. can't be done without full bios HLE. bad plan. nice try. much education.

This commit is contained in:
zeromus 2015-07-22 18:25:57 -05:00
parent e43e89e5cc
commit 5f4f164a95
3 changed files with 10 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
BizHawk.Client.EmuHawk/config/PSX/PSXOptions.Designer.cs generated
View File

@ -33,7 +33,6 @@
this.btnCancel = new System.Windows.Forms.Button();
this.btnOk = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.lblTweakedMednafen = new System.Windows.Forms.Label();
this.rbTweakedMednafenMode = new System.Windows.Forms.RadioButton();
this.label3 = new System.Windows.Forms.Label();
@ -54,17 +53,14 @@
this.label1 = new System.Windows.Forms.Label();
this.NTSC_LastLineNumeric = new System.Windows.Forms.NumericUpDown();
this.NTSC_FirstLineNumeric = new System.Windows.Forms.NumericUpDown();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.checkSkipFirmwareBoot = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PAL_LastLineNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PAL_FirstLineNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NTSC_LastLineNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NTSC_FirstLineNumeric)).BeginInit();
this.groupBox3.SuspendLayout();
this.SuspendLayout();
//
// btnCancel
@ -108,17 +104,6 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Resolution Management";
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(327, 248);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(53, 13);
this.linkLabel1.TabIndex = 29;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "About Me";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// lblTweakedMednafen
//
this.lblTweakedMednafen.Location = new System.Drawing.Point(255, 132);
@ -349,40 +334,16 @@
this.NTSC_FirstLineNumeric.TabIndex = 21;
this.NTSC_FirstLineNumeric.ValueChanged += new System.EventHandler(this.DrawingArea_ValueChanged);
//
// groupBox3
// linkLabel1
//
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.checkSkipFirmwareBoot);
this.groupBox3.Controls.Add(this.checkBox1);
this.groupBox3.Location = new System.Drawing.Point(492, 173);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(212, 48);
this.groupBox3.TabIndex = 32;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Mighty Hacks";
//
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(7, 127);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(142, 17);
this.checkBox1.TabIndex = 30;
this.checkBox1.Text = "Clip Horizontal Overscan";
this.toolTip1.SetToolTip(this.checkBox1, "A mednafen option -- appears to be 5.5% horizontally");
this.checkBox1.UseVisualStyleBackColor = true;
//
// checkSkipFirmwareBoot
//
this.checkSkipFirmwareBoot.AutoSize = true;
this.checkSkipFirmwareBoot.Location = new System.Drawing.Point(8, 19);
this.checkSkipFirmwareBoot.Name = "checkSkipFirmwareBoot";
this.checkSkipFirmwareBoot.Size = new System.Drawing.Size(117, 17);
this.checkSkipFirmwareBoot.TabIndex = 45;
this.checkSkipFirmwareBoot.Text = "Skip Firmware Boot";
this.toolTip1.SetToolTip(this.checkSkipFirmwareBoot, "A mednafen option -- appears to be 5.5% horizontally");
this.checkSkipFirmwareBoot.UseVisualStyleBackColor = true;
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(327, 248);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(53, 13);
this.linkLabel1.TabIndex = 29;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "About Me";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// PSXOptions
//
@ -391,7 +352,6 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(713, 297);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btnCancel);
@ -409,8 +369,6 @@
((System.ComponentModel.ISupportInitialize)(this.PAL_FirstLineNumeric)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NTSC_LastLineNumeric)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NTSC_FirstLineNumeric)).EndInit();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.ResumeLayout(false);
}
@ -442,8 +400,5 @@
private System.Windows.Forms.NumericUpDown NTSC_FirstLineNumeric;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.CheckBox checkSkipFirmwareBoot;
private System.Windows.Forms.CheckBox checkBox1;
}
}

2
BizHawk.Client.EmuHawk/config/PSX/PSXOptions.cs
View File

@ -37,7 +37,6 @@ namespace BizHawk.Client.EmuHawk
rbMednafenMode.Checked = _settings.ResolutionMode == Octoshock.eResolutionMode.Mednafen;
rbTweakedMednafenMode.Checked = _settings.ResolutionMode == Octoshock.eResolutionMode.TweakedMednafen;
checkClipHorizontal.Checked = _settings.ClipHorizontalOverscan;
checkSkipFirmwareBoot.Checked = _settings.SkipFirmwareBoot;
NTSC_FirstLineNumeric.Value = _settings.ScanlineStart_NTSC;
NTSC_LastLineNumeric.Value = _settings.ScanlineEnd_NTSC;
@ -77,7 +76,6 @@ namespace BizHawk.Client.EmuHawk
if (rbTweakedMednafenMode.Checked) settings.ResolutionMode = Octoshock.eResolutionMode.TweakedMednafen;
settings.ClipHorizontalOverscan = checkClipHorizontal.Checked;
settings.SkipFirmwareBoot = checkSkipFirmwareBoot.Checked;
settings.ScanlineStart_NTSC = (int)NTSC_FirstLineNumeric.Value;
settings.ScanlineEnd_NTSC = (int)NTSC_LastLineNumeric.Value;

57
BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
View File

@ -232,10 +232,6 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
public Octoshock(CoreComm comm, List<DiscSystem.Disc> discs, List<string> discNames, byte[] exe, object settings, object syncSettings)
{
Load(comm, discs, discNames, exe, settings, syncSettings, null);
if(_Settings.SkipFirmwareBoot)
TrySkipFirmwareBoot();
OctoshockDll.shock_PowerOn(psx);
}
@ -391,55 +387,6 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
StudySaveBufferSize();
}
void TrySkipFirmwareBoot()
{
//find a SYSTEM.CNF file with a BOOT = cdrom:\exefile;1 or something like that
//the filenames all have a semicolon after them, I don't kno what's up with that
var iso = new DiscSystem.ISOFile();
bool isIso;
using (var ds = new DiscSystem.DiscStream(Discs[0], DiscSystem.EDiscStreamView.DiscStreamView_Mode2_Form1_2048, 0))
{
isIso = iso.Parse(ds);
ds.Position = 0;
if (isIso)
{
string exeName = null;
if (iso.Root.Children.ContainsKey("SYSTEM.CNF;1"))
{
var syscnfNode = iso.Root.Children["SYSTEM.CNF;1"];
var syscnfSector = syscnfNode.Offset;
var syscnfFile = new byte[syscnfNode.Length];
ds.Position = syscnfNode.Offset * 2048;
ds.Read(syscnfFile, 0, syscnfFile.Length);
var syscnfString = System.Text.Encoding.ASCII.GetString(syscnfFile).Replace("\r\n", "\n");
var lines = syscnfString.Split('\n');
foreach (var line in lines)
{
var parts = line.Split(new[] { " = " }, StringSplitOptions.None);
if (parts[0] == "BOOT" && parts[1].ToLowerInvariant().StartsWith("cdrom:\\"))
{
exeName = parts[1].Substring(7);
//don't remove it, it's needed
//int semicolon = exeName.IndexOf(';');
//if(semicolon != -1) exeName = parts[1].Substring(0,semicolon+1);
}
}
}
if (exeName != null && iso.Root.Children.ContainsKey(exeName))
{
var exeNode = iso.Root.Children[exeName];
var exeBuffer = new byte[exeNode.Length];
ds.Position = exeNode.Offset * 2048;
if (ds.Read(exeBuffer, 0, exeBuffer.Length) == exeBuffer.Length)
{
fixed (byte* pExe = exeBuffer)
OctoshockDll.shock_MountEXE(psx, pExe, exeBuffer.Length, false);
}
}
}
}
}
public IEmulatorServiceProvider ServiceProvider { get; private set; }
public IInputCallbackSystem InputCallbacks { get { throw new NotImplementedException(); } }
@ -1072,10 +1019,6 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
[DefaultValue(false)]
public bool ClipHorizontalOverscan { get; set; }
[DisplayName("Skip Firmware Boot")]
[DefaultValue(false)]
public bool SkipFirmwareBoot { get; set; }
public void Validate()
{
if (ScanlineStart_NTSC < 0) ScanlineStart_NTSC = 0;