[CPCHawk] Fixed high-impedence returns

TASEmulators · Oct 1, 2024 · 6309ee5 · 6309ee5
1 parent 5905fc7
commit 6309ee5
Show file tree

Hide file tree

Showing 11 changed files with 153 additions and 190 deletions.
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.Type0.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.Type0.cs
@@ -22,7 +22,7 @@ public override void Clock()
 		{
 			base.Clock();
 
-			var maxScanLine = 0;
+			int maxScanLine;
 
 			if (HCC == R0_HorizontalTotal)
 			{
@@ -204,7 +204,7 @@ public override void Clock()
 
 
 			/* Address Generation */
-			var line = VLC;
+			int line = VLC;
 
 			if (R8_Interlace == 3)
 			{
@@ -244,7 +244,7 @@ public override void Clock()
 		/// </summary>
 		protected override bool ReadRegister(ref int data)
 		{
-			bool addressed = false;
+			bool addressed;
 
 			switch (AddressRegister)
 			{

diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.Type1.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.Type1.cs
@@ -21,7 +21,7 @@ public override void Clock()
 		{
 			base.Clock();
 
-			var maxScanLine = 0;
+			int maxScanLine;
 
 			if (HCC == R0_HorizontalTotal)
 			{
@@ -209,7 +209,7 @@ public override void Clock()
 
 
 			/* Address Generation */
-			var line = VLC;
+			int line = VLC;
 
 			if (R8_Interlace == 3)
 			{

diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.Type2.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.Type2.cs
@@ -23,7 +23,7 @@ public override void Clock()
 		{
 			base.Clock();
 
-			var maxScanLine = 0;
+			int maxScanLine;
 
 			if (HCC == R0_HorizontalTotal)
 			{
@@ -206,7 +206,7 @@ public override void Clock()
 
 
 			/* Address Generation */
-			var line = VLC;
+			int line = VLC;
 
 			if (R8_Interlace == 3)
 			{

diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.Type3.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.Type3.cs
@@ -21,7 +21,7 @@ public override void Clock()
 		{
 			base.Clock();
 
-			var maxScanLine = 0;
+			int maxScanLine;
 
 			if (HCC == R0_HorizontalTotal)
 			{
@@ -204,7 +204,7 @@ public override void Clock()
 
 
 			/* Address Generation */
-			var line = VLC;
+			int line = VLC;
 
 			if (R8_Interlace == 3)
 			{
@@ -279,8 +279,6 @@ protected override bool ReadRegister(ref int data)
 		/// </summary>
 		protected override void WriteRegister(int data)
 		{
-			byte v = (byte)data;
-
 			byte v3 = (byte)data;
 			switch (AddressRegister)
 			{

diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.Type4.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.Type4.cs
@@ -22,7 +22,7 @@ public override void Clock()
 		{
 			base.Clock();
 
-			var maxScanLine = 0;
+			int maxScanLine;
 
 			if (HCC == R0_HorizontalTotal)
 			{
@@ -205,7 +205,7 @@ public override void Clock()
 
 
 			/* Address Generation */
-			var line = VLC;
+			int line = VLC;
 
 			if (R8_Interlace == 3)
 			{
@@ -280,8 +280,6 @@ protected override bool ReadRegister(ref int data)
 		/// </summary>
 		protected override void WriteRegister(int data)
 		{
-			byte v = (byte)data;
-
 			byte v3 = (byte)data;
 			switch (AddressRegister)
 			{

diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/CRTC.cs
@@ -44,20 +44,14 @@ public abstract partial class CRTC : IPortIODevice
 		/// </summary>
 		public static CRTC Create(int crtcType)
 		{
-			switch (crtcType)
+			return crtcType switch
 			{
-				case 0:
-					return new CRTC_Type0();
-				case 1:
-				default:
-					return new CRTC_Type1();				
-				case 2:
-					return new CRTC_Type2();
-				case 3:
-					return new CRTC_Type3();
-				case 4:
-					return new CRTC_Type4();
-			}
+				0 => new CRTC_Type0(),
+				2 => new CRTC_Type2(),
+				3 => new CRTC_Type3(),
+				4 => new CRTC_Type4(),
+				_ => new CRTC_Type1(),
+			};
 		}