SAM4E UDP: Add support for USB monitor

This commit is contained in:
Gregory Nutt 2014-03-18 16:33:36 -06:00
parent 3da4e2fc4f
commit 47ffb340e9
3 changed files with 23 additions and 6 deletions

View File

@ -593,7 +593,7 @@ USB Full-Speed Device
Basic USB Full-Speed Device Configuration Basic USB Full-Speed Device Configuration
----------------------------------------- -----------------------------------------
Support the USB high-speed device (UDPHS) driver can be enabled with these Support the USB full-speed device (UDP) driver can be enabled with these
NuttX configuration settings. NuttX configuration settings.
Device Drivers -> USB Device Driver Support Device Drivers -> USB Device Driver Support
@ -611,7 +611,7 @@ USB Full-Speed Device
------------------ ------------------
The Mass Storage Class (MSC) class driver can be selected for use with The Mass Storage Class (MSC) class driver can be selected for use with
UDPHS. Note: The following assumes that the internal AT24 Serial FLASH UDP. Note: The following assumes that the internal AT24 Serial FLASH
is configured to support a FAT file system through an FTL layer as is configured to support a FAT file system through an FTL layer as
described about under "AT25 Serial FLASH". described about under "AT25 Serial FLASH".
@ -689,7 +689,7 @@ USB Full-Speed Device
There is normal console debug output available that can be enabled with There is normal console debug output available that can be enabled with
CONFIG_DEBUG + CONFIG_DEBUG_USB. However, USB device operation is very CONFIG_DEBUG + CONFIG_DEBUG_USB. However, USB device operation is very
time critical and enabling this debug output WILL interfere with the time critical and enabling this debug output WILL interfere with the
operation of the UDPHS. USB device tracing is a less invasive way to get operation of the UDP. USB device tracing is a less invasive way to get
debug information: If tracing is enabled, the USB device will save debug information: If tracing is enabled, the USB device will save
encoded trace output in in-memory buffer; if the USB monitor is also encoded trace output in in-memory buffer; if the USB monitor is also
enabled, that trace buffer will be periodically emptied and dumped to the enabled, that trace buffer will be periodically emptied and dumped to the

View File

@ -57,6 +57,8 @@
#define HAVE_HSMCI 1 #define HAVE_HSMCI 1
#define HAVE_AT25 1 #define HAVE_AT25 1
#define HAVE_USBDEV 1
#define HAVE_USBMONITOR 1
/* HSMCI */ /* HSMCI */
/* Can't support MMC/SD if the card interface is not enabled */ /* Can't support MMC/SD if the card interface is not enabled */
@ -112,10 +114,24 @@
# undef CONFIG_SAM4EEK_AT25_NXFFS # undef CONFIG_SAM4EEK_AT25_NXFFS
#endif #endif
/* Touchscreen controller (TSC) */ /* USB Device */
/* CONFIG_SAM34_UDP and CONFIG_USBDEV must be defined, or there is no USB
* device.
*/
#define CONFIG_TSC_ADS7843 1 /* ADS7843 present on board */ #if !defined(CONFIG_SAM34_UDP) || !defined(CONFIG_USBDEV)
#define CONFIG_TSC_SPI 0 /* On SPI0 */ # undef HAVE_USBDEV
#endif
/* Check if we should enable the USB monitor before starting NSH */
#ifndef HAVE_USBDEV
# undef CONFIG_USBDEV_TRACE
#endif
#if !defined(CONFIG_SYSTEM_USBMONITOR) && !defined(CONFIG_USBDEV_TRACE)
# undef HAVE_USBMONITOR
#endif
/* External Memory Usage ************************************************************/ /* External Memory Usage ************************************************************/
/* LCD on CS2 */ /* LCD on CS2 */

View File

@ -119,6 +119,7 @@ int nsh_archinitialize(void)
if (ret != OK) if (ret != OK)
{ {
message("nsh_archinitialize: Start USB monitor: %d\n", ret); message("nsh_archinitialize: Start USB monitor: %d\n", ret);
return ret;
} }
#endif #endif