libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3432 from DavidLin1577/patch-4 

Fixed wrong output information in core.c
This commit is contained in:
Bernard Xiong 2020-03-10 16:21:41 +08:00 committed by GitHub
parent 817afbdf59 eb5467bece
commit a189eb6c33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/drivers/usb/usbdevice/core/core.c
View File

@ -1010,7 +1010,7 @@ udevice_t rt_usbd_device_new(void)
udevice = (udevice_t)rt_malloc(sizeof(struct udevice)); udevice = (udevice_t)rt_malloc(sizeof(struct udevice));
if(udevice == RT_NULL) if(udevice == RT_NULL)
{ {
rt_kprintf("alloc memery failed\n"); rt_kprintf("alloc memory failed\n");
return RT_NULL; return RT_NULL;
} }
rt_memset(udevice, 0, sizeof(struct udevice)); rt_memset(udevice, 0, sizeof(struct udevice));
@ -1124,7 +1124,7 @@ uconfig_t rt_usbd_config_new(void)
cfg = (uconfig_t)rt_malloc(sizeof(struct uconfig)); cfg = (uconfig_t)rt_malloc(sizeof(struct uconfig));
if(cfg == RT_NULL) if(cfg == RT_NULL)
{ {
rt_kprintf("alloc memery failed\n"); rt_kprintf("alloc memory failed\n");
return RT_NULL; return RT_NULL;
} }
rt_memset(cfg, 0, sizeof(struct uconfig)); rt_memset(cfg, 0, sizeof(struct uconfig));
@ -1163,7 +1163,7 @@ uintf_t rt_usbd_interface_new(udevice_t device, uintf_handler_t handler)
intf = (uintf_t)rt_malloc(sizeof(struct uinterface)); intf = (uintf_t)rt_malloc(sizeof(struct uinterface));
if(intf == RT_NULL) if(intf == RT_NULL)
{ {
rt_kprintf("alloc memery failed\n"); rt_kprintf("alloc memory failed\n");
return RT_NULL; return RT_NULL;
} }
intf->intf_num = device->nr_intf; intf->intf_num = device->nr_intf;
@ -1198,14 +1198,14 @@ ualtsetting_t rt_usbd_altsetting_new(rt_size_t desc_size)
setting = (ualtsetting_t)rt_malloc(sizeof(struct ualtsetting)); setting = (ualtsetting_t)rt_malloc(sizeof(struct ualtsetting));
if(setting == RT_NULL) if(setting == RT_NULL)
{ {
rt_kprintf("alloc memery failed\n"); rt_kprintf("alloc memory failed\n");
return RT_NULL; return RT_NULL;
} }
/* allocate memory for the desc */ /* allocate memory for the desc */
setting->desc = rt_malloc(desc_size); setting->desc = rt_malloc(desc_size);
if (setting->desc == RT_NULL) if (setting->desc == RT_NULL)
{ {
rt_kprintf("alloc desc memery failed\n"); rt_kprintf("alloc desc memory failed\n");
rt_free(setting); rt_free(setting);
return RT_NULL; return RT_NULL;
} }
@ -1263,7 +1263,7 @@ ufunction_t rt_usbd_function_new(udevice_t device, udev_desc_t dev_desc,
func = (ufunction_t)rt_malloc(sizeof(struct ufunction)); func = (ufunction_t)rt_malloc(sizeof(struct ufunction));
if(func == RT_NULL) if(func == RT_NULL)
{ {
rt_kprintf("alloc memery failed\n"); rt_kprintf("alloc memory failed\n");
return RT_NULL; return RT_NULL;
} }
func->dev_desc = dev_desc; func->dev_desc = dev_desc;
@ -1298,7 +1298,7 @@ uep_t rt_usbd_endpoint_new(uep_desc_t ep_desc, udep_handler_t handler)
ep = (uep_t)rt_malloc(sizeof(struct uendpoint)); ep = (uep_t)rt_malloc(sizeof(struct uendpoint));
if(ep == RT_NULL) if(ep == RT_NULL)
{ {
rt_kprintf("alloc memery failed\n"); rt_kprintf("alloc memory failed\n");
return RT_NULL; return RT_NULL;
} }
ep->ep_desc = ep_desc; ep->ep_desc = ep_desc;
@ -2204,7 +2204,7 @@ static struct rt_thread usb_thread;
#define USBD_MQ_MAX_MSG 16 #define USBD_MQ_MAX_MSG 16
/* internal of the message queue: every message is associated with a pointer, /* internal of the message queue: every message is associated with a pointer,
* so in order to recveive USBD_MQ_MAX_MSG messages, we have to allocate more * so in order to recveive USBD_MQ_MAX_MSG messages, we have to allocate more
* than USBD_MQ_MSG_SZ*USBD_MQ_MAX_MSG memery. */ * than USBD_MQ_MSG_SZ*USBD_MQ_MAX_MSG memory. */
static rt_uint8_t usb_mq_pool[(USBD_MQ_MSG_SZ+sizeof(void*))*USBD_MQ_MAX_MSG]; static rt_uint8_t usb_mq_pool[(USBD_MQ_MSG_SZ+sizeof(void*))*USBD_MQ_MAX_MSG];
/** /**