From 4bb47f5145179e9b5b4f1efe6a8ef23a50b39f60 Mon Sep 17 00:00:00 2001 From: "C.S.M" Date: Wed, 11 Feb 2026 18:47:16 +0800 Subject: [PATCH] fix(usj):Fix usj fifo write/read on p4 --- .../hal/esp32p4/include/hal/usb_serial_jtag_ll.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/components/hal/esp32p4/include/hal/usb_serial_jtag_ll.h b/components/hal/esp32p4/include/hal/usb_serial_jtag_ll.h index fe835881f5..2d6d8a31df 100644 --- a/components/hal/esp32p4/include/hal/usb_serial_jtag_ll.h +++ b/components/hal/esp32p4/include/hal/usb_serial_jtag_ll.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -119,8 +119,10 @@ static inline int usb_serial_jtag_ll_read_rxfifo(uint8_t *buf, uint32_t rd_len) { int i; for (i = 0; i < (int)rd_len; i++) { - if (!USB_SERIAL_JTAG.ep1_conf.serial_out_ep_data_avail) break; - buf[i] = HAL_FORCE_READ_U32_REG_FIELD(USB_SERIAL_JTAG.ep1, rdwr_byte); + if (!USB_SERIAL_JTAG.ep1_conf.serial_out_ep_data_avail) { + break; + } + buf[i] = USB_SERIAL_JTAG.ep1.val; } return i; } @@ -138,8 +140,10 @@ static inline int usb_serial_jtag_ll_write_txfifo(const uint8_t *buf, uint32_t w { int i; for (i = 0; i < (int)wr_len; i++) { - if (!USB_SERIAL_JTAG.ep1_conf.serial_in_ep_data_free) break; - HAL_FORCE_MODIFY_U32_REG_FIELD(USB_SERIAL_JTAG.ep1, rdwr_byte, buf[i]); + if (!USB_SERIAL_JTAG.ep1_conf.serial_in_ep_data_free) { + break; + } + USB_SERIAL_JTAG.ep1.val = buf[i]; } return i; }