pingu_98/HID
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Partly revert commit 8bb3b2339f

Browse source 
Arduino integrated the function now as normal fix
This commit is contained in:
NicoHood 2016-01-04 18:13:30 +01:00
parent bb0960c9f3
commit 14f52f1879
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/SingleReport/BootKeyboard.cpp
View file

@ -152,7 +152,7 @@ bool BootKeyboard_::setup(USBSetup& setup)
// except the host tries to send more then 32k bytes. // except the host tries to send more then 32k bytes.
// We dont have that much ram anyways. // We dont have that much ram anyways.
if (length == featureLength) { if (length == featureLength) {
USB_RecvControlLong(featureReport, featureLength); USB_RecvControl(featureReport, featureLength);
// Block until data is read (make length negative) // Block until data is read (make length negative)
disableFeatureReport(); disableFeatureReport();
@ -164,7 +164,7 @@ bool BootKeyboard_::setup(USBSetup& setup)
// Output (set led states) // Output (set led states)
else if(setup.wValueH == HID_REPORT_TYPE_OUTPUT){ else if(setup.wValueH == HID_REPORT_TYPE_OUTPUT){
if(length == sizeof(leds)){ if(length == sizeof(leds)){
USB_RecvControlLong(&leds, length); USB_RecvControl(&leds, length);
return true; return true;
} }
} }
@ -173,7 +173,7 @@ bool BootKeyboard_::setup(USBSetup& setup)
else if(setup.wValueH == HID_REPORT_TYPE_INPUT) else if(setup.wValueH == HID_REPORT_TYPE_INPUT)
{ {
if(length == sizeof(_keyReport)){ if(length == sizeof(_keyReport)){
USB_RecvControlLong(&_keyReport, length); USB_RecvControl(&_keyReport, length);
return true; return true;
} }
} }

4
src/SingleReport/RawHID.cpp
View file

@ -123,7 +123,7 @@ bool RawHID_::setup(USBSetup& setup)
// except the host tries to send more then 32k bytes. // except the host tries to send more then 32k bytes.
// We dont have that much ram anyways. // We dont have that much ram anyways.
if (length == featureLength) { if (length == featureLength) {
USB_RecvControlLong(featureReport, featureLength); USB_RecvControl(featureReport, featureLength);
// Block until data is read (make length negative) // Block until data is read (make length negative)
disableFeatureReport(); disableFeatureReport();
@ -135,7 +135,7 @@ bool RawHID_::setup(USBSetup& setup)
else if(setup.wValueH == HID_REPORT_TYPE_OUTPUT){ else if(setup.wValueH == HID_REPORT_TYPE_OUTPUT){
if(!dataAvailable && length <= dataLength){ if(!dataAvailable && length <= dataLength){
// Write data to fit to the end (not the beginning) of the array // Write data to fit to the end (not the beginning) of the array
USB_RecvControlLong(data + dataLength - length, length); USB_RecvControl(data + dataLength - length, length);
dataAvailable = length; dataAvailable = length;
return true; return true;
} }