Merge pull request #1530 from reicast/fh/saveport-vmu

Save maple port of connected gamepads between runs. Display VMU LCD on pause

Author: skmp

core/hw/maple/maple_devs.cpp

@@ -644,9 +644,7 @@ struct maple_sega_vmu: maple_base
 							}
 						}
 						config->SetImage(lcd_data_decoded);
-#if !defined(TARGET_PANDORA) && HOST_OS != OS_DARWIN
-						push_vmu_screen(lcd_data_decoded);
-#endif
+						push_vmu_screen(bus_id, bus_port, lcd_data_decoded);
 #if 0
 						// Update LCD window
 						if (!dev->lcd.visible)
@@ -791,7 +789,7 @@ struct maple_microphone: maple_base
 		switch (cmd)
 		{
 		case MDC_DeviceRequest:
-			LOGI("maple_microphone::dma MDC_DeviceRequest");
+			LOGI("maple_microphone::dma MDC_DeviceRequest\n");
 			//this was copied from the controller case with just the id and name replaced!
 
 			//caps
@@ -826,7 +824,7 @@ struct maple_microphone: maple_base
 
 		case MDCF_GetCondition:
 			{
-				LOGI("maple_microphone::dma MDCF_GetCondition");
+				LOGI("maple_microphone::dma MDCF_GetCondition\n");
 				//this was copied from the controller case with just the id replaced!
 
 				//PlainJoystickState pjs;
@@ -863,7 +861,7 @@ struct maple_microphone: maple_base
 
 		case MDC_DeviceReset:
 			//uhhh do nothing?
-			LOGI("maple_microphone::dma MDC_DeviceReset");
+			LOGI("maple_microphone::dma MDC_DeviceReset\n");
 			return MDRS_DeviceReply;
 
 		case MDCF_MICControl:
@@ -932,7 +930,7 @@ struct maple_microphone: maple_base
 					LOGI("maple_microphone::dma MDCF_MICControl set gain %#010x\n",secondword);
 					return MDRS_DeviceReply;
 				case MDRE_TransmitAgain:
-					LOGW("maple_microphone::dma MDCF_MICControl MDRE_TransminAgain");
+					LOGW("maple_microphone::dma MDCF_MICControl MDRE_TransmitAgain\n");
 					//apparently this doesnt matter
 					//wptr(micdata, SIZE_OF_MIC_DATA);
 					return MDRS_DeviceReply;//MDRS_DataTransfer;

core/hw/maple/maple_devs.h

@@ -101,6 +101,6 @@ maple_device* maple_Create(MapleDeviceType type);
 #define SIZE_OF_MIC_DATA	480 //ALSO DEFINED IN SipEmulator.java
 #ifndef TARGET_PANDORA
 int get_mic_data(u8* buffer); //implemented in Android.cpp
-int push_vmu_screen(u8* buffer); //implemented in Android.cpp
 #endif
+void push_vmu_screen(int bus_id, int bus_port, u8* buffer);
 #define MAPLE_PORTS 4

core/input/gamepad_device.cpp

@@ -21,6 +21,9 @@
 #include "gamepad_device.h"
 #include "rend/gui.h"
 #include "oslib/oslib.h"
+#include "cfg/cfg.h"
+
+#define MAPLE_PORT_CFG_PREFIX "maple_"
 
 extern void dc_exit();
 
@@ -253,3 +256,36 @@ void GamepadDevice::detect_axis_input(input_detected_cb axis_moved)
 	_detection_start_time = os_GetSeconds() + 0.2;
 }
 
+void GamepadDevice::Register(std::shared_ptr<GamepadDevice> gamepad)
+{
+	int maple_port = cfgLoadInt("input",
+			(MAPLE_PORT_CFG_PREFIX + gamepad->unique_id()).c_str(), 12345);
+	if (maple_port != 12345)
+		gamepad->set_maple_port(maple_port);
+
+	_gamepads_mutex.lock();
+	_gamepads.push_back(gamepad);
+	_gamepads_mutex.unlock();
+}
+
+void GamepadDevice::Unregister(std::shared_ptr<GamepadDevice> gamepad)
+{
+	gamepad->save_mapping();
+	_gamepads_mutex.lock();
+	for (auto it = _gamepads.begin(); it != _gamepads.end(); it++)
+		if (*it == gamepad) {
+			_gamepads.erase(it);
+			break;
+		}
+	_gamepads_mutex.unlock();
+}
+
+void GamepadDevice::SaveMaplePorts()
+{
+	for (int i = 0; i < GamepadDevice::GetGamepadCount(); i++)
+	{
+		std::shared_ptr<GamepadDevice> gamepad = GamepadDevice::GetGamepad(i);
+		if (gamepad != NULL && !gamepad->unique_id().empty())
+			cfgSaveInt("input", (MAPLE_PORT_CFG_PREFIX + gamepad->unique_id()).c_str(), gamepad->maple_port());
+	}
+}

core/input/gamepad_device.h

@@ -31,6 +31,7 @@ class GamepadDevice
 	const std::string& name() { return _name; }
 	int maple_port() { return _maple_port; }
 	void set_maple_port(int port) { _maple_port = port; }
+	const std::string& unique_id() { return _unique_id; }
 	virtual bool gamepad_btn_input(u32 code, bool pressed);
 	bool gamepad_axis_input(u32 code, int value);
 	virtual ~GamepadDevice() {}
@@ -50,28 +51,13 @@ class GamepadDevice
 	virtual void update_rumble() {}
 	bool is_rumble_enabled() { return _rumble_enabled; }
 
-	static void Register(std::shared_ptr<GamepadDevice> gamepad)
-	{
-		_gamepads_mutex.lock();
-		_gamepads.push_back(gamepad);
-		_gamepads_mutex.unlock();
-	}
+	static void Register(std::shared_ptr<GamepadDevice> gamepad);
 
-	static void Unregister(std::shared_ptr<GamepadDevice> gamepad)
-	{
-		gamepad->save_mapping();
-		_gamepads_mutex.lock();
-		for (auto it = _gamepads.begin(); it != _gamepads.end(); it++)
-			if (*it == gamepad)
-			{
-				_gamepads.erase(it);
-				break;
-			}
-		_gamepads_mutex.unlock();
-	}
+	static void Unregister(std::shared_ptr<GamepadDevice> gamepad);
 
 	static int GetGamepadCount();
 	static std::shared_ptr<GamepadDevice> GetGamepad(int index);
+	static void SaveMaplePorts();
 
 protected:
 	GamepadDevice(int maple_port, const char *api_name, bool remappable = true)
@@ -83,6 +69,7 @@ class GamepadDevice
 	virtual void load_axis_min_max(u32 axis) {}
 
 	std::string _name;
+	std::string _unique_id = "";
 	InputMapping *input_mapper;
 	std::map<u32, int> axis_min_values;
 	std::map<u32, unsigned int> axis_ranges;

core/linux-dist/evdev_gamepad.h

@@ -9,31 +9,37 @@ class EvdevGamepadDevice : public GamepadDevice
 	: GamepadDevice(maple_port, "evdev"), _fd(fd), _rumble_effect_id(-1), _devnode(devnode)
 	{
 		fcntl(fd, F_SETFL, O_NONBLOCK);
-		char name[256] = "Unknown";
-		if (ioctl(fd, EVIOCGNAME(sizeof(name)), name) < 0)
+		char buf[256] = "Unknown";
+		if (ioctl(fd, EVIOCGNAME(sizeof(buf) - 1), buf) < 0)
 			perror("evdev: ioctl(EVIOCGNAME)");
 		else
-			printf("evdev: Opened device '%s' ", name);
-		_name = name;
+			printf("evdev: Opened device '%s' ", buf);
+		_name = buf;
+		buf[0] = 0;
+		if (ioctl(fd, EVIOCGUNIQ(sizeof(buf) - 1), buf) == 0)
+			_unique_id = buf;
+		if (_unique_id.empty())
+			_unique_id = devnode;
+
 		if (!find_mapping(mapping_file))
 		{
 #if defined(TARGET_PANDORA)
 			mapping_file = "controller_pandora.cfg";
 #elif defined(TARGET_GCW0)
 			mapping_file = "controller_gcwz.cfg";
 #else
-			if (!strcmp(name, "Microsoft X-Box 360 pad")
-				|| !strcmp(name, "Xbox 360 Wireless Receiver")
-				|| !strcmp(name, "Xbox 360 Wireless Receiver (XBOX)"))
+			if (_name == "Microsoft X-Box 360 pad"
+				|| _name == "Xbox 360 Wireless Receiver"
+				|| _name == "Xbox 360 Wireless Receiver (XBOX)")
 			{
 				mapping_file = "controller_xpad.cfg";
 			}
-			else if (strstr(name, "Xbox Gamepad (userspace driver)") != NULL)
+			else if (_name.find("Xbox Gamepad (userspace driver)") != std::string::npos)
 			{
 				mapping_file = "controller_xboxdrv.cfg";
 			}
-			else if (strstr(name, "keyboard") != NULL ||
-					 strstr(name, "Keyboard") != NULL)
+			else if (_name.find("keyboard") != std::string::npos
+						|| _name.find("Keyboard") != std::string::npos)
 			{
 				mapping_file = "keyboard.cfg";
 			}

core/linux-dist/main.cpp

@@ -408,7 +408,6 @@ int main(int argc, wchar* argv[])
 #endif
 
 int get_mic_data(u8* buffer) { return 0; }
-int push_vmu_screen(u8* buffer) { return 0; }
 
 void os_DebugBreak()
 {

core/linux-dist/x11.cpp

@@ -52,6 +52,7 @@ class X11MouseGamepadDevice : public GamepadDevice
 	X11MouseGamepadDevice(int maple_port) : GamepadDevice(maple_port, "X11")
 	{
 		_name = "Mouse";
+		_unique_id = "x11_mouse";
 		if (!find_mapping())
 			input_mapper = new MouseInputMapping();
 	}

core/linux-dist/x11_keyboard.h

@@ -181,6 +181,7 @@ class X11KbGamepadDevice : public GamepadDevice
 	X11KbGamepadDevice(int maple_port) : GamepadDevice(maple_port, "X11")
 	{
 		_name = "Keyboard";
+		_unique_id = "x11_keyboard";
 		if (!find_mapping())
 			input_mapper = new KbInputMapping();
 	}

core/nullDC.cpp

@@ -22,6 +22,7 @@
 #include "imgread/common.h"
 #include "rend/gui.h"
 #include "profiler/profiler.h"
+#include "input/gamepad_device.h"
 
 void FlushCache();
 void LoadCustom();
@@ -741,6 +742,9 @@ void SaveSettings()
 		paths += path;
 	}
 	cfgSaveStr("config", "Dreamcast.ContentPath", paths.c_str());
+
+	GamepadDevice::SaveMaplePorts();
+
 #ifdef _ANDROID
 	void SaveAndroidSettings();
 	SaveAndroidSettings();

core/rend/gles/imgui_impl_opengl3.cpp

@@ -585,3 +585,20 @@ void ImGui_ImplOpenGL3_DrawBackground()
 		glClear(GL_COLOR_BUFFER_BIT);
 	}
 }
+
+ImTextureID ImGui_ImplOpenGL3_CreateVmuTexture(const unsigned int *data)
+{
+	GLuint tex_id;
+    glGenTextures(1, &tex_id);
+    glBindTexture(GL_TEXTURE_2D, tex_id);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 48, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
+
+    return reinterpret_cast<ImTextureID>(tex_id);
+}
+
+void ImGui_ImplOpenGL3_DeleteVmuTexture(ImTextureID tex_id)
+{
+	glDeleteTextures(1, &(GLuint &)tex_id);
+}