c++ side setup for setting any devices on snes input ports

BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs

@@ -205,6 +205,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 			public int port, device, index, slot;
 			public int width, height;
 			public int scanline;
+			public fixed int inports[2];
 
 			//this should always be used in pairs
 			public void* buf0, buf1;
@@ -242,6 +243,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 			comm->layerEnables = enables;
 			QUERY_set_layer_enable();
 		}
+
+		public void SetInputPortBeforeInit(int port, SNES_INPUT_PORT type)
+		{
+			comm->inports[port] = (int)type;
+		}
 	}
 
 }

BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_Enums.cs

@@ -73,6 +73,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 			eStatus_BRK
 		};
 
+		public enum SNES_INPUT_PORT : int
+		{
+			None,
+			Joypad,
+			Multitap,
+			Mouse,
+			SuperScope,
+			Justifier,
+			Justifiers,
+			USART
+		}
+
 		public enum SNES_REG : int
 		{
 			//$2105

BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs

@@ -66,6 +66,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 
 			ScanlineHookManager = new MyScanlineHookManager(this);
 
+			//TODO: set correct port inputs from sync settings
+			api.SetInputPortBeforeInit(0, LibsnesApi.SNES_INPUT_PORT.Joypad);
+			api.SetInputPortBeforeInit(1, LibsnesApi.SNES_INPUT_PORT.Joypad);
+
 			api.CMD_init();
 
 			api.QUERY_set_video_refresh(snes_video_refresh);

libsnes/bsnes/target-libsnes/libsnes.cpp

@@ -263,9 +263,6 @@ void snes_init(void) {
   
   //zero 26-aug-2013 - yup. still more
   reconstruct(&GameBoy::cpu); GameBoy::cpu.initialize();
-  
-  SNES::input.connect(SNES::Controller::Port1, SNES::Input::Device::Joypad);
-  SNES::input.connect(SNES::Controller::Port2, SNES::Input::Device::Joypad);
 }
 
 void snes_term(void) {

libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp

@@ -147,6 +147,7 @@ struct CommStruct
 	int32 port, device, index, slot;
 	int32 width, height;
 	int32 scanline;
+	SNES::Input::Device inports[2];
 
 	//always used in pairs
 	void* buf[2];
@@ -373,6 +374,14 @@ void CMD_LoadCartridgeSGB()
 		Analyze();
 }
 
+void CMD_init()
+{
+	snes_init();
+
+	SNES::input.connect(SNES::Controller::Port1, comm.inports[0]);
+	SNES::input.connect(SNES::Controller::Port2, comm.inports[1]);
+}
+
 void CMD_serialize()
 {
 	int size = comm.buf_size[0];
@@ -511,7 +520,7 @@ void QUERY_serialize_size() {
 }
 
 const Action kHandlers_CMD[] = {
-	snes_init,
+	CMD_init,
 	snes_power,
 	snes_reset,
 	snes_run,