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

First round of changes from debug of USB composite device (still has problems)

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4342 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-01-27 16:25:57 +00:00
parent cd24ef4a30
commit b8e32a94f3
16 changed files with 377 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/examples/README.txt
+16 -6
View File
@@ -118,12 +118,22 @@ examples/composite
Required overall configuration:
CONFIG_USBDEV - USB device support
CONFIG_USBDEV_COMPOSITE - USB composite device support
CONFIG_CDCACM - USB CDC/ACM serial device support
CONFIG_CDCACM_COMPOSITE - USB CDC/ACM serial composite device support
CONFIG_USBMSC - USB mass storage device support
CONFIG_USBMSC_COMPOSITE - USB mass storage composite device support
CONFIG_USBDEV=y - USB device support
CONFIG_USBDEV_COMPOSITE=y - USB composite device support
CONFIG_COMPOSITE_IAD=y - Interface associate descriptor needed
CONFIG_CDCACM=y - USB CDC/ACM serial device support
CONFIG_CDCACM_COMPOSITE=y - USB CDC/ACM serial composite device support
CONFIG_CDCACM_IFNOBASE=0 - CDC/ACM interfaces start with number 0
CONFIG_CDCACM_EPINTIN=1 - Endpoint numbers must be unique
CONFIG_CDCACM_EPBULKIN=2
CONFIG_CDCACM_EPBULKOUT=3
CONFIG_USBMSC - USB mass storage device support
CONFIG_USBMSC_COMPOSITE - USB mass storage composite device support
CONFIG_USBMSC_IFNOBASE=2 - USB mass storage interfaces start with number 2
CONFIG_USBMSC_EPBULKOUT=4 - Endpoint numbers must be unique
CONFIG_USBMSC_EPBULKIN=5
CONFIG_NSH_BUILTIN_APPS
This example can be built as two NSH "built-in" commands if this option
apps/examples/composite/composite_main.c
+2 -2
View File
@@ -503,7 +503,7 @@ int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev)
{
int ret;
DEBUGASSERT(g_composite.mschandle != NULL);
DEBUGASSERT(g_composite.mschandle == NULL);
/* Initialize USB trace output IDs */
@@ -657,7 +657,7 @@ void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
}
/****************************************************************************
* user_start/msconn_main
* user_start/conn_main
*
* Description:
* This is the main program that configures the USB mass storage device