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

refactor(core/usbh_core): refactor devaddr allocation, use auto increment

Browse Source 
Signed-off-by: sakumisu <1203593632@qq.com>
This commit is contained in:
sakumisu
2025-08-27 21:19:43 +08:00
parent 6256260203
commit 5130d22766
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/usbh_core.c
View File

@@ -33,29 +33,27 @@ struct usbh_bus g_usbhost_bus[CONFIG_USBHOST_MAX_BUS];
static int usbh_allocate_devaddr(struct usbh_devaddr_map *devgen)
{
uint8_t startaddr = devgen->next;
uint8_t devaddr;
uint8_t lastaddr = devgen->last;
uint8_t devaddr = lastaddr;
int index;
int bitno;
for (;;) {
devaddr = devgen->next;
if (devgen->next >= 0x7f) {
devgen->next = 2;
} else {
devgen->next++;
devaddr++;
if (devaddr > 0x7f) {
devaddr = 2;
}
if (devaddr == lastaddr) {
return -USB_ERR_NOMEM;
}
index = devaddr >> 5;
bitno = devaddr & 0x1f;
if ((devgen->alloctab[index] & (1 << bitno)) == 0) {
devgen->alloctab[index] |= (1 << bitno);
if ((devgen->alloctab[index] & (1ul << bitno)) == 0) {
devgen->alloctab[index] |= (1ul << bitno);
devgen->last = devaddr;
return (int)devaddr;
}
if (startaddr == devaddr) {
return -USB_ERR_NOMEM;
}
}
}
@@ -69,15 +67,11 @@ static int __usbh_free_devaddr(struct usbh_devaddr_map *devgen, uint8_t devaddr)
bitno = devaddr & USB_DEV_ADDR_MARK_MASK;
/* Free the address */
if ((devgen->alloctab[index] |= (1 << bitno)) != 0) {
devgen->alloctab[index] &= ~(1 << bitno);
if ((devgen->alloctab[index] & (1ul << bitno)) != 0) {
devgen->alloctab[index] &= ~(1ul << bitno);
} else {
return -1;
}
if (devaddr < devgen->next) {
devgen->next = devaddr;
}
}
return 0;
@@ -652,7 +646,7 @@ static void usbh_bus_init(struct usbh_bus *bus, uint8_t busid, uintptr_t reg_bas
bus->hcd.reg_base = reg_base;
/* devaddr 1 is for roothub */
bus->devgen.next = 2;
bus->devgen.last = 0x7f;
usb_slist_add_tail(&g_bus_head, &bus->list);
}

2
core/usbh_core.h
View File

@@ -150,7 +150,7 @@ struct usbh_devaddr_map {
* alloctab[3]:addr from 96~127
*
*/
uint8_t next; /* Next device address */
uint8_t last; /* Last device address */
uint32_t alloctab[4]; /* Bit allocation table */
};