From 938a2e28ef6293528aa3b003ab5c6490ad310e4f Mon Sep 17 00:00:00 2001
From: OV2 <OV2@sessionclan.de>
Date: Mon, 29 Nov 2010 02:53:51 +0100
Subject: [PATCH] Remove DisableHDMA and DisableIRQ from windows port

---
 win32/wconfig.cpp |  4 +---
 win32/wsnes9x.cpp | 11 ++---------
 win32/wsnes9x.h   |  2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/win32/wconfig.cpp b/win32/wconfig.cpp
index ae2cfab9..3eca7647 100644
--- a/win32/wconfig.cpp
+++ b/win32/wconfig.cpp
@@ -301,7 +301,6 @@ void WinSetDefaultValues ()
 
 	// CPU options
 	Settings.HDMATimingHack = 100;
-	Settings.DisableIRQ	= false;
 	Settings.Paused	= false;
 	Timings.H_Max =	SNES_CYCLES_PER_SCANLINE;
 	Timings.HBlankStart	= (256 * Timings.H_Max)	/ SNES_HCOUNTER_MAX;
@@ -315,7 +314,6 @@ void WinSetDefaultValues ()
 
 	// SNES	graphics options
 	Settings.DisableGraphicWindows = false;
-	Settings.DisableHDMA = false;
 	GUI.HeightExtend = false;
 	Settings.DisplayFrameRate =	false;
 //	Settings.SixteenBit =	true;
@@ -1104,7 +1102,7 @@ void WinRegisterConfigItems()
 	ADDN(SelectSave[0],SelectSlot0); ADDN(SelectSave[1],SelectSlot1); ADDN(SelectSave[2],SelectSlot2); ADDN(SelectSave[3],SelectSlot3); ADDN(SelectSave[4],SelectSlot4); ADDN(SelectSave[5],SelectSlot5); ADDN(SelectSave[6],SelectSlot6); ADDN(SelectSave[7],SelectSlot7); ADDN(SelectSave[8],SelectSlot8); ADDN(SelectSave[9],SelectSlot9);
 	ADD(SaveScreenShot); ADD(SlotPlus); ADD(SlotMinus); ADD(SlotSave); ADD(SlotLoad);
 	ADD(BGL1); ADD(BGL2); ADD(BGL3); ADD(BGL4); ADD(BGL5);
-	ADD(ClippingWindows); /*ADD(BGLHack);*/ ADD(Transparency); ADD(HDMA); ADD(GLCube);
+	ADD(ClippingWindows); /*ADD(BGLHack);*/ ADD(Transparency); /*ADD(HDMA)*/; ADD(GLCube);
 	/*ADD(InterpMode7);*/ ADD(JoypadSwap); ADD(SwitchControllers); ADD(ResetGame); ADD(ToggleCheats);
 	ADD(TurboA); ADD(TurboB); ADD(TurboY); ADD(TurboX); ADD(TurboL); ADD(TurboR); ADD(TurboStart); ADD(TurboSelect); ADD(TurboUp); ADD(TurboDown); ADD(TurboLeft); ADD(TurboRight);
 #undef ADD
diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp
index 57c1e024..caea6e02 100644
--- a/win32/wsnes9x.cpp
+++ b/win32/wsnes9x.cpp
@@ -528,7 +528,6 @@ struct SCustomKeys CustomKeys = {
 	{'8',0}, // Clipping Windows
 //	{'8',0}, // BG Layering hack
 	{'9',0}, // Transparency
-	{'0',0}, // HDMA Emulation
 	{'6',CUSTKEY_SHIFT_MASK}, // GLCube Mode
 //	{'9',CUSTKEY_SHIFT_MASK}, // Interpolate Mode 7
 	{'6',0}, // Joypad Swap
@@ -1155,12 +1154,6 @@ int HandleKeyMessage(WPARAM wParam, LPARAM lParam)
 			S9xSetInfoString (InfoString);
 			hitHotKey = true;
 		}
-		if(wParam == CustomKeys.HDMA.key
-		&& modifiers == CustomKeys.HDMA.modifiers)
-		{
-			Settings.DisableHDMA = !Settings.DisableHDMA;
-			S9xDisplayStateChange (WINPROC_HDMA_TEXT, !Settings.DisableHDMA);
-		}
 		if(wParam == CustomKeys.BGL1.key
 		&& modifiers == CustomKeys.BGL1.modifiers)
 		{
@@ -7615,7 +7608,7 @@ static void set_hotkeyinfo(HWND hDlg)
 		SendDlgItemMessage(hDlg,IDC_HOTKEY5,WM_USER+44,CustomKeys.BGL5.key,CustomKeys.BGL5.modifiers);
 		SendDlgItemMessage(hDlg,IDC_HOTKEY6,WM_USER+44,CustomKeys.ClippingWindows.key,CustomKeys.ClippingWindows.modifiers);
 		SendDlgItemMessage(hDlg,IDC_HOTKEY7,WM_USER+44,CustomKeys.Transparency.key,CustomKeys.Transparency.modifiers);
-		SendDlgItemMessage(hDlg,IDC_HOTKEY8,WM_USER+44,CustomKeys.HDMA.key,CustomKeys.HDMA.modifiers);
+//		SendDlgItemMessage(hDlg,IDC_HOTKEY8,WM_USER+44,CustomKeys.HDMA.key,CustomKeys.HDMA.modifiers);
 		SendDlgItemMessage(hDlg,IDC_HOTKEY9,WM_USER+44,CustomKeys.GLCube.key,CustomKeys.GLCube.modifiers);
 		SendDlgItemMessage(hDlg,IDC_HOTKEY10,WM_USER+44,CustomKeys.SwitchControllers.key,CustomKeys.SwitchControllers.modifiers);
 		SendDlgItemMessage(hDlg,IDC_HOTKEY11,WM_USER+44,CustomKeys.JoypadSwap.key,CustomKeys.JoypadSwap.modifiers);
@@ -7842,7 +7835,7 @@ switch(msg)
 			break;
 		case IDC_HOTKEY8:
 			if(index == 0) CustomKeys.ScopeTurbo.key = wParam,  CustomKeys.ScopeTurbo.modifiers = modifiers;
-			if(index == 1) CustomKeys.HDMA.key = wParam,       CustomKeys.HDMA.modifiers = modifiers;
+//			if(index == 1) CustomKeys.HDMA.key = wParam,       CustomKeys.HDMA.modifiers = modifiers;
 			if(index == 2) CustomKeys.TurboSelect.key = wParam,    CustomKeys.TurboSelect.modifiers = modifiers;
 			if(index == 3) CustomKeys.SelectSave[7].key = wParam,	CustomKeys.SelectSave[7].modifiers = modifiers;
 			break;
diff --git a/win32/wsnes9x.h b/win32/wsnes9x.h
index 6696f5b0..97a532fe 100644
--- a/win32/wsnes9x.h
+++ b/win32/wsnes9x.h
@@ -450,7 +450,7 @@ struct SCustomKeys {
 	SCustomKey ClippingWindows;
 //	SCustomKey BGLHack;
 	SCustomKey Transparency;
-	SCustomKey HDMA;
+//	SCustomKey HDMA;
 	SCustomKey GLCube;
 //	SCustomKey InterpMode7;
 	SCustomKey JoypadSwap;