Merge pull request #1365 from reicast/baka/evdev_rework

Remove evdev specific code from main.cpp

core/linux-dist/evdev.cpp

@@ -3,6 +3,9 @@
 #include <linux/input.h>
 #include "linux-dist/evdev.h"
 #include "linux-dist/main.h"
+#include "hw/maple/maple_devs.h"
+#include "hw/maple/maple_cfg.h"
+#include "cfg/cfg.h"
 #include "cfg/ini.h"
 #include <vector>
 #include <map>
@@ -16,6 +19,14 @@
 	libevdev_func1_t libevdev_event_code_from_name;
 	libevdev_func2_t libevdev_event_code_get_name;
 
+	/* evdev input */
+	static EvdevController evdev_controllers[4] = {
+		{ -1, NULL },
+		{ -1, NULL },
+		{ -1, NULL },
+		{ -1, NULL }
+	};
+
 	void dc_stop(void);
 
 	void load_libevdev()
@@ -107,6 +118,46 @@
 		this->rumble_effect_id = -1;
 	}
 
+	MapleDeviceType GetMapleDeviceType(int value, int port)
+	{
+		switch (value)
+		{
+			case 0:
+				#if defined(_DEBUG) || defined(DEBUG)
+				printf("Maple Device: None\n");
+				#endif
+				return MDT_None;
+			case 1:
+				#if defined(_DEBUG) || defined(DEBUG)
+				printf("Maple Device: VMU\n");
+				#endif
+				return MDT_SegaVMU;
+			case 2:
+				#if defined(_DEBUG) || defined(DEBUG)
+				printf("Maple Device: Microphone\n");
+				#endif
+				return MDT_Microphone;
+			case 3:
+				#if defined(_DEBUG) || defined(DEBUG)
+				printf("Maple Device: PuruPuruPack\n");
+				#endif
+				return MDT_PurupuruPack;
+			default:
+				MapleDeviceType result = MDT_None;
+				string result_type = "None";
+
+				// Controller in port 0 (player1) defaults to VMU for Maple device, all other to None
+				if (port == 0)
+				{
+					result_type = "VMU";
+					result = MDT_SegaVMU;
+				}
+
+				printf("Unsupported configuration (%d) for Maple Device, using %s\n", value, result_type.c_str());
+				return result;
+		}
+	}
+
 	std::map<std::string, EvdevControllerMapping> loaded_mappings;
 
 	int load_keycode(ConfigFile* cfg, string section, string dc_key)
@@ -383,8 +434,77 @@
 		}
 	}
 
-	bool input_evdev_handle(EvdevController* controller, u32 port)
+	void input_evdev_init()
 	{
+		int evdev_device_id[4] = { -1, -1, -1, -1 };
+		size_t size_needed;
+		int port, i;
+
+		char* evdev_device;
+
+		for (port = 0; port < 4; port++)
+		{
+			size_needed = snprintf(NULL, 0, EVDEV_DEVICE_CONFIG_KEY, port+1) + 1;
+			char* evdev_config_key = (char*)malloc(size_needed);
+			sprintf(evdev_config_key, EVDEV_DEVICE_CONFIG_KEY, port+1);
+			evdev_device_id[port] = cfgLoadInt("input", evdev_config_key, EVDEV_DEFAULT_DEVICE_ID(port+1));
+			free(evdev_config_key);
+
+			// Check if the same device is already in use on another port
+			if (evdev_device_id[port] < 0)
+			{
+				printf("evdev: Controller %d disabled by config.\n", port + 1);
+			}
+			else
+			{
+				size_needed = snprintf(NULL, 0, EVDEV_DEVICE_STRING, evdev_device_id[port]) + 1;
+				evdev_device = (char*)malloc(size_needed);
+				sprintf(evdev_device, EVDEV_DEVICE_STRING, evdev_device_id[port]);
+
+				size_needed = snprintf(NULL, 0, EVDEV_MAPPING_CONFIG_KEY, port+1) + 1;
+				evdev_config_key = (char*)malloc(size_needed);
+				sprintf(evdev_config_key, EVDEV_MAPPING_CONFIG_KEY, port+1);
+
+				string tmp;
+				const char* mapping = (cfgExists("input", evdev_config_key) == 2 ? (tmp = cfgLoadStr("input", evdev_config_key, "")).c_str() : NULL);
+				free(evdev_config_key);
+
+				input_evdev_init(&evdev_controllers[port], evdev_device, mapping);
+
+				free(evdev_device);
+
+				for (i = 0; i < port; i++)
+				{
+						if (evdev_device_id[port] == evdev_device_id[i])
+						{
+							// Multiple controllers with the same device, check for multiple button assignments
+							if (input_evdev_button_duplicate_button(evdev_controllers[i].mapping, evdev_controllers[port].mapping))
+							{
+								printf("WARNING: One or more button(s) of this device is also used in the configuration of input device %d (mapping: %s)\n", i, evdev_controllers[i].mapping->name.c_str());
+							}
+						}
+				}
+
+				mcfg_CreateController(port, GetMapleDeviceType(evdev_controllers[port].mapping->Maple_Device1, port), GetMapleDeviceType(evdev_controllers[port].mapping->Maple_Device2, port));
+			}
+		}
+	}
+
+	void input_evdev_close()
+	{
+		for (int port = 0; port < 4 ; port++)
+		{
+			if (evdev_controllers[port].fd >= 0)
+			{
+				close(evdev_controllers[port].fd);
+			}
+		}
+	}
+
+	bool input_evdev_handle(u32 port)
+	{
+		EvdevController* controller = &evdev_controllers[port];
+
 		#define SET_FLAG(field, mask, expr) field =((expr) ? (field & ~mask) : (field | mask))
 		if (controller->fd < 0 || controller->mapping == NULL)
 		{
@@ -533,8 +653,10 @@
 		return true;
 	}
 
-	void input_evdev_rumble(EvdevController* controller, u16 pow_strong, u16 pow_weak)
+	void input_evdev_rumble(u32 port, u16 pow_strong, u16 pow_weak)
 	{
+		EvdevController* controller = &evdev_controllers[port];
+
 		if (controller->fd < 0 || controller->rumble_effect_id == -2)
 		{
 			// Either the controller is not used or previous rumble effect failed

core/linux-dist/evdev.h

@@ -73,7 +73,7 @@ struct EvdevController
 
 #define EVDEV_DEFAULT_DEVICE_ID(port) (port == 1 ? EVDEV_DEFAULT_DEVICE_ID_1 : -1)
 
-extern int input_evdev_init(EvdevController* controller, const char* device, const char* mapping_fname);
+extern void input_evdev_init();
-extern bool input_evdev_handle(EvdevController* controller, u32 port);
+extern void input_evdev_close();
-extern void input_evdev_rumble(EvdevController* controller, u16 pow_strong, u16 pow_weak);
+extern bool input_evdev_handle(u32 port);
-extern bool input_evdev_button_duplicate_button(EvdevControllerMapping* mapping1, EvdevControllerMapping* mapping2);
+extern void input_evdev_rumble(u32 port, u16 pow_strong, u16 pow_weak);

core/linux-dist/main.cpp

@@ -37,11 +37,8 @@
 
 #if defined(USE_EVDEV)
 	#include "linux-dist/evdev.h"
-	#include "hw/maple/maple_devs.h"
 #endif
 
-#include "hw/maple/maple_cfg.h"
-
 #if defined(USE_JOYSTICK)
 	#include "linux-dist/joystick.h"
 #endif
@@ -91,116 +88,15 @@ s8 joyx[4], joyy[4];
 
 void emit_WriteCodeCache();
 
-#if defined(USE_EVDEV)
-	/* evdev input */
-	static EvdevController evdev_controllers[4] = {
-		{ -1, NULL },
-		{ -1, NULL },
-		{ -1, NULL },
-		{ -1, NULL }
-	};
-#endif
-
 #if defined(USE_JOYSTICK)
 	/* legacy joystick input */
 	static int joystick_fd = -1; // Joystick file descriptor
 #endif
 
-MapleDeviceType GetMapleDeviceType(int value, int port)
-{
-	switch (value)
-	{
-		case 0:
-			#if defined(_DEBUG) || defined(DEBUG)
-			printf("Maple Device: None\n");
-			#endif
-			return MDT_None;
-		case 1:
-			#if defined(_DEBUG) || defined(DEBUG)
-			printf("Maple Device: VMU\n");
-			#endif
-			return MDT_SegaVMU;
-		case 2:
-			#if defined(_DEBUG) || defined(DEBUG)
-			printf("Maple Device: Microphone\n");
-			#endif
-			return MDT_Microphone;
-		case 3:
-			#if defined(_DEBUG) || defined(DEBUG)
-			printf("Maple Device: PuruPuruPack\n");
-			#endif
-			return MDT_PurupuruPack;
-		default:
-			MapleDeviceType result = MDT_None;
-			string result_type = "None";
-
-			// Controller in port 0 (player1) defaults to VMU for Maple device, all other to None
-			if (port == 0)
-			{
-				result_type = "VMU";
-				result = MDT_SegaVMU;
-			}
-
-			printf("Unsupported configuration (%d) for Maple Device, using %s\n", value, result_type.c_str());
-			return result;
-	}
-}
-
 void os_SetupInput()
 {
 	#if defined(USE_EVDEV)
-		int evdev_device_id[4] = { -1, -1, -1, -1 };
+		input_evdev_init();
-		size_t size_needed;
-		int port, i;
-
-		char* evdev_device;
-
-		for (port = 0; port < 4; port++)
-		{
-			size_needed = snprintf(NULL, 0, EVDEV_DEVICE_CONFIG_KEY, port+1) + 1;
-			char* evdev_config_key = (char*)malloc(size_needed);
-			sprintf(evdev_config_key, EVDEV_DEVICE_CONFIG_KEY, port+1);
-			evdev_device_id[port] = cfgLoadInt("input", evdev_config_key, EVDEV_DEFAULT_DEVICE_ID(port+1));
-			free(evdev_config_key);
-
-			// Check if the same device is already in use on another port
-			if (evdev_device_id[port] < 0)
-			{
-				printf("evdev: Controller %d disabled by config.\n", port + 1);
-			}
-			else
-			{
-				size_needed = snprintf(NULL, 0, EVDEV_DEVICE_STRING, evdev_device_id[port]) + 1;
-				evdev_device = (char*)malloc(size_needed);
-				sprintf(evdev_device, EVDEV_DEVICE_STRING, evdev_device_id[port]);
-
-				size_needed = snprintf(NULL, 0, EVDEV_MAPPING_CONFIG_KEY, port+1) + 1;
-				evdev_config_key = (char*)malloc(size_needed);
-				sprintf(evdev_config_key, EVDEV_MAPPING_CONFIG_KEY, port+1);
-
-				string tmp;
-				const char* mapping = (cfgExists("input", evdev_config_key) == 2 ? (tmp = cfgLoadStr("input", evdev_config_key, "")).c_str() : NULL);
-				free(evdev_config_key);
-
-				input_evdev_init(&evdev_controllers[port], evdev_device, mapping);
-
-				free(evdev_device);
-
-				for (i = 0; i < port; i++)
-				{
-						if (evdev_device_id[port] == evdev_device_id[i])
-						{
-							// Multiple controllers with the same device, check for multiple button assignments
-							if (input_evdev_button_duplicate_button(evdev_controllers[i].mapping, evdev_controllers[port].mapping))
-							{
-								printf("WARNING: One or more button(s) of this device is also used in the configuration of input device %d (mapping: %s)\n", i, evdev_controllers[i].mapping->name.c_str());
-							}
-						}
-				}
-
-				mcfg_CreateController(port, GetMapleDeviceType(evdev_controllers[port].mapping->Maple_Device1, port), GetMapleDeviceType(evdev_controllers[port].mapping->Maple_Device2, port));
-			}
-		}
 	#endif
 
 	#if defined(USE_JOYSTICK)
@@ -238,7 +134,7 @@ void UpdateInputState(u32 port)
 	#endif
 
 	#if defined(USE_EVDEV)
-		input_evdev_handle(&evdev_controllers[port], port);
+		input_evdev_handle(port);
 	#endif
 
 	#if defined(USE_SDL)
@@ -263,7 +159,7 @@ void UpdateVibration(u32 port, u32 value)
 		u16 pow_strong = (u16)(65535 * pow_l);
 		u16 pow_weak = (u16)(65535 * pow_r);
 
-		input_evdev_rumble(&evdev_controllers[port], pow_strong, pow_weak);
+		input_evdev_rumble(port, pow_strong, pow_weak);
 	#endif
 }
 
@@ -531,13 +427,7 @@ int main(int argc, wchar* argv[])
 	dc_term();
 
 	#if defined(USE_EVDEV)
-		for (int port = 0; port < 4 ; port++)
+		input_evdev_close();
-		{
-			if(evdev_controllers[port].fd >= 0)
-			{
-				close(evdev_controllers[port].fd);
-			}
-		}
 	#endif
 
 	#if defined(SUPPORT_X11)