@@ -12,6 +12,7 @@ extern "C" {
1212#include " key_states.h"
1313#include " logger.h"
1414#include " macro_events.h"
15+ #include " trace.h"
1516#include " usb_report_updater.h"
1617}
1718#include " command_app.hpp"
@@ -88,26 +89,35 @@ extern "C" void Hid_TransportStateChanged(
8889
8990extern " C" errno_t Hid_SendKeyboardReport (const hid_keyboard_report_t *report)
9091{
91- switch (determineSink ()) {
92+ report_sink_t sink = determineSink ();
93+ Trace_Printf (" z11,%d" , sink);
94+ errno_t err;
95+ switch (sink) {
9296 case ReportSink_Usb:
93- return keyboard_app::usb_handle ().send_report (*report);
97+ err = keyboard_app::usb_handle ().send_report (*report);
98+ break ;
9499#if DEVICE_IS_UHK80_RIGHT
95100 case ReportSink_BleHid:
96- return keyboard_app::ble_handle ().send_report (*report);
101+ err = keyboard_app::ble_handle ().send_report (*report);
102+ break ;
97103#endif
98104#if DEVICE_IS_UHK80
99105 case ReportSink_Dongle:
100106 // TODO: propagate underlying error up the stack
101107 Messenger_Send2 (DeviceId_Uhk_Dongle, MessageId_SyncableProperty,
102108 SyncablePropertyId_KeyboardReport, (const uint8_t *)report, sizeof (*report));
103- return 0 ;
109+ err = 0 ;
110+ break ;
104111#endif
105112 default :
106113#ifdef __ZEPHYR__
107114 printk (" Unhandled and unexpected switch state!\n " );
108115#endif
109- return -EHOSTUNREACH;
116+ err = -EHOSTUNREACH;
117+ break ;
110118 }
119+ Trace_Printf (" z12,%d" , err);
120+ return err;
111121}
112122
113123extern " C" void Hid_KeyboardReportSentCallback (hid_transport_t transport)
@@ -120,26 +130,35 @@ extern "C" void Hid_KeyboardReportSentCallback(hid_transport_t transport)
120130
121131extern " C" errno_t Hid_SendMouseReport (const hid_mouse_report_t *report)
122132{
123- switch (determineSink ()) {
133+ report_sink_t sink = determineSink ();
134+ Trace_Printf (" z21,%d" , sink);
135+ errno_t err;
136+ switch (sink) {
124137 case ReportSink_Usb:
125- return mouse_app::usb_handle ().send_report (*report);
138+ err = mouse_app::usb_handle ().send_report (*report);
139+ break ;
126140#if DEVICE_IS_UHK80_RIGHT
127141 case ReportSink_BleHid:
128- return mouse_app::ble_handle ().send_report (*report);
142+ err = mouse_app::ble_handle ().send_report (*report);
143+ break ;
129144#endif
130145#if DEVICE_IS_UHK80
131146 case ReportSink_Dongle:
132147 // TODO: propagate underlying error up the stack
133148 Messenger_Send2 (DeviceId_Uhk_Dongle, MessageId_SyncableProperty,
134149 SyncablePropertyId_MouseReport, (const uint8_t *)report, sizeof (*report));
135- return 0 ;
150+ err = 0 ;
151+ break ;
136152#endif
137153 default :
138154#ifdef __ZEPHYR__
139155 printk (" Unhandled and unexpected switch state!\n " );
140156#endif
141- return -EHOSTUNREACH;
157+ err = -EHOSTUNREACH;
158+ break ;
142159 }
160+ Trace_Printf (" z22,%d" , err);
161+ return err;
143162}
144163
145164extern " C" void Hid_MouseReportSentCallback (hid_transport_t transport)
@@ -152,26 +171,35 @@ extern "C" void Hid_MouseReportSentCallback(hid_transport_t transport)
152171
153172extern " C" errno_t Hid_SendControlsReport (const hid_controls_report_t *report)
154173{
155- switch (determineSink ()) {
174+ report_sink_t sink = determineSink ();
175+ Trace_Printf (" z31,%d" , sink);
176+ errno_t err;
177+ switch (sink) {
156178 case ReportSink_Usb:
157- return controls_app::usb_handle ().send_report (*report);
179+ err = controls_app::usb_handle ().send_report (*report);
180+ break ;
158181#if DEVICE_IS_UHK80_RIGHT
159182 case ReportSink_BleHid:
160- return controls_app::ble_handle ().send_report (*report);
183+ err = controls_app::ble_handle ().send_report (*report);
184+ break ;
161185#endif
162186#if DEVICE_IS_UHK80
163187 case ReportSink_Dongle:
164188 // TODO: propagate underlying error up the stack
165189 Messenger_Send2 (DeviceId_Uhk_Dongle, MessageId_SyncableProperty,
166190 SyncablePropertyId_ControlsReport, (const uint8_t *)report, sizeof (*report));
167- return 0 ;
191+ err = 0 ;
192+ break ;
168193#endif
169194 default :
170195#ifdef __ZEPHYR__
171196 printk (" Unhandled and unexpected switch state!\n " );
172197#endif
173- return -EHOSTUNREACH;
198+ err = -EHOSTUNREACH;
199+ break ;
174200 }
201+ Trace_Printf (" z32,%d" , err);
202+ return err;
175203}
176204
177205extern " C" void Hid_ControlsReportSentCallback (hid_transport_t transport)
0 commit comments