Rename some USB device files

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4645 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 14 insertions, 10 deletions

diff --git a/nuttx/drivers/usbdev/Make.defs b/nuttx/drivers/usbdev/Make.defs
index 445cf7817..f1b3c405a 100644
--- a/nuttx/drivers/usbdev/Make.defs
+++ b/nuttx/drivers/usbdev/Make.defs
@@ -42,15 +42,15 @@ ifeq ($(CONFIG_PL2303),y)
 endif
 
 ifeq ($(CONFIG_CDCACM),y)
-  CSRCS += cdcacm.c cdcacm_descriptors.c
+  CSRCS += cdcacm.c cdcacm_desc.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
-  CSRCS += usbmsc.c usbmsc_descriptors.c usbmsc_scsi.c
+  CSRCS += usbmsc.c usbmsc_desc.c usbmsc_scsi.c
 endif
 
 ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
-  CSRCS += composite.c composite_descriptors.c
+  CSRCS += composite.c composite_desc.c
 endif
 
 CSRCS += usbdev_trace.c usbdev_trprintf.c
diff --git a/nuttx/drivers/usbdev/cdcacm_descriptors.c b/nuttx/drivers/usbdev/cdcacm_desc.c
index 11a83541e..fde13bfd3 100644
--- a/nuttx/drivers/usbdev/cdcacm_descriptors.c
+++ b/nuttx/drivers/usbdev/cdcacm_desc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/cdcacm_descriptors.c
+ * drivers/usbdev/cdcacm_desc.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/drivers/usbdev/composite_descriptors.c b/nuttx/drivers/usbdev/composite_desc.c
index 9ea6ef2d7..0a0cd4a6a 100644
--- a/nuttx/drivers/usbdev/composite_descriptors.c
+++ b/nuttx/drivers/usbdev/composite_desc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/composite_descriptors.c
+ * drivers/usbdev/composite_desc.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/drivers/usbdev/usbmsc_descriptors.c b/nuttx/drivers/usbdev/usbmsc_desc.c
index 8305a660a..6d7561b3f 100644
--- a/nuttx/drivers/usbdev/usbmsc_descriptors.c
+++ b/nuttx/drivers/usbdev/usbmsc_desc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/usbmsc_descriptors.c
+ * drivers/usbdev/usbmsc_desc.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/include/nuttx/usb/audio.h b/nuttx/include/nuttx/usb/audio.h
index b9280e318..97c3ed6cb 100644
--- a/nuttx/include/nuttx/usb/audio.h
+++ b/nuttx/include/nuttx/usb/audio.h
@@ -86,6 +86,7 @@
 
 #define ADC_PROTOCOL_UNDEF          0x00       /* Undefined */
 #define ADC_PROTOCOLv20             0x20       /* IP version 2.0 */
+#define ADC_PROTOCOLv20_BCD         0x0200     /* IP version 2.0 (BCD) */
 
 /* Interface Association Descriptor (IAD) */
 
diff --git a/nuttx/sched/task_delete.c b/nuttx/sched/task_delete.c
index e5244a0b8..5448260d5 100644
--- a/nuttx/sched/task_delete.c
+++ b/nuttx/sched/task_delete.c
@@ -179,6 +179,13 @@ int task_delete(pid_t pid)
 
   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 */
 
   sched_releasetcb(dtcb);
diff --git a/nuttx/sched/task_exithook.c b/nuttx/sched/task_exithook.c
index e160a1cb3..500129382 100644
--- a/nuttx/sched/task_exithook.c
+++ b/nuttx/sched/task_exithook.c
@@ -102,10 +102,6 @@
 
 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-
    * initialized.  NOTE:  In the case of task_delete(), the exit function
    * will *not* be called on the thread execution of the task being deleted!