From 7ee2494ba7ea53ddaa113b07bd2da304a43db41f Mon Sep 17 00:00:00 2001
From: mart0258 <mart0258@users.sf.net>
Date: Sat, 12 Feb 2011 17:56:58 +0000
Subject: [PATCH] Fix input selection for Famicom Expansion port

---
 changelog.txt             | 1 +
 src/drivers/win/input.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 22cc5afd..f0492bc1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,4 @@
+12-feb-2010 - mart0258 - Fix input selection for Famicom Expansion port
 25-jan-2010 - prg318 - gtk - filechooser now remembers last file opened
 25-jan-2010 - prg318 - gtk - fixed xscale/yscale spinbuttons not changing config
 24-jan-2010 - prg318 - gtk - game window integrated into sdl window (thanks bryan!)
diff --git a/src/drivers/win/input.cpp b/src/drivers/win/input.cpp
index b12dff1d..b099bac6 100644
--- a/src/drivers/win/input.cpp
+++ b/src/drivers/win/input.cpp
@@ -1210,8 +1210,8 @@ BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			);
 		}
 
-		if (InputType[FAMICOM_POSITION]>SI_COUNT || InputType[FAMICOM_POSITION]<0)
-			InputType[FAMICOM_POSITION]=SI_UNSET; 
+		if (InputType[FAMICOM_POSITION]>SIFC_COUNT || InputType[FAMICOM_POSITION]<0)
+			InputType[FAMICOM_POSITION]=SIFC_UNSET; 
 
 		// Update the combobox selection according to the
 		// currently selected input mode.
@@ -1325,7 +1325,7 @@ BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			{
 			case BTN_FAM:
 				{
-					const char *text = ESI_Name((ESI)InputType[FAMICOM_POSITION]);
+					const char *text = ESIFC_Name((ESIFC)InputType[FAMICOM_POSITION]);
 
 					DoTBType = DoTBPort = 0;