From 9f1cf17c99049de5eec9af713057aa1217a0f2b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Quentin?= <bjoernQ@users.noreply.github.com>
Date: Fri, 17 May 2024 16:49:55 +0200
Subject: [PATCH] Fix async-serial-usb-jtag (#1561)

* Fix async-serial-usb-jtag

* CHANGELOG.md
---
 esp-hal/CHANGELOG.md           |  1 +
 esp-hal/src/usb_serial_jtag.rs | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/esp-hal/CHANGELOG.md b/esp-hal/CHANGELOG.md
index e7e5831ed76..3471cf009cf 100644
--- a/esp-hal/CHANGELOG.md
+++ b/esp-hal/CHANGELOG.md
@@ -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
 
diff --git a/esp-hal/src/usb_serial_jtag.rs b/esp-hal/src/usb_serial_jtag.rs
index 32213728aae..a2e509e3215 100644
--- a/esp-hal/src/usb_serial_jtag.rs
+++ b/esp-hal/src/usb_serial_jtag.rs
@@ -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
@@ -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
@@ -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)
@@ -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()
@@ -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()
@@ -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;
             }
@@ -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| {