Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Misc USB device changes reated to SAMA5, trace support, and USB monitoring

Browse Source
This commit is contained in:
Gregory Nutt
2013-09-01 11:52:21 -06:00
parent 8587026c18
commit 67a126a5dc
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/sama5d3x-ek/src/sam_nsh.c
+14 -7
View File
@@ -46,12 +46,8 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#ifdef CONFIG_SAMA5_SPI0 #ifdef CONFIG_SYSTEM_USBMONITOR
# include <nuttx/spi/spi.h> # include <apps/usbmonitor.h>
# include <nuttx/mtd.h>
# include <nuttx/fs/nxffs.h>
# include "sam_spi.h"
#endif #endif
#include "sama5d3x-ek.h" #include "sama5d3x-ek.h"
@@ -118,7 +114,8 @@
int nsh_archinitialize(void) int nsh_archinitialize(void)
{ {
#if defined(HAVE_AT25_MTD) || defined(HAVE_HSMCI_MTD) || defined(HAVE_USBHOST) #if defined(HAVE_AT25_MTD) || defined(HAVE_HSMCI_MTD) || defined(HAVE_USBHOST) || \
defined(HAVE_USBMONITOR)
int ret; int ret;
#endif #endif
@@ -168,5 +165,15 @@ int nsh_archinitialize(void)
} }
#endif #endif
#ifdef HAVE_USBMONITOR
/* Start the USB Monitor */
ret = usbmonitor_start(0, NULL);
if (ret != OK)
{
message("nsh_archinitialize: Start USB monitor: %d\n", ret);
}
#endif
return OK; return OK;
} }
configs/sama5d3x-ek/src/sama5d3x-ek.h
+8
View File
@@ -59,6 +59,7 @@
#define HAVE_AT25_MTD 1 #define HAVE_AT25_MTD 1
#define HAVE_USBHOST 1 #define HAVE_USBHOST 1
#define HAVE_USBDEV 1 #define HAVE_USBDEV 1
#define HAVE_USBMONITOR 1
/* HSMCI */ /* HSMCI */
/* Can't support MMC/SD if the card interface(s) are not enable */ /* Can't support MMC/SD if the card interface(s) are not enable */
@@ -143,6 +144,13 @@
# undef HAVE_USBHOST # undef HAVE_USBHOST
#endif #endif
/* Check if we should enable the USB monitor before starting NSH */
#if !defined(HAVE_USBDEV) || !defined(CONFIG_USBDEV_TRACE) || \
!defined(CONFIG_SYSTEM_USBMONITOR)
# undef HAVE_USBMONITOR
#endif
/* LEDs *****************************************************************************/ /* LEDs *****************************************************************************/
/* There are two LEDs on the SAMA5D3 series-CM board that can be controlled /* There are two LEDs on the SAMA5D3 series-CM board that can be controlled
* by software. A blue LED is controlled via PIO pins. A red LED normally * by software. A blue LED is controlled via PIO pins. A red LED normally
drivers/usbdev/Kconfig
+1 -1
View File
@@ -88,7 +88,7 @@ config USBDEV_TRACE_NRECORDS
config USBDEV_TRACE_STRINGS config USBDEV_TRACE_STRINGS
bool "Decode device controller events" bool "Decode device controller events"
default n default n
depends on USBDEV_TRACE depends on USBDEV_TRACE || DEBUG_USB
---help--- ---help---
If USBDEV_TRACE_STRINGS is defined, then the USB device controller If USBDEV_TRACE_STRINGS is defined, then the USB device controller
driver must provide arrays of strings to support decoding of device- driver must provide arrays of strings to support decoding of device-