alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-10 04:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/usj_fifo_8_32_read' into 'master'

Browse Source 
fix(usb_serial_jtag): Fix issue that use u32_reg read/write cannot be used to modify fifo regs

See merge request espressif/esp-idf!31879
This commit is contained in:
C.S.M
2024-07-04 11:02:33 +08:00
parent ad70d000b0 8b2350ce1c
commit c59403147c
11 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/hal/esp32p4/include/hal/usb_serial_jtag_ll.h
View File

@@ -120,7 +120,7 @@ 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);
buf[i] = USB_SERIAL_JTAG.ep1.rdwr_byte;
}
return i;
}
@@ -139,7 +139,7 @@ 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]);
USB_SERIAL_JTAG.ep1.rdwr_byte = buf[i];
}
return i;
}