diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-30 14:23:45 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-30 14:23:45 -0600 |
commit | 03ed8828a9ab9714402df1d9cc019f8c1bcc55b5 (patch) | |
tree | 92fb5634f52b54d63f35c08b82f2c7a20155b643 /apps/examples/cc3000/cc3000basic.c | |
parent | 9c190bae9b5d3082d156626dc7c741691a3338cd (diff) | |
download | px4-nuttx-03ed8828a9ab9714402df1d9cc019f8c1bcc55b5.tar.gz px4-nuttx-03ed8828a9ab9714402df1d9cc019f8c1bcc55b5.tar.bz2 px4-nuttx-03ed8828a9ab9714402df1d9cc019f8c1bcc55b5.zip |
Updates to the CC3000 example from David Sidrane
Diffstat (limited to 'apps/examples/cc3000/cc3000basic.c')
-rw-r--r-- | apps/examples/cc3000/cc3000basic.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/apps/examples/cc3000/cc3000basic.c b/apps/examples/cc3000/cc3000basic.c index 1a4d12714..7ac4fa139 100644 --- a/apps/examples/cc3000/cc3000basic.c +++ b/apps/examples/cc3000/cc3000basic.c @@ -145,17 +145,13 @@ void ShowInformation(void); #define US_PER_MS 1000 #define US_PER_SEC 1000000 -/* Define to help debug stack size issues */ - -#undef CONFIG_EXAMPLE_CC3000_MEM_CHECK - /**************************************************************************** * Private Data ****************************************************************************/ static uint8_t isInitialized = false; -#ifdef CONFIG_EXAMPLE_CC3000_MEM_CHECK +#ifdef CONFIG_EXAMPLES_CC3000_MEM_CHECK static struct mallinfo mmstart; static struct mallinfo mmprevious; #endif @@ -164,7 +160,7 @@ static struct mallinfo mmprevious; * Private Functions ****************************************************************************/ -#ifdef CONFIG_EXAMPLE_CC3000_MEM_CHECK +#ifdef CONFIG_EXAMPLES_CC3000_MEM_CHECK static void show_memory_usage(struct mallinfo *mmbefore, struct mallinfo *mmafter) { @@ -186,14 +182,21 @@ static void show_memory_usage(struct mallinfo *mmbefore, printf("Change:%11d freed\n", diff); } +#ifdef CONFIG_EXAMPLES_CC3000_STACK_CHECK stkmon_disp(); +#endif } +#endif +#ifdef CONFIG_EXAMPLES_CC3000_STACK_CHECK +static char buff[CONFIG_TASK_NAME_SIZE+1]; static void _stkmon_disp(FAR struct tcb_s *tcb, FAR void *arg) { #if CONFIG_TASK_NAME_SIZE > 0 + strncpy(buff,tcb->name,CONFIG_TASK_NAME_SIZE); + buff[CONFIG_TASK_NAME_SIZE] = '\0'; syslog("%5d %6d %6d %s\n", - tcb->pid, tcb->adj_stack_size, up_check_tcbstack(tcb), tcb->name); + tcb->pid, tcb->adj_stack_size, up_check_tcbstack(tcb), buff); #else syslog("%5d %6d %6d\n", tcb->pid, tcb->adj_stack_size, up_check_tcbstack(tcb)); @@ -247,7 +250,7 @@ static bool wait_on(long timeoutMs, volatile unsigned long *what, * Public Functions ****************************************************************************/ -#ifndef CONFIG_EXAMPLE_CC3000_MEM_CHECK +#ifndef CONFIG_EXAMPLES_CC3000_STACK_CHECK # define stkmon_disp() #else void stkmon_disp(void) @@ -369,12 +372,12 @@ int execute(int cmd) Initialize(); } -#ifdef CONFIG_EXAMPLE_CC3000_MEM_CHECK +#ifdef CONFIG_EXAMPLES_CC3000_MEM_CHECK mmprevious= mallinfo(); show_memory_usage(&mmstart,&mmprevious); #endif shell_main(0, 0); -#ifdef CONFIG_EXAMPLE_CC3000_MEM_CHECK +#ifdef CONFIG_EXAMPLES_CC3000_MEM_CHECK mmprevious= mallinfo(); show_memory_usage(&mmstart,&mmprevious); #endif @@ -395,7 +398,7 @@ int execute(int cmd) void Initialize(void) { -#ifdef CONFIG_EXAMPLE_CC3000_MEM_CHECK +#ifdef CONFIG_EXAMPLES_CC3000_MEM_CHECK mmstart = mallinfo(); memcpy(&mmprevious, &mmstart, sizeof(struct mallinfo)); show_memory_usage(&mmstart,&mmprevious); @@ -412,7 +415,7 @@ void Initialize(void) printf("Initializing CC3000...\n"); CC3000_Init(); -#ifdef CONFIG_EXAMPLE_CC3000_MEM_CHECK +#ifdef CONFIG_EXAMPLES_CC3000_STACK_CHECK stkmon_disp(); #endif printf(" CC3000 init complete.\n"); @@ -454,7 +457,7 @@ void Initialize(void) isInitialized = true; #endif -#ifdef CONFIG_EXAMPLE_CC3000_MEM_CHECK +#ifdef CONFIG_EXAMPLES_CC3000_MEM_CHECK mmprevious = mallinfo(); show_memory_usage(&mmstart,&mmprevious); #endif |