Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-08-03 21:50:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/usj_fifo_bug_v6.0' into 'release/v6.0'

Browse Source 
fix(usj):Fix usj fifo write/read on p4 (backport v6.0)

See merge request espressif/esp-idf!46636
This commit is contained in:
morris
2026-03-19 23:23:52 +08:00
parent 100f66809a 3d56bfc56c
commit c3f0efcc2e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp_hal_usb/esp32p4/include/hal/usb_serial_jtag_ll.h
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -122,7 +122,7 @@ static inline int usb_serial_jtag_ll_read_rxfifo(uint8_t *buf, uint32_t rd_len)
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);
buf[i] = USB_SERIAL_JTAG.ep1.val;
}
return i;
}
@@ -143,7 +143,7 @@ static inline int usb_serial_jtag_ll_write_txfifo(const uint8_t *buf, uint32_t w
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]);
USB_SERIAL_JTAG.ep1.val = buf[i];
}
return i;
}