Fix Bob's name in as many places as possible; Make sure that Bob is an author in as many files as I can think of (might be missing a few)

22 files changed, 684 insertions, 663 deletions

diff --git a/apps/examples/cpuhog/cpuhog_main.c b/apps/examples/cpuhog/cpuhog_main.c
index 26c456952..4e5fe3593 100644
--- a/apps/examples/cpuhog/cpuhog_main.c
+++ b/apps/examples/cpuhog/cpuhog_main.c
@@ -2,7 +2,8 @@
  * examples/cpuhog/cpuhog_main.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/examples/serialblaster/serialblaster_main.c b/apps/examples/serialblaster/serialblaster_main.c
index 8889c2e30..88d8ebf84 100644
--- a/apps/examples/serialblaster/serialblaster_main.c
+++ b/apps/examples/serialblaster/serialblaster_main.c
@@ -2,7 +2,8 @@
  * examples/serialblaster/serialblaster_main.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/examples/serialrx/serialrx_main.c b/apps/examples/serialrx/serialrx_main.c
index 21b3d9494..fcf2f49a4 100644
--- a/apps/examples/serialrx/serialrx_main.c
+++ b/apps/examples/serialrx/serialrx_main.c
@@ -2,7 +2,8 @@
  * examples/serialrx/serialrx_main.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 68b5189ed..8ddb32d9d 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -7229,17 +7229,17 @@
 	  from Bob Doiron needed to support PDC-based HSMCI DMA transfers
 	  (2014-4-21).
 	* configs/sam4s-xplained-pro:  Support for the SAM4S Xplained Pro
-	  board from Bob Doison (2014-4-21).
+	  board from Bob Doiron (2014-4-21).
 	* configs/sam4s-xplained-pro: Added card detect (kind of broken
 	  still); added proc/vfat mounting during init to save some typing.
-	  From Bob Doison (2014-4-21).
+	  From Bob Doiron (2014-4-21).
 	* configs/sam4s-xplained-pro: Boost PLLA to 240MHz to allow USB. From
-	  Bob Doison (2014-4-21).
+	  Bob Doiron (2014-4-21).
 	* arch/arm/src/sam34/sam_wdt.c/.h:  Add watchdog driver.  From Bob
-	  Doison (2014-4-21).
+	  Doiron (2014-4-21).
 	* nuttx/configs/sam4s-xplained-pro:  Add board-specific watchdog
-	  timer support.  From Bob Doison (2014-4-21).
+	  timer support.  From Bob Doiron (2014-4-21).
 	* drivers/timer.c and include/nuttx/timer.h:  Timer "upper half"
-	  driver and lower half interface definition from Bob Doison
+	  driver and lower half interface definition from Bob Doiron
 	  (2014-40-22).
 
diff --git a/nuttx/arch/arm/src/sam34/sam_rtc.c b/nuttx/arch/arm/src/sam34/sam_rtc.c
index 4f6a96f28..0bdb028d2 100644
--- a/nuttx/arch/arm/src/sam34/sam_rtc.c
+++ b/nuttx/arch/arm/src/sam34/sam_rtc.c
@@ -2,7 +2,8 @@
  * arch/arm/src/sam34/sam_rtc.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/arch/arm/src/sam34/sam_rtc.h b/nuttx/arch/arm/src/sam34/sam_rtc.h
index 6e00d290c..03b123a6d 100644
--- a/nuttx/arch/arm/src/sam34/sam_rtc.h
+++ b/nuttx/arch/arm/src/sam34/sam_rtc.h
@@ -2,7 +2,8 @@
  * arch/arm/src/sam34/sam_rtc.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/arch/arm/src/sam34/sam_tc.c b/nuttx/arch/arm/src/sam34/sam_tc.c
index 0c2ee406c..99fbce646 100644
--- a/nuttx/arch/arm/src/sam34/sam_tc.c
+++ b/nuttx/arch/arm/src/sam34/sam_tc.c
@@ -1,639 +1,640 @@
-/****************************************************************************

- * arch/arm/src/sam34/sam_tc.c

- *

- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.

- *   Author: Gregory Nutt <gnutt@nuttx.org>

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- *

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in

- *    the documentation and/or other materials provided with the

- *    distribution.

- * 3. Neither the name NuttX nor the names of its contributors may be

- *    used to endorse or promote products derived from this software

- *    without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,

- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS

- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED

- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN

- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- *

- ****************************************************************************/

-

-/****************************************************************************

- * Included Files

- ****************************************************************************/

-

-#include <nuttx/config.h>

-#include <nuttx/arch.h>

-

-#include <sys/types.h>

-

-#include <stdint.h>

-#include <errno.h>

-#include <debug.h>

-

-#include <nuttx/timer.h>

-#include <arch/board/board.h>

-

-#include "up_arch.h"

-#include "sam_tc.h"

-#include "sam_periphclks.h"

-

-//#define CONFIG_SAM34_TC_REGDEBUG

-

-#if defined(CONFIG_TIMER) && (defined(CONFIG_SAM34_TC0) || \

-    defined(CONFIG_SAM34_TC1) || defined(CONFIG_SAM34_TC2) || \

-    defined(CONFIG_SAM34_TC3) || defined(CONFIG_SAM34_TC4) || \

-    defined(CONFIG_SAM34_TC5))

-

-/****************************************************************************

- * Pre-Processor Definitions

- ****************************************************************************/

-/* Clocking *****************************************************************/

-

-/* TODO: Allow selection of any of the input clocks */

-

-#define TC_FCLK        (BOARD_SLCK_FREQUENCY)

-#define TC_MAXTIMEOUT  ((1000000ULL * (1ULL + TC_RVALUE_MASK)) / TC_FCLK)

-

-/* Configuration ************************************************************/

-

-/* Debug ********************************************************************/

-/* Non-standard debug that may be enabled just for testing the timer

- * driver.  NOTE: that only lldbg types are used so that the output is

- * immediately available.

- */

-

-#ifdef CONFIG_DEBUG_TIMER

-#  define tcdbg    lldbg

-#  define tcvdbg   llvdbg

-#else

-#  define tcdbg(x...)

-#  define tcvdbg(x...)

-#endif

-

-/****************************************************************************

- * Private Types

- ****************************************************************************/

-/* This structure provides the private representation of the "lower-half"

- * driver state structure.  This structure must be cast-compatible with the

- * timer_lowerhalf_s structure.

- */

-

-struct sam34_lowerhalf_s

-{

-  FAR const struct timer_ops_s  *ops;  /* Lower half operations */

-  xcpt_t   handler;  /* Current user interrupt handler */

-  uint32_t timeout;  /* The actual timeout value (us) */

-  bool     started;  /* The timer has been started */

-  uint16_t reload;   /* The 12-bit reload field reset value (WDV) */

-  uint16_t debug;

-};

-

-/****************************************************************************

- * Private Function Prototypes

- ****************************************************************************/

-/* Register operations ******************************************************/

-

-#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)

-static uint32_t sam34_getreg(uint32_t addr);

-static void     sam34_putreg(uint32_t val, uint32_t addr);

-#else

-# define        sam34_getreg(addr)     getreg32(addr)

-# define        sam34_putreg(val,addr) putreg32(val,addr)

-#endif

-

-/* Interrupt hanlding *******************************************************/

-

-static int      sam34_interrupt(int irq, FAR void *context);

-

-/* "Lower half" driver methods **********************************************/

-

-static int      sam34_start(FAR struct timer_lowerhalf_s *lower);

-static int      sam34_stop(FAR struct timer_lowerhalf_s *lower);

-static int      sam34_getstatus(FAR struct timer_lowerhalf_s *lower,

-                  FAR struct timer_status_s *status);

-static int      sam34_settimeout(FAR struct timer_lowerhalf_s *lower,

-                  uint32_t timeout);

-static xcpt_t   sam34_capture(FAR struct timer_lowerhalf_s *lower,

-                  xcpt_t handler);

-static int      sam34_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd,

-                  unsigned long arg);

-

-/****************************************************************************

- * Private Data

- ****************************************************************************/

-/* "Lower half" driver methods */

-

-static const struct timer_ops_s g_tcops =

-{

-  .start      = sam34_start,

-  .stop       = sam34_stop,

-  .getstatus  = sam34_getstatus,

-  .settimeout = sam34_settimeout,

-  .capture    = sam34_capture,

-  .ioctl      = sam34_ioctl,

-};

-

-/* "Lower half" driver state */

-

-static struct sam34_lowerhalf_s g_tcdev;

-

-/****************************************************************************

- * Private Functions

- ****************************************************************************/

-

-/****************************************************************************

- * Name: sam34_getreg

- *

- * Description:

- *   Get the contents of a register

- *

- ****************************************************************************/

-

-#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)

-static uint32_t sam34_getreg(uint32_t addr)

-{

-  static uint32_t prevaddr = 0;

-  static uint32_t count = 0;

-  static uint32_t preval = 0;

-

-  /* Read the value from the register */

-

-  uint32_t val = getreg32(addr);

-

-  /* Is this the same value that we read from the same registe last time?  Are

-   * we polling the register?  If so, suppress some of the output.

-   */

-

-  if (addr == prevaddr && val == preval)

-    {

-      if (count == 0xffffffff || ++count > 3)

-        {

-           if (count == 4)

-             {

-               lldbg("...\n");

-             }

-

-          return val;

-        }

-    }

-

-  /* No this is a new address or value */

-

-  else

-    {

-       /* Did we print "..." for the previous value? */

-

-       if (count > 3)

-         {

-           /* Yes.. then show how many times the value repeated */

-

-           lldbg("[repeats %d more times]\n", count-3);

-         }

-

-       /* Save the new address, value, and count */

-

-       prevaddr = addr;

-       preval   = val;

-       count    = 1;

-    }

-

-  /* Show the register value read */

-

-  lldbg("%08lx->%08lx\n", addr, val);

-  return val;

-}

-#endif

-

-/****************************************************************************

- * Name: sam34_putreg

- *

- * Description:

- *   Set the contents of an SAM34 register to a value

- *

- ****************************************************************************/

-

-#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)

-static void sam34_putreg(uint32_t val, uint32_t addr)

-{

-  /* Show the register value being written */

-

-  lldbg("%08lx<-%08lx\n", addr, val);

-

-  /* Write the value */

-

-  putreg32(val, addr);

-}

-#endif

-

-

-/****************************************************************************

- * Name: sam34_interrupt

- *

- * Description:

- *   TC interrupt

- *

- * Input Parameters:

- *   Usual interrupt handler arguments.

- *

- * Returned Values:

- *   Always returns OK.

- *

- ****************************************************************************/

-

-static int sam34_interrupt(int irq, FAR void *context)

-{

-  FAR struct sam34_lowerhalf_s *priv = &g_tcdev;

-  uint16_t regval;

-

-  tcvdbg("Entry\n");  

-

-  /* Check if the interrupt is really pending */

-

-  regval = sam34_getreg(SAM_TC0_SR);

-  if ((regval & TC_INT_CPCS) != 0)

-    {

-      /* Is there a registered handler? */

-

-      if (priv->handler)

-      {

-        priv->handler(irq, context);

-      }

-

-      /* TC_INT_CPCS is cleared by reading SAM_TC0_SR */

-    }

-

-  return OK;

-}

-

-/****************************************************************************

- * Name: sam34_start

- *

- * Description:

- *   Start the timer, resetting the time to the current timeout,

- *

- * Input Parameters:

- *   lower - A pointer the publicly visible representation of the "lower-half"

- *           driver state structure.

- *

- * Returned Values:

- *   Zero on success; a negated errno value on failure.

- *

- ****************************************************************************/

-

-static int sam34_start(FAR struct timer_lowerhalf_s *lower)

-{

-  FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;

-  uint32_t mr_val = 0;

-

-  tcvdbg("Entry\n");

-  DEBUGASSERT(priv);

-

-  sam_tc0_enableclk();

-

-  sam34_putreg(TC_CCR_CLKDIS, SAM_TC0_CCR); // disable counter

-

-  /* TC_CMR_WAVE - waveform mode

-   * TC_CMR_WAVSEL_UPAUTO - reset on RC compare (interval timer)

-   * TC_CMR_TCCLKS_TIMERCLOCK5 = SCLK

-   */

-

-  mr_val |= (TC_CMR_WAVE + TC_CMR_WAVSEL_UPAUTO + TC_CMR_TCCLKS_TIMERCLOCK5);

-  sam34_putreg(mr_val, SAM_TC0_CMR);

-

-  sam34_putreg(priv->reload, SAM_TC0_RC); // set interval

-

-  /* TODO: isr active without user handle for now... */

-//  if (priv->handler)

-    {

-      /* Clear status */

-

-      sam34_getreg(SAM_TC0_SR);

-      sam34_putreg(TC_INT_CPCS, SAM_TC0_IMR);

-      sam34_putreg(TC_INT_CPCS, SAM_TC0_IER);

-    }

-

-  sam34_putreg(TC_CCR_SWTRG + TC_CCR_CLKEN, SAM_TC0_CCR); // start counter

-

-  priv->started = true;

-  return OK;

-}

-

-/****************************************************************************

- * Name: sam34_stop

- *

- * Description:

- *   Stop the timer

- *

- * Input Parameters:

- *   lower - A pointer the publicly visible representation of the "lower-half"

- *           driver state structure.

- *

- * Returned Values:

- *   Zero on success; a negated errno value on failure.

- *

- ****************************************************************************/

-

-static int sam34_stop(FAR struct timer_lowerhalf_s *lower)

-{

-  tcvdbg("Entry\n");

-  sam34_putreg(TC_CCR_CLKDIS, SAM_TC0_CCR); // disable counter

-  sam34_putreg(TC_INT_ALL, SAM_TC0_IDR); // disable all ints

-  sam_tc0_disableclk();

-

-  return OK;

-}

-

-/****************************************************************************

- * Name: sam34_getstatus

- *

- * Description:

- *   Get the current timer status

- *

- * Input Parameters:

- *   lower   - A pointer the publicly visible representation of the "lower-half"

- *             driver state structure.

- *   stawtus - The location to return the status information.

- *

- * Returned Values:

- *   Zero on success; a negated errno value on failure.

- *

- ****************************************************************************/

-

-static int sam34_getstatus(FAR struct timer_lowerhalf_s *lower,

-                           FAR struct timer_status_s *status)

-{

-  FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;

-  uint32_t elapsed;

-

-  tcvdbg("Entry\n");

-  DEBUGASSERT(priv);

-

-  /* Return the status bit */

-

-  status->flags = 0;

-  if (priv->started)

-    {

-      status->flags |= TCFLAGS_ACTIVE;

-    }

- 

-  if (priv->handler)

-    {

-      status->flags |= TCFLAGS_CAPTURE;

-    }

-

-  /* Return the actual timeout is milliseconds */

-

-  status->timeout = priv->timeout;

-

-  /* Get the time remaining until the timer expires (in microseconds) */

-

-  elapsed = sam34_getreg(SAM_TC0_CV);

-  status->timeleft = (priv->timeout * elapsed) / (priv->reload + 1);

-

-  tcvdbg("  flags    : %08x\n", status->flags);

-  tcvdbg("  timeout  : %d\n", status->timeout);

-  tcvdbg("  timeleft : %d\n", status->timeleft);

-  return OK;

-}

-

-/****************************************************************************

- * Name: sam34_settimeout

- *

- * Description:

- *   Set a new timeout value (and reset the timer)

- *

- * Input Parameters:

- *   lower   - A pointer the publicly visible representation of the "lower-half"

- *             driver state structure.

- *   timeout - The new timeout value in millisecnds.

- *

- * Returned Values:

- *   Zero on success; a negated errno value on failure.

- *

- ****************************************************************************/

-

-static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower,

-                            uint32_t timeout)

-{

-  FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;

-  uint32_t reload;

-

-  DEBUGASSERT(priv);

-  tcvdbg("Entry: timeout=%d\n", timeout);

-

-  /* Can this timeout be represented? */

-

-  if (timeout < 1 || timeout > TC_MAXTIMEOUT)

-    {

-      tcdbg("Cannot represent timeout=%lu > %lu\n",

-            timeout, TC_MAXTIMEOUT);

-      return -ERANGE;

-    }

-

-   

-  /* TODOR: -1 or no? */

-

-  reload = (((uint64_t)timeout * TC_FCLK) / 1000000) - 1;

-

-  /* Make sure that the final reload value is within range */

-  /* TODOR: +1 or no? */

-

-  if (reload > TC_CV_MASK)

-    {

-      reload = TC_CV_MASK;

-    }

-

-  /* Calculate and save the actual timeout value in milliseconds:

-   *

-   * timeout =  1000 * (reload + 1) / Fwdt

-   */

-

-  priv->timeout = 1000 * (reload + 1) / TC_FCLK;

-

-  /* Remember the selected values */

-

-  priv->reload = reload;

-

-  tcvdbg("fwdt=%d reload=%d timout=%d\n",

-         TC_FCLK, reload, priv->timeout);

-  

-  /* Don't commit to MR register until started! */

-

-  return OK;

-}

-

-/****************************************************************************

- * Name: sam34_capture

- *

- * Description:

- *   Don't reset on timer timeout; instead, call this user provider

- *   timeout handler.  NOTE:  Providing handler==NULL will restore the reset

- *   behavior.

- *

- * Input Parameters:

- *   lower      - A pointer the publicly visible representation of the "lower-half"

- *                driver state structure.

- *   newhandler - The new timer expiration function pointer.  If this

- *                function pointer is NULL, then the reset-on-expiration

- *                behavior is restored,

- *

- * Returned Values:

- *   The previous timer expiration function pointer or NULL is there was

- *   no previous function pointer, i.e., if the previous behavior was

- *   reset-on-expiration (NULL is also returned if an error occurs).

- *

- ****************************************************************************/

-

-static xcpt_t sam34_capture(FAR struct timer_lowerhalf_s *lower,

-                            xcpt_t handler)

-{

-#if 0 // TODO

-  FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;

-  irqstate_t flags;

-  xcpt_t oldhandler;

-  uint16_t regval;

-

-  DEBUGASSERT(priv);

-  tcvdbg("Entry: handler=%p\n", handler);

-

-  /* Get the old handler return value */

-  flags = irqsave();

-  oldhandler = priv->handler;

-

-  /* Save the new handler */

-

-   priv->handler = handler;

-

-  /* Are we attaching or detaching the handler? */

-

-  regval = sam34_getreg(SAM_TC_CFR);

-  if (handler)

-    {

-      /* Attaching... Enable the EWI interrupt */

-

-      regval |= WWDG_CFR_EWI;

-      sam34_putreg(regval, SAM_TC_CFR);

- 

-      up_enable_irq(STM32_IRQ_WWDG);

-    }

-  else

-    {

-      /* Detaching... Disable the EWI interrupt */

-

-      regval &= ~WWDG_CFR_EWI;

-      sam34_putreg(regval, SAM_TC_CFR);

-

-      up_disable_irq(STM32_IRQ_WWDG);

-    }

-

-  irqrestore(flags);

-  return oldhandler;

-#endif

-  ASSERT(0);

-  return NULL;

-}

-

-/****************************************************************************

- * Name: sam34_ioctl

- *

- * Description:

- *   Any ioctl commands that are not recognized by the "upper-half" driver

- *   are forwarded to the lower half driver through this method.

- *

- * Input Parameters:

- *   lower - A pointer the publicly visible representation of the "lower-half"

- *           driver state structure.

- *   cmd   - The ioctol command value

- *   arg   - The optional argument that accompanies the 'cmd'.  The

- *           interpretation of this argument depends on the particular

- *           command.

- *

- * Returned Values:

- *   Zero on success; a negated errno value on failure.

- *

- ****************************************************************************/

-

-static int sam34_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd,

-                    unsigned long arg)

-{

-  FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;

-  int ret = -ENOTTY;

-

-  DEBUGASSERT(priv);

-  tcvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg);

-

-  return ret;

-}

-

-/****************************************************************************

- * Public Functions

- ****************************************************************************/

-

-/****************************************************************************

- * Name: sam_tcinitialize

- *

- * Description:

- *   Initialize the timer.  The timer is initialized and

- *   registers as 'devpath'.  

- *

- * Input Parameters:

- *   devpath - The full path to the timer.  This should be of the form

- *     /dev/tc0

- *

- * Returned Values:

- *   None

- *

- ****************************************************************************/

-

-void sam_tcinitialize(FAR const char *devpath, int irq)

-{

-  FAR struct sam34_lowerhalf_s *priv = &g_tcdev;

-

-  tcvdbg("Entry: devpath=%s\n", devpath);

-

-  /* NOTE we assume that clocking to the IWDG has already been provided by

-   * the RCC initialization logic.

-   */

-

-  /* Initialize the driver state structure.  Here we assume: (1) the state

-   * structure lies in .bss and was zeroed at reset time.  (2) This function

-   * is only called once so it is never necessary to re-zero the structure.

-   */

-

-  priv->ops = &g_tcops;

-

-  /* TODO: Add irq + switch in sam34_interrupt or something (also need register

-   * base address...

-   */

-

-  (void)irq_attach(irq, sam34_interrupt);

-

-  /* enable interrupt.

-   *

-   * TODO: May want to enable/disable in start/stop...

-   */

-

-  up_enable_irq(irq);

-

-  /* Register the timer driver as /dev/timerX */

-

-  (void)timer_register(devpath, (FAR struct timer_lowerhalf_s *)priv);

-}

-

-#endif /* CONFIG_TIMER && CONFIG_SAM34_TCx */

+/****************************************************************************
+ * arch/arm/src/sam34/sam_tc.c
+ *
+ *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Dioron
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/arch.h>
+
+#include <sys/types.h>
+
+#include <stdint.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/timer.h>
+#include <arch/board/board.h>
+
+#include "up_arch.h"
+#include "sam_tc.h"
+#include "sam_periphclks.h"
+
+//#define CONFIG_SAM34_TC_REGDEBUG
+
+#if defined(CONFIG_TIMER) && (defined(CONFIG_SAM34_TC0) || \
+    defined(CONFIG_SAM34_TC1) || defined(CONFIG_SAM34_TC2) || \
+    defined(CONFIG_SAM34_TC3) || defined(CONFIG_SAM34_TC4) || \
+    defined(CONFIG_SAM34_TC5))
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+/* Clocking *****************************************************************/
+
+/* TODO: Allow selection of any of the input clocks */
+
+#define TC_FCLK        (BOARD_SLCK_FREQUENCY)
+#define TC_MAXTIMEOUT  ((1000000ULL * (1ULL + TC_RVALUE_MASK)) / TC_FCLK)
+
+/* Configuration ************************************************************/
+
+/* Debug ********************************************************************/
+/* Non-standard debug that may be enabled just for testing the timer
+ * driver.  NOTE: that only lldbg types are used so that the output is
+ * immediately available.
+ */
+
+#ifdef CONFIG_DEBUG_TIMER
+#  define tcdbg    lldbg
+#  define tcvdbg   llvdbg
+#else
+#  define tcdbg(x...)
+#  define tcvdbg(x...)
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+/* This structure provides the private representation of the "lower-half"
+ * driver state structure.  This structure must be cast-compatible with the
+ * timer_lowerhalf_s structure.
+ */
+
+struct sam34_lowerhalf_s
+{
+  FAR const struct timer_ops_s  *ops;  /* Lower half operations */
+  xcpt_t   handler;  /* Current user interrupt handler */
+  uint32_t timeout;  /* The actual timeout value (us) */
+  bool     started;  /* The timer has been started */
+  uint16_t reload;   /* The 12-bit reload field reset value (WDV) */
+  uint16_t debug;
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+/* Register operations ******************************************************/
+
+#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)
+static uint32_t sam34_getreg(uint32_t addr);
+static void     sam34_putreg(uint32_t val, uint32_t addr);
+#else
+# define        sam34_getreg(addr)     getreg32(addr)
+# define        sam34_putreg(val,addr) putreg32(val,addr)
+#endif
+
+/* Interrupt hanlding *******************************************************/
+
+static int      sam34_interrupt(int irq, FAR void *context);
+
+/* "Lower half" driver methods **********************************************/
+
+static int      sam34_start(FAR struct timer_lowerhalf_s *lower);
+static int      sam34_stop(FAR struct timer_lowerhalf_s *lower);
+static int      sam34_getstatus(FAR struct timer_lowerhalf_s *lower,
+                  FAR struct timer_status_s *status);
+static int      sam34_settimeout(FAR struct timer_lowerhalf_s *lower,
+                  uint32_t timeout);
+static xcpt_t   sam34_capture(FAR struct timer_lowerhalf_s *lower,
+                  xcpt_t handler);
+static int      sam34_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd,
+                  unsigned long arg);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+/* "Lower half" driver methods */
+
+static const struct timer_ops_s g_tcops =
+{
+  .start      = sam34_start,
+  .stop       = sam34_stop,
+  .getstatus  = sam34_getstatus,
+  .settimeout = sam34_settimeout,
+  .capture    = sam34_capture,
+  .ioctl      = sam34_ioctl,
+};
+
+/* "Lower half" driver state */
+
+static struct sam34_lowerhalf_s g_tcdev;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: sam34_getreg
+ *
+ * Description:
+ *   Get the contents of a register
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)
+static uint32_t sam34_getreg(uint32_t addr)
+{
+  static uint32_t prevaddr = 0;
+  static uint32_t count = 0;
+  static uint32_t preval = 0;
+
+  /* Read the value from the register */
+
+  uint32_t val = getreg32(addr);
+
+  /* Is this the same value that we read from the same registe last time?  Are
+   * we polling the register?  If so, suppress some of the output.
+   */
+
+  if (addr == prevaddr && val == preval)
+    {
+      if (count == 0xffffffff || ++count > 3)
+        {
+           if (count == 4)
+             {
+               lldbg("...\n");
+             }
+
+          return val;
+        }
+    }
+
+  /* No this is a new address or value */
+
+  else
+    {
+       /* Did we print "..." for the previous value? */
+
+       if (count > 3)
+         {
+           /* Yes.. then show how many times the value repeated */
+
+           lldbg("[repeats %d more times]\n", count-3);
+         }
+
+       /* Save the new address, value, and count */
+
+       prevaddr = addr;
+       preval   = val;
+       count    = 1;
+    }
+
+  /* Show the register value read */
+
+  lldbg("%08lx->%08lx\n", addr, val);
+  return val;
+}
+#endif
+
+/****************************************************************************
+ * Name: sam34_putreg
+ *
+ * Description:
+ *   Set the contents of an SAM34 register to a value
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)
+static void sam34_putreg(uint32_t val, uint32_t addr)
+{
+  /* Show the register value being written */
+
+  lldbg("%08lx<-%08lx\n", addr, val);
+
+  /* Write the value */
+
+  putreg32(val, addr);
+}
+#endif
+
+
+/****************************************************************************
+ * Name: sam34_interrupt
+ *
+ * Description:
+ *   TC interrupt
+ *
+ * Input Parameters:
+ *   Usual interrupt handler arguments.
+ *
+ * Returned Values:
+ *   Always returns OK.
+ *
+ ****************************************************************************/
+
+static int sam34_interrupt(int irq, FAR void *context)
+{
+  FAR struct sam34_lowerhalf_s *priv = &g_tcdev;
+  uint16_t regval;
+
+  tcvdbg("Entry\n");
+
+  /* Check if the interrupt is really pending */
+
+  regval = sam34_getreg(SAM_TC0_SR);
+  if ((regval & TC_INT_CPCS) != 0)
+    {
+      /* Is there a registered handler? */
+
+      if (priv->handler)
+      {
+        priv->handler(irq, context);
+      }
+
+      /* TC_INT_CPCS is cleared by reading SAM_TC0_SR */
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: sam34_start
+ *
+ * Description:
+ *   Start the timer, resetting the time to the current timeout,
+ *
+ * Input Parameters:
+ *   lower - A pointer the publicly visible representation of the "lower-half"
+ *           driver state structure.
+ *
+ * Returned Values:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int sam34_start(FAR struct timer_lowerhalf_s *lower)
+{
+  FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
+  uint32_t mr_val = 0;
+
+  tcvdbg("Entry\n");
+  DEBUGASSERT(priv);
+
+  sam_tc0_enableclk();
+
+  sam34_putreg(TC_CCR_CLKDIS, SAM_TC0_CCR); // disable counter
+
+  /* TC_CMR_WAVE - waveform mode
+   * TC_CMR_WAVSEL_UPAUTO - reset on RC compare (interval timer)
+   * TC_CMR_TCCLKS_TIMERCLOCK5 = SCLK
+   */
+
+  mr_val |= (TC_CMR_WAVE + TC_CMR_WAVSEL_UPAUTO + TC_CMR_TCCLKS_TIMERCLOCK5);
+  sam34_putreg(mr_val, SAM_TC0_CMR);
+
+  sam34_putreg(priv->reload, SAM_TC0_RC); // set interval
+
+  /* TODO: isr active without user handle for now... */
+//  if (priv->handler)
+    {
+      /* Clear status */
+
+      sam34_getreg(SAM_TC0_SR);
+      sam34_putreg(TC_INT_CPCS, SAM_TC0_IMR);
+      sam34_putreg(TC_INT_CPCS, SAM_TC0_IER);
+    }
+
+  sam34_putreg(TC_CCR_SWTRG + TC_CCR_CLKEN, SAM_TC0_CCR); // start counter
+
+  priv->started = true;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: sam34_stop
+ *
+ * Description:
+ *   Stop the timer
+ *
+ * Input Parameters:
+ *   lower - A pointer the publicly visible representation of the "lower-half"
+ *           driver state structure.
+ *
+ * Returned Values:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int sam34_stop(FAR struct timer_lowerhalf_s *lower)
+{
+  tcvdbg("Entry\n");
+  sam34_putreg(TC_CCR_CLKDIS, SAM_TC0_CCR); // disable counter
+  sam34_putreg(TC_INT_ALL, SAM_TC0_IDR); // disable all ints
+  sam_tc0_disableclk();
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: sam34_getstatus
+ *
+ * Description:
+ *   Get the current timer status
+ *
+ * Input Parameters:
+ *   lower   - A pointer the publicly visible representation of the "lower-half"
+ *             driver state structure.
+ *   stawtus - The location to return the status information.
+ *
+ * Returned Values:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int sam34_getstatus(FAR struct timer_lowerhalf_s *lower,
+                           FAR struct timer_status_s *status)
+{
+  FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
+  uint32_t elapsed;
+
+  tcvdbg("Entry\n");
+  DEBUGASSERT(priv);
+
+  /* Return the status bit */
+
+  status->flags = 0;
+  if (priv->started)
+    {
+      status->flags |= TCFLAGS_ACTIVE;
+    }
+
+  if (priv->handler)
+    {
+      status->flags |= TCFLAGS_CAPTURE;
+    }
+
+  /* Return the actual timeout is milliseconds */
+
+  status->timeout = priv->timeout;
+
+  /* Get the time remaining until the timer expires (in microseconds) */
+
+  elapsed = sam34_getreg(SAM_TC0_CV);
+  status->timeleft = (priv->timeout * elapsed) / (priv->reload + 1);
+
+  tcvdbg("  flags    : %08x\n", status->flags);
+  tcvdbg("  timeout  : %d\n", status->timeout);
+  tcvdbg("  timeleft : %d\n", status->timeleft);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: sam34_settimeout
+ *
+ * Description:
+ *   Set a new timeout value (and reset the timer)
+ *
+ * Input Parameters:
+ *   lower   - A pointer the publicly visible representation of the "lower-half"
+ *             driver state structure.
+ *   timeout - The new timeout value in millisecnds.
+ *
+ * Returned Values:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower,
+                            uint32_t timeout)
+{
+  FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
+  uint32_t reload;
+
+  DEBUGASSERT(priv);
+  tcvdbg("Entry: timeout=%d\n", timeout);
+
+  /* Can this timeout be represented? */
+
+  if (timeout < 1 || timeout > TC_MAXTIMEOUT)
+    {
+      tcdbg("Cannot represent timeout=%lu > %lu\n",
+            timeout, TC_MAXTIMEOUT);
+      return -ERANGE;
+    }
+
+
+  /* TODOR: -1 or no? */
+
+  reload = (((uint64_t)timeout * TC_FCLK) / 1000000) - 1;
+
+  /* Make sure that the final reload value is within range */
+  /* TODOR: +1 or no? */
+
+  if (reload > TC_CV_MASK)
+    {
+      reload = TC_CV_MASK;
+    }
+
+  /* Calculate and save the actual timeout value in milliseconds:
+   *
+   * timeout =  1000 * (reload + 1) / Fwdt
+   */
+
+  priv->timeout = 1000 * (reload + 1) / TC_FCLK;
+
+  /* Remember the selected values */
+
+  priv->reload = reload;
+
+  tcvdbg("fwdt=%d reload=%d timout=%d\n",
+         TC_FCLK, reload, priv->timeout);
+
+  /* Don't commit to MR register until started! */
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: sam34_capture
+ *
+ * Description:
+ *   Don't reset on timer timeout; instead, call this user provider
+ *   timeout handler.  NOTE:  Providing handler==NULL will restore the reset
+ *   behavior.
+ *
+ * Input Parameters:
+ *   lower      - A pointer the publicly visible representation of the "lower-half"
+ *                driver state structure.
+ *   newhandler - The new timer expiration function pointer.  If this
+ *                function pointer is NULL, then the reset-on-expiration
+ *                behavior is restored,
+ *
+ * Returned Values:
+ *   The previous timer expiration function pointer or NULL is there was
+ *   no previous function pointer, i.e., if the previous behavior was
+ *   reset-on-expiration (NULL is also returned if an error occurs).
+ *
+ ****************************************************************************/
+
+static xcpt_t sam34_capture(FAR struct timer_lowerhalf_s *lower,
+                            xcpt_t handler)
+{
+#if 0 // TODO
+  FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
+  irqstate_t flags;
+  xcpt_t oldhandler;
+  uint16_t regval;
+
+  DEBUGASSERT(priv);
+  tcvdbg("Entry: handler=%p\n", handler);
+
+  /* Get the old handler return value */
+  flags = irqsave();
+  oldhandler = priv->handler;
+
+  /* Save the new handler */
+
+   priv->handler = handler;
+
+  /* Are we attaching or detaching the handler? */
+
+  regval = sam34_getreg(SAM_TC_CFR);
+  if (handler)
+    {
+      /* Attaching... Enable the EWI interrupt */
+
+      regval |= WWDG_CFR_EWI;
+      sam34_putreg(regval, SAM_TC_CFR);
+
+      up_enable_irq(STM32_IRQ_WWDG);
+    }
+  else
+    {
+      /* Detaching... Disable the EWI interrupt */
+
+      regval &= ~WWDG_CFR_EWI;
+      sam34_putreg(regval, SAM_TC_CFR);
+
+      up_disable_irq(STM32_IRQ_WWDG);
+    }
+
+  irqrestore(flags);
+  return oldhandler;
+#endif
+  ASSERT(0);
+  return NULL;
+}
+
+/****************************************************************************
+ * Name: sam34_ioctl
+ *
+ * Description:
+ *   Any ioctl commands that are not recognized by the "upper-half" driver
+ *   are forwarded to the lower half driver through this method.
+ *
+ * Input Parameters:
+ *   lower - A pointer the publicly visible representation of the "lower-half"
+ *           driver state structure.
+ *   cmd   - The ioctol command value
+ *   arg   - The optional argument that accompanies the 'cmd'.  The
+ *           interpretation of this argument depends on the particular
+ *           command.
+ *
+ * Returned Values:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int sam34_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd,
+                    unsigned long arg)
+{
+  FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
+  int ret = -ENOTTY;
+
+  DEBUGASSERT(priv);
+  tcvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg);
+
+  return ret;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: sam_tcinitialize
+ *
+ * Description:
+ *   Initialize the timer.  The timer is initialized and
+ *   registers as 'devpath'.
+ *
+ * Input Parameters:
+ *   devpath - The full path to the timer.  This should be of the form
+ *     /dev/tc0
+ *
+ * Returned Values:
+ *   None
+ *
+ ****************************************************************************/
+
+void sam_tcinitialize(FAR const char *devpath, int irq)
+{
+  FAR struct sam34_lowerhalf_s *priv = &g_tcdev;
+
+  tcvdbg("Entry: devpath=%s\n", devpath);
+
+  /* NOTE we assume that clocking to the IWDG has already been provided by
+   * the RCC initialization logic.
+   */
+
+  /* Initialize the driver state structure.  Here we assume: (1) the state
+   * structure lies in .bss and was zeroed at reset time.  (2) This function
+   * is only called once so it is never necessary to re-zero the structure.
+   */
+
+  priv->ops = &g_tcops;
+
+  /* TODO: Add irq + switch in sam34_interrupt or something (also need register
+   * base address...
+   */
+
+  (void)irq_attach(irq, sam34_interrupt);
+
+  /* enable interrupt.
+   *
+   * TODO: May want to enable/disable in start/stop...
+   */
+
+  up_enable_irq(irq);
+
+  /* Register the timer driver as /dev/timerX */
+
+  (void)timer_register(devpath, (FAR struct timer_lowerhalf_s *)priv);
+}
+
+#endif /* CONFIG_TIMER && CONFIG_SAM34_TCx */
diff --git a/nuttx/arch/arm/src/sam34/sam_tc.h b/nuttx/arch/arm/src/sam34/sam_tc.h
index 48a97916e..df7b3caf2 100644
--- a/nuttx/arch/arm/src/sam34/sam_tc.h
+++ b/nuttx/arch/arm/src/sam34/sam_tc.h
@@ -2,7 +2,8 @@
  * arch/arm/src/sam34/sam_tc.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/arch/arm/src/sam34/sam_wdt.c b/nuttx/arch/arm/src/sam34/sam_wdt.c
index 41e018414..7886b7842 100644
--- a/nuttx/arch/arm/src/sam34/sam_wdt.c
+++ b/nuttx/arch/arm/src/sam34/sam_wdt.c
@@ -2,7 +2,8 @@
  * arch/arm/src/sam34/sam_wdt.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/arch/arm/src/sam34/sam_wdt.h b/nuttx/arch/arm/src/sam34/sam_wdt.h
index 0c9f78006..4c13c64e4 100644
--- a/nuttx/arch/arm/src/sam34/sam_wdt.h
+++ b/nuttx/arch/arm/src/sam34/sam_wdt.h
@@ -2,7 +2,8 @@
  * arch/arm/src/sam34/sam_wdt.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/sam4s-xplained-pro/include/board.h b/nuttx/configs/sam4s-xplained-pro/include/board.h
index 406efc17f..a4e008b5d 100644
--- a/nuttx/configs/sam4s-xplained-pro/include/board.h
+++ b/nuttx/configs/sam4s-xplained-pro/include/board.h
@@ -2,7 +2,8 @@
  * configs/sam4s-xplained-pro/include/board.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h b/nuttx/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h
index 898362f63..c5efc2c60 100644
--- a/nuttx/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h
+++ b/nuttx/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h
@@ -2,7 +2,8 @@
  * configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_autoleds.c b/nuttx/configs/sam4s-xplained-pro/src/sam_autoleds.c
index d2391a208..a06be9ab4 100644
--- a/nuttx/configs/sam4s-xplained-pro/src/sam_autoleds.c
+++ b/nuttx/configs/sam4s-xplained-pro/src/sam_autoleds.c
@@ -2,7 +2,8 @@
  * configs/sam4s-xplained-pro/src/sam_autoleds.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_buttons.c b/nuttx/configs/sam4s-xplained-pro/src/sam_buttons.c
index 8ca6fa54c..5d3c7d92e 100644
--- a/nuttx/configs/sam4s-xplained-pro/src/sam_buttons.c
+++ b/nuttx/configs/sam4s-xplained-pro/src/sam_buttons.c
@@ -2,7 +2,8 @@
  * configs/sam4s-xplained-pro/src/sam_buttons.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_hsmci.c b/nuttx/configs/sam4s-xplained-pro/src/sam_hsmci.c
index 635bc22a9..4c90c0088 100644
--- a/nuttx/configs/sam4s-xplained-pro/src/sam_hsmci.c
+++ b/nuttx/configs/sam4s-xplained-pro/src/sam_hsmci.c
@@ -2,7 +2,8 @@
  * config/sam4s-xplained-pro/src/sam_hsmci.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_nsh.c b/nuttx/configs/sam4s-xplained-pro/src/sam_nsh.c
index ecbec7c0f..9ecd00d6b 100644
--- a/nuttx/configs/sam4s-xplained-pro/src/sam_nsh.c
+++ b/nuttx/configs/sam4s-xplained-pro/src/sam_nsh.c
@@ -3,6 +3,7 @@
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *           Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_tc.c b/nuttx/configs/sam4s-xplained-pro/src/sam_tc.c
index bf954de3c..b10477f29 100755
--- a/nuttx/configs/sam4s-xplained-pro/src/sam_tc.c
+++ b/nuttx/configs/sam4s-xplained-pro/src/sam_tc.c
@@ -3,6 +3,7 @@
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *           Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_udp.c b/nuttx/configs/sam4s-xplained-pro/src/sam_udp.c
index 9fbab907c..c71caf7f0 100644
--- a/nuttx/configs/sam4s-xplained-pro/src/sam_udp.c
+++ b/nuttx/configs/sam4s-xplained-pro/src/sam_udp.c
@@ -2,7 +2,8 @@
  * configs/sam4s-xplained-pro/src/sam_udp.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_userleds.c b/nuttx/configs/sam4s-xplained-pro/src/sam_userleds.c
index 15f524942..a0c8a092f 100644
--- a/nuttx/configs/sam4s-xplained-pro/src/sam_userleds.c
+++ b/nuttx/configs/sam4s-xplained-pro/src/sam_userleds.c
@@ -2,7 +2,8 @@
  * configs/sam4s-xplained-pro/src/sam_userleds.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_wdt.c b/nuttx/configs/sam4s-xplained-pro/src/sam_wdt.c
index a54d44701..d2b62578c 100644
--- a/nuttx/configs/sam4s-xplained-pro/src/sam_wdt.c
+++ b/nuttx/configs/sam4s-xplained-pro/src/sam_wdt.c
@@ -2,7 +2,8 @@
  * configs/sam4s-xplained-pro/src/up_watchdog.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/drivers/timer.c b/nuttx/drivers/timer.c
index 59a0ebf80..01195d6c9 100644
--- a/nuttx/drivers/timer.c
+++ b/nuttx/drivers/timer.c
@@ -2,7 +2,8 @@
  * drivers/timer.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/include/nuttx/timer.h b/nuttx/include/nuttx/timer.h
index 82776a6a6..f5ad663f1 100644
--- a/nuttx/include/nuttx/timer.h
+++ b/nuttx/include/nuttx/timer.h
@@ -2,7 +2,8 @@
  * include/nuttx/timer.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            Bob Doiron
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions