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.

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

Fix async-serial-usb-jtag #1561

Merged
merged 2 commits into from
May 17, 2024
Merged

Fix async-serial-usb-jtag #1561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59708cf
Fix async-serial-usb-jtag
bjoernQ May 17, 2024
13a9eb4
CHANGELOG.md
bjoernQ May 17, 2024
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 esp-hal/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix delay on esp32h2 (#1535)
- spi: fix dma wrong mode when using eh1 blocking api (#1541)
- uart: make `uart::UartRx::read_byte` public (#1547)
- Fix async serial-usb-jtag (#1561)

### Changed

Expand Down
17 changes: 9 additions & 8 deletions esp-hal/src/usb_serial_jtag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ where
.ep1()
.write(|w| unsafe { w.rdwr_byte().bits(*byte) });
}
reg_block.ep1_conf().write(|w| w.wr_done().set_bit());
reg_block.ep1_conf().modify(|_, w| w.wr_done().set_bit());

while reg_block.ep1_conf().read().bits() & 0b011 == 0b000 {
// wait
Expand Down Expand Up @@ -149,7 +149,7 @@ where
/// Flush the output FIFO and block until it has been sent
pub fn flush_tx(&mut self) -> Result<(), Error> {
let reg_block = USB_DEVICE::register_block();
reg_block.ep1_conf().write(|w| w.wr_done().set_bit());
reg_block.ep1_conf().modify(|_, w| w.wr_done().set_bit());

while reg_block.ep1_conf().read().bits() & 0b011 == 0b000 {
// wait
Expand All @@ -161,7 +161,7 @@ where
/// Flush the output FIFO but don't block if it isn't ready immediately
pub fn flush_tx_nb(&mut self) -> nb::Result<(), Error> {
let reg_block = USB_DEVICE::register_block();
reg_block.ep1_conf().write(|w| w.wr_done().set_bit());
reg_block.ep1_conf().modify(|_, w| w.wr_done().set_bit());

if reg_block.ep1_conf().read().bits() & 0b011 == 0b000 {
Err(nb::Error::WouldBlock)
Expand Down Expand Up @@ -362,7 +362,7 @@ pub trait Instance: crate::private::Sealed {
fn disable_tx_interrupts() {
Self::register_block()
.int_ena()
.write(|w| w.serial_in_empty().clear_bit());
.modify(|_, w| w.serial_in_empty().clear_bit());

Self::register_block()
.int_clr()
Expand All @@ -373,7 +373,7 @@ pub trait Instance: crate::private::Sealed {
fn disable_rx_interrupts() {
Self::register_block()
.int_ena()
.write(|w| w.serial_out_recv_pkt().clear_bit());
.modify(|_, w| w.serial_out_recv_pkt().clear_bit());

Self::register_block()
.int_clr()
Expand Down Expand Up @@ -770,7 +770,7 @@ mod asynch {
.ep1()
.write(|w| unsafe { w.rdwr_byte().bits(*byte) });
}
reg_block.ep1_conf().write(|w| w.wr_done().set_bit());
reg_block.ep1_conf().modify(|_, w| w.wr_done().set_bit());

UsbSerialJtagWriteFuture::new().await;
}
Expand Down Expand Up @@ -851,10 +851,11 @@ mod asynch {
let rx = interrupts.serial_out_recv_pkt().bit_is_set();

if tx {
usb.int_ena().write(|w| w.serial_in_empty().clear_bit());
usb.int_ena().modify(|_, w| w.serial_in_empty().clear_bit());
}
if rx {
usb.int_ena().write(|w| w.serial_out_recv_pkt().clear_bit());
usb.int_ena()
.modify(|_, w| w.serial_out_recv_pkt().clear_bit());
}

usb.int_clr().write(|w| {
Expand Down
Loading