Refactor error reporting and remove font.S

Centralize and simplify error handling across the codebase: add CONFIG_CLIB_USE_UART0 to bootloader-tftp/Common.mk; refactor lib-clib/src/perror.cpp to use stdio (printf/puts) instead of console:: functions; remove lib-hal/console/font.S; and update lib-network sources to include network_private.h and replace console::Error calls with network::Error(__func__, ...) (lib-network/src/core/network_memory.h, lib-network/src/core/tcp.cpp). These changes remove console forward-declarations and route errors through a unified network error API while cleaning up the perror implementation.

Author: vanvught

bootloader-tftp/Common.mk

@@ -5,6 +5,7 @@ DEFINES+=DISABLE_PRINTF_FLOAT
 
 DEFINES+=ENABLE_TFTP_SERVER
 DEFINES+=CONFIG_REMOTECONFIG_MINIMUM
+DEFINES+=CONFIG_CLIB_USE_UART0
 
 DEFINES+=UDP_MAX_PORTS_ALLOWED=3
 DEFINES+=ENET_RXBUF_NUM=2 ENET_TXBUF_NUM=2

lib-clib/src/perror.cpp

@@ -23,20 +23,10 @@
  * THE SOFTWARE.
  */
 
-#include <stddef.h>
+#include <cstdio>
 #include <errno.h>
 
-namespace console {
-void Error(const char*);
-int PutChar(int);
-int Puts(const char*);
-void Write(const char*, unsigned int);
-} // namespace console
-
-/*
-errno -l | cut -f3- -d ' ' | sort -V -u | awk '$0="\""$0"\","'
-*/
-
+//errno -l | cut -f3- -d ' ' | sort -V -u | awk '$0="\""$0"\","'
 const char* const kSysErrlist[] = {"OK",
                                    "Operation not permitted",
                                    "No such file or directory",
@@ -98,11 +88,9 @@ void perror(const char* s) { // NOLINT
     }
 
     if (s && *s) {
-        console::Error(s);
-        console::Write(": ", 2);
+		printf("%s: ", s);
     }
 
-    console::Error(ptr);
-    console::PutChar('\n');
+    puts(ptr);
 }
 }

lib-hal/.cproject

@@ -27,8 +27,6 @@
 					</folderInfo>
 					<sourceEntries>
 						<entry excluding="rtc|console|debug|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-						<entry excluding="uart0" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="console"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="console/uart0"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="debug"/>
 						<entry excluding="gd32" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 						<entry excluding="com0" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gd32"/>

lib-hal/.settings/language.settings.xml

@@ -30,9 +30,7 @@
 #include <cstring>
 #include <cassert>
 
-namespace console {
-void Error(const char*);
-}
+#include "network_private.h"
 
 namespace network::memory {
 inline constexpr uint32_t kBlocks =
@@ -86,7 +84,7 @@ class Allocator {
 
     uint8_t* Allocate() {
         if (IsFull()) {
-            console::Error("Allocate:Full!\n");
+            network::Error(__func__, "Allocate:Full!");
             return nullptr;
         }
 
@@ -104,7 +102,7 @@ class Allocator {
         assert(size <= kBlockSize);
 
         if (IsFull()) {
-            console::Error("Allocate:Full!\n");
+            network::Error(__func__, "Allocate:Full!");
             return UINT16_MAX;
         }
 

lib-hal/console/font.S

@@ -55,14 +55,9 @@
 #pragma GCC optimize("O2")
 #pragma GCC optimize("no-tree-loop-distribute-patterns")
 
-namespace console {
-void Error(const char*);
-}
-
 #include <cstdint>
 #include <cstring>
 #include <algorithm>
-#include <cstdio>
 #include <cassert>
 
 #include "core/netif.h"
@@ -1499,15 +1494,15 @@ static uint16_t s_local_port = kLocalPortRangeStart;
 ConnHandle Connect(uint32_t remote_ip, uint16_t remote_port, CallbackConnect cb_connect, CallbackData cb_data, void* context) {
     const auto& netif = netif::global::netif_default;
     if (__builtin_expect((netif.ip.addr == 0), 0)) {
-        console::Error("Connect: No ip!");
+        network::Error(__func__, "Connect: No ip!");
         return kInvalidConnHandle;
     }
 
     uint32_t out_index = 0;
 
     auto* tcb = AllocTcb(remote_port, &out_index);
     if (tcb == nullptr) {
-        console::Error("Connect: No TCB!");
+        network::Error(__func__, "Connect: No TCB!");
         return kInvalidConnHandle;
     }
 
@@ -1547,14 +1542,14 @@ ConnHandle Connect(uint32_t remote_ip, uint16_t remote_port, CallbackConnect cb_
 int32_t Close(ConnHandle conn_handle) // graceful FIN
 {
     if (conn_handle >= TCP_MAX_TCBS_ALLOWED) {
-        console::Error("Close: Connection handle!\n");
+        network::Error(__func__, "Close: Connection handle!");
         return -1;
     }
 
     auto* c = &s_tcbs[conn_handle];
 
     if (!c->in_use || c->state == kStateClosed) {
-        console::Error("Close: TCB!\n");
+        network::Error(__func__, "Close: TCB!");
         return -1;
     }
 
@@ -1573,7 +1568,7 @@ int32_t Close(ConnHandle conn_handle) // graceful FIN
 
     // We only support graceful close from states where FIN makes sense here.
     if (c->state != kStateEstablished && c->state != kStateCloseWait) {
-        console::Error("Close: Not graceful!\n");
+        network::Error(__func__, "Close: Not graceful!");
         return -1;
     }