Skip to content
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.

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

fixed usb serial not working after reconnect #2196

Merged
merged 4 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions firmware/application/usb_serial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ void USBSerial::on_channel_opened() {
}

void USBSerial::on_channel_closed() {
reset_transfer_queues();
connected = false;
}

Expand Down
8 changes: 4 additions & 4 deletions firmware/application/usb_serial_cdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ CH_IRQ_HANDLER(USB0_IRQHandler) {
chSysUnlockFromIsr();
}

if (status & USB0_USBSTS_D_SLI) {
on_channel_closed();
}

CH_IRQ_EPILOGUE();
}

Expand Down Expand Up @@ -131,11 +135,7 @@ usb_request_status_t usb_get_line_coding_request(usb_endpoint_t* const endpoint,
}
usb_request_status_t usb_set_control_line_state_request(usb_endpoint_t* const endpoint, const usb_transfer_stage_t stage) {
if (stage == USB_TRANSFER_STAGE_SETUP) {
// if (endpoint->setup.value == 3) {
on_channel_opened();
//} else {
// on_channel_closed();
//}

usb_transfer_schedule_ack(endpoint->in);
}
Expand Down
8 changes: 8 additions & 0 deletions firmware/application/usb_serial_host_to_device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ void init_host_to_device() {
thread_usb_event = chThdSelf();
}

void reset_transfer_queues() {
while (usb_bulk_buffer_queue.empty() == false)
usb_bulk_buffer_queue.pop();

while (usb_bulk_buffer_spare.empty() == false)
usb_bulk_buffer_spare.pop();
}

void schedule_host_to_device_transfer() {
if (usb_bulk_buffer_queue.size() >= 8)
return;
Expand Down
1 change: 1 addition & 0 deletions firmware/application/usb_serial_host_to_device.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#define USB_BULK_BUFFER_SIZE 64

void init_host_to_device();
void reset_transfer_queues();
void serial_bulk_transfer_complete(void* user_data, unsigned int bytes_transferred);
void schedule_host_to_device_transfer();
void complete_host_to_device_transfer();
10 changes: 10 additions & 0 deletions firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,23 @@

#include "ch.h"
#include "hal.h"
#include <libopencm3/lpc43xx/usb.h>

extern "C" {
void start_usb(void);
void irq_usb(void);
void usb_transfer(void);

extern volatile bool scsi_running;

CH_IRQ_HANDLER(Vector60) {
const uint32_t status = USB0_USBSTS_D & USB0_USBINTR_D;
if (status & USB0_USBSTS_D_SLI) {
// USB reset received.
if (scsi_running) {
LPC_RGU->RESET_CTRL[0] = (1 << 0);
}
}
irq_usb();
}
}
Expand Down
2 changes: 1 addition & 1 deletion firmware/baseband/sd_over_usb/sd_over_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "sd_over_usb.h"
#include "scsi.h"

bool scsi_running = false;
volatile bool scsi_running = false;

usb_request_status_t report_max_lun(
usb_endpoint_t* const endpoint,
Expand Down
Loading