lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[dev][usb] some improvements to the usb stack

Browse Source
This commit is contained in:
Travis Geiselbrecht
2013-09-12 11:12:27 -07:00
parent b120ed310e
commit fa6fbe7e50
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dev/usb/usb.c
View File

@@ -46,7 +46,12 @@ static void append_desc_data(usb_descriptor *desc, const void *dat, size_t len)
memcpy(ptr, desc->desc, desc->len);
memcpy(ptr + desc->len, dat, len);
free(desc->desc);
/* free the old buffer if it wasn't marked static */
if ((desc->flags & USB_DESC_FLAG_STATIC) == 0)
free(desc->desc);
desc->flags &= ~USB_DESC_FLAG_STATIC;
desc->desc = ptr;
desc->len += len;
}
@@ -144,6 +149,17 @@ status_t usb_add_string(const char *string, uint8_t id)
return ERR_NO_MEMORY;
}
static void usb_set_active_config(uint8_t config)
{
if (config != active_config) {
active_config = config;
if (active_config != 0)
printf("usb online\n");
else
printf("usb offline\n");
}
}
status_t usb_callback(usbc_callback_op_t op, const union usb_callback_args *args)
{
LTRACEF("op %d, args %p\n", op, args);
@@ -241,10 +257,8 @@ status_t usb_callback(usbc_callback_op_t op, const union usb_callback_args *args
case SET_CONFIGURATION:
LTRACEF("SET_CONFIGURATION %d\n", setup->value);
active_config = setup->value;
if (active_config != 0)
printf("usb online\n");
usbc_ep0_ack();
usb_set_active_config(setup->value);
break;
case GET_CONFIGURATION: