Removed unused variables, as the actions are no longer sent from within the interrupts
This commit is contained in:
@@ -4,7 +4,6 @@
|
|||||||
static usb_basic_keyboard_report_t usbBasicKeyboardReports[2];
|
static usb_basic_keyboard_report_t usbBasicKeyboardReports[2];
|
||||||
uint32_t UsbBasicKeyboardActionCounter;
|
uint32_t UsbBasicKeyboardActionCounter;
|
||||||
usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardReports;
|
usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardReports;
|
||||||
volatile bool IsUsbBasicKeyboardReportSent = false;
|
|
||||||
static uint8_t usbBasicKeyboardInBuffer[USB_BASIC_KEYBOARD_REPORT_LENGTH];
|
static uint8_t usbBasicKeyboardInBuffer[USB_BASIC_KEYBOARD_REPORT_LENGTH];
|
||||||
|
|
||||||
static usb_basic_keyboard_report_t* getInactiveUsbBasicKeyboardReport(void)
|
static usb_basic_keyboard_report_t* getInactiveUsbBasicKeyboardReport(void)
|
||||||
@@ -24,15 +23,10 @@ void ResetActiveUsbBasicKeyboardReport(void)
|
|||||||
|
|
||||||
usb_status_t UsbBasicKeyboardAction(void)
|
usb_status_t UsbBasicKeyboardAction(void)
|
||||||
{
|
{
|
||||||
usb_status_t status = kStatus_USB_Error;
|
UsbBasicKeyboardActionCounter++;
|
||||||
if (!IsUsbBasicKeyboardReportSent) {
|
return USB_DeviceHidSend(
|
||||||
status = USB_DeviceHidSend(
|
UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX,
|
||||||
UsbCompositeDevice.basicKeyboardHandle, USB_BASIC_KEYBOARD_ENDPOINT_INDEX,
|
(uint8_t*)getInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH);
|
||||||
(uint8_t*)getInactiveUsbBasicKeyboardReport(), USB_BASIC_KEYBOARD_REPORT_LENGTH);
|
|
||||||
IsUsbBasicKeyboardReportSent = true;
|
|
||||||
UsbBasicKeyboardActionCounter++;
|
|
||||||
}
|
|
||||||
return status;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
|
usb_status_t UsbBasicKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
|
||||||
|
|||||||
@@ -31,7 +31,6 @@
|
|||||||
|
|
||||||
// Variables:
|
// Variables:
|
||||||
|
|
||||||
extern volatile bool IsUsbBasicKeyboardReportSent;
|
|
||||||
extern uint32_t UsbBasicKeyboardActionCounter;
|
extern uint32_t UsbBasicKeyboardActionCounter;
|
||||||
extern usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport;
|
extern usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport;
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
uint32_t UsbMediaKeyboardActionCounter;
|
uint32_t UsbMediaKeyboardActionCounter;
|
||||||
static usb_media_keyboard_report_t usbMediaKeyboardReports[2];
|
static usb_media_keyboard_report_t usbMediaKeyboardReports[2];
|
||||||
usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport = usbMediaKeyboardReports;
|
usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport = usbMediaKeyboardReports;
|
||||||
volatile bool IsUsbMediaKeyboardReportSent = false;
|
|
||||||
|
|
||||||
static usb_media_keyboard_report_t* getInactiveUsbMediaKeyboardReport(void)
|
static usb_media_keyboard_report_t* getInactiveUsbMediaKeyboardReport(void)
|
||||||
{
|
{
|
||||||
@@ -22,15 +21,10 @@ void ResetActiveUsbMediaKeyboardReport(void)
|
|||||||
|
|
||||||
usb_status_t UsbMediaKeyboardAction()
|
usb_status_t UsbMediaKeyboardAction()
|
||||||
{
|
{
|
||||||
usb_status_t status = kStatus_USB_Error;
|
UsbMediaKeyboardActionCounter++;
|
||||||
if (!IsUsbMediaKeyboardReportSent) {
|
return USB_DeviceHidSend(
|
||||||
status = USB_DeviceHidSend(
|
UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX,
|
||||||
UsbCompositeDevice.mediaKeyboardHandle, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX,
|
(uint8_t*)getInactiveUsbMediaKeyboardReport(), USB_MEDIA_KEYBOARD_REPORT_LENGTH);
|
||||||
(uint8_t*)getInactiveUsbMediaKeyboardReport(), USB_MEDIA_KEYBOARD_REPORT_LENGTH);
|
|
||||||
IsUsbMediaKeyboardReportSent = true;
|
|
||||||
UsbMediaKeyboardActionCounter++;
|
|
||||||
}
|
|
||||||
return status;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
usb_status_t UsbMediaKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
|
usb_status_t UsbMediaKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
|
|
||||||
// Variables:
|
// Variables:
|
||||||
|
|
||||||
extern volatile bool IsUsbMediaKeyboardReportSent;
|
|
||||||
extern uint32_t UsbMediaKeyboardActionCounter;
|
extern uint32_t UsbMediaKeyboardActionCounter;
|
||||||
extern usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport;
|
extern usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport;
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
uint32_t UsbMouseActionCounter;
|
uint32_t UsbMouseActionCounter;
|
||||||
static usb_mouse_report_t usbMouseReports[2];
|
static usb_mouse_report_t usbMouseReports[2];
|
||||||
usb_mouse_report_t* ActiveUsbMouseReport = usbMouseReports;
|
usb_mouse_report_t* ActiveUsbMouseReport = usbMouseReports;
|
||||||
volatile bool IsUsbMouseReportSent = false;
|
|
||||||
|
|
||||||
static usb_mouse_report_t* getInactiveUsbMouseReport(void)
|
static usb_mouse_report_t* getInactiveUsbMouseReport(void)
|
||||||
{
|
{
|
||||||
@@ -22,15 +21,10 @@ void ResetActiveUsbMouseReport(void)
|
|||||||
|
|
||||||
usb_status_t usbMouseAction(void)
|
usb_status_t usbMouseAction(void)
|
||||||
{
|
{
|
||||||
usb_status_t status = kStatus_USB_Error;
|
UsbMouseActionCounter++;
|
||||||
if (!IsUsbMouseReportSent) {
|
return USB_DeviceHidSend(
|
||||||
status = USB_DeviceHidSend(
|
UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
|
||||||
UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
|
(uint8_t*)getInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH);
|
||||||
(uint8_t*)getInactiveUsbMouseReport(), USB_MOUSE_REPORT_LENGTH);
|
|
||||||
IsUsbMouseReportSent = true;
|
|
||||||
UsbMouseActionCounter++;
|
|
||||||
}
|
|
||||||
return status;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param)
|
usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param)
|
||||||
|
|||||||
@@ -31,7 +31,6 @@
|
|||||||
|
|
||||||
// Variables:
|
// Variables:
|
||||||
|
|
||||||
extern volatile bool IsUsbMouseReportSent;
|
|
||||||
extern uint32_t UsbMouseActionCounter;
|
extern uint32_t UsbMouseActionCounter;
|
||||||
extern usb_mouse_report_t* ActiveUsbMouseReport;
|
extern usb_mouse_report_t* ActiveUsbMouseReport;
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
uint32_t UsbSystemKeyboardActionCounter;
|
uint32_t UsbSystemKeyboardActionCounter;
|
||||||
static usb_system_keyboard_report_t usbSystemKeyboardReports[2];
|
static usb_system_keyboard_report_t usbSystemKeyboardReports[2];
|
||||||
usb_system_keyboard_report_t* ActiveUsbSystemKeyboardReport = usbSystemKeyboardReports;
|
usb_system_keyboard_report_t* ActiveUsbSystemKeyboardReport = usbSystemKeyboardReports;
|
||||||
volatile bool IsUsbSystemKeyboardReportSent = false;
|
|
||||||
|
|
||||||
static usb_system_keyboard_report_t* getInactiveUsbSystemKeyboardReport()
|
static usb_system_keyboard_report_t* getInactiveUsbSystemKeyboardReport()
|
||||||
{
|
{
|
||||||
@@ -22,15 +21,10 @@ void ResetActiveUsbSystemKeyboardReport(void)
|
|||||||
|
|
||||||
usb_status_t UsbSystemKeyboardAction(void)
|
usb_status_t UsbSystemKeyboardAction(void)
|
||||||
{
|
{
|
||||||
usb_status_t status = kStatus_USB_Error;
|
UsbSystemKeyboardActionCounter++;
|
||||||
if (!IsUsbSystemKeyboardReportSent) {
|
return USB_DeviceHidSend(
|
||||||
status = USB_DeviceHidSend(
|
UsbCompositeDevice.systemKeyboardHandle, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX,
|
||||||
UsbCompositeDevice.systemKeyboardHandle, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX,
|
(uint8_t*)getInactiveUsbSystemKeyboardReport(), USB_SYSTEM_KEYBOARD_REPORT_LENGTH);
|
||||||
(uint8_t*)getInactiveUsbSystemKeyboardReport(), USB_SYSTEM_KEYBOARD_REPORT_LENGTH);
|
|
||||||
IsUsbSystemKeyboardReportSent = true;
|
|
||||||
UsbSystemKeyboardActionCounter++;
|
|
||||||
}
|
|
||||||
return status;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
usb_status_t UsbSystemKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
|
usb_status_t UsbSystemKeyboardCallback(class_handle_t handle, uint32_t event, void *param)
|
||||||
|
|||||||
@@ -29,7 +29,6 @@
|
|||||||
|
|
||||||
// Variables:
|
// Variables:
|
||||||
|
|
||||||
extern volatile bool IsUsbSystemKeyboardReportSent;
|
|
||||||
extern uint32_t UsbSystemKeyboardActionCounter;
|
extern uint32_t UsbSystemKeyboardActionCounter;
|
||||||
extern usb_system_keyboard_report_t* ActiveUsbSystemKeyboardReport;
|
extern usb_system_keyboard_report_t* ActiveUsbSystemKeyboardReport;
|
||||||
|
|
||||||
|
|||||||
@@ -389,8 +389,6 @@ void UpdateUsbReports(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Timer_SetCurrentTime(&lastMouseUpdateTime);
|
Timer_SetCurrentTime(&lastMouseUpdateTime);
|
||||||
} else if (!IsUsbBasicKeyboardReportSent || !IsUsbMediaKeyboardReportSent || !IsUsbSystemKeyboardReportSent || !IsUsbMouseReportSent) {
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ResetActiveUsbBasicKeyboardReport();
|
ResetActiveUsbBasicKeyboardReport();
|
||||||
@@ -401,38 +399,42 @@ void UpdateUsbReports(void)
|
|||||||
updateActiveUsbReports();
|
updateActiveUsbReports();
|
||||||
|
|
||||||
static usb_basic_keyboard_report_t last_basic_report = { .scancodes[0] = 0xFF };
|
static usb_basic_keyboard_report_t last_basic_report = { .scancodes[0] = 0xFF };
|
||||||
|
bool HasUsbBasicKeyboardReportChanged = false;
|
||||||
if (memcmp(ActiveUsbBasicKeyboardReport, &last_basic_report, sizeof(usb_basic_keyboard_report_t)) != 0) {
|
if (memcmp(ActiveUsbBasicKeyboardReport, &last_basic_report, sizeof(usb_basic_keyboard_report_t)) != 0) {
|
||||||
last_basic_report = *ActiveUsbBasicKeyboardReport;
|
last_basic_report = *ActiveUsbBasicKeyboardReport;
|
||||||
SwitchActiveUsbBasicKeyboardReport();
|
SwitchActiveUsbBasicKeyboardReport();
|
||||||
IsUsbBasicKeyboardReportSent = false;
|
HasUsbBasicKeyboardReportChanged = true;
|
||||||
UsbBasicKeyboardAction();
|
UsbBasicKeyboardAction();
|
||||||
}
|
}
|
||||||
|
|
||||||
static usb_media_keyboard_report_t last_media_report = { .scancodes[0] = 0xFF };
|
static usb_media_keyboard_report_t last_media_report = { .scancodes[0] = 0xFF };
|
||||||
|
bool HasUsbMediaKeyboardReportChanged = false;
|
||||||
if (memcmp(ActiveUsbMediaKeyboardReport, &last_media_report, sizeof(usb_media_keyboard_report_t)) != 0) {
|
if (memcmp(ActiveUsbMediaKeyboardReport, &last_media_report, sizeof(usb_media_keyboard_report_t)) != 0) {
|
||||||
last_media_report = *ActiveUsbMediaKeyboardReport;
|
last_media_report = *ActiveUsbMediaKeyboardReport;
|
||||||
|
HasUsbMediaKeyboardReportChanged = true;
|
||||||
SwitchActiveUsbMediaKeyboardReport();
|
SwitchActiveUsbMediaKeyboardReport();
|
||||||
IsUsbMediaKeyboardReportSent = false;
|
|
||||||
UsbMediaKeyboardAction();
|
UsbMediaKeyboardAction();
|
||||||
}
|
}
|
||||||
|
|
||||||
static usb_system_keyboard_report_t last_system_report = { .scancodes[0] = 0xFF };
|
static usb_system_keyboard_report_t last_system_report = { .scancodes[0] = 0xFF };
|
||||||
|
bool HasUsbSystemKeyboardReportChanged = false;
|
||||||
if (memcmp(ActiveUsbSystemKeyboardReport, &last_system_report, sizeof(usb_system_keyboard_report_t)) != 0) {
|
if (memcmp(ActiveUsbSystemKeyboardReport, &last_system_report, sizeof(usb_system_keyboard_report_t)) != 0) {
|
||||||
last_system_report = *ActiveUsbSystemKeyboardReport;
|
last_system_report = *ActiveUsbSystemKeyboardReport;
|
||||||
|
HasUsbSystemKeyboardReportChanged = true;
|
||||||
SwitchActiveUsbSystemKeyboardReport();
|
SwitchActiveUsbSystemKeyboardReport();
|
||||||
IsUsbSystemKeyboardReportSent = false;
|
|
||||||
UsbSystemKeyboardAction();
|
UsbSystemKeyboardAction();
|
||||||
}
|
}
|
||||||
|
|
||||||
static usb_mouse_report_t last_mouse_report = { .buttons = 0xFF };
|
static usb_mouse_report_t last_mouse_report = { .buttons = 0xFF };
|
||||||
|
bool HasUsbMouseReportChanged = false;
|
||||||
if (memcmp(ActiveUsbMouseReport, &last_mouse_report, sizeof(usb_mouse_report_t)) != 0) {
|
if (memcmp(ActiveUsbMouseReport, &last_mouse_report, sizeof(usb_mouse_report_t)) != 0) {
|
||||||
last_mouse_report = *ActiveUsbMouseReport;
|
last_mouse_report = *ActiveUsbMouseReport;
|
||||||
|
HasUsbMouseReportChanged = true;
|
||||||
SwitchActiveUsbMouseReport();
|
SwitchActiveUsbMouseReport();
|
||||||
IsUsbMouseReportSent = false;
|
|
||||||
usbMouseAction();
|
usbMouseAction();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((previousLayer != LayerId_Base || !IsUsbBasicKeyboardReportSent || !IsUsbMediaKeyboardReportSent || !IsUsbSystemKeyboardReportSent || !IsUsbMouseReportSent) && IsHostSleeping) {
|
if ((previousLayer != LayerId_Base || HasUsbBasicKeyboardReportChanged || HasUsbMediaKeyboardReportChanged || HasUsbSystemKeyboardReportChanged || HasUsbMouseReportChanged) && IsHostSleeping) {
|
||||||
WakeUpHost(true); // Wake up the host if any key is pressed and the computer is sleeping.
|
WakeUpHost(true); // Wake up the host if any key is pressed and the computer is sleeping.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user