summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-09-20 12:37:36 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-09-20 12:37:36 -0600
commitcc5f987a097942689d5a711250bf6afbde2c0a20 (patch)
treefdc5666081a890aec0e6666718d943e0dc66d705
parentc794150a59dd58c83ad5e80b20ce17d9b3713740 (diff)
downloadpx4-nuttx-cc5f987a097942689d5a711250bf6afbde2c0a20.tar.gz
px4-nuttx-cc5f987a097942689d5a711250bf6afbde2c0a20.tar.bz2
px4-nuttx-cc5f987a097942689d5a711250bf6afbde2c0a20.zip
Several usability improvements the SAMA5D3x-EK configurations
-rw-r--r--nuttx/ChangeLog7
-rw-r--r--nuttx/configs/sama5d3x-ek/demo/defconfig4
-rw-r--r--nuttx/configs/sama5d3x-ek/nsh/defconfig4
-rw-r--r--nuttx/configs/sama5d3x-ek/src/sam_usb.c4
4 files changed, 12 insertions, 7 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index a1b475101..3069484d9 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5600,4 +5600,9 @@
* Several USB device driver files: Change naming of SELFPOWERED
and REMOTEWAKEUP to avoid name collisions. Prepend the name
of the driver (for example CDCACM_SELFPOWERED) (201309-20).
-
+ * configs/sama5d3x-ek/nsh and demo: Increase the number of pre-allocated
+ watchdog timers. The default number of 4 was easily being exhausted
+ in the more complex configurations. Enable the task name feature
+ to provide prettier ps command output. src/sam_usb.c: Use more
+ descriptive task names when starting the EHCI and OHCI monitor tasks
+ (2013-9-20).
diff --git a/nuttx/configs/sama5d3x-ek/demo/defconfig b/nuttx/configs/sama5d3x-ek/demo/defconfig
index c991918c4..bc6618345 100644
--- a/nuttx/configs/sama5d3x-ek/demo/defconfig
+++ b/nuttx/configs/sama5d3x-ek/demo/defconfig
@@ -315,7 +315,7 @@ CONFIG_SAMA5_AT25_FTL=y
CONFIG_MSEC_PER_TICK=10
CONFIG_RR_INTERVAL=200
# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
+CONFIG_TASK_NAME_SIZE=32
# CONFIG_SCHED_HAVE_PARENT is not set
# CONFIG_JULIAN_TIME is not set
CONFIG_START_YEAR=2013
@@ -361,7 +361,7 @@ CONFIG_NAME_MAX=32
CONFIG_PREALLOC_MQ_MSGS=4
CONFIG_MQ_MAXMSGSIZE=32
CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
+CONFIG_PREALLOC_WDOGS=16
CONFIG_PREALLOC_TIMERS=4
#
diff --git a/nuttx/configs/sama5d3x-ek/nsh/defconfig b/nuttx/configs/sama5d3x-ek/nsh/defconfig
index 67e9e2357..7583cefc2 100644
--- a/nuttx/configs/sama5d3x-ek/nsh/defconfig
+++ b/nuttx/configs/sama5d3x-ek/nsh/defconfig
@@ -261,7 +261,7 @@ CONFIG_NSH_MMCSDMINOR=0
CONFIG_MSEC_PER_TICK=10
CONFIG_RR_INTERVAL=200
# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
+CONFIG_TASK_NAME_SIZE=32
# CONFIG_SCHED_HAVE_PARENT is not set
# CONFIG_JULIAN_TIME is not set
CONFIG_START_YEAR=2013
@@ -306,7 +306,7 @@ CONFIG_NAME_MAX=32
CONFIG_PREALLOC_MQ_MSGS=4
CONFIG_MQ_MAXMSGSIZE=32
CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
+CONFIG_PREALLOC_WDOGS=16
CONFIG_PREALLOC_TIMERS=4
#
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_usb.c b/nuttx/configs/sama5d3x-ek/src/sam_usb.c
index bbadc788e..8c180ad05 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_usb.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_usb.c
@@ -330,7 +330,7 @@ int sam_usbhost_initialize(void)
/* Start a thread to handle device connection. */
- pid = TASK_CREATE("usbhost", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE,
+ pid = TASK_CREATE("OHCI monitor", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE,
(main_t)ohci_waiter, (FAR char * const *)NULL);
if (pid < 0)
{
@@ -351,7 +351,7 @@ int sam_usbhost_initialize(void)
/* Start a thread to handle device connection. */
- pid = TASK_CREATE("usbhost", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE,
+ pid = TASK_CREATE("EHCI monitor", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE,
(main_t)ehci_waiter, (FAR char * const *)NULL);
if (pid < 0)
{