Fixed click-drag issue.

TODO: find out why 8-byte device interrupt endpoints totally fail.
WTF???
USG_1.0
Robert Fisk 9 years ago
parent a5f4e52e02
commit 6f944a33db

@ -17,7 +17,7 @@
#define HID_REPORT_DATA_LEN 8 #define HID_MAX_REPORT_LEN 8
#define HID_MOUSE_DATA_LEN 3 #define HID_MOUSE_DATA_LEN 3
#define HID_KEYBOARD_DATA_LEN 0 #define HID_KEYBOARD_DATA_LEN 0
@ -33,7 +33,7 @@ InterfaceCommandClassTypeDef Downstream_HID_ApproveConnectedDevice(void)
if (HID_Handle->Protocol == HID_MOUSE_BOOT_CODE) if (HID_Handle->Protocol == HID_MOUSE_BOOT_CODE)
{ {
if ((HID_Handle->length >= HID_MOUSE_DATA_LEN) && (HID_Handle->length <= HID_REPORT_DATA_LEN)) if ((HID_Handle->length >= HID_MOUSE_DATA_LEN) && (HID_Handle->length <= HID_MAX_REPORT_LEN))
{ {
return COMMAND_CLASS_HID_MOUSE; return COMMAND_CLASS_HID_MOUSE;
} }

@ -14,9 +14,9 @@
#include "upstream_hid.h" #include "upstream_hid.h"
#include "upstream_spi.h" #include "upstream_spi.h"
#include "upstream_interface_def.h" #include "upstream_interface_def.h"
#include "usbd_hid.h"
#define HID_REPORT_DATA_LEN 8
#define HID_MOUSE_DATA_LEN 3 #define HID_MOUSE_DATA_LEN 3
#define HID_KEYBOARD_DATA_LEN 0 #define HID_KEYBOARD_DATA_LEN 0
@ -138,7 +138,7 @@ void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPa
return; return;
} }
for (i = dataLength; i < HID_REPORT_DATA_LEN; i++) for (i = dataLength; i < HID_EPIN_SIZE; i++)
{ {
receivedPacket->Data[i] = 0; //Zero out unused bytes before we send report upstream receivedPacket->Data[i] = 0; //Zero out unused bytes before we send report upstream
} }
@ -146,7 +146,7 @@ void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPa
UpstreamHidPacket = receivedPacket; //Save packet so we can free it when upstream USB transaction is done UpstreamHidPacket = receivedPacket; //Save packet so we can free it when upstream USB transaction is done
tempReportCallback = ReportCallback; tempReportCallback = ReportCallback;
ReportCallback = NULL; ReportCallback = NULL;
tempReportCallback(receivedPacket->Data, HID_REPORT_DATA_LEN); tempReportCallback(receivedPacket->Data, HID_EPIN_SIZE);
} }

Loading…
Cancel
Save