Semaphore: Aesthetic fixes.

Author: kareltucek

right/src/event_scheduler.c

@@ -11,7 +11,6 @@
 #include "peripherals/merge_sensor.h"
 #include "power_mode.h"
 #include "usb_report_updater.h"
-#include "usb_semaphore.h"
 #include "oneshot.h"
 #include "trace.h"
 
@@ -253,11 +252,6 @@ static void processEvt(event_scheduler_event_t evt)
         case EventSchedulerEvent_SendUsbReports:
             EventVector_Set(EventVector_SendUsbReports);
             break;
-        case EventSchedulerEvent_UpdateUsbSemaphore:
-            // Drives the semaphore timeout so a stuck (unconfirmed) report gets resent
-            // even if nothing else wakes the event loop.
-            UsbSemaphore_RecalculateIsReady();
-            break;
         case EventSchedulerEvent_CheckLeftBleVsUart:
 #if DEVICE_IS_UHK80_LEFT
             BtManager_CheckLeftBleVsUart();

right/src/event_scheduler.h

@@ -50,7 +50,6 @@
         EventSchedulerEvent_OneShotTimeout,
         EventSchedulerEvent_KickHid,
         EventSchedulerEvent_SendUsbReports,
-        EventSchedulerEvent_UpdateUsbSemaphore,
         EventSchedulerEvent_CheckLeftBleVsUart,
         EventSchedulerEvent_ConnectionsUpdateState,
         EventSchedulerEvent_Count

right/src/main.c

@@ -235,6 +235,7 @@ int main(void)
         sendFirstReport();
 
         Trace_Printc("initialized");
+        LOG_INF("Booted up");
 
         while (1) {
             Trace_Printc("{");

right/src/usb_report_sender.c

@@ -251,14 +251,14 @@ static bool blockedByReportThrottle() {
 
     // If we are retrying too agressively, we may clog some USB hubs, so add a throttle in that case as well.
     if (currentTime < retryThrottleTime) {
-        blockedUntil = MAX(retryThrottleTime, blockedUntil);;
+        blockedUntil = MAX(retryThrottleTime, blockedUntil);
         blocked = true;
     }
 
     // To reduce mouse latency, don't construct report until we are close enough to transport window.
     if ((int32_t)(UsbReportWindowEstimate - currentTime) > USB_REPORT_WINDOW_LOOKAHEAD_MS) {
         uint32_t throttleUntil = UsbReportWindowEstimate - USB_REPORT_WINDOW_LOOKAHEAD_MS;
-        blockedUntil = MAX(throttleUntil, blockedUntil);;
+        blockedUntil = MAX(throttleUntil, blockedUntil);
         blocked = true;
     }
 
@@ -281,7 +281,7 @@ static bool blockedByReportThrottle() {
     return false;
 }
 
-// All paths have to call either UsbReportUpdater_UpdateActiveReports or justPreprocessInput.
+// All paths have to call either UsbReportUpdater_UpdateActiveReports or justPreprocessInput(true).
 void UsbReportSender_UpdateAndSendUsbReports(void)
 {
     Trace_Printc("u1");

right/src/usb_semaphore.c

@@ -43,11 +43,6 @@ void UsbSemaphore_Clear(void) {
     UsbSemaphore.mouse.inFlight = false;
 }
 
-// Release a report's in-flight latch once it has been successfully sent (USB/BLE via the
-// async sent callback, NUS/dongle synchronously on successful enqueue). This unblocks report
-// processing: advance the baseline to the just-sent report and reset the resend state
-// (ShouldResendReport(0, ...) clears the retry counter and the give-up latch). This means
-// "sent", not "delivered" - for USB/BLE the delivery confirmation is a separate, later event.
 void UsbSemaphore_Release(report_send_state_t* st) {
     st->switchActiveReport();
     st->retries = 0;
@@ -56,10 +51,7 @@ void UsbSemaphore_Release(report_send_state_t* st) {
     EventScheduler_Schedule(Timer_GetCurrentTime(), EventSchedulerEvent_Postponer, "Usb semaphore released. Recalculate throttle delay.");
 }
 
-// Recompute the in-flight gate. While a report is still in flight within its confirmation
-// grace window we are not ready (return false). Once the window elapses, re-arm the resend
-// for the still-pending reports (their baseline was never advanced, so the current state is
-// re-sent rather than lost) and report ready.
+// NOTE: if we retry too soon, we might get a double report confirmation, confirming this report and the next one, which would make us loose the next one if its transport failes. Low probability in practice.
 bool UsbSemaphore_RecalculateIsReady(void) {
     if (UsbSemaphore_AnyInFlight() && CurrentPowerMode <= PowerMode_LastAwake) {
         if (Timer_GetElapsedTime(&UpdateUsbReports_LastUpdateTime) < USB_SEMAPHORE_TIMEOUT) {