From 4be8f2b6fc5244df9217fbb81047b79a985f5928 Mon Sep 17 00:00:00 2001
From: Grazfather <grazfather@gmail.com>
Date: Tue, 11 Mar 2025 18:31:26 -0400
Subject: [PATCH] Cleanup/address PR comments in zig-master (#406)

---
 core/src/core/usb.zig                      | 16 ++++++++++++++--
 port/raspberrypi/rp2xxx/patches/rp2040.zig |  3 +--
 port/raspberrypi/rp2xxx/patches/rp2350.zig |  3 +--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/core/src/core/usb.zig b/core/src/core/usb.zig
index f9bc7672..8e37b5ff 100644
--- a/core/src/core/usb.zig
+++ b/core/src/core/usb.zig
@@ -125,7 +125,13 @@ pub fn Usb(comptime f: anytype) type {
         }
 
         fn device() types.UsbDevice {
-            return .{ .fn_ready = device_ready, .fn_control_transfer = device_control_transfer, .fn_control_ack = device_control_ack, .fn_endpoint_open = device_endpoint_open, .fn_endpoint_transfer = device_endpoint_transfer };
+            return .{
+                .fn_ready = device_ready,
+                .fn_control_transfer = device_control_transfer,
+                .fn_control_ack = device_control_ack,
+                .fn_endpoint_open = device_endpoint_open,
+                .fn_endpoint_transfer = device_endpoint_transfer,
+            };
         }
 
         fn device_ready() bool {
@@ -504,7 +510,13 @@ pub fn Usb(comptime f: anytype) type {
 // Driver support stuctures
 // +++++++++++++++++++++++++++++++++++++++++++++++++
 
-pub const DeviceConfiguration = struct { device_descriptor: *const types.DeviceDescriptor, config_descriptor: []const u8, lang_descriptor: []const u8, descriptor_strings: []const []const u8, drivers: []types.UsbClassDriver };
+pub const DeviceConfiguration = struct {
+    device_descriptor: *const types.DeviceDescriptor,
+    config_descriptor: []const u8,
+    lang_descriptor: []const u8,
+    descriptor_strings: []const []const u8,
+    drivers: []types.UsbClassDriver,
+};
 
 /// USB interrupt status
 ///
diff --git a/port/raspberrypi/rp2xxx/patches/rp2040.zig b/port/raspberrypi/rp2xxx/patches/rp2040.zig
index 6d68279f..ebd574d1 100644
--- a/port/raspberrypi/rp2xxx/patches/rp2040.zig
+++ b/port/raspberrypi/rp2xxx/patches/rp2040.zig
@@ -1,5 +1,4 @@
-const microzig = @import("microzig/build-internals");
-const Patch = microzig.Patch;
+const Patch = @import("microzig/build-internals").Patch;
 
 pub const patches: []const Patch = &.{
     .{
diff --git a/port/raspberrypi/rp2xxx/patches/rp2350.zig b/port/raspberrypi/rp2xxx/patches/rp2350.zig
index 8cd6efe8..d0cf997b 100644
--- a/port/raspberrypi/rp2xxx/patches/rp2350.zig
+++ b/port/raspberrypi/rp2xxx/patches/rp2350.zig
@@ -1,5 +1,4 @@
-const microzig = @import("microzig/build-internals");
-const Patch = microzig.Patch;
+const Patch = @import("microzig/build-internals").Patch;
 
 pub const patches: []const Patch = &.{
     .{ .add_enum = .{