fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 03:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add a text for the new composite USB device

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4341 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-01-26 23:14:27 +00:00
parent 804205a104
commit cd24ef4a30
23 changed files with 3183 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/include/nuttx/usb/cdcacm.h
+5 -2
View File
@@ -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
nuttx/include/nuttx/usb/composite.h
+2 -2
View File
@@ -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
nuttx/include/nuttx/usb/usbdev_trace.h
+1 -1
View File
@@ -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 */
nuttx/include/nuttx/usb/usbmsc.h
+5 -3
View File
@@ -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