Merge remote-tracking branch 'upstream/master'

This commit is contained in:
zyh 2018-04-27 16:55:11 +08:00
commit 6c00531044
4 changed files with 7 additions and 7 deletions

View File

@ -110,9 +110,9 @@ LoopFillZerobss:
/* Call the clock system initialization function.*/
bl SystemInit
/* Call static constructors */
bl __libc_init_array
/* bl __libc_init_array */
/* Call the application's entry point.*/
bl main
bl entry
bx lr
.size Reset_Handler, .-Reset_Handler

View File

@ -110,9 +110,9 @@ LoopFillZerobss:
/* Call the clock system initialization function.*/
bl SystemInit
/* Call static constructors */
bl __libc_init_array
/* bl __libc_init_array */
/* Call the application's entry point.*/
bl main
bl entry
bx lr
.size Reset_Handler, .-Reset_Handler

View File

@ -110,9 +110,9 @@ LoopFillZerobss:
/* Call the clock system intitialization function.*/
bl SystemInit
/* Call static constructors */
bl __libc_init_array
/* bl __libc_init_array */
/* Call the application's entry point.*/
bl main
bl entry
bx lr
.size Reset_Handler, .-Reset_Handler

View File

@ -306,9 +306,9 @@ rt_err_t rt_udisk_run(struct uhintf* intf)
rt_memset(data, 0, sizeof(struct ustor_data));
data->intf = intf;
data->udisk_id = udisk_get_id();
data->part.lock = rt_sem_create(sname, 1, RT_IPC_FLAG_FIFO);
rt_snprintf(dname, 6, "ud%d-%d", data->udisk_id, i);
rt_snprintf(sname, 8, "sem_ud%d", i);
data->part.lock = rt_sem_create(sname, 1, RT_IPC_FLAG_FIFO);
/* register sdcard device */
stor->dev[i].type = RT_Device_Class_Block;