From 549061586ae65d583f7e3d5337391a725934c55f Mon Sep 17 00:00:00 2001
From: "fix94.1" <fix94.1@gmail.com>
Date: Mon, 15 Sep 2014 23:22:04 +0000
Subject: [PATCH] -added libwupc, this will make the wiiu pro controller usable
 in wiiflow

---
 Makefile.main                |   4 +--
 portlibs/include/wupc/wupc.h |  49 +++++++++++++++++++++++++++++++++++
 portlibs/lib/libwupc.a       | Bin 0 -> 37512 bytes
 source/gui/gui.cpp           |   6 ++++-
 source/gui/gui.hpp           |   4 ++-
 source/loader/sys.c          |   4 +++
 source/menu/menu.hpp         |   3 +++
 source/menu/menu_input.cpp   |  45 ++++++++++++++++++++------------
 8 files changed, 94 insertions(+), 21 deletions(-)
 create mode 100644 portlibs/include/wupc/wupc.h
 create mode 100644 portlibs/lib/libwupc.a

diff --git a/Makefile.main b/Makefile.main
index 869cffcc..5ee379c6 100644
--- a/Makefile.main
+++ b/Makefile.main
@@ -57,7 +57,7 @@ ios			:=	249
 #---------------------------------------------------------------------------------
 CFLAGS		=	-g -ggdb -Os -Wall -Wextra $(MACHDEP) $(INCLUDE) -DHAVE_CONFIG_H
 CXXFLAGS	=	$(CFLAGS)
-LDFLAGS		=	-g -ggdb $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80620000,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size
+LDFLAGS		=	-g -ggdb $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80620000,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size,-wrap,wiiuse_register
 
 ifeq ($(BUILDMODE),channel)
 CFLAGS += -DFULLCHANNEL
@@ -67,7 +67,7 @@ endif
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS	:=	-lcustomfat -lcustomntfs -lcustomext2fs -lpng -lturbojpeg -lm -lz -lwiiuse -lbte -lasnd -logc -lfreetype -lvorbisidec -lmad
+LIBS	:=	-lcustomfat -lcustomntfs -lcustomext2fs -lpng -lturbojpeg -lm -lz -lwiiuse -lwupc -lbte -lasnd -logc -lfreetype -lvorbisidec -lmad
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
diff --git a/portlibs/include/wupc/wupc.h b/portlibs/include/wupc/wupc.h
new file mode 100644
index 00000000..02653964
--- /dev/null
+++ b/portlibs/include/wupc/wupc.h
@@ -0,0 +1,49 @@
+/****************************************************************************
+ * Copyright (C) 2014 FIX94
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+#ifndef _WUPC_H_
+#define _WUPC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct WUPCData {
+	s16 xAxisL;
+	s16 xAxisR;
+	s16 yAxisL;
+	s16 yAxisR;
+	u32 button;
+};
+
+void WUPC_Init();
+void WUPC_Shutdown();
+struct WUPCData *WUPC_Data(u8 chan);
+void WUPC_Rumble(u8 chan, bool rumble);
+u32 WUPC_UpdateButtonStats();
+u32 WUPC_ButtonsUp(u8 chan);
+u32 WUPC_ButtonsDown(u8 chan);
+u32 WUPC_ButtonsHeld(u8 chan);
+s16 WUPC_lStickX(u8 chan);
+s16 WUPC_lStickY(u8 chan);
+s16 WUPC_rStickX(u8 chan);
+s16 WUPC_rStickY(u8 chan);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/portlibs/lib/libwupc.a b/portlibs/lib/libwupc.a
new file mode 100644
index 0000000000000000000000000000000000000000..397dae2bfda06eeee91917c6885aa0a3bf353615
GIT binary patch
literal 37512
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
V`2Ob{vGSZFUcBW7_<43*{x86`@F4&I

literal 0
HcmV?d00001

diff --git a/source/gui/gui.cpp b/source/gui/gui.cpp
index 695afaec..a2268c88 100644
--- a/source/gui/gui.cpp
+++ b/source/gui/gui.cpp
@@ -197,10 +197,11 @@ void CButtonsMgr::show(s16 id, bool instant)
 	}
 }
 
-void CButtonsMgr::setRumble(int chan, bool wii, bool gc)
+void CButtonsMgr::setRumble(int chan, bool wii, bool gc, bool wupc)
 {
 	wii_rumble[chan] = wii;
 	gc_rumble[chan] = gc;
+	wupc_rumble[chan] = wupc;
 }
 
 void CButtonsMgr::mouse(int chan, int x, int y)
@@ -240,6 +241,7 @@ void CButtonsMgr::mouse(int chan, int x, int y)
 					if(m_rumbleEnabled)
 					{
 						m_rumble[chan] = 4;
+						if(wupc_rumble[chan]) WUPC_Rumble(chan, 1);
 						if(wii_rumble[chan]) WPAD_Rumble(chan, 1);
 						if(gc_rumble[chan]) PAD_ControlMotor(chan, 1);
 					}
@@ -341,6 +343,7 @@ void CButtonsMgr::click(s16 id)
 {
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
+		WUPC_Rumble(chan, 0);
 		WPAD_Rumble(chan, 0);
 		PAD_ControlMotor(chan, 0);
 
@@ -393,6 +396,7 @@ void CButtonsMgr::tick(void)
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 		if (m_rumble[chan] > 0 && --m_rumble[chan] == 0)
 		{
+			WUPC_Rumble(chan, 0);
 			WPAD_Rumble(chan, 0);
 			PAD_ControlMotor(chan, 0);
 		}
diff --git a/source/gui/gui.hpp b/source/gui/gui.hpp
index fe4a42be..154417b3 100644
--- a/source/gui/gui.hpp
+++ b/source/gui/gui.hpp
@@ -6,6 +6,7 @@
 
 #include <ogc/pad.h>
 #include "wiiuse/wpad.h"
+#include "wupc/wupc.h"
 
 #include "video.hpp"
 #include "FreeTypeGX.h"
@@ -60,7 +61,7 @@ public:
 	void noHover(bool nohover = false);
 	void click(s16 id = -1);
 	bool selected(s16 button = -1);
-	void setRumble(int, bool wii = false, bool gc = false);
+	void setRumble(int, bool wii = false, bool gc = false, bool wupc = false);
 	void deselect(void){ for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--) m_selected[chan] = -1; }
 	void stopSounds(void);
 	void setSoundVolume(int vol);
@@ -144,6 +145,7 @@ private:
 	u8 m_rumble[WPAD_MAX_WIIMOTES];
 	bool wii_rumble[WPAD_MAX_WIIMOTES];
 	bool gc_rumble[WPAD_MAX_WIIMOTES];
+	bool wupc_rumble[WPAD_MAX_WIIMOTES];
 	GuiSound *m_sndHover;
 	GuiSound *m_sndClick;
 	u8 m_soundVolume;
diff --git a/source/loader/sys.c b/source/loader/sys.c
index 99dcd026..82fcf2bc 100644
--- a/source/loader/sys.c
+++ b/source/loader/sys.c
@@ -16,6 +16,7 @@
 #include "memory/mem2.hpp"
 #include "memory/memory.h"
 #include "wiiuse/wpad.h"
+#include "wupc/wupc.h"
 
 /* Variables */
 bool reset = false;
@@ -33,6 +34,7 @@ void Open_Inputs(void)
 {
 	/* Initialize Wiimote subsystem */
 	PAD_Init();
+	WUPC_Init();
 	WPAD_Init();
 
 	/* Set POWER button callback */
@@ -43,6 +45,8 @@ void Open_Inputs(void)
 
 void Close_Inputs(void)
 {
+	WUPC_Shutdown();
+
 	u32 cnt;
 
 	/* Disconnect Wiimotes */
diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp
index 7f977ad1..d87b9aff 100644
--- a/source/menu/menu.hpp
+++ b/source/menu/menu.hpp
@@ -28,6 +28,7 @@
 #include "music/MusicPlayer.hpp"
 #include "plugin/plugin.hpp"
 #include "wiiuse/wpad.h"
+#include "wupc/wupc.h"
 
 using namespace std;
 
@@ -624,6 +625,8 @@ private:
 	bool wBtn_HeldChan(int btn, u8 ext, int &chan);
 	u32 gc_btnsPressed;
 	u32 gc_btnsHeld;
+	u32 wupc_btnsPressed[WPAD_MAX_WIIMOTES];
+	u32 wupc_btnsHeld[WPAD_MAX_WIIMOTES];
 
 	bool m_show_pointer[WPAD_MAX_WIIMOTES];
 	float left_stick_angle[WPAD_MAX_WIIMOTES];
diff --git a/source/menu/menu_input.cpp b/source/menu/menu_input.cpp
index 6621ec71..c1424045 100644
--- a/source/menu/menu_input.cpp
+++ b/source/menu/menu_input.cpp
@@ -60,6 +60,7 @@ void CMenu::ScanInput()
 	m_show_zone_prev = false;
 	m_show_zone_next = false;
 
+	WUPC_UpdateButtonStats();
 	WPAD_ScanPads();
 	PAD_ScanPads();
 
@@ -102,7 +103,8 @@ void CMenu::ScanInput()
 	}
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		m_btnMgr.setRumble(chan, WPadIR_Valid(chan), PAD_StickX(chan) < -20 || PAD_StickX(chan) > 20 || PAD_StickY(chan) < -20 || PAD_StickY(chan) > 20);
+		m_btnMgr.setRumble(chan, WPadIR_Valid(chan), PAD_StickX(chan) < -20 || PAD_StickX(chan) > 20 || PAD_StickY(chan) < -20 || PAD_StickY(chan) > 20,
+			WUPC_lStickX(chan) < -160 || WUPC_lStickX(chan) > 160 || WUPC_lStickY(chan) < -160 || WUPC_lStickY(chan) > 160);
 		m_btnMgr.setMouse(WPadIR_Valid(chan) || m_show_pointer[chan]);
 		if(WPadIR_Valid(chan))
 		{
@@ -130,6 +132,7 @@ void CMenu::ButtonsPressed()
 	{
 		wii_btnsPressed[chan] = WPAD_ButtonsDown(chan);
 		gc_btnsPressed |= PAD_ButtonsDown(chan);
+		wupc_btnsPressed[chan] = WUPC_ButtonsDown(chan);
 	}
 }
 
@@ -140,12 +143,14 @@ void CMenu::ButtonsHeld()
 	{
 		wii_btnsHeld[chan] = WPAD_ButtonsHeld(chan);
 		gc_btnsHeld |= PAD_ButtonsHeld(chan);
+		wupc_btnsHeld[chan] = WUPC_ButtonsHeld(chan);
 	}
 }
 
 bool CMenu::wBtn_PressedChan(int btn, u8 ext, int &chan)
 {
-	return ((wii_btnsPressed[chan] & btn) && (ext == WPAD_EXP_NONE || ext == wd[chan]->exp.type));
+	return ((wii_btnsPressed[chan] & btn) && (ext == WPAD_EXP_NONE || ext == wd[chan]->exp.type))
+		|| ((wupc_btnsPressed[chan] & btn) && (ext == WPAD_EXP_CLASSIC));
 }
 
 bool CMenu::wBtn_Pressed(int btn, u8 ext)
@@ -160,7 +165,8 @@ bool CMenu::wBtn_Pressed(int btn, u8 ext)
 
 bool CMenu::wBtn_HeldChan(int btn, u8 ext, int &chan)
 {
-	return ((wii_btnsHeld[chan] & btn) && (ext == WPAD_EXP_NONE || ext == wd[chan]->exp.type));
+	return ((wii_btnsHeld[chan] & btn) && (ext == WPAD_EXP_NONE || ext == wd[chan]->exp.type))
+		|| ((wupc_btnsHeld[chan] & btn) && (ext == WPAD_EXP_CLASSIC));
 }
 
 bool CMenu::wBtn_Held(int btn, u8 ext)
@@ -178,13 +184,14 @@ void CMenu::LeftStick()
 	u8 speed = 0, pSpeed = 0;
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		if(left_stick_mag[chan] > 0.15 || abs(PAD_StickX(chan)) > 20 || abs(PAD_StickY(chan)) > 20)
+		if(left_stick_mag[chan] > 0.15 || abs(PAD_StickX(chan)) > 20 || abs(PAD_StickY(chan)) > 20
+			|| abs(WUPC_lStickX(chan)) > 160 || abs(WUPC_lStickY(chan)) > 160)
 		{
 			m_show_pointer[chan] = true;
 			if(LEFT_STICK_LEFT)
 			{
 				speed = (u8)(left_stick_mag[chan] * 10.00);
-				pSpeed = (u8)abs(PAD_StickX(chan))/10;
+				pSpeed = (u8)(abs(PAD_StickX(chan))/10 | abs(WUPC_lStickX(chan))/80);
 				if(stickPointer_x[chan] > m_cursor[chan].width()/2)
 					stickPointer_x[chan] = stickPointer_x[chan]-speed-pSpeed;
 				pointerhidedelay[chan] = 150;
@@ -192,7 +199,7 @@ void CMenu::LeftStick()
 			if(LEFT_STICK_DOWN)
 			{
 				speed = (u8)(left_stick_mag[chan] * 10.00);
-				pSpeed = (u8)abs(PAD_StickY(chan))/10;
+				pSpeed = (u8)(abs(PAD_StickY(chan))/10 | abs(WUPC_lStickY(chan))/80);
 				if(stickPointer_y[chan] < (m_vid.height() + (m_cursor[chan].height()/2)))
 					stickPointer_y[chan] = stickPointer_y[chan]+speed+pSpeed;
 				pointerhidedelay[chan] = 150;
@@ -200,7 +207,7 @@ void CMenu::LeftStick()
 			if(LEFT_STICK_RIGHT)
 			{
 				speed = (u8)(left_stick_mag[chan] * 10.00);
-				pSpeed = (u8)abs(PAD_StickX(chan))/10;
+				pSpeed = (u8)(abs(PAD_StickX(chan))/10 | abs(WUPC_lStickX(chan))/80);
 				if(stickPointer_x[chan] < (m_vid.width() + (m_cursor[chan].width()/2)))
 					stickPointer_x[chan] = stickPointer_x[chan]+speed+pSpeed;
 				pointerhidedelay[chan] = 150;
@@ -208,7 +215,7 @@ void CMenu::LeftStick()
 			if(LEFT_STICK_UP)
 			{
 				speed = (u8)(left_stick_mag[chan] * 10.00);
-				pSpeed = (u8)abs(PAD_StickY(chan))/10;
+				pSpeed = (u8)(abs(PAD_StickY(chan))/10 | abs(WUPC_lStickY(chan))/80);
 				if(stickPointer_y[chan] > m_cursor[chan].height()/2)
 					stickPointer_y[chan] = stickPointer_y[chan]-speed-pSpeed;
 				pointerhidedelay[chan] = 150;
@@ -393,7 +400,7 @@ bool CMenu::lStick_Up(void)
 {
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		if((LEFT_STICK_ANG_UP && left_stick_mag[chan] > 0.15) || PAD_StickY(chan) > 20)
+		if((LEFT_STICK_ANG_UP && left_stick_mag[chan] > 0.15) || PAD_StickY(chan) > 20 || WUPC_lStickY(chan) > 160)
 			return true;
 	}
 	return false;
@@ -403,7 +410,7 @@ bool CMenu::lStick_Right(void)
 {
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		if((LEFT_STICK_ANG_RIGHT && left_stick_mag[chan] > 0.15) || PAD_StickX(chan) > 20)
+		if((LEFT_STICK_ANG_RIGHT && left_stick_mag[chan] > 0.15) || PAD_StickX(chan) > 20 || WUPC_lStickX(chan) > 160)
 			return true;
 	}
 	return false;
@@ -413,7 +420,7 @@ bool CMenu::lStick_Down(void)
 {
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		if((LEFT_STICK_ANG_DOWN && left_stick_mag[chan] > 0.15) || PAD_StickY(chan) < -20)
+		if((LEFT_STICK_ANG_DOWN && left_stick_mag[chan] > 0.15) || PAD_StickY(chan) < -20 || WUPC_lStickY(chan) < -160)
 			return true;
 	}
 	return false;
@@ -423,7 +430,7 @@ bool CMenu::lStick_Left(void)
 {
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		if((LEFT_STICK_ANG_LEFT && left_stick_mag[chan] > 0.15) || PAD_StickX(chan) < -20)
+		if((LEFT_STICK_ANG_LEFT && left_stick_mag[chan] > 0.15) || PAD_StickX(chan) < -20 || WUPC_lStickX(chan) < -160)
 			return true;
 	}
 	return false;
@@ -433,7 +440,8 @@ bool CMenu::rStick_Up(void)
 {
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		if((RIGHT_STICK_ANG_UP && right_stick_mag[chan] > 0.15 && right_stick_skip[chan] == 0) || PAD_SubStickY(chan) > 20)
+		if((RIGHT_STICK_ANG_UP && right_stick_mag[chan] > 0.15 && right_stick_skip[chan] == 0)
+					|| PAD_SubStickY(chan) > 20 || WUPC_rStickY(chan) > 160)
 			return true;
 	}
 	return false;
@@ -443,7 +451,8 @@ bool CMenu::rStick_Right(void)
 {
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		if((RIGHT_STICK_ANG_RIGHT && right_stick_mag[chan] > 0.15 && right_stick_skip[chan] == 0) || PAD_SubStickX(chan) > 20)
+		if((RIGHT_STICK_ANG_RIGHT && right_stick_mag[chan] > 0.15 && right_stick_skip[chan] == 0)
+					|| PAD_SubStickX(chan) > 20 || WUPC_rStickX(chan) > 160)
 			return true;
 	}
 	return false;
@@ -453,7 +462,8 @@ bool CMenu::rStick_Down(void)
 {
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		if((RIGHT_STICK_ANG_DOWN && right_stick_mag[chan] > 0.15 && right_stick_skip[chan] == 0) || PAD_SubStickY(chan) < -20)
+		if((RIGHT_STICK_ANG_DOWN && right_stick_mag[chan] > 0.15 && right_stick_skip[chan] == 0)
+					|| PAD_SubStickY(chan) < -20 || WUPC_rStickY(chan) < -160)
 			return true;
 	}
 	return false;
@@ -463,7 +473,8 @@ bool CMenu::rStick_Left(void)
 {
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		if((RIGHT_STICK_ANG_LEFT && right_stick_mag[chan] > 0.15 && right_stick_skip[chan] == 0) || PAD_SubStickX(chan) < -20)
+		if((RIGHT_STICK_ANG_LEFT && right_stick_mag[chan] > 0.15 && right_stick_skip[chan] == 0)
+					|| PAD_SubStickX(chan) < -20 || WUPC_rStickX(chan) < -160)
 			return true;
 	}
 	return false;
@@ -483,7 +494,7 @@ bool CMenu::wRoll_Right(void)
 {
 	for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
 	{
-		if(WBTN_B_HELD && (wmote_roll[chan] > 5)  && wmote_roll_skip[chan] == 0)
+		if(WBTN_B_HELD && (wmote_roll[chan] > 5) && wmote_roll_skip[chan] == 0)
 			return true;
 	}
 	return false;