mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-08-18 11:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor interrupt handling and add pipe_write to fix IN ZLP issue

Browse Source
This commit is contained in:
hathach
2026-04-21 11:28:29 +07:00
parent f9e79844ed
commit 85b967c9b0
2 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/portable/mentor/musb/dcd_musb.c
View File

@ -191,21 +191,12 @@ static void process_setup_packet(uint8_t rhport) {
}
}
static bool handle_xfer_in(uint8_t rhport, uint_fast8_t ep_addr) {
unsigned epnum = tu_edpt_number(ep_addr);
unsigned epnum_minus1 = epnum - 1;
pipe_state_t *pipe = &_dcd.pipe[tu_edpt_dir(ep_addr)][epnum_minus1];
const unsigned rem = pipe->remaining;
if (rem == 0 && pipe->length > 0) {
pipe->buf = NULL;
pipe->armed = false;
return true;
}
musb_regs_t* musb_regs = MUSB_REGS(rhport);
// write to txfifo using pipe_state_t info
static void pipe_write(musb_regs_t* musb_regs, uint8_t epnum) {
pipe_state_t* pipe = &_dcd.pipe[TUSB_DIR_IN][epnum - 1];
musb_ep_csr_t* ep_csr = get_ep_csr(musb_regs, epnum);
const unsigned mps = ep_csr->tx_maxp;
const unsigned rem = pipe->remaining;
const unsigned len = TU_MIN(mps, rem);
volatile void *fifo_ptr = &musb_regs->fifo[epnum];
if (len) {
@ -218,7 +209,19 @@ static bool handle_xfer_in(uint8_t rhport, uint_fast8_t ep_addr) {
pipe->remaining = rem - len;
}
ep_csr->tx_csrl = MUSB_TXCSRL1_TXRDY;
// TU_LOG1(" TXCSRL%d = %x %d\r\n", epnum, ep_csr->tx_csrl, rem - len);
}
// Called from the TX interrupt. If the last queued packet finished the transfer,
// signal completion; otherwise queue the next packet.
static bool handle_xfer_in(musb_regs_t* musb_regs, uint8_t epnum) {
pipe_state_t* pipe = &_dcd.pipe[TUSB_DIR_IN][epnum - 1];
if (pipe->remaining == 0) {
pipe->buf = NULL;
pipe->armed = false;
return true;
}
pipe_write(musb_regs, epnum);
return false;
}
@ -288,7 +291,7 @@ static bool edpt_n_xfer(uint8_t rhport, uint8_t ep_addr, void *buffer, uint16_t
pipe->armed = true;
if (dir_in) {
handle_xfer_in(rhport, ep_addr);
pipe_write(MUSB_REGS(rhport), (uint8_t) epnum);
} else {
musb_regs_t* musb_regs = MUSB_REGS(rhport);
musb_ep_csr_t* ep_csr = get_ep_csr(musb_regs, epnum);
@ -476,7 +479,7 @@ static void process_edpt_n(uint8_t rhport, uint_fast8_t ep_addr)
ep_csr->tx_csrl &= ~(MUSB_TXCSRL1_STALLED | MUSB_TXCSRL1_UNDRN);
return;
}
completed = handle_xfer_in(rhport, ep_addr);
completed = handle_xfer_in(musb_regs, (uint8_t) epn);
} else {
// TU_LOG1(" RX CSRL%d = %x\r\n", epn, ep_csr->rx_csrl);
if (ep_csr->rx_csrl & MUSB_RXCSRL1_STALLED) {

31
test/hil/hil_test.py
View File

@ -59,6 +59,7 @@ STATUS_SKIPPED = "\033[33mSkipped\033[0m"
verbose = False
test_only = []
build_dir = 'cmake-build'
skip_flash = False
WCH_RISCV_CONTENT = """
adapter driver wlinke
@ -1248,11 +1249,15 @@ def test_example(board, f1, example):
if verbose:
print(f'Flashing {fw_name}.elf')
# flash firmware. It may fail randomly, retry a few times
# flash firmware (unless --skip-flash), then run the test. Both may fail randomly,
# retry a few times.
start_s = time.time()
flash_ok = True
for i in range(max_retry):
ret = globals()[f'flash_{board["flasher"]["name"].lower()}'](board, fw_name)
if ret.returncode == 0:
if not skip_flash:
ret = globals()[f'flash_{board["flasher"]["name"].lower()}'](board, fw_name)
flash_ok = (ret.returncode == 0)
if flash_ok:
try:
tret = globals()[f'test_{example.replace("/", "_")}'](board)
if tret == 'skipped':
@ -1271,7 +1276,7 @@ def test_example(board, f1, example):
print(f'\n Flash failed, retry {i+2}/{max_retry}', end='')
time.sleep(0.5)
if ret.returncode != 0:
if not flash_ok:
err_count += 1
print(f' Flash {STATUS_FAILED}', end='')
@ -1315,8 +1320,9 @@ def test_board(board):
for test in test_list:
err_count += test_example(board, f1, test)
# flash board_test last to disable board's usb
test_example(board, flags_on_list[0], 'device/board_test')
# flash board_test last to disable board's usb (skipped when --skip-flash is set)
if not skip_flash:
test_example(board, flags_on_list[0], 'device/board_test')
return name, err_count
@ -1329,26 +1335,29 @@ def main():
global test_only
global build_dir
global max_retry
global skip_flash
duration = time.time()
parser = argparse.ArgumentParser()
parser.add_argument('config_file', help='Configuration JSON file')
parser.add_argument('-b', '--board', action='append', default=[], help='Boards to test, all if not specified')
parser.add_argument('-s', '--skip', action='append', default=[], help='Skip boards from test')
parser.add_argument('-s', '--skip-board', action='append', default=[], help='Skip boards from test')
parser.add_argument('-sf', '--skip-flash', action='store_true', help='Run tests without flashing firmware (use whatever is already on the board)')
parser.add_argument('-t', '--test-only', action='append', default=[], help='Tests to run, all if not specified')
parser.add_argument('-B', '--build', default='cmake-build', help='Build folder name (default: cmake-build)')
parser.add_argument('-B', '--build-dir', default='cmake-build', help='Build folder name (default: cmake-build)')
parser.add_argument('-r', '--retry', type=int, default=3, help='Retry count for failed tests (default: 3)')
parser.add_argument('-v', '--verbose', action='store_true', help='Verbose output')
args = parser.parse_args()
config_file = args.config_file
boards = args.board
skip_boards = args.skip
skip_boards = args.skip_board
verbose = args.verbose
test_only = args.test_only
build_dir = args.build
build_dir = args.build_dir
max_retry = args.retry
skip_flash = args.skip_flash
# if config file is not found, try to find it in the same directory as this script
if not os.path.exists(config_file):
@ -1370,7 +1379,7 @@ def main():
if err_count > 0:
skip_boards += [name for name, err in mret if err == 0]
with open(skip_fname, 'w') as f:
f.write(' '.join(f'-s {i}' for i in skip_boards))
f.write(' '.join(f'--skip-board {i}' for i in skip_boards))
elif os.path.exists(skip_fname):
os.remove(skip_fname)