saturnus: support 8mbit/32mbit dram cart as a syncsetting. this inflates your savestate size heavily, of course...

BizHawk.Client.EmuHawk/config/Saturn/SaturnPrefs.Designer.cs

@@ -40,11 +40,14 @@
 			this.radioButtonFactor = new System.Windows.Forms.RadioButton();
 			this.buttonOK = new System.Windows.Forms.Button();
 			this.buttonCancel = new System.Windows.Forms.Button();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.comboBoxCartType = new System.Windows.Forms.ComboBox();
 			this.groupBox1.SuspendLayout();
 			this.groupBox2.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.numericUpDownFactor)).BeginInit();
+			this.groupBox3.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// groupBox1
@@ -208,7 +211,7 @@
 			// 
 			this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.buttonOK.Location = new System.Drawing.Point(187, 122);
+			this.buttonOK.Location = new System.Drawing.Point(188, 178);
 			this.buttonOK.Name = "buttonOK";
 			this.buttonOK.Size = new System.Drawing.Size(75, 23);
 			this.buttonOK.TabIndex = 2;
@@ -220,18 +223,37 @@
 			// 
 			this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.buttonCancel.Location = new System.Drawing.Point(268, 122);
+			this.buttonCancel.Location = new System.Drawing.Point(269, 178);
 			this.buttonCancel.Name = "buttonCancel";
 			this.buttonCancel.Size = new System.Drawing.Size(75, 23);
 			this.buttonCancel.TabIndex = 3;
 			this.buttonCancel.Text = "Cancel";
 			this.buttonCancel.UseVisualStyleBackColor = true;
 			// 
+			// groupBox3
+			// 
+			this.groupBox3.Controls.Add(this.comboBoxCartType);
+			this.groupBox3.Location = new System.Drawing.Point(12, 118);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(332, 54);
+			this.groupBox3.TabIndex = 4;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = "Cartridge Type";
+			// 
+			// comboBoxCartType
+			// 
+			this.comboBoxCartType.FormattingEnabled = true;
+			this.comboBoxCartType.Location = new System.Drawing.Point(6, 19);
+			this.comboBoxCartType.Name = "comboBoxCartType";
+			this.comboBoxCartType.Size = new System.Drawing.Size(320, 21);
+			this.comboBoxCartType.TabIndex = 0;
+			// 
 			// SaturnPrefs
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(355, 155);
+			this.ClientSize = new System.Drawing.Size(356, 213);
+			this.Controls.Add(this.groupBox3);
 			this.Controls.Add(this.buttonCancel);
 			this.Controls.Add(this.buttonOK);
 			this.Controls.Add(this.groupBox2);
@@ -247,6 +269,7 @@
 			((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.numericUpDownFactor)).EndInit();
+			this.groupBox3.ResumeLayout(false);
 			this.ResumeLayout(false);
 
 		}
@@ -265,5 +288,7 @@
 		private System.Windows.Forms.RadioButton radioButtonFactor;
 		private System.Windows.Forms.Button buttonOK;
 		private System.Windows.Forms.Button buttonCancel;
+		private System.Windows.Forms.GroupBox groupBox3;
+		private System.Windows.Forms.ComboBox comboBoxCartType;
 	}
 }

BizHawk.Client.EmuHawk/config/Saturn/SaturnPrefs.cs

@@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk
 		public SaturnPrefs()
 		{
 			InitializeComponent();
+			comboBoxCartType.Items.AddRange(Enum.GetNames(typeof(LibYabause.CartType)));
 			try
 			{
 				var ss = (Yabause.SaturnSyncSettings)Global.Emulator.GetSyncSettings();
@@ -28,6 +29,7 @@ namespace BizHawk.Client.EmuHawk
 				numericUpDownFactor.Value = ss.DispFactor;
 				numericUpDown1.Value = ss.GLW;
 				numericUpDown2.Value = ss.GLH;
+				comboBoxCartType.SelectedItem = Enum.GetName(typeof(LibYabause.CartType), ss.CartType);
 			}
 			catch (ArgumentOutOfRangeException)
 			{
@@ -53,6 +55,7 @@ namespace BizHawk.Client.EmuHawk
 			ss.DispFactor = (int)numericUpDownFactor.Value;
 			ss.GLW = (int)numericUpDown1.Value;
 			ss.GLH = (int)numericUpDown2.Value;
+			ss.CartType = (LibYabause.CartType)Enum.Parse(typeof(LibYabause.CartType), (string)comboBoxCartType.SelectedItem);
 			GlobalWin.MainForm.PutCoreSyncSettings(ss);
 		}
 	}

BizHawk.Emulation.Cores/Consoles/Sega/Saturn/LibYabause.cs

@@ -163,6 +163,14 @@ namespace BizHawk.Emulation.Cores.Sega.Saturn
 		[DllImport("libyabause.dll", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void libyabause_glsetnativefactor(int n);
 
+
+		public enum CartType : int
+		{
+			NONE = 0,
+			DRAM8MBIT = 6,
+			DRAM32MBIT = 7
+		}
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -171,7 +179,7 @@ namespace BizHawk.Emulation.Cores.Sega.Saturn
 		/// <param name="usegl">true for opengl</param>
 		/// <returns></returns>
 		[DllImport("libyabause.dll", CallingConvention = CallingConvention.Cdecl)]
-		public static extern bool libyabause_init(ref CDInterface intf, string biosfn, bool usegl);
+		public static extern bool libyabause_init(ref CDInterface intf, string biosfn, bool usegl, CartType carttype);
 
 		public struct CDInterface
 		{

BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs

@@ -82,7 +82,7 @@ namespace BizHawk.Emulation.Cores.Sega.Saturn
 			string BiosPipe = fp.GetPipeNameNative();
 			fp.Offer(bios);
 
-			if (!LibYabause.libyabause_init(ref CDInt, BiosPipe, GL))
+			if (!LibYabause.libyabause_init(ref CDInt, BiosPipe, GL, SyncSettings.CartType))
 				throw new Exception("libyabause_init() failed!");
 
 			fp.Finish();
@@ -670,10 +670,11 @@ namespace BizHawk.Emulation.Cores.Sega.Saturn
 			public bool DispFree = false;
 			public int GLW = 640;
 			public int GLH = 480;
+			public LibYabause.CartType CartType = LibYabause.CartType.NONE;
 
 			public static bool NeedsReboot(SaturnSyncSettings x, SaturnSyncSettings y)
 			{
-				return x.UseGL != y.UseGL;
+				return x.UseGL != y.UseGL || x.CartType != y.CartType;
 			}
 			public SaturnSyncSettings Clone()
 			{

yabause/src/cs0.c

@@ -1479,6 +1479,15 @@ int CartSaveState(FILE * fp)
    fwrite((void *)&CartridgeArea->carttype, 4, 1, fp);
 
    // Write the areas associated with the cart type here
+   switch (CartridgeArea->carttype)
+   {
+   case CART_DRAM8MBIT:
+	   fwrite(CartridgeArea->dram, 1, 0x100000, fp);
+	   break;
+   case CART_DRAM32MBIT:
+	   fwrite(CartridgeArea->dram, 1, 0x400000, fp);
+	   break;
+   }
 
    return StateFinishHeader(fp, offset);
 }
@@ -1494,6 +1503,19 @@ int CartLoadState(FILE * fp, UNUSED int version, int size)
 
    // Check to see if old cart type and new cart type match, if they don't,
    // reallocate memory areas
+   if (CartridgeArea->carttype != newtype)
+   {
+	   // ...
+   }
+   switch (CartridgeArea->carttype)
+   {
+   case CART_DRAM8MBIT:
+	   fread(CartridgeArea->dram, 1, 0x100000, fp);
+	   break;
+   case CART_DRAM32MBIT:
+	   fread(CartridgeArea->dram, 1, 0x400000, fp);
+	   break;
+   }
 
    // Read the areas associated with the cart type here
 

yabause/src/libyabause/yui.cpp

@@ -507,7 +507,7 @@ void vdp2newhook(u16 v)
 	}
 }
 
-extern "C" __declspec(dllexport) int libyabause_init(CDInterface *_CD, const char *biosfn, int usegl)
+extern "C" __declspec(dllexport) int libyabause_init(CDInterface *_CD, const char *biosfn, int usegl, int carttype)
 {
 	usinggl = usegl;
 	if (usegl && (!StartGLContext() || !LoadExtensions()))
@@ -544,7 +544,7 @@ extern "C" __declspec(dllexport) int libyabause_init(CDInterface *_CD, const cha
 	yinit.cdpath = "Saturnus"; //NULL;
 	yinit.buppath = NULL;
 	yinit.mpegpath = NULL;
-	yinit.cartpath = NULL;
+	yinit.carttype = carttype;
 	yinit.netlinksetting = NULL;
 	yinit.videoformattype = VIDEOFORMATTYPE_NTSC;