Add a text for the new composite USB device

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4341 7fd9a85b-ad96-42d3-883c-3090e2eb8679

4 files changed, 13 insertions, 8 deletions

diff --git a/nuttx/include/nuttx/usb/cdcacm.h b/nuttx/include/nuttx/usb/cdcacm.h
index 7c0e260bb..012bc55db 100644
--- a/nuttx/include/nuttx/usb/cdcacm.h
+++ b/nuttx/include/nuttx/usb/cdcacm.h
@@ -309,6 +309,7 @@ typedef FAR void (*cdcacm_callback_t)(enum cdcacm_event_e event);
  ****************************************************************************/
 
 #if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_CDCACM_COMPOSITE)
+struct usbdevclass_driver_s;
 EXTERN int board_cdcclassobject(FAR struct usbdevclass_driver_s **classdev);
 #endif
 
@@ -329,7 +330,7 @@ EXTERN int board_cdcclassobject(FAR struct usbdevclass_driver_s **classdev);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_USBMSC_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
+#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_CDCACM_COMPOSITE)
 struct usbdevclass_driver_s;
 EXTERN void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev);
 #endif
@@ -371,7 +372,9 @@ int cdcacm_classobject(int minor, FAR struct usbdevclass_driver_s **classdev);
  *
  ****************************************************************************/
 
+#if !defined(CONFIG_USBDEV_COMPOSITE) || !defined(CONFIG_CDCACM_COMPOSITE)
 EXTERN int cdcacm_initialize(int minor);
+#endif
 
 /****************************************************************************
  * Name: cdcacm_uninitialize
@@ -387,7 +390,7 @@ EXTERN int cdcacm_initialize(int minor);
  *
  ****************************************************************************/
 
-#ifndef CONFIG_CDCACM_COMPOSITE
+#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_CDCACM_COMPOSITE)
 EXTERN void cdcacm_uninitialize(FAR struct usbdevclass_driver_s *classdev);
 #endif
 
diff --git a/nuttx/include/nuttx/usb/composite.h b/nuttx/include/nuttx/usb/composite.h
index 53bedc34f..fc935fd67 100644
--- a/nuttx/include/nuttx/usb/composite.h
+++ b/nuttx/include/nuttx/usb/composite.h
@@ -115,7 +115,7 @@ extern "C" {
 EXTERN FAR void *composite_initialize(void);
 
 /****************************************************************************
- * Name: usbmsc_uninitialize
+ * Name: composite_uninitialize
  *
  * Description:
  *   Un-initialize the USB composite driver.  The handle is the USB composite
@@ -132,7 +132,7 @@ EXTERN FAR void *composite_initialize(void);
  *
  ***************************************************************************/
 
-EXTERN void usbmsc_uninitialize(FAR void *handle);
+EXTERN void composite_uninitialize(FAR void *handle);
 
 /****************************************************************************
  * Name: composite_initialize
diff --git a/nuttx/include/nuttx/usb/usbdev_trace.h b/nuttx/include/nuttx/usb/usbdev_trace.h
index bc60da211..814478686 100644
--- a/nuttx/include/nuttx/usb/usbdev_trace.h
+++ b/nuttx/include/nuttx/usb/usbdev_trace.h
@@ -184,7 +184,7 @@
 #define USBSER_TRACECLASSAPI_SEND                    0x0009
 #define USBSER_TRACECLASSAPI_TXINT                   0x000a
 #define USBSER_TRACECLASSAPI_TXREADY                 0x000b
-#define RTXEMPTY                 0x000c
+#define USBSER_TRACECLASSAPI_TXEMPTY                 0x000c
 
 /* Values of the class error ID used by the USB serial driver */
 
diff --git a/nuttx/include/nuttx/usb/usbmsc.h b/nuttx/include/nuttx/usb/usbmsc.h
index dd2740a21..325c665c5 100644
--- a/nuttx/include/nuttx/usb/usbmsc.h
+++ b/nuttx/include/nuttx/usb/usbmsc.h
@@ -100,7 +100,7 @@ extern "C"
  *
  ************************************************************************************/
 
-#if defined(CONFIG_USBMSC_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
+#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
 struct usbdevclass_driver_s;
 EXTERN int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev);
 #endif
@@ -122,7 +122,7 @@ EXTERN int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_USBMSC_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
+#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
 struct usbdevclass_driver_s;
 EXTERN void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev);
 #endif
@@ -207,7 +207,9 @@ EXTERN int usbmsc_unbindlun(FAR void *handle, unsigned int lunno);
  *
  ************************************************************************************/
 
+#if !defined(CONFIG_USBDEV_COMPOSITE) || !defined(CONFIG_USBMSC_COMPOSITE)
 EXTERN int usbmsc_exportluns(FAR void *handle);
+#endif
 
 /************************************************************************************
  * Name: usbmsc_classobject
@@ -225,7 +227,7 @@ EXTERN int usbmsc_exportluns(FAR void *handle);
  *
  ************************************************************************************/
 
-#if defined(CONFIG_USBMSC_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
+#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
 struct usbdevclass_driver_s;
 EXTERN int usbmsc_classobject(FAR void *handle, FAR struct usbdevclass_driver_s **classdev);
 #endif