Trivial updates from review of last PR

configs/stm32f4discovery/canard/Make.defs

@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm32f4discovery/canard/Make.defs
 #
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without

configs/stm32f4discovery/canard/defconfig

@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
@@ -43,36 +43,7 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 CONFIG_DEBUG_ALERT=y
-CONFIG_DEBUG_FEATURES=y
+# CONFIG_DEBUG_FEATURES is not set
-
-#
-# Debug SYSLOG Output Controls
-#
-# CONFIG_DEBUG_ERROR is not set
-# CONFIG_DEBUG_ASSERTIONS is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_CAN is not set
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_SPI is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
@@ -160,7 +131,6 @@ CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
-# CONFIG_DEBUG_HARDFAULT is not set
 
 #
 # ARMV7M Configuration Options
@@ -471,6 +441,8 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 #
 # Timer Configuration
 #
+# CONFIG_STM32_ONESHOT is not set
+# CONFIG_STM32_FREERUN is not set
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -637,6 +609,8 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
+CONFIG_ARCH_HAVE_TICKLESS=y
+# CONFIG_SCHED_TICKLESS is not set
 CONFIG_USEC_PER_TICK=10000
 CONFIG_SYSTEM_TIME64=y
 CONFIG_CLOCK_MONOTONIC=y
@@ -837,7 +811,6 @@ CONFIG_SERIAL_NPOLLWAITERS=2
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_USART2_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -1030,6 +1003,7 @@ CONFIG_LIBCANARD_VERSION="b28bf6ac337e55d49037fd9904d4b951760c4690"
 # Examples
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CAN is not set
 CONFIG_EXAMPLES_LIBCANARD=y
 CONFIG_EXAMPLES_LIBCANARD_DEVPATH="/dev/can0"
 CONFIG_EXAMPLES_LIBCANARD_NODE_ID=1
@@ -1037,7 +1011,6 @@ CONFIG_EXAMPLES_LIBCANARD_APP_NODE_NAME="org.uavcan.libcanard.nuttx.demo"
 CONFIG_EXAMPLES_LIBCANARD_NODE_MEM_POOL_SIZE=1024
 CONFIG_EXAMPLES_LIBCANARD_DAEMON_PRIORITY=100
 CONFIG_EXAMPLES_LIBCANARD_STACKSIZE=2048
-# CONFIG_EXAMPLES_CAN is not set
 # CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
@@ -1060,10 +1033,10 @@ CONFIG_EXAMPLES_LIBCANARD_STACKSIZE=2048
 CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
-# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXLINES is not set
 # CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set

configs/stm32f4discovery/canard/setenv.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-# configs/stm32f4discovery/nsh/setenv.sh
+# configs/stm32f4discovery/canard/setenv.sh
 #
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without

configs/stm32f4discovery/src/stm32_can.c

@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/stm32f4discovery/src/stm32_can.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,7 @@
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
+
 /* Configuration ********************************************************************/
 
 #if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_CAN2)