mirror of
https://github.com/apache/nuttx.git
synced 2026-05-27 11:26:12 +08:00
Rename some USB device files
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4645 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
@@ -42,15 +42,15 @@ ifeq ($(CONFIG_PL2303),y)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_CDCACM),y)
|
ifeq ($(CONFIG_CDCACM),y)
|
||||||
CSRCS += cdcacm.c cdcacm_descriptors.c
|
CSRCS += cdcacm.c cdcacm_desc.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_USBMSC),y)
|
ifeq ($(CONFIG_USBMSC),y)
|
||||||
CSRCS += usbmsc.c usbmsc_descriptors.c usbmsc_scsi.c
|
CSRCS += usbmsc.c usbmsc_desc.c usbmsc_scsi.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
|
ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
|
||||||
CSRCS += composite.c composite_descriptors.c
|
CSRCS += composite.c composite_desc.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CSRCS += usbdev_trace.c usbdev_trprintf.c
|
CSRCS += usbdev_trace.c usbdev_trprintf.c
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* drivers/usbdev/cdcacm_descriptors.c
|
* drivers/usbdev/cdcacm_desc.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* drivers/usbdev/composite_descriptors.c
|
* drivers/usbdev/composite_desc.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* drivers/usbdev/usbmsc_descriptors.c
|
* drivers/usbdev/usbmsc_desc.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
|
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
@@ -86,6 +86,7 @@
|
|||||||
|
|
||||||
#define ADC_PROTOCOL_UNDEF 0x00 /* Undefined */
|
#define ADC_PROTOCOL_UNDEF 0x00 /* Undefined */
|
||||||
#define ADC_PROTOCOLv20 0x20 /* IP version 2.0 */
|
#define ADC_PROTOCOLv20 0x20 /* IP version 2.0 */
|
||||||
|
#define ADC_PROTOCOLv20_BCD 0x0200 /* IP version 2.0 (BCD) */
|
||||||
|
|
||||||
/* Interface Association Descriptor (IAD) */
|
/* Interface Association Descriptor (IAD) */
|
||||||
|
|
||||||
|
|||||||
@@ -179,6 +179,13 @@ int task_delete(pid_t pid)
|
|||||||
|
|
||||||
sched_unlock();
|
sched_unlock();
|
||||||
|
|
||||||
|
/* Since all tasks pass through this function as the final step in their
|
||||||
|
* exit sequence, this is an appropriate place to inform any instrumentation
|
||||||
|
* layer that the task no longer exists.
|
||||||
|
*/
|
||||||
|
|
||||||
|
sched_note_stop(tcb);
|
||||||
|
|
||||||
/* Deallocate its TCB */
|
/* Deallocate its TCB */
|
||||||
|
|
||||||
sched_releasetcb(dtcb);
|
sched_releasetcb(dtcb);
|
||||||
|
|||||||
@@ -102,10 +102,6 @@
|
|||||||
|
|
||||||
void task_exithook(FAR _TCB *tcb, int status)
|
void task_exithook(FAR _TCB *tcb, int status)
|
||||||
{
|
{
|
||||||
/* Inform the instrumentation layer that the task has stopped */
|
|
||||||
|
|
||||||
sched_note_stop(tcb);
|
|
||||||
|
|
||||||
/* If an exit function was registered, call it now before we do any un-
|
/* If an exit function was registered, call it now before we do any un-
|
||||||
* initialized. NOTE: In the case of task_delete(), the exit function
|
* initialized. NOTE: In the case of task_delete(), the exit function
|
||||||
* will *not* be called on the thread execution of the task being deleted!
|
* will *not* be called on the thread execution of the task being deleted!
|
||||||
|
|||||||
Reference in New Issue
Block a user