circle_8bitdo_keyboard_patch.diff

diff --git a/include/circle/usb/usbkeyboard.h b/include/circle/usb/usbkeyboard.h
index 373b0d26..3c26d61d 100644
--- a/include/circle/usb/usbkeyboard.h
+++ b/include/circle/usb/usbkeyboard.h
@@ -62,9 +62,13 @@ public:
 	// works in cooked and raw mode
 	boolean SetLEDs (u8 ucStatus);		// must not be called in interrupt context
 
-private:
+
+protected:
+	boolean ConfigureKeyboard (unsigned nReportSize);
 	void ReportHandler (const u8 *pReport, unsigned nReportSize);
 
+
+private:
 	static boolean FindByte (const u8 *pBuffer, u8 ucByte, unsigned nLength);
 
 private:
diff --git a/include/circle/usb/usbkeyboard8bitdo.h b/include/circle/usb/usbkeyboard8bitdo.h
new file mode 100644
index 00000000..4cc7a8f6
--- /dev/null
+++ b/include/circle/usb/usbkeyboard8bitdo.h
@@ -0,0 +1,22 @@
+//
+// usbkeyboard8bitdo.h
+//
+
+#ifndef _circle_usb_usbkeyboard8bitdo_h
+#define _circle_usb_usbkeyboard8bitdo_h
+
+#include <circle/usb/usbkeyboard.h>
+
+class CUSBKeyboard8BitDoDevice : public CUSBKeyboardDevice
+{
+public:
+	CUSBKeyboard8BitDoDevice (CUSBFunction *pFunction);
+	~CUSBKeyboard8BitDoDevice (void);
+
+	boolean Configure (void);
+
+protected:
+	void ReportHandler (const u8 *pReport, unsigned nReportSize);
+};
+
+#endif
\ No newline at end of file
diff --git a/lib/usb/Makefile b/lib/usb/Makefile
index 14471753..e3e2e8d4 100644
--- a/lib/usb/Makefile
+++ b/lib/usb/Makefile
@@ -28,7 +28,7 @@ OBJS	= lan7800.o smsc951x.o usbbluetooth.o usbcdcethernet.o usbfloppydevice.o \
 	  usbconfigparser.o usbdevice.o usbdevicefactory.o usbendpoint.o usbfunction.o \
 	  usbgamepad.o usbgamepadps3.o usbgamepadps4.o usbgamepadstandard.o usbgamepadswitchpro.o \
 	  usbgamepadxbox360.o usbgamepadxboxone.o usbhiddevice.o usbhostcontroller.o \
-	  usbkeyboard.o usbmassdevice.o usbmidi.o usbmidihost.o usbmouse.o usbprinter.o usbrequest.o \
+	  usbkeyboard.o usbkeyboard8bitdo.o usbmassdevice.o usbmidi.o usbmidihost.o usbmouse.o usbprinter.o usbrequest.o \
 	  usbstandardhub.o usbstring.o usbserial.o usbserialhost.o usbserialch341.o usbserialcp210x.o \
 	  usbserialpl2303.o usbserialft231x.o usbserialcdc.o usbtouchscreen.o dwhciregister.o
 
diff --git a/lib/usb/usbdevicefactory.cpp b/lib/usb/usbdevicefactory.cpp
index 75210581..fefd0f34 100644
--- a/lib/usb/usbdevicefactory.cpp
+++ b/lib/usb/usbdevicefactory.cpp
@@ -30,6 +30,7 @@
 #include <circle/usb/usbmassdevice.h>
 #include <circle/usb/usbfloppydevice.h>
 #include <circle/usb/usbkeyboard.h>
+#include <circle/usb/usbkeyboard8bitdo.h>
 #include <circle/usb/usbmouse.h>
 #include <circle/usb/usbgamepadstandard.h>
 #include <circle/usb/usbgamepadps3.h>
@@ -91,7 +92,12 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
 		CString *pVendor = pParent->GetDevice ()->GetName (DeviceNameVendor);
 		assert (pVendor != 0);
 
-		if (pVendor->Compare ("ven3f0-1198") != 0)	// HP USB 1000dpi Laser Mouse
+		if (   pVendor->Compare ("ven2dc8-5200") == 0
+		    || pVendor->Compare ("ven2dc8-5201") == 0)  // 8bitDo Retro Keyboard
+		{
+			pResult = new CUSBKeyboard8BitDoDevice (pParent);
+		}
+		else if (pVendor->Compare ("ven3f0-1198") != 0)	// HP USB 1000dpi Laser Mouse
 		{
 			pResult = new CUSBKeyboardDevice (pParent);
 		}
@@ -102,7 +108,16 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
 #ifndef EXCLUDE_USB_MOUSE
 	else if (pName->Compare ("int3-1-2") == 0)
 	{
-		pResult = new CUSBMouseDevice (pParent);
+		CString *pVendor = pParent->GetDevice ()->GetName (DeviceNameVendor);
+		assert (pVendor != 0);
+
+		if (   pVendor->Compare ("ven2dc8-5200") != 0
+		    && pVendor->Compare ("ven2dc8-5201") != 0) // 8bitDo Retro Keyboard
+		{
+			pResult = new CUSBMouseDevice (pParent);
+		}
+
+		delete pVendor;
 	}
 #endif
 	else if (   pName->Compare ("int3-0-0") == 0
diff --git a/lib/usb/usbkeyboard.cpp b/lib/usb/usbkeyboard.cpp
index 05fe2fab..b5adf198 100644
--- a/lib/usb/usbkeyboard.cpp
+++ b/lib/usb/usbkeyboard.cpp
@@ -67,7 +67,12 @@ boolean CUSBKeyboardDevice::Configure (void)
 		m_nReportSize++;
 	}
 
-	if (!CUSBHIDDevice::ConfigureHID (m_nReportSize))
+	return ConfigureKeyboard (m_nReportSize);
+}
+
+boolean CUSBKeyboardDevice::ConfigureKeyboard (unsigned nReportSize)
+{
+	if (!CUSBHIDDevice::ConfigureHID (nReportSize))
 	{
 		CLogger::Get ()->Write (FromUSBKbd, LogError, "Cannot configure HID device");
 
diff --git a/lib/usb/usbkeyboard8bitdo.cpp b/lib/usb/usbkeyboard8bitdo.cpp
new file mode 100644
index 00000000..0c67c0e3
--- /dev/null
+++ b/lib/usb/usbkeyboard8bitdo.cpp
@@ -0,0 +1,70 @@
+//
+// usbkeyboard8bitdo.cpp
+//
+
+#include <circle/usb/usbkeyboard8bitdo.h>
+
+#define USBKEYB8BITDO_REPORT_SIZE	17
+
+static const char FromUSBKbd8BitDo[] = "ukbd8bitdo";
+
+CUSBKeyboard8BitDoDevice::CUSBKeyboard8BitDoDevice (CUSBFunction *pFunction)
+: 	CUSBKeyboardDevice (pFunction)
+{
+}
+
+CUSBKeyboard8BitDoDevice::~CUSBKeyboard8BitDoDevice (void)
+{
+}
+
+boolean CUSBKeyboard8BitDoDevice::Configure (void)
+{
+	return ConfigureKeyboard (USBKEYB8BITDO_REPORT_SIZE);
+}
+
+void CUSBKeyboard8BitDoDevice::ReportHandler (const u8 *pReport, unsigned nReportSize)
+{
+	// Forward HID transfer failures to the common keyboard driver.
+	if (pReport == 0)
+	{
+		CUSBKeyboardDevice::ReportHandler (0, 0);
+
+		return;
+	}
+
+	// Convert the 8BitDo NKRO bitmap report to a boot keyboard report.
+	if (   nReportSize == USBKEYB8BITDO_REPORT_SIZE
+	    && (pReport[0] == 0x0A || pReport[0] == 0x0C))
+	{
+		u8 Report[USBKEYB_REPORT_SIZE] = {pReport[1]};
+		unsigned nSlots = 0;
+
+		for (unsigned nUsage = 0x04; nUsage <= 0x77 && nSlots < 6; nUsage++)
+		{
+			if (pReport[2 + nUsage / 8] & (1U << (nUsage % 8)))
+			{
+				Report[2 + nSlots++] = nUsage;
+			}
+		}
+
+		CUSBKeyboardDevice::ReportHandler (Report, sizeof Report);
+
+		return;
+	}
+
+	// Strip the report ID from a standard boot keyboard report.
+	if (nReportSize == 9 && pReport[0] == 0x01)
+	{
+		CUSBKeyboardDevice::ReportHandler (pReport + 1, USBKEYB_REPORT_SIZE);
+
+		return;
+	}
+
+	// Forward an unprefixed standard boot keyboard report.
+	if (nReportSize == USBKEYB_REPORT_SIZE)
+	{
+		CUSBKeyboardDevice::ReportHandler (pReport, nReportSize);
+
+		return;
+	}
+}
\ No newline at end of file