Merge branch 'main' into zig-master

Author: tact1m4n3

core/src/interrupt.zig

@@ -122,9 +122,10 @@ pub const CriticalSectionMutex = struct {
 
     /// Unlocks the mutex.
     pub fn unlock(self: *CriticalSectionMutex) void {
-        if (self.critical_section) |cs| {
+        const maybe_cs = self.critical_section;
+        self.critical_section = null;
+        if (maybe_cs) |cs| {
             cs.leave();
-            self.critical_section = null;
         }
     }
 };

drivers/build.zig

@@ -8,6 +8,10 @@ pub fn build(b: *std.Build) void {
         .root_source_file = b.path("framework.zig"),
         .target = target,
         .optimize = optimize,
+        .imports = &.{.{
+            .name = "link",
+            .module = b.dependency("link", .{}).module("link"),
+        }},
     });
 
     const test_suite = b.addTest(.{

drivers/build.zig.zon

@@ -2,6 +2,9 @@
     .name = .mz_drivers,
     .fingerprint = 0x576453eedc5af46e,
     .minimum_zig_version = "0.15.1",
+    .dependencies = .{
+        .link = .{ .path = "../modules/network/link" },
+    },
     .version = "0.0.1",
     .paths = .{
         "build.zig",

drivers/wireless/cyw43439.zig

@@ -2,6 +2,7 @@ const std = @import("std");
 const mem = std.mem;
 const assert = std.debug.assert;
 
+const Link = @import("link");
 const Bus = @import("cyw43439/bus.zig");
 const WiFi = @import("cyw43439/wifi.zig");
 pub const JoinOptions = WiFi.JoinOptions;
@@ -58,14 +59,13 @@ pub fn recv_zc(ptr: *anyopaque, bytes: []u8) anyerror!?struct { usize, usize } {
     return self.wifi.recv_zc(bytes);
 }
 
-pub fn send_zc(ptr: *anyopaque, bytes: []u8) anyerror!void {
+pub fn send_zc(ptr: *anyopaque, bytes: []u8) Link.Error!void {
     const self: *Self = @ptrCast(@alignCast(ptr));
-    try self.wifi.send_zc(bytes);
-}
-
-pub fn ready(ptr: *anyopaque) bool {
-    const self: *Self = @ptrCast(@alignCast(ptr));
-    return self.wifi.has_credit();
+    self.wifi.send_zc(bytes) catch |err| switch (err) {
+        error.OutOfMemory => return error.OutOfMemory,
+        error.LinkDown => return error.LinkDown,
+        else => return error.InternalError,
+    };
 }
 
 pub fn gpio(self: *Self, pin: u2) Pin {
@@ -86,6 +86,16 @@ pub const Pin = struct {
     }
 };
 
+pub fn link(self: *Self) Link {
+    return .{
+        .ptr = self,
+        .vtable = .{
+            .recv = recv_zc,
+            .send = send_zc,
+        },
+    };
+}
+
 // References:
 //   https://github.com/embassy-rs/embassy/blob/abb1d8286e2415686150e2e315ca1c380659c3c3/cyw43/src/consts.rs
 //   https://github.com/jbentham/picowi/blob/main/lib/picowi_regs.h

drivers/wireless/cyw43439/wifi.zig

@@ -528,8 +528,8 @@ pub fn recv_zc(self: *Self, buffer: []u8) !?struct { usize, usize } {
 ///
 /// Buffer has to be 4 bytes aligned and it will be extended in as_words to the
 /// word boundary!
-pub fn send_zc(self: *Self, buffer: []u8) !void {
-    if (!self.has_credit()) return error.Cyw43NoCredit;
+pub fn send_zc(self: *Self, buffer: []u8) anyerror!void {
+    if (!self.has_credit()) return error.OutOfMemory;
 
     const eth_frame_len = buffer.len - 22;
     // add bus header

examples/espressif/esp/build.zig

@@ -12,13 +12,7 @@ pub fn build(b: *std.Build) void {
     const mz_dep = b.dependency("microzig", .{});
     const mb = MicroBuild.init(b, mz_dep) orelse return;
 
-    const targets = [_]TargetDescription{
-        .{ .prefix = "esp32_c3", .target = mb.ports.esp.chips.esp32_c3 },
-        // .{ .prefix = "esp32_c3_direct_boot", .target = mb.ports.esp.chips.esp32_c3_direct_boot },
-        .{ .prefix = "esp32_c3_flashless", .target = mb.ports.esp.chips.esp32_c3_flashless },
-    };
-
-    const available_examples = [_]Example{
+    const examples: []const Example = &.{
         .{ .name = "blinky", .file = "src/blinky.zig" },
         .{ .name = "custom_clock_config", .file = "src/custom_clock_config.zig" },
         .{ .name = "gpio_input", .file = "src/gpio_input.zig" },
@@ -30,15 +24,25 @@ pub fn build(b: *std.Build) void {
         .{ .name = "stepper_driver_dumb", .file = "src/stepper_driver_dumb.zig" },
         .{ .name = "systimer", .file = "src/systimer.zig" },
         .{ .name = "ws2812_blinky", .file = "src/ws2812_blinky.zig" },
+        .{ .name = "rtos", .file = "src/rtos.zig" },
+        .{ .name = "tcp_server", .file = "src/tcp_server.zig", .features = .{
+            .flashless = false,
+            .lwip = true,
+        } },
     };
 
-    for (available_examples) |example| {
+    for (examples) |example| {
         // If we specify example, only select the ones that match
         if (maybe_example) |selected_example|
             if (!std.mem.containsAtLeast(u8, example.name, 1, selected_example))
                 continue;
 
-        for (targets) |target_desc| {
+        for (std.enums.values(TargetEnum)) |target_enum| {
+            if (!example.features.flashless and std.mem.containsAtLeast(u8, @tagName(target_enum), 1, "flashless"))
+                continue;
+
+            const target_desc = target_enum.get_target_desc(mb);
+
             // `add_firmware` basically works like addExecutable, but takes a
             // `microzig.Target` for target instead of a `std.zig.CrossTarget`.
             //
@@ -51,6 +55,28 @@ pub fn build(b: *std.Build) void {
                 .root_source_file = b.path(example.file),
             });
 
+            if (example.features.lwip) {
+                const target = b.resolveTargetQuery(firmware.target.zig_target);
+
+                const foundation_dep = b.dependency("foundation_libc", .{
+                    .target = target,
+                    .optimize = optimize,
+                    .single_threaded = true,
+                });
+
+                const lwip_dep = b.dependency("lwip", .{
+                    .target = target,
+                    .optimize = optimize,
+                    .include_dir = b.path("src/lwip/include"),
+                });
+
+                const libc_lib = foundation_dep.artifact("foundation");
+                const lwip_lib = lwip_dep.artifact("lwip");
+
+                lwip_lib.root_module.linkLibrary(libc_lib);
+                firmware.app_mod.linkLibrary(lwip_lib);
+            }
+
             // `installFirmware()` is the MicroZig pendant to `Build.installArtifact()`
             // and allows installing the firmware as a typical firmware file.
             //
@@ -63,12 +89,146 @@ pub fn build(b: *std.Build) void {
     }
 }
 
+const TargetEnum = enum {
+    esp32_c3,
+    esp32_c3_direct_boot,
+    esp32_c3_flashless,
+
+    fn get_target_desc(target_enum: TargetEnum, mb: *MicroBuild) TargetDescription {
+        return switch (target_enum) {
+            .esp32_c3 => .{
+                .prefix = "esp32_c3",
+                .target = mb.ports.esp.chips.esp32_c3,
+            },
+            .esp32_c3_direct_boot => .{
+                .prefix = "esp32_c3_direct_boot",
+                .target = mb.ports.esp.chips.esp32_c3_direct_boot,
+            },
+            .esp32_c3_flashless => .{
+                .prefix = "esp32_c3_flashless",
+                .target = mb.ports.esp.chips.esp32_c3_flashless,
+            },
+        };
+    }
+};
+
 const TargetDescription = struct {
     prefix: []const u8,
     target: *const microzig.Target,
 };
 
 const Example = struct {
+    const Features = packed struct {
+        flashless: bool = true,
+        lwip: bool = false,
+    };
+
     name: []const u8,
     file: []const u8,
+    features: Features = .{},
+};
+
+const lwip_flags = [_][]const u8{ "-std=c99", "-fno-sanitize=undefined" };
+const lwip_files = [_][]const u8{
+    // Core files
+    "core/init.c",
+    "core/def.c",
+    "core/dns.c",
+    "core/inet_chksum.c",
+    "core/ip.c",
+    "core/mem.c",
+    "core/memp.c",
+    "core/netif.c",
+    "core/pbuf.c",
+    "core/raw.c",
+    "core/stats.c",
+    "core/sys.c",
+    "core/altcp.c",
+    "core/altcp_alloc.c",
+    "core/altcp_tcp.c",
+    "core/tcp.c",
+    "core/tcp_in.c",
+    "core/tcp_out.c",
+    "core/timeouts.c",
+    "core/udp.c",
+
+    // IPv4 implementation:
+    "core/ipv4/acd.c",
+    "core/ipv4/autoip.c",
+    "core/ipv4/dhcp.c",
+    "core/ipv4/etharp.c",
+    "core/ipv4/icmp.c",
+    "core/ipv4/igmp.c",
+    "core/ipv4/ip4_frag.c",
+    "core/ipv4/ip4.c",
+    "core/ipv4/ip4_addr.c",
+
+    // IPv6 implementation:
+    "core/ipv6/dhcp6.c",
+    "core/ipv6/ethip6.c",
+    "core/ipv6/icmp6.c",
+    "core/ipv6/inet6.c",
+    "core/ipv6/ip6.c",
+    "core/ipv6/ip6_addr.c",
+    "core/ipv6/ip6_frag.c",
+    "core/ipv6/mld6.c",
+    "core/ipv6/nd6.c",
+
+    // Interfaces
+    "netif/ethernet.c",
+
+    // Interfaces:
+    // "netif/bridgeif.c",
+    // "netif/ethernet.c",
+    // "netif/slipif.c",
+    // "netif/bridgeif_fdb.c",
+
+    // sequential APIs
+    // "api/err.c",
+    // "api/api_msg.c",
+    // "api/netifapi.c",
+    // "api/sockets.c",
+    // "api/netbuf.c",
+    // "api/api_lib.c",
+    // "api/tcpip.c",
+    // "api/netdb.c",
+    // "api/if_api.c",
+
+    // 6LoWPAN
+    // "netif/lowpan6.c",
+    // "netif/lowpan6_ble.c",
+    // "netif/lowpan6_common.c",
+    // "netif/zepif.c",
+
+    // PPP
+    // "netif/ppp/polarssl/arc4.c",
+    // "netif/ppp/polarssl/des.c",
+    // "netif/ppp/polarssl/md4.c",
+    // "netif/ppp/polarssl/sha1.c",
+    // "netif/ppp/polarssl/md5.c",
+    // "netif/ppp/ipcp.c",
+    // "netif/ppp/magic.c",
+    // "netif/ppp/pppoe.c",
+    // "netif/ppp/mppe.c",
+    // "netif/ppp/multilink.c",
+    // "netif/ppp/chap-new.c",
+    // "netif/ppp/auth.c",
+    // "netif/ppp/chap_ms.c",
+    // "netif/ppp/ipv6cp.c",
+    // "netif/ppp/chap-md5.c",
+    // "netif/ppp/upap.c",
+    // "netif/ppp/pppapi.c",
+    // "netif/ppp/pppos.c",
+    // "netif/ppp/eap.c",
+    // "netif/ppp/pppol2tp.c",
+    // "netif/ppp/demand.c",
+    // "netif/ppp/fsm.c",
+    // "netif/ppp/eui64.c",
+    // "netif/ppp/ccp.c",
+    // "netif/ppp/pppcrypt.c",
+    // "netif/ppp/utils.c",
+    // "netif/ppp/vj.c",
+    // "netif/ppp/lcp.c",
+    // "netif/ppp/ppp.c",
+    // "netif/ppp/ecp.c",
 };

examples/espressif/esp/build.zig.zon

@@ -4,6 +4,8 @@
     .version = "0.0.0",
     .dependencies = .{
         .microzig = .{ .path = "../../.." },
+        .lwip = .{ .path = "../../../modules/lwip" },
+        .foundation_libc = .{ .path = "../../../modules/foundation-libc" },
     },
     .paths = .{
         "README.md",