Skip to content

Fix USB bus reset handling and add some debug logging (Issue #928) #933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Uthedris wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −6
Open

Fix USB bus reset handling and add some debug logging (Issue #928) #933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions port/raspberrypi/rp2xxx/src/hal/usb.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ pub fn Polled(config: Config) type {

// Setup request received?
if (ints.SETUP_REQ != 0) {
log.debug("-- setup request --", .{});

// Reset PID to 1 for EP0 IN. Every DATA packet we send in response
// to an IN on EP0 needs to use PID DATA1.
buffer_control[0].in.modify(.{ .PID_0 = 0 });
Expand All @@ -133,6 +135,8 @@ pub fn Polled(config: Config) type {

// Events on one or more buffers? (In practice, always one.)
if (ints.BUFF_STATUS != 0) {
log.debug("-- buffer status --", .{});

const buff_status = peripherals.USB.BUFF_STATUS.raw;

inline for (0..2 * config.max_endpoints_count) |shift| {
Expand Down Expand Up @@ -163,23 +167,20 @@ pub fn Polled(config: Config) type {

// Has the host signaled a bus reset?
if (ints.BUS_RESET != 0) {
log.info("bus reset", .{});
log.debug("-- bus reset --", .{});

// Abort all endpoints
peripherals.USB.EP_ABORT.raw = 0xFFFFFFFF;
// Acknowledge by writing the write-one-to-clear status bit.
peripherals.USB.SIE_STATUS.modify(.{ .BUS_RESET = 1 });
set_address(&self.interface, 0);
controller.on_bus_reset(&self.interface);
while (peripherals.USB.EP_ABORT_DONE.raw != 0xFFFFFFFF) {}
peripherals.USB.EP_ABORT.raw = 0;
}
}

pub fn init() @This() {
if (chip == .RP2350)
peripherals.USB.MAIN_CTRL.write(.{ .PHY_ISO = 0 });

peripherals.USB.SIE_CTRL.modify(.{ .PULLUP_EN = 0 });

// Clear the control portion of DPRAM. This may not be necessary -- the
// datasheet is ambiguous -- but the C examples do it, and so do we.
peripherals.USB_DPRAM.SETUP_PACKET_LOW.write_raw(0);
Expand Down Expand Up @@ -243,6 +244,7 @@ pub fn Polled(config: Config) type {
};

@memset(std.mem.asBytes(&self.endpoints), 0);

// Set up endpoints.
self.interface.ep_open(&.control(.in(.ep0), max_supported_packet_size));
self.interface.ep_open(&.control(.out(.ep0), max_supported_packet_size));
Expand Down
Loading