From dc42bc06fad3daefbc1fdbfe3737638e71c89e7c Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 22 Apr 2014 11:04:31 -0600 Subject: [PATCH] Back out a bad change in the last commit + add missing SAM4S Xplained Pro file --- configs/sam4s-xplained-pro/src/Makefile | 2 +- .../src/sam4s-xplained-pro.h | 14 ++ configs/sam4s-xplained-pro/src/sam_nsh.c | 2 +- configs/sam4s-xplained-pro/src/sam_tc.c | 203 ++++++++++++++++++ 4 files changed, 219 insertions(+), 2 deletions(-) create mode 100755 configs/sam4s-xplained-pro/src/sam_tc.c diff --git a/configs/sam4s-xplained-pro/src/Makefile b/configs/sam4s-xplained-pro/src/Makefile index 4de3f86992..e3ebc842f8 100644 --- a/configs/sam4s-xplained-pro/src/Makefile +++ b/configs/sam4s-xplained-pro/src/Makefile @@ -73,7 +73,7 @@ CSRCS += sam_wdt.c endif ifeq ($(CONFIG_TIMER),y) -# CSRCS += sam_tc.c +CSRCS += sam_tc.c endif COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h b/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h index fbc9391565..898362f632 100644 --- a/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h +++ b/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h @@ -225,5 +225,19 @@ bool sam_writeprotected(int slotno); # define sam_writeprotected(slotno) (false) #endif +/************************************************************************************ + * Name: sam_timerinitialize() + * + * Description: + * Perform architecture-specific initialization of the timer hardware. + * + ************************************************************************************/ + +#ifdef CONFIG_TIMER +int sam_timerinitialize(void); +#else +# define sam_timerinitialize() (0) +#endif + #endif /* __ASSEMBLY__ */ #endif /* __CONFIGS_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H */ diff --git a/configs/sam4s-xplained-pro/src/sam_nsh.c b/configs/sam4s-xplained-pro/src/sam_nsh.c index e793df9794..ecbec7c0fa 100644 --- a/configs/sam4s-xplained-pro/src/sam_nsh.c +++ b/configs/sam4s-xplained-pro/src/sam_nsh.c @@ -153,7 +153,7 @@ int nsh_archinitialize(void) #ifdef CONFIG_TIMER /* Registers the timer driver and starts an async interrupt. */ - up_timerinitialize(); + sam_timerinitialize(); #endif #ifdef HAVE_USBMONITOR diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c new file mode 100755 index 0000000000..bf954de3cc --- /dev/null +++ b/configs/sam4s-xplained-pro/src/sam_tc.c @@ -0,0 +1,203 @@ +/**************************************************************************** + * configs/sam4s-xplained-pro/src/sam_tc.c + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include "sam_lowputc.h" +#include "sam_tc.h" + +#ifdef CONFIG_TIMER + +/**************************************************************************** + * Definitions + ****************************************************************************/ +/* Configuration ************************************************************/ +/* Watchdog hardware should be enabled */ + +#if !defined(CONFIG_SAM34_TC0) +# warning "CONFIG_SAM34_TC0 must be defined" +#endif + +/* Select the path to the registered watchdog timer device */ + +#ifndef CONFIG_TIMER0_DEVPATH +# define CONFIG_TIMER0_DEVPATH "/dev/tc0" +# define CONFIG_TIMER1_DEVPATH "/dev/tc1" +# define CONFIG_TIMER2_DEVPATH "/dev/tc2" +# define CONFIG_TIMER3_DEVPATH "/dev/tc3" +# define CONFIG_TIMER4_DEVPATH "/dev/tc4" +# define CONFIG_TIMER5_DEVPATH "/dev/tc5" +#endif + +/* Timer Definitions ********************************************************/ + +#define TINTERVAL (3042) + +/* Debug ********************************************************************/ +/* Non-standard debug that may be enabled just for testing the watchdog + * timer + */ + +#ifndef CONFIG_DEBUG +# undef CONFIG_DEBUG_TIMER +#endif + +#ifdef CONFIG_DEBUG_TIMER +# define tcdbg dbg +# define tclldbg lldbg +# ifdef CONFIG_DEBUG_VERBOSE +# define tcvdbg vdbg +# define tcllvdbg llvdbg +# else +# define tcvdbg(x...) +# define tcllvdbg(x...) +# endif +#else +# define tcdbg(x...) +# define tclldbg(x...) +# define tcvdbg(x...) +# define tcllvdbg(x...) +#endif + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: sam_timerinitialize() + * + * Description: + * Perform architecture-specific initialization of the timer hardware. + * + ****************************************************************************/ + +int sam_timerinitialize(void) +{ + int fd; + int ret; + + /* Initialize and register the timer devices */ + +#if defined(CONFIG_SAM34_TC0) + tcvdbg("Initializing %s...\n", CONFIG_TIMER0_DEVPATH); + sam_tcinitialize(CONFIG_TIMER0_DEVPATH, SAM_IRQ_TC0); +#endif + +#if defined(CONFIG_SAM34_TC1) + tcvdbg("Initializing %s...\n", CONFIG_TIMER1_DEVPATH); + sam_tcinitialize(CONFIG_TIMER1_DEVPATH, SAM_IRQ_TC1); +#endif + +#if defined(CONFIG_SAM34_TC2) + tcvdbg("Initializing %s...\n", CONFIG_TIMER2_DEVPATH); + sam_tcinitialize(CONFIG_TIMER2_DEVPATH, SAM_IRQ_TC2); +#endif + +#if defined(CONFIG_SAM34_TC3) + tcvdbg("Initializing %s...\n", CONFIG_TIMER3_DEVPATH); + sam_tcinitialize(CONFIG_TIMER3_DEVPATH, SAM_IRQ_TC3); +#endif + +#if defined(CONFIG_SAM34_TC4) + tcvdbg("Initializing %s...\n", CONFIG_TIMER4_DEVPATH); + sam_tcinitialize(CONFIG_TIMER4_DEVPATH, SAM_IRQ_TC4); +#endif + +#if defined(CONFIG_SAM34_TC5) + tcvdbg("Initializing %s...\n", CONFIG_TIMER5_DEVPATH); + sam_tcinitialize(CONFIG_TIMER5_DEVPATH, SAM_IRQ_TC5); +#endif + + /* Open the timer device */ + + tcvdbg("Opening.\n"); + fd = open(CONFIG_TIMER0_DEVPATH, O_RDONLY); + if (fd < 0) + { + tcdbg("open %s failed: %d\n", CONFIG_TIMER0_DEVPATH, errno); + goto errout; + } + + /* Set the timeout */ + + tcvdbg("Timeout = %d.\n", TINTERVAL); + ret = ioctl(fd, TCIOC_SETTIMEOUT, (unsigned long)TINTERVAL); + if (ret < 0) + { + tcdbg("ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno); + goto errout_with_dev; + } + + /* Start the timer */ + + tcvdbg("Starting.\n"); + ret = ioctl(fd, TCIOC_START, 0); + if (ret < 0) + { + tcdbg("ioctl(TCIOC_START) failed: %d\n", errno); + goto errout_with_dev; + } + + return OK; + +errout_with_dev: + close(fd); +errout: + return ERROR; +} + +#endif /* CONFIG_TIMER */