yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(musb): fix musb_pipe_alloc missing bus parameter, and fix host checks in irq

Browse Source 
Includes:

- add `struct usbh_bus *bus` parameter to `musb_pipe_alloc`
- correct call in `usbh_submit_urb`
- correct host checks in irq
This commit is contained in:
MDLZCOOL
2026-01-17 13:50:36 +08:00
committed by sakumisu
parent 1de6b93045
commit e414833589
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
port/musb/usb_glue_sifli.c
View File

@@ -17,7 +17,7 @@
#undef USB_POWER_RESUME
#ifndef CONFIG_USB_MUSB_SIFLI
#error must define CONFIG_USB_MUSB_SIFLI when use sunxi chips
#error must define CONFIG_USB_MUSB_SIFLI when use sifli chips
#endif
#include "bf0_hal.h"

6
port/musb/usb_hc_musb.c
View File

@@ -524,7 +524,7 @@ static uint8_t usbh_get_port_speed(struct usbh_bus *bus, const uint8_t port)
return speed;
}
static int musb_pipe_alloc(void)
static int musb_pipe_alloc(struct usbh_bus *bus)
{
int chidx;
uintptr_t flags;
@@ -769,7 +769,7 @@ int usbh_submit_urb(struct usbh_urb *urb)
if (USB_GET_ENDPOINT_TYPE(urb->ep->bmAttributes) == USB_ENDPOINT_TYPE_CONTROL) {
chidx = 0;
} else {
chidx = musb_pipe_alloc();
chidx = musb_pipe_alloc(bus);
if (chidx == -1) {
return -USB_ERR_NOMEM;
}
@@ -1023,9 +1023,11 @@ void USBH_IRQHandler(uint8_t busid)
bus = &g_usbhost_bus[busid];
#if 0
if (!(HWREGB(USB_BASE + MUSB_DEVCTL_OFFSET) & USB_DEVCTL_HOST)) {
return;
}
#endif
is = HWREGB(USB_BASE + MUSB_IS_OFFSET);
txis = HWREGH(USB_BASE + MUSB_TXIS_OFFSET);