From 8ef2af44f3f23ddbe8356ba5f44605cd2875e6eb Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 16 Mar 2023 13:14:25 -0400 Subject: [PATCH] counting per-channel traffic --- firmware/console/binary/tunerstudio.cpp | 4 ++++ firmware/console/eficonsole.h | 3 +++ firmware/console/usb_console.cpp | 10 ++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index 838bc2dc2d..0cd10a0744 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -120,6 +120,10 @@ static void printTsStats(void) { #endif /* EFI_PROD_CODE */ +#if EFI_USB_SERIAL + printUsbConnectorStats(); +#endif // EFI_USB_SERIAL + printErrorCounters(); } diff --git a/firmware/console/eficonsole.h b/firmware/console/eficonsole.h index 77a049f2d6..42aba950c8 100644 --- a/firmware/console/eficonsole.h +++ b/firmware/console/eficonsole.h @@ -9,5 +9,8 @@ #pragma once void initializeConsole(); + void startUsbConsole(); +void printUsbConnectorStats(); + void startEthernetConsole(); diff --git a/firmware/console/usb_console.cpp b/firmware/console/usb_console.cpp index a1ecc96673..22ba983fc0 100644 --- a/firmware/console/usb_console.cpp +++ b/firmware/console/usb_console.cpp @@ -24,11 +24,14 @@ public: } void write(const uint8_t* buffer, size_t size, bool /*isEndOfPacket*/) override { - chnWriteTimeout(m_channel, buffer, size, BINARY_IO_TIMEOUT); + size_t transferred = chnWriteTimeout(m_channel, buffer, size, BINARY_IO_TIMEOUT); + bytesOut += transferred; } size_t readTimeout(uint8_t* buffer, size_t size, int timeout) override { - return chnReadTimeout(m_channel, buffer, size, timeout); + size_t transferred = chnReadTimeout(m_channel, buffer, size, timeout); + bytesIn += transferred; + return transferred; } private: @@ -54,4 +57,7 @@ void startUsbConsole() { usbConsole.start(); } +void printUsbConnectorStats() { +} + #endif // EFI_USB_SERIAL