rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #290 from elfmimi/numicro-usb-fix

This commit is contained in:
a_p_u_r_o 2021-08-04 23:46:35 +09:00 committed by GitHub
parent 1310a8ce93 2935adef79
commit ae3542876c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/ports/NUMICRO/LLD/USBv1/hal_usb_lld.c
View File

@ -210,7 +210,7 @@ static void usb_serve_out_endpoint(uint32_t epn)
{
USBDriver *const usbp = &USBD1;
uint32_t mxpld = HW_OUT_EP(epn)->MXPLD;
uint32_t rxsize_actual = min(mxpld, usbp->epc[epn]->out_state->rxcnt - usbp->epc[epn]->out_state->rxsize);
uint32_t rxsize_actual = min(mxpld, usbp->epc[epn]->out_state->rxsize - usbp->epc[epn]->out_state->rxcnt);
usb_memcpy(usbp->epc[epn]->out_state->rxbuf +
usbp->epc[epn]->out_state->rxcnt,

10
os/hal/ports/NUMICRO/LLD/USBv1/usb_memcpy.S
View File

@ -47,7 +47,7 @@ check_alignment:
bne.n unaligned
aligned:
/* r0: src, r1: dest, r2: num, r3: #3 */
/* r0: dest, r1: src, r2: num, r3: #3 */
movs r4, r2
bics r4, r3
@ -79,8 +79,8 @@ leftover_check:
adds r0, r0, r6
/*
* r0: src
* r1: dest
* r0: dest
* r1: src
* r2 is 1, 2, or 3 (# of bytes left)
* r3: #3
* r4: &USBD
@ -122,8 +122,8 @@ offset:
str r5, [r4, #16]
offset_loop:
ldrb r6, [r0, #0]
strb r6, [r1, #0]
ldrb r6, [r1, #0]
strb r6, [r0, #0]
adds r0, r0, #1
adds r1, r1, #1
subs r2, r2, #1