The-Homebrew-Cloud/SummerCart64
2
0
Fork 0
mirror of https://github.com/Polprzewodnikowy/SummerCart64.git synced 2024-11-23 22:29:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

small cleanup in usb.c

Browse Source
This commit is contained in:
Mateusz Faderewski 2024-07-03 19:54:27 +02:00
parent 2bb47720e2
commit ab5b02251f
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sw/controller/src/usb.c
View File

@ -174,9 +174,9 @@ static void usb_flush_packet (void) {
p.packet_pending = false; p.packet_pending = false;
p.packet_info.done_callback(); p.packet_info.done_callback();
} }
if (p.tx_state != TX_STATE_IDLE && p.tx_info.done_callback) { if (p.tx_state != TX_STATE_IDLE && p.tx_info.done_callback) {
p.tx_info.done_callback(); p.tx_info.done_callback();
p.tx_info.done_callback = NULL;
} }
} }
@ -461,27 +461,34 @@ static void usb_rx_process (void) {
} }
if (p.rx_state == RX_STATE_FLUSH) { if (p.rx_state == RX_STATE_FLUSH) {
if (usb_dma_ready()) { if (p.rx_args[1] > 0) {
if (p.rx_args[1] != 0) { if (usb_dma_ready()) {
uint32_t length = (p.rx_args[1] > RX_FLUSH_LENGTH) ? RX_FLUSH_LENGTH : p.rx_args[1]; uint32_t length = (p.rx_args[1] > RX_FLUSH_LENGTH) ? RX_FLUSH_LENGTH : p.rx_args[1];
fpga_reg_set(REG_USB_DMA_ADDRESS, RX_FLUSH_ADDRESS); if (!p.rx_dma_running) {
fpga_reg_set(REG_USB_DMA_LENGTH, length); fpga_reg_set(REG_USB_DMA_ADDRESS, RX_FLUSH_ADDRESS);
fpga_reg_set(REG_USB_DMA_SCR, DMA_SCR_DIRECTION | DMA_SCR_START); fpga_reg_set(REG_USB_DMA_LENGTH, length);
p.rx_args[1] -= length; fpga_reg_set(REG_USB_DMA_SCR, DMA_SCR_DIRECTION | DMA_SCR_START);
} else { p.rx_dma_running = true;
if (p.flush_response) {
p.rx_state = RX_STATE_IDLE;
p.response_pending = true;
p.response_error = true;
} else if (p.flush_packet) {
usb_tx_info_t packet_info;
usb_create_packet(&packet_info, PACKET_CMD_DATA_FLUSHED);
if (usb_enqueue_packet(&packet_info)) {
p.rx_state = RX_STATE_IDLE;
}
} else { } else {
p.rx_args[1] -= length;
p.rx_dma_running = false;
}
}
}
if (p.rx_args[1] == 0) {
if (p.flush_response) {
p.rx_state = RX_STATE_IDLE;
p.response_pending = true;
p.response_error = true;
} else if (p.flush_packet) {
usb_tx_info_t packet_info;
usb_create_packet(&packet_info, PACKET_CMD_DATA_FLUSHED);
if (usb_enqueue_packet(&packet_info)) {
p.rx_state = RX_STATE_IDLE; p.rx_state = RX_STATE_IDLE;
} }
} else {
p.rx_state = RX_STATE_IDLE;
} }
} }
} }