Refactor PHY, timing, and error handling

Large refactor across lib-network to improve PHY handling, timing API usage and error reporting.

Highlights:
- PHY API: changed PHY address/register parameters from uint32_t to uint16_t and added kUnknown variants for Duplex/Speed enums; updated Read/Write/Config/GetId/Start signatures and implementations.
- PHY logic: improved autonegotiation/advertisement handling, ParseLink logic, added more robust Status initialization and debug prints, and switched to human-readable ToString outputs.
- Timing: replaced hal::Millis() with timing::Millis() and updated related includes.
- Error reporting: removed console::Error usage, added network::Error helper and ERROR macro, and replaced many console error prints with ERROR(...) messages.
- Misc: added ../lib-hwclock include to Rules.mk, changed some counter types to uint32_t, renamed/adjusted dp83848 source filenames, updated gd32 PTP calls to CamelCase (Gd32*), and small naming/const improvements (e.g. kPhyValue).

These changes consolidate types, standardize timing and error APIs, and clarify PHY status reporting.

Author: vanvught

lib-network/Rules.mk

@@ -1,7 +1,7 @@
 $(info $$MAKE_FLAGS [${MAKE_FLAGS}])
 $(info $$DEFINES [${DEFINES}])
 
-EXTRA_INCLUDES+=../lib-display/include
+EXTRA_INCLUDES+=../lib-hwclock/include ../lib-display/include
 
 COND=
 

lib-network/include/emac/emac_phy.h

@@ -30,8 +30,8 @@
 
 namespace emac::phy {
 enum class Link { kStateDown, kStateUp };
-enum class Duplex { kDuplexHalf, kDuplexFull };
-enum class Speed { kSpeed10, kSpeed100, kSpeed1000 };
+enum class Duplex { kUnknown, kDuplexHalf, kDuplexFull };
+enum class Speed { kUnknown, kSpeed10, kSpeed100, kSpeed1000 };
 
 struct Status {
     Link link;
@@ -50,15 +50,15 @@ struct Identifier {
   @{
 */
 
-bool GetId(uint32_t address, Identifier& phy_identifier);
-Link GetLink(uint32_t address);
+bool GetId(uint16_t address, Identifier& phy_identifier);
+Link GetLink(uint16_t address);
 
 /**
  *
  * @param address PHY address
  * @return true for success, false for failure
  */
-bool Powerdown(uint32_t address);
+bool Powerdown(uint16_t address);
 
 /**
  *
@@ -67,7 +67,7 @@ bool Powerdown(uint32_t address);
  * @param address PHY address
  * @return true for success, false for failure
  */
-bool Start(uint32_t address, Status& phy_status);
+bool Start(uint16_t address, Status& phy_status);
 /** @} */
 
 /** \defgroup platform Platform implementation
@@ -81,7 +81,7 @@ bool Start(uint32_t address, Status& phy_status);
  * @param value Returned value
  * @return
  */
-bool Read(uint32_t address, uint32_t reg, uint16_t& value);
+bool Read(uint16_t address, uint16_t reg, uint16_t& value);
 
 /**
  *
@@ -90,15 +90,15 @@ bool Read(uint32_t address, uint32_t reg, uint16_t& value);
  * @param value Value to write
  * @return true for success, false for failure
  */
-bool Write(uint32_t address, uint32_t reg, uint16_t value);
+bool Write(uint16_t address, uint16_t reg, uint16_t value);
 
 /**
  * PHY interface configuration (configure SMI and reset PHY)
  * Called from \ref EmacConfig
  * @param address true for success, false for failure
  * @return
  */
-bool Config(uint32_t address);
+bool Config(uint16_t address);
 /** @} */
 
 /** \defgroup specific PHY specific

lib-network/include/emac/mmi.h

@@ -74,7 +74,7 @@ inline constexpr uint16_t ADVERTISE_LPACK = 0x4000;         /* Ack link partners
 inline constexpr uint16_t ADVERTISE_NPAGE = 0x8000;         /* Next page bit               */
 
 inline constexpr uint16_t ADVERTISE_FULL = (ADVERTISE_100FULL | ADVERTISE_10FULL | ADVERTISE_CSMA);
-inline constexpr uint16_t ADVERTISE_ALL = (ADVERTISE_10HALF | ADVERTISE_10FULL | ADVERTISE_100HALF | ADVERTISE_100FULL);
+inline constexpr uint16_t ADVERTISE_ALL = (ADVERTISE_10HALF | ADVERTISE_10FULL | ADVERTISE_100HALF | ADVERTISE_100FULL | ADVERTISE_CSMA);
 
 /* Link partner ability register. */
 inline constexpr uint16_t LPA_SLCT = 0x001f;            /* Same as advertise selector  */

lib-network/src/apps/ntp/gd32/ptp/ntpclient.cpp

@@ -204,7 +204,7 @@ static void Send() {
     // Only when the client receives a valid response from the server,
     // it will be able to send a request in the interleaved mode
     if (s_ntp_client.state.missed_responses > 4) {
-        s_ntp_client.cookie_basic.seconds = random();
+        s_ntp_client.cookie_basic.seconds = static_cast<uint32_t>(random());
         s_ntp_client.cookie_basic.fraction = 0;
 
         s_ntp_client.request.origin_timestamp_s = 0;
@@ -244,10 +244,10 @@ static void Send() {
 
     if (s_ntp_client.state.x > 0) {
         s_ntp_client.state.sent_a.seconds = net::globals::ptp::timestamp[1] + ntp::kJan1970;
-        s_ntp_client.state.sent_a.fraction = NTPFRAC(gd32::ptp_subsecond_2_nanosecond(net::globals::ptp::timestamp[0]));
+        s_ntp_client.state.sent_a.fraction = NTPFRAC(gd32::PtpSubsecond2Nanosecond(net::globals::ptp::timestamp[0]));
     } else {
         s_ntp_client.state.sent_b.seconds = net::globals::ptp::timestamp[1] + ntp::kJan1970;
-        s_ntp_client.state.sent_b.fraction = NTPFRAC(gd32::ptp_subsecond_2_nanosecond(net::globals::ptp::timestamp[0]));
+        s_ntp_client.state.sent_b.fraction = NTPFRAC(gd32::PtpSubsecond2Nanosecond(net::globals::ptp::timestamp[0]));
     }
 
     s_ntp_client.state.x = -s_ntp_client.state.x;
@@ -262,7 +262,7 @@ static void Difference(const ntp::TimeStamp& start, const ntp::TimeStamp& stop,
     gd32::ptp::time_t r;
     const gd32::ptp::time_t kX = {.tv_sec = static_cast<int32_t>(stop.seconds), .tv_nsec = static_cast<int32_t>(USEC(stop.fraction) * 1000)};
     const gd32::ptp::time_t kY = {.tv_sec = static_cast<int32_t>(start.seconds), .tv_nsec = static_cast<int32_t>(USEC(start.fraction) * 1000)};
-    gd32::sub_time(&r, &kX, &kY);
+    gd32::SubTime(&r, &kX, &kY);
 
     diff_seconds = r.tv_sec;
     diff_nano_seconds = r.tv_nsec;
@@ -286,11 +286,11 @@ static void UpdatePtpTime() {
     const int32_t kOffsetNanosverage = offset_nano_seconds / 2;
 
     gd32::ptp::time_t ptp_offset = {.tv_sec = kOffsetSecondsAverage, .tv_nsec = kOffsetNanosverage};
-    gd32::normalize_time(&ptp_offset);
-    gd32_ptp_update_time(&ptp_offset);
+    gd32::NormalizeTime(&ptp_offset);
+    Gd32PtpUpdateTime(&ptp_offset);
 
     gd32::ptp::ptptime ptp_get;
-    gd32_ptp_get_time(&ptp_get);
+    Gd32PtpGetTime(&ptp_get);
 
     s_ntp_client.request.reference_timestamp_s = __builtin_bswap32(static_cast<uint32_t>(ptp_get.tv_sec) + ntp::kJan1970);
     s_ntp_client.request.reference_timestamp_f = __builtin_bswap32(NTPFRAC(ptp_get.tv_nsec));
@@ -336,7 +336,7 @@ static void UpdatePtpTime() {
     }
 
     gd32::ptp::time_t ptp_delay;
-    gd32::sub_time(&ptp_delay, &diff1, &diff2);
+    gd32::SubTime(&ptp_delay, &diff1, &diff2);
 
     char sign = '+';
 
@@ -383,7 +383,7 @@ static void Process() {
         }
 
         s_ntp_client.t4.seconds = net::globals::ptp::timestamp[1] + ntp::kJan1970;
-        s_ntp_client.t4.fraction = NTPFRAC(gd32::ptp_subsecond_2_nanosecond(net::globals::ptp::timestamp[0]));
+        s_ntp_client.t4.fraction = NTPFRAC(gd32::PtpSubsecond2Nanosecond(net::globals::ptp::timestamp[0]));
 #ifndef NDEBUG
         s_ntp_client.state.mode = ntp::Modes::kBasic;
 #endif
@@ -418,7 +418,7 @@ static void Process() {
     s_ntp_client.state.dst.fraction = __builtin_bswap32(kReply->receive_timestamp_f);
 
     s_ntp_client.state.previous_receive.seconds = net::globals::ptp::timestamp[1] + ntp::kJan1970;
-    s_ntp_client.state.previous_receive.fraction = NTPFRAC(gd32::ptp_subsecond_2_nanosecond(net::globals::ptp::timestamp[0]));
+    s_ntp_client.state.previous_receive.fraction = NTPFRAC(gd32::PtpSubsecond2Nanosecond(net::globals::ptp::timestamp[0]));
 
     UpdatePtpTime();
 

lib-network/src/core/ipv4/dhcp.cpp

@@ -233,12 +233,10 @@ void Inform() {
     DEBUG_ENTRY();
 
     const auto kHandle = network::udp::Begin(network::iana::Ports::kPortDhcpClient, nullptr);
-#ifndef NDEBUG
     if (kHandle < 0) {
-        console::Error("DHCP Inform\n");
+		ERROR("No handle\n");
         return;
     }
-#endif
 
     MessageInit();
     network::MemcpyIp(&s_dhcp_message.ciaddr[0], netif::global::netif_default.ip.addr);
@@ -674,13 +672,11 @@ bool Start() {
     std::memset(dhcp, 0, sizeof(struct dhcp::Dhcp));
     dhcp->handle = network::udp::Begin(network::iana::Ports::kPortDhcpClient, dhcp::Input);
 
-#ifndef NDEBUG
     if (dhcp->handle < 0) {
-        console::Error("DHCP Start\n");
+        ERROR("No handle.\n");
         DEBUG_EXIT();
         return false;
     }
-#endif
 
     MessageInit();
 

lib-network/src/core/ipv4/igmp.cpp

@@ -335,9 +335,7 @@ void static Join(uint32_t group_address) {
         }
     }
 
-#ifndef NDEBUG
-    console::Error("igmp::Join\n");
-#endif
+	ERROR("Max joins reached.\n");
     DEBUG_ENTRY();
 }
 
@@ -361,10 +359,7 @@ static void Leave(uint32_t group_address) {
         }
     }
 
-#ifndef NDEBUG
-    console::Error("igmp::Leave: ");
-    printf(IPSTR "\n", IP2STR(group_address));
-#endif
+	ERROR("Group address not found.\n");
     DEBUG_EXIT();
 }
 

lib-network/src/core/network_private.h

@@ -27,6 +27,7 @@
 #define NET_NET_PRIVATE_H_
 
 #include <cstdint>
+#include <cstdio>
 
 #include "core/protocol/icmp.h"
 #include "core/protocol/igmp.h"
@@ -39,10 +40,6 @@
 #define ALIGNED __attribute__((aligned(4)))
 #endif
 
-namespace console {
-void Error(const char*);
-}
-
 namespace emac::eth {
 uint8_t* SendGetDmaBuffer();
 void Send(const uint32_t);
@@ -56,6 +53,12 @@ void FreePkt();
 } // namespace emac::eth
 
 namespace network {
+inline void Error(const char* func, const char* s) {
+    printf("%s: %s\n", func, s);
+}
+
+#define ERROR(s)	Error(__func__, (s))
+
 namespace global {
 extern uint32_t broadcast_mask;
 extern uint32_t on_network_mask;

lib-network/src/core/tcp.cpp

@@ -70,8 +70,7 @@ void Error(const char*);
 #include "core/protocol/ieee.h"
 #include "core/protocol/tcp.h"
 #include "network_private.h"
-#include "hal.h"
-#include "hal_millis.h"
+#include "timing.h"
 #include "firmware/debug/debug_debug.h"
 #include "network_tcp.h"
 #include "core/protocol/ethernet.h"
@@ -337,7 +336,7 @@ static void TcpSwap32AcknumSeqnum(struct Header* const kTcp) {
 static void TcpInitTcb(struct Tcb* tcb, uint16_t local_port) {
     tcb->local_port = local_port;
 
-    tcb->ISS = hal::Millis();
+    tcb->ISS = timing::Millis();
 
     tcb->RCV.WND = kAdvertisedRxWnd;
 
@@ -363,7 +362,7 @@ static void RtxOnAck(Tcb* tcb, uint32_t ack) {
     if (tcb->rtx.count == 0) {
         tcb->rtx_deadline = 0;
     } else {
-        tcb->rtx_deadline = hal::Millis() + tcb->rtx_rto;
+        tcb->rtx_deadline = timing::Millis() + tcb->rtx_rto;
     }
 }
 
@@ -480,7 +479,7 @@ static void SendSegment(Tcb* tcb, const SendInfo& send_info, bool track_rtx = tr
     *data++ = Option::kKindNop;
     *data++ = Option::kKindTimestamp;
     *data++ = 10;
-    const auto kMillis = __builtin_bswap32(hal::Millis());
+    const auto kMillis = __builtin_bswap32(timing::Millis());
     memcpy(data, &kMillis, 4);
     data += 4;
     memcpy(data, &tcb->TS.recent, 4);
@@ -514,7 +513,7 @@ static void SendSegment(Tcb* tcb, const SendInfo& send_info, bool track_rtx = tr
         r.consumed = r.len + ((send_info.CTL & Control::SYN) ? 1U : 0U) + ((send_info.CTL & Control::FIN) ? 1U : 0U);
         r.ctl = send_info.CTL;
         r.retries = 0;
-        r.last_sent = hal::Millis();
+        r.last_sent = timing::Millis();
         r.pool_idx = (r.len != 0) ? memory::Allocator::Instance().Allocate(tcb->TX.data, r.len) : 0xFFFF;
 
         tcb->rtx.count++;
@@ -674,7 +673,7 @@ __attribute__((hot)) void Run() {
 
         // Client-side  TIME-WAIT expiry
         if (tcb.state == kStateTimeWait) {
-            if (tcb.timewait_deadline != 0 && hal::Millis() >= tcb.timewait_deadline) {
+            if (tcb.timewait_deadline != 0 && timing::Millis() >= tcb.timewait_deadline) {
                 NEW_STATE(&tcb, kStateClosed);
                 FreeTcb(&tcb);
                 continue;
@@ -694,7 +693,7 @@ __attribute__((hot)) void Run() {
         }
 
         // ---- Retransmission timeout ----
-        if (tcb.rtx.count > 0 && tcb.rtx_deadline != 0 && hal::Millis() >= tcb.rtx_deadline) {
+        if (tcb.rtx.count > 0 && tcb.rtx_deadline != 0 && timing::Millis() >= tcb.rtx_deadline) {
             auto& r = tcb.rtx.q[tcb.rtx.head];
 
             SendInfo info;
@@ -714,7 +713,7 @@ __attribute__((hot)) void Run() {
             tcb.TX.data = nullptr;
             tcb.TX.size = 0;
 
-            r.last_sent = hal::Millis();
+            r.last_sent = timing::Millis();
             r.retries++;
 
             if (r.retries > kTcpRtxMaxRetry) {
@@ -723,7 +722,7 @@ __attribute__((hot)) void Run() {
             }
 
             tcb.rtx_rto = std::min(tcb.rtx_rto * 2U, kTcpRtoMaxMs);
-            tcb.rtx_deadline = hal::Millis() + tcb.rtx_rto;
+            tcb.rtx_deadline = timing::Millis() + tcb.rtx_rto;
         }
     }
 }
@@ -830,7 +829,7 @@ static Tcb* AcceptNewConnection(const Header* tcp_segment, uint32_t* out_index)
 static inline void EnterTimeWait(Tcb* tcb) {
     NEW_STATE(tcb, kStateTimeWait);
 
-    tcb->timewait_deadline = hal::Millis() + kTimeWaitMs;
+    tcb->timewait_deadline = timing::Millis() + kTimeWaitMs;
 
     // Turn off other timers
     tcb->rtx.count = 0;    // drop unacked queue
@@ -1429,7 +1428,7 @@ __attribute__((hot)) void Input(struct Header* eth_frame) {
                     SendSegment(tcb, si, false);
 
                     // Restart TIME-WAIT timer
-                    tcb->timewait_deadline = hal::Millis() + kTimeWaitMs;
+                    tcb->timewait_deadline = timing::Millis() + kTimeWaitMs;
                     return;
                 }
 

lib-network/src/core/udp.cpp

@@ -219,9 +219,7 @@ int32_t Begin(uint16_t localport, UdpCallbackFunctionPtr callback) {
         }
     }
 
-#ifndef NDEBUG
-    console::Error("network::udp::Begin\n");
-#endif
+    ERROR("Max ports reached.\n");
     return -1;
 }
 
@@ -241,9 +239,7 @@ int32_t End(uint16_t localport) {
         }
     }
 
-#ifndef NDEBUG
-    console::Error("network::udp::End\n");
-#endif
+    ERROR("Port not found.\n");
     return -1;
 }
 

lib-network/src/emac/gd32/emac.cpp

@@ -200,7 +200,7 @@ void __attribute__((cold)) Start(uint8_t mac_address[], emac::phy::Link& link) {
     }
 
 #if defined(CONFIG_NET_ENABLE_PTP)
-    gd32_ptp_start();
+    Gd32PtpStart();
 #if !defined(DISABLE_RTC)
     // Set the System Clock from the Hardware Clock
     HwClock::Get()->HcToSys();