ch32 USBHD/USBHS driver implementation

core/src/core/usb.zig

@@ -274,7 +274,7 @@ pub fn DeviceController(config: Config, driver_args: config.DriverArgs()) type {
             const desc_device: descriptor.Device = .{
                 .bcd_usb = config.bcd_usb,
                 .device_triple = config.device_triple,
-                .max_packet_size0 = @max(config.max_supported_packet_size, 64),
+                .max_packet_size0 = @min(config.max_supported_packet_size, 64),
                 .vendor = .from(config.vendor.id),
                 .product = .from(config.product.id),
                 .bcd_device = config.bcd_device,

examples/wch/ch32v/build.zig

@@ -5,7 +5,7 @@ const MicroBuild = microzig.MicroBuild(.{
     .ch32v = true,
 });
 
-pub fn build(b: *std.Build) void {
+pub fn build(b: *std.Build) void { // $ls root_id 30
     const optimize = b.standardOptimizeOption(.{});
     const maybe_example = b.option([]const u8, "example", "only build matching examples");
 
@@ -36,7 +36,9 @@ pub fn build(b: *std.Build) void {
         .{ .target = mb.ports.ch32v.chips.ch32v203x6, .name = "blinky_ch32v203", .file = "src/blinky.zig" },
         .{ .target = mb.ports.ch32v.chips.ch32v203x6, .name = "blinky_systick_ch32v203", .file = "src/blinky_systick.zig" },
         .{ .target = mb.ports.ch32v.boards.ch32v203.nano_ch32v203, .name = "nano_ch32v203_blinky", .file = "src/board_blinky.zig" },
+        .{ .target = mb.ports.ch32v.boards.ch32v203.nano_ch32v203, .name = "nano_ch32v203_usb_cdc", .file = "src/usb_cdc.zig" },
         .{ .target = mb.ports.ch32v.boards.ch32v203.suzuduino_uno_v1b, .name = "suzuduino_blinky", .file = "src/board_blinky.zig" },
+        .{ .target = mb.ports.ch32v.boards.ch32v203.suzuduino_uno_v1b, .name = "suzuduino_usb_cdc", .file = "src/usb_cdc.zig" },
         .{ .target = mb.ports.ch32v.boards.ch32v203.lana_tny, .name = "lana_tny_dma", .file = "src/dma.zig" },
         .{ .target = mb.ports.ch32v.boards.ch32v203.lana_tny, .name = "lana_tny_ws2812", .file = "src/ws2812.zig" },
         .{ .target = mb.ports.ch32v.boards.ch32v203.lana_tny, .name = "lana_tny_uart_log", .file = "src/uart_log.zig" },
@@ -46,13 +48,15 @@ pub fn build(b: *std.Build) void {
         .{ .target = mb.ports.ch32v.boards.ch32v203.lana_tny, .name = "lana_tny_spi_loopback", .file = "src/spi_loopback.zig" },
         .{ .target = mb.ports.ch32v.boards.ch32v203.lana_tny, .name = "lana_tny_spi_flash_w25q", .file = "src/spi_flash_w25q.zig" },
         .{ .target = mb.ports.ch32v.boards.ch32v203.lana_tny, .name = "lana_tny_sharp_niceview", .file = "src/sharp_niceview.zig" },
+        .{ .target = mb.ports.ch32v.boards.ch32v203.lana_tny, .name = "lana_tny_usb_cdc", .file = "src/usb_cdc.zig" },
 
         // CH32V30x
         .{ .target = mb.ports.ch32v.chips.ch32v303xb, .name = "empty_ch32v303", .file = "src/empty.zig" },
         .{ .target = mb.ports.ch32v.chips.ch32v303xb, .name = "blinky_ch32v303", .file = "src/blinky.zig" },
         .{ .target = mb.ports.ch32v.chips.ch32v303xb, .name = "blinky_systick_ch32v303", .file = "src/blinky_systick.zig" },
         .{ .target = mb.ports.ch32v.boards.ch32v305.nano_ch32v305, .name = "nano_ch32v305_blinky", .file = "src/board_blinky.zig" },
         .{ .target = mb.ports.ch32v.boards.ch32v307.ch32v307v_r1_1v0, .name = "ch32v307v_r1_1v0_blinky", .file = "src/blinky.zig" },
+        .{ .target = mb.ports.ch32v.boards.ch32v307.ch32v307v_r1_1v0, .name = "ch32v307v_r1_1v0_usb_cdc", .file = "src/usb_cdc.zig" },
     };
 
     for (available_examples) |example| {

examples/wch/ch32v/src/usb_cdc.zig

@@ -0,0 +1,139 @@
+const std = @import("std");
+const microzig = @import("microzig");
+
+const hal = microzig.hal;
+const board = microzig.board;
+const time = hal.time;
+const gpio = hal.gpio;
+const usb = microzig.core.usb;
+const USB_Serial = usb.drivers.CDC;
+
+const RCC = microzig.chip.peripherals.RCC;
+const AFIO = microzig.chip.peripherals.AFIO;
+const PFIC = microzig.chip.peripherals.PFIC;
+
+const usart = hal.usart.instance.USART1;
+
+const usart_tx_pin = gpio.Pin.init(0, 9); // PA9
+const func_pin = gpio.Pin.init(0, 10); // PA10
+const tog_pin = gpio.Pin.init(0, 14);
+const mco_pin = gpio.Pin.init(0, 8);
+
+pub const microzig_options = microzig.Options{
+    .logFn = hal.usart.log,
+    .log_level = .debug,
+    .log_scope_levels = &.{
+        .{ .scope = .usb_dev, .level = .warn },
+        .{ .scope = .usb_ctrl, .level = .warn },
+        .{ .scope = .usb_cdc, .level = .warn },
+    },
+};
+
+const USBController = usb.DeviceController(.{
+    .bcd_usb = .v2_00,
+    .device_triple = .unspecified,
+    .vendor = .{ .id = 0x2E8A, .str = "MicroZig" },
+    .product = .{ .id = 0x000A, .str = board.product_string },
+    .bcd_device = .v1_00,
+    .serial = "someserial",
+    .max_supported_packet_size = hal.usb.max_packet_size,
+    .configurations = &.{.{
+        .attributes = .{ .self_powered = false },
+        .max_current_ma = 50,
+        .Drivers = struct { serial: USB_Serial },
+    }},
+}, .{.{
+    .serial = .{ .itf_notifi = "Board CDC", .itf_data = "Board CDC Data" },
+}});
+
+pub var usb_dev: hal.usb.Polled(
+    .{},
+) = undefined;
+
+var usb_controller: USBController = .init;
+
+pub fn main() !void {
+    // Board brings up clocks and time
+    microzig.board.init();
+    microzig.hal.init();
+    // Enable peripheral clocks for USART1 and GPIOA
+    RCC.APB2PCENR.modify(.{
+        .IOPAEN = 1, // Enable GPIOA clock
+        .IOPCEN = 1,
+        .AFIOEN = 1, // Enable AFIO clock
+        .USART1EN = 1, // Enable USART1 clock
+    });
+    // Configure TX pin as alternate function push-pull
+    usart_tx_pin.set_output_mode(.alternate_function_push_pull, .max_50MHz);
+
+    // Initialize USART1 at 115200 baud
+    usart.apply(.{ .baud_rate = 115200 });
+
+    hal.usart.init_logger(usart);
+    std.log.info("UART logging initialized.", .{});
+
+    std.log.info("Initializing USB device.", .{});
+
+    usb_dev = .init();
+
+    var i: u32 = 0;
+    var old: u64 = time.get_time_since_boot().to_us();
+    var new: u64 = 0;
+
+    while (true) {
+        if (usb_controller.drivers()) |drivers| {
+            new = time.get_time_since_boot().to_us();
+            if (new - old > 500000) {
+                old = new;
+                i += 1;
+                std.log.info("cdc test: {}", .{i});
+
+                usb_cdc_write(&drivers.serial, "This is very very very long text sent from ch32v30x by USB CDC to your device: {}\r\n", .{i});
+            }
+
+            // read and print host command if present
+            const message = usb_cdc_read(&drivers.serial);
+            if (message.len > 0) {
+                usb_cdc_write(&drivers.serial, "Your message to me was: {s}\r\n", .{message});
+            }
+        }
+        usb_dev.poll(false, &usb_controller);
+    }
+}
+
+var usb_tx_buff: [1024]u8 = undefined;
+
+// Transfer data to host
+// NOTE: After each USB chunk transfer, we have to call the USB task so that bus TX events can be handled
+pub fn usb_cdc_write(serial: *USB_Serial, comptime fmt: []const u8, args: anytype) void {
+    const text = std.fmt.bufPrint(&usb_tx_buff, fmt, args) catch &.{};
+    var write_buff = text;
+    while (write_buff.len > 0) {
+        write_buff = write_buff[serial.write(write_buff)..];
+        while (!serial.flush()) {
+            // pins.tog.put(0);
+            usb_dev.poll(false, &usb_controller);
+            // pins.tog.put(1);
+        }
+    }
+}
+
+var usb_rx_buff: [1024]u8 = undefined;
+
+// Receive data from host
+// NOTE: Read code was not tested extensively. In case of issues, try to call USB task before every read operation
+pub fn usb_cdc_read(
+    serial: *USB_Serial,
+) []const u8 {
+    var total_read: usize = 0;
+    var read_buff: []u8 = usb_rx_buff[0..];
+
+    while (true) {
+        const len = serial.read(read_buff);
+        read_buff = read_buff[len..];
+        total_read += len;
+        if (len == 0) break;
+    }
+
+    return usb_rx_buff[0..total_read];
+}

port/wch/ch32v/src/boards/CH32V307V-R1-1v0.zig

@@ -4,9 +4,12 @@ pub const microzig = @import("microzig");
 pub const chip = @import("chip");
 const ch32v = microzig.hal;
 
+pub const product_string = "ch32v307 Demo Device";
+
 /// Clock configuration for this board
 pub const clock_config: ch32v.clocks.Config = .{
-    .source = .hsi,
+    .source = .hse,
+    .hse_frequency = 8_000_000,
     .target_frequency = 48_000_000,
 };
 

port/wch/ch32v/src/boards/CH32Vx03C-R0-1v0.zig

@@ -4,6 +4,8 @@ pub const microzig = @import("microzig");
 pub const chip = @import("chip");
 const ch32v = microzig.hal;
 
+pub const product_string = "ch32vx03c Demo Device";
+
 /// Clock configuration for this board
 pub const clock_config: ch32v.clocks.Config = .{
     .source = .hsi,

port/wch/ch32v/src/boards/LANA_TNY.zig

@@ -5,6 +5,8 @@ pub const microzig = @import("microzig");
 pub const chip = @import("chip");
 const ch32v = microzig.hal;
 
+pub const product_string = "LANA TNY";
+
 /// Clock configuration for this board
 pub const clock_config: ch32v.clocks.Config = .{
     .source = .hsi,

port/wch/ch32v/src/boards/Suzuduino_Uno_V1b.zig

@@ -5,6 +5,8 @@ pub const microzig = @import("microzig");
 pub const chip = @import("chip");
 const ch32v = microzig.hal;
 
+pub const product_string = "Suzuduino Uno";
+
 /// Clock configuration for this board
 pub const clock_config: ch32v.clocks.Config = .{
     .source = .hsi,

port/wch/ch32v/src/boards/nanoCH32V203.zig

@@ -5,6 +5,8 @@ pub const microzig = @import("microzig");
 pub const chip = @import("chip");
 const ch32v = microzig.hal;
 
+pub const product_string = "nanoCH32v203";
+
 /// Clock configuration for this board
 pub const clock_config: ch32v.clocks.Config = .{
     .source = .hse,
@@ -19,6 +21,7 @@ pub const cpu_frequency = clock_config.target_frequency;
 pub fn init() void {
     ch32v.clocks.init(clock_config);
     ch32v.time.init();
+    ch32v.clocks.enable_usbfs_clock();
 }
 
 pub const pin_config = ch32v.pins.GlobalConfiguration{

port/wch/ch32v/src/boards/nanoCH32V305.zig

@@ -5,6 +5,8 @@ pub const chip = @import("chip");
 pub const microzig = @import("microzig");
 const ch32v = microzig.hal;
 
+pub const product_string = "nanoCH32v305";
+
 /// Clock configuration for this board
 pub const clock_config: ch32v.clocks.Config = .{
     .source = .hsi,

port/wch/ch32v/src/hals/ch32v20x.zig

@@ -9,6 +9,7 @@ pub const i2c = @import("i2c.zig");
 pub const usart = @import("usart.zig");
 pub const spi = @import("spi.zig");
 pub const dma = @import("dma.zig");
+pub const usb = @import("usbfs.zig");
 
 /// HSI (High Speed Internal) oscillator frequency
 /// This is the fixed internal RC oscillator frequency for CH32V20x

port/wch/ch32v/src/hals/ch32v30x.zig

@@ -5,18 +5,32 @@ pub const clocks = @import("clocks.zig");
 pub const time = @import("time.zig");
 pub const i2c = @import("i2c.zig");
 pub const usart = @import("usart.zig");
+const std = @import("std");
+pub const usb = @import("usbhs.zig");
+pub const usbfs = @import("usbfs.zig");
 
 /// HSI (High Speed Internal) oscillator frequency
 /// This is the fixed internal RC oscillator frequency for CH32V30x
 pub const hsi_frequency: u32 = 8_000_000; // 8 MHz
+pub const hse_frequency: u32 = 8_000_000; // 8 MHz
 
 /// Default interrupt handlers provided by the HAL
 pub const default_interrupts: microzig.cpu.InterruptOptions = .{
     .TIM2 = time.tim2_handler,
+    // .USBHS = usb.usbhs_interrupt_handler,
 };
 
 /// Initialize HAL subsystems used by default
 pub fn init() void {
     // Configure TIM2 timing driver
     time.init();
+    clocks.init(.{
+        .source = .hse,
+        .hse_frequency = hse_frequency,
+        .target_frequency = 48_000_000,
+    });
+    clocks.enable_usbhs_clock(.{
+        .ref_source_hz = hse_frequency,
+        .ref_source = .hse,
+    });
 }