diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index e6a8feecc2..8a9213d0f1 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -22,6 +22,7 @@
prompt
4
true
+ x86
pdbonly
@@ -31,6 +32,7 @@
prompt
4
true
+ x86
diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj
index e0f74a6bca..15497a6fd8 100644
--- a/BizHawk.Common/BizHawk.Common.csproj
+++ b/BizHawk.Common/BizHawk.Common.csproj
@@ -21,6 +21,7 @@
DEBUG;TRACE
prompt
4
+ AnyCPU
pdbonly
@@ -29,6 +30,7 @@
TRACE
prompt
4
+ AnyCPU
diff --git a/BizHawk.Emulation/Consoles/Calculator/TI83.cs b/BizHawk.Emulation/Consoles/Calculator/TI83.cs
index 8431b3862a..94eb6b54ff 100644
--- a/BizHawk.Emulation/Consoles/Calculator/TI83.cs
+++ b/BizHawk.Emulation/Consoles/Calculator/TI83.cs
@@ -628,13 +628,14 @@ namespace BizHawk.Emulation.Consoles.Calculator
public void Dispose() { }
public Link LinkPort;
+
public class Link
{
readonly TI83 Parent;
- private FileStream CurrentFile;
- private int FileBytesLeft;
- private byte[] VariableData;
+ private FileStream CurrentFile;
+ //private int FileBytesLeft;
+ private byte[] VariableData;
private Action NextStep;
private Queue CurrentData = new Queue();
@@ -789,93 +790,93 @@ namespace BizHawk.Emulation.Consoles.Calculator
}
}
- public void SendFileToCalc(FileStream FS, bool Verify)
- {
- if (Verify)
- VerifyFile(FS);
+ public void SendFileToCalc(FileStream FS, bool Verify)
+ {
+ if (Verify)
+ VerifyFile(FS);
- FS.Seek(55, SeekOrigin.Begin);
- CurrentFile = FS;
- SendNextFile();
- }
+ FS.Seek(55, SeekOrigin.Begin);
+ CurrentFile = FS;
+ SendNextFile();
+ }
private void VerifyFile(FileStream FS)
{
- //Verify the file format.
- byte[] Expected = new byte[] { 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x33, 0x2a, 0x2a, 0x1a, 0x0a, 0x00 };
- byte[] Actual = new byte[11];
+ //Verify the file format.
+ byte[] Expected = new byte[] { 0x2a, 0x2a, 0x54, 0x49, 0x38, 0x33, 0x2a, 0x2a, 0x1a, 0x0a, 0x00 };
+ byte[] Actual = new byte[11];
- FS.Seek(0, SeekOrigin.Begin);
- FS.Read(Actual, 0, 11);
+ FS.Seek(0, SeekOrigin.Begin);
+ FS.Read(Actual, 0, 11);
- //Check the header.
- for (int n = 0; n < 11; n++)
- if (Expected[n] != Actual[n])
- {
- FS.Close();
- throw new IOException("Invalid Header.");
- }
+ //Check the header.
+ for (int n = 0; n < 11; n++)
+ if (Expected[n] != Actual[n])
+ {
+ FS.Close();
+ throw new IOException("Invalid Header.");
+ }
- //Seek to the end of the comment.
- FS.Seek(53, SeekOrigin.Begin);
+ //Seek to the end of the comment.
+ FS.Seek(53, SeekOrigin.Begin);
int Size = FS.ReadByte() + FS.ReadByte() * 256;
- if (FS.Length != Size + 57)
- {
- FS.Close();
- throw new IOException("Invalid file length.");
- }
+ if (FS.Length != Size + 57)
+ {
+ FS.Close();
+ throw new IOException("Invalid file length.");
+ }
- //Verify the checksum.
- ushort Checksum = 0;
- for (int n = 0; n < Size; n++)
- Checksum += (ushort)FS.ReadByte();
+ //Verify the checksum.
+ ushort Checksum = 0;
+ for (int n = 0; n < Size; n++)
+ Checksum += (ushort)FS.ReadByte();
- ushort ActualChecksum = (ushort)(FS.ReadByte() + FS.ReadByte() * 256);
+ ushort ActualChecksum = (ushort)(FS.ReadByte() + FS.ReadByte() * 256);
- if (Checksum != ActualChecksum)
- {
- FS.Close();
- throw new IOException("Invalid Checksum.");
- }
+ if (Checksum != ActualChecksum)
+ {
+ FS.Close();
+ throw new IOException("Invalid Checksum.");
+ }
}
- private void SendNextFile()
- {
- byte[] Header = new byte[13];
- if (!CurrentFile.CanRead || CurrentFile.Read(Header, 0, 13) != 13)
- {
- //End of file.
- CurrentFile.Close();
- return;
- }
+ private void SendNextFile()
+ {
+ byte[] Header = new byte[13];
+ if (!CurrentFile.CanRead || CurrentFile.Read(Header, 0, 13) != 13)
+ {
+ //End of file.
+ CurrentFile.Close();
+ return;
+ }
- int Size = Header[2] + Header[3] * 256;
- VariableData = new byte[Size + 2];
- CurrentFile.Read(VariableData, 0, Size + 2);
+ int Size = Header[2] + Header[3] * 256;
+ VariableData = new byte[Size + 2];
+ CurrentFile.Read(VariableData, 0, Size + 2);
- //Request to send the file.
- CurrentData.Clear();
+ //Request to send the file.
+ CurrentData.Clear();
- CurrentData.Enqueue(0x03);
- CurrentData.Enqueue(0xC9);
- foreach (byte B in Header)
- CurrentData.Enqueue(B);
+ CurrentData.Enqueue(0x03);
+ CurrentData.Enqueue(0xC9);
+ foreach (byte B in Header)
+ CurrentData.Enqueue(B);
- //Calculate the checksum for the command.
- ushort Checksum = 0;
- for (int n = 2; n < Header.Length; n++)
- Checksum += Header[n];
+ //Calculate the checksum for the command.
+ ushort Checksum = 0;
+ for (int n = 2; n < Header.Length; n++)
+ Checksum += Header[n];
- CurrentData.Enqueue((byte)(Checksum % 256));
- CurrentData.Enqueue((byte)(Checksum / 256));
+ CurrentData.Enqueue((byte)(Checksum % 256));
+ CurrentData.Enqueue((byte)(Checksum / 256));
- //Finalize the command.
- CurrentStatus = Status.PrepareReceive;
- NextStep = ReceiveReqAck;
- Parent.LinkActive = true;
- }
+ //Finalize the command.
+ CurrentStatus = Status.PrepareReceive;
+ NextStep = ReceiveReqAck;
+ Parent.LinkActive = true;
+ }
private void ReceiveReqAck()
{
@@ -912,13 +913,13 @@ namespace BizHawk.Emulation.Consoles.Calculator
CurrentData.Enqueue(0x15);
//Add variable data.
- foreach (byte B in VariableData)
+ foreach (byte B in VariableData)
CurrentData.Enqueue(B);
//Calculate the checksum.
ushort Checksum = 0;
- for (int n = 2; n < VariableData.Length; n++)
- Checksum += VariableData[n];
+ for (int n = 2; n < VariableData.Length; n++)
+ Checksum += VariableData[n];
CurrentData.Enqueue((byte)(Checksum % 256));
CurrentData.Enqueue((byte)(Checksum / 256));
@@ -957,7 +958,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
private void OutOfMemory()
{
- CurrentFile.Close();
+ CurrentFile.Close();
Parent.LinkActive = false;
CurrentData.Clear();
@@ -982,13 +983,16 @@ namespace BizHawk.Emulation.Consoles.Calculator
Parent.LinkActive = true;
}
+ //adelikat: This isn't used (yet?) and causes a warning. Did you really mean to override finalize? if so it should be protected virtual, else rename this
+ /*
private void Finalize()
{
CurrentData.Clear();
Parent.LinkActive = false;
NextStep = null;
- SendNextFile();
+ SendNextFile();
}
+ */
}
}
}
\ No newline at end of file
diff --git a/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj b/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj
index 8ca9f27f69..aab162983c 100644
--- a/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj
+++ b/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj
@@ -11,7 +11,8 @@
BizHawk.PCE_Debugger
BizHawk.PCE_Debugger
v4.0
- Client
+
+
512
@@ -65,7 +66,9 @@
True
Resources.resx
+ True
+
SettingsSingleFileGenerator
Settings.Designer.cs
diff --git a/BizHawk.PCE_Debugger/Properties/Resources.Designer.cs b/BizHawk.PCE_Debugger/Properties/Resources.Designer.cs
index a3881b1263..869dda0746 100644
--- a/BizHawk.PCE_Debugger/Properties/Resources.Designer.cs
+++ b/BizHawk.PCE_Debugger/Properties/Resources.Designer.cs
@@ -1,17 +1,17 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1008
+// Runtime Version:4.0.30319.18052
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
//
//------------------------------------------------------------------------------
-namespace BizHawk.PCE_Debugger.Properties
-{
-
-
+namespace BizHawk.PCE_Debugger.Properties {
+ using System;
+
+
///
/// A strongly-typed resource class, for looking up localized strings, etc.
///
@@ -22,48 +22,40 @@ namespace BizHawk.PCE_Debugger.Properties
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources
- {
-
+ internal class Resources {
+
private static global::System.Resources.ResourceManager resourceMan;
-
+
private static global::System.Globalization.CultureInfo resourceCulture;
-
+
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources()
- {
+ internal Resources() {
}
-
+
///
/// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager
- {
- get
- {
- if ((resourceMan == null))
- {
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BizHawk.PCE_Debugger.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
-
+
///
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture
- {
- get
- {
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
return resourceCulture;
}
- set
- {
+ set {
resourceCulture = value;
}
}
diff --git a/BizHawk.PCE_Debugger/Properties/Settings.Designer.cs b/BizHawk.PCE_Debugger/Properties/Settings.Designer.cs
index 6de1344289..b3f8884137 100644
--- a/BizHawk.PCE_Debugger/Properties/Settings.Designer.cs
+++ b/BizHawk.PCE_Debugger/Properties/Settings.Designer.cs
@@ -1,28 +1,24 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1008
+// Runtime Version:4.0.30319.18052
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
//
//------------------------------------------------------------------------------
-namespace BizHawk.PCE_Debugger.Properties
-{
-
-
+namespace BizHawk.PCE_Debugger.Properties {
+
+
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default
- {
- get
- {
+
+ public static Settings Default {
+ get {
return defaultInstance;
}
}