Added Feature Report function to BootKeyboard

This may be added to other HID Devices as well, but Keyboard makes the most sense.
NicoHood · Nov 7, 2015 · a8c292a · a8c292a
1 parent febc714
commit a8c292a
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 4 deletions.
diff --git a/src/SingleReport/BootKeyboard.cpp b/src/SingleReport/BootKeyboard.cpp
@@ -120,10 +120,12 @@ bool BootKeyboard_::setup(USBSetup& setup)
 			return true;
 		}
 		if (request == HID_GET_PROTOCOL) {
+			// TODO improve
 			UEDATX = protocol;
 			return true;
 		}
 		if (request == HID_GET_IDLE) {
+			// TODO improve
 			UEDATX = idle;
 			return true;
 		}
@@ -141,10 +143,38 @@ bool BootKeyboard_::setup(USBSetup& setup)
 		}
 		if (request == HID_SET_REPORT)
 		{
-			// Check if data has the correct length
-			auto length = setup.wLength;
-			if(length == sizeof(leds)){
-				USB_RecvControl(&leds, length);
+			// Check if data has the correct length afterwards
+			int length = setup.wLength;
+
+			// Feature (set feature report)
+			if(setup.wValueH == HID_REPORT_TYPE_FEATURE){
+				// No need to check for negative featureLength values,
+				// except the host tries to send more then 32k bytes.
+				// We dont have that much ram anyways.
+				if (length == featureLength) {
+					USB_RecvControl(featureReport, featureLength);
+
+					// Block until data is read (make length negative)
+					disableFeatureReport();
+					return true;
+				}
+			}
+
+			// Output (set led states)
+			else if(setup.wValueH == HID_REPORT_TYPE_OUTPUT){
+				if(length == sizeof(leds)){
+					USB_RecvControl(&leds, length);
+					return true;
+				}
+			}
+
+			// Input (set HID report)
+			else if(setup.wValueH == HID_REPORT_TYPE_INPUT)
+			{
+				if(length == sizeof(_keyReport)){
+					USB_RecvControl(&_keyReport, length);
+					return true;
+				}
 			}
 		}
 	}

diff --git a/src/SingleReport/BootKeyboard.h b/src/SingleReport/BootKeyboard.h
@@ -38,6 +38,28 @@ class BootKeyboard_ : public PluggableUSBModule, public DefaultKeyboardAPI
     uint8_t getLeds(void);
     uint8_t getProtocol(void);
     void wakeupHost(void);
+
+    void setFeatureReport(void* report, int length){
+        if(length > 0){
+            featureReport = (uint8_t*)report;
+            featureLength = length;
+        }
+    }
+
+    int availableFeatureReport(void){
+        if(featureLength < 0){
+            return featureLength & ~0x8000;
+        }
+        return 0;
+    }
+
+    void enableFeatureReport(void){
+        featureLength &= ~0x8000;
+    }
+
+    void disableFeatureReport(void){
+        featureLength |= 0x8000;
+    }
 
 protected:
     // Implementation of the PUSBListNode
@@ -51,6 +73,9 @@ class BootKeyboard_ : public PluggableUSBModule, public DefaultKeyboardAPI
 
     uint8_t leds;
 
+    uint8_t* featureReport;
+    int featureLength;
+
     virtual int send(void) override;
 };
 extern BootKeyboard_ BootKeyboard;