sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sam4s-xplained-pro: Remove obsolete timer initialization logic

Browse Source
This commit is contained in:
Gregory Nutt 2016-11-22 12:25:57 -06:00
parent 09b6af96ba
commit d95b8f64f5
6 changed files with 1 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/misoc/src/common/misoc_serial.c
View File

@ -334,7 +334,6 @@ static void misoc_detach(struct uart_dev_s *dev)
struct misoc_dev_s *priv = (struct misoc_dev_s *)dev->priv;
up_disable_irq(priv->irq);
irq_detach(priv->irq);
}

4
configs/sam4s-xplained-pro/src/Makefile
View File

@ -64,8 +64,4 @@ ifeq ($(CONFIG_SAM34_WDT),y)
CSRCS += sam_wdt.c
endif
ifeq ($(CONFIG_TIMER),y)
CSRCS += sam_tc.c
endif
include $(TOPDIR)/configs/Board.mk

14
configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h
View File

@ -215,20 +215,6 @@ 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
/****************************************************************************
* Name: sam_watchdog_initialize()
*

8
configs/sam4s-xplained-pro/src/sam_appinit.c
View File

@ -59,20 +59,12 @@
# include <nuttx/usb/pl2303.h>
#endif
#ifdef CONFIG_TIMER
# include <nuttx/timers/timer.h>
#endif
#ifdef CONFIG_USBMONITOR
# include <nuttx/usb/usbmonitor.h>
#endif
#include "sam4s-xplained-pro.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Public Functions
****************************************************************************/

17
configs/sam4s-xplained-pro/src/sam_boot.c
View File

@ -42,19 +42,10 @@
#include <debug.h>
#include <nuttx/board.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "sam4s-xplained-pro.h"
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/************************************************************************************
* Private Functions
************************************************************************************/
/************************************************************************************
* Public Functions
************************************************************************************/
@ -91,6 +82,7 @@ void sam_boardinitialize(void)
* may be used, for example, to initialize board-specific device drivers.
*
****************************************************************************/
#ifdef CONFIG_BOARD_INITIALIZE
void board_initialize(void)
{
@ -105,12 +97,5 @@ void board_initialize(void)
sam_led_initialize();
#endif
#ifdef CONFIG_TIMER
/* Registers the timers and starts any async processes (which may include the scheduler) */
sam_timerinitialize();
#endif
}
#endif /* CONFIG_BOARD_INITIALIZE */

295
configs/sam4s-xplained-pro/src/sam_tc.c
View File

@ -1,295 +0,0 @@
/****************************************************************************
* configs/sam4s-xplained-pro/src/sam_tc.c
*
* 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
* 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 <sys/types.h>
#include <sys/ioctl.h>
#include <errno.h>
#include <debug.h>
#include <sched.h>
#include <stdio.h>
#include <fcntl.h>
#include <nuttx/arch.h>
#include <nuttx/timers/timer.h>
#include <nuttx/clock.h>
#include <nuttx/kthread.h>
#include <arch/board/board.h>
#include "sam_lowputc.h"
#include "sam_tc.h"
#include "sam_rtt.h"
#ifdef CONFIG_TIMER
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
#if !(defined(CONFIG_SAM34_TC0) || defined(CONFIG_SAM34_TC1) || defined(CONFIG_SAM34_TC2) \
|| defined(CONFIG_SAM34_TC3) || defined(CONFIG_SAM34_TC4) || defined(CONFIG_SAM34_RTT) )
# warning "CONFIG_SAM34_TCx or CONFIG_SAM34_RTT must be defined"
#endif
/* Select the path to the registered watchdog timer device */
#ifndef CONFIG_TIMER0_DEVPATH
# define CONFIG_TIMER0_DEVPATH "/dev/tc0"
#endif
#ifndef CONFIG_TIMER1_DEVPATH
# define CONFIG_TIMER1_DEVPATH "/dev/tc1"
#endif
#ifndef CONFIG_TIMER2_DEVPATH
# define CONFIG_TIMER2_DEVPATH "/dev/tc2"
#endif
#ifndef CONFIG_TIMER3_DEVPATH
# define CONFIG_TIMER3_DEVPATH "/dev/tc3"
#endif
#ifndef CONFIG_TIMER4_DEVPATH
# define CONFIG_TIMER4_DEVPATH "/dev/tc4"
#endif
#ifndef CONFIG_TIMER5_DEVPATH
# define CONFIG_TIMER5_DEVPATH "/dev/tc5"
#endif
#ifndef CONFIG_RTT_DEVPATH
# define CONFIG_RTT_DEVPATH "/dev/rtt0"
#endif
/****************************************************************************
* Private Functions
****************************************************************************/
#if 0 /* Cannot be used -- needs to be updated to current, signal based interface */
#if defined(CONFIG_SYSTEMTICK_EXTCLK) && !defined(CONFIG_SUPPRESS_INTERRUPTS) && \
!defined(CONFIG_SUPPRESS_TIMER_INTS)
static bool systemtick(FAR uint32_t *next_interval_us)
{
sched_process_timer();
return true; // reload, no change to interval
}
#endif /* CONFIG_SYSTEMTICK_EXTCLK && !CONFIG_SUPPRESS_INTERRUPTS && !CONFIG_SUPPRESS_TIMER_INTS */
#if defined(CONFIG_SCHED_CPULOAD) && defined(CONFIG_SCHED_CPULOAD_EXTCLK)
static bool calc_cpuload(FAR uint32_t *next_interval_us)
{
sched_process_cpuload();
return TRUE; /* Reload, no change to interval */
}
#endif /* CONFIG_SCHED_CPULOAD && CONFIG_SCHED_CPULOAD_EXTCLK */
#endif /* 0 */
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: sam_timerinitialize()
*
* Description:
* Perform architecture-specific initialization of the timer hardware.
*
****************************************************************************/
int sam_timerinitialize(void)
{
#if 0 /* Cannot be used -- needs to be updated to current, signal based interface */
int fd;
int ret;
/* Initialize and register the timer devices */
#if defined(CONFIG_SAM34_TC0)
tmrinfo("Initializing %s...\n", CONFIG_TIMER0_DEVPATH);
sam_tcinitialize(CONFIG_TIMER0_DEVPATH, SAM_IRQ_TC0);
#endif
#if defined(CONFIG_SAM34_TC1)
tmrinfo("Initializing %s...\n", CONFIG_TIMER1_DEVPATH);
sam_tcinitialize(CONFIG_TIMER1_DEVPATH, SAM_IRQ_TC1);
#endif
#if defined(CONFIG_SAM34_TC2)
tmrinfo("Initializing %s...\n", CONFIG_TIMER2_DEVPATH);
sam_tcinitialize(CONFIG_TIMER2_DEVPATH, SAM_IRQ_TC2);
#endif
#if defined(CONFIG_SAM34_TC3)
tmrinfo("Initializing %s...\n", CONFIG_TIMER3_DEVPATH);
sam_tcinitialize(CONFIG_TIMER3_DEVPATH, SAM_IRQ_TC3);
#endif
#if defined(CONFIG_SAM34_TC4)
tmrinfo("Initializing %s...\n", CONFIG_TIMER4_DEVPATH);
sam_tcinitialize(CONFIG_TIMER4_DEVPATH, SAM_IRQ_TC4);
#endif
#if defined(CONFIG_SAM34_TC5)
tmrinfo("Initializing %s...\n", CONFIG_TIMER5_DEVPATH);
sam_tcinitialize(CONFIG_TIMER5_DEVPATH, SAM_IRQ_TC5);
#endif
#if defined(CONFIG_SAM34_RTT)
tmrinfo("Initializing %s...\n", CONFIG_RTT_DEVPATH);
sam_rttinitialize(CONFIG_RTT_DEVPATH);
#endif
#if defined(CONFIG_SYSTEMTICK_EXTCLK) && !defined(CONFIG_SUPPRESS_INTERRUPTS) && \
!defined(CONFIG_SUPPRESS_TIMER_INTS)
/* System Timer Initialization */
tmrinfo("Opening %s\n", CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH);
fd = open(CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH, O_RDONLY);
if (fd < 0)
{
tmrerr("ERROR: open %s failed: %d\n",
CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH, errno);
goto errout;
}
/* Set the timeout */
tmrinfo("Interval = %d us.\n", (unsigned long)USEC_PER_TICK);
ret = ioctl(fd, TCIOC_SETTIMEOUT, (unsigned long)USEC_PER_TICK);
if (ret < 0)
{
tmrerr("ERROR: ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno);
goto errout_with_dev;
}
/* install user callback */
{
struct timer_notify_s notify;
notify.newhandler = systemtick;
notify.oldhandler = NULL;
ret = ioctl(fd, TCIOC_NOTIFICATION, (unsigned long)&notify);
if (ret < 0)
{
tmrerr("ERROR: ioctl(TCIOC_NOTIFICATION) failed: %d\n", errno);
goto errout_with_dev;
}
}
/* Start the timer */
tmrinfo("Starting.\n");
ret = ioctl(fd, TCIOC_START, 0);
if (ret < 0)
{
tmrerr("ERROR: ioctl(TCIOC_START) failed: %d\n", errno);
goto errout_with_dev;
}
#endif
#if defined(CONFIG_SCHED_CPULOAD) && defined(CONFIG_SCHED_CPULOAD_EXTCLK)
/* CPU Load initialization */
tmrinfo("Opening %s\n", CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH);
fd = open(CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH, O_RDONLY);
if (fd < 0)
{
tmrerr("ERROR: open %s failed: %d\n",
CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH, errno);
goto errout;
}
/* Set the timeout */
tmrinfo("Interval = %d us.\n", (unsigned long)1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC);
ret = ioctl(fd, TCIOC_SETTIMEOUT,
(unsigned long)1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC);
if (ret < 0)
{
tmrerr("ERROR: ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno);
goto errout_with_dev;
}
/* Install user callback */
{
struct timer_notify_s notify;
notify.newhandler = calc_cpuload;
notify.oldhandler = NULL;
ret = ioctl(fd, TCIOC_NOTIFICATION, (unsigned long)&notify);
if (ret < 0)
{
tmrerr("ERROR: ioctl(TCIOC_NOTIFICATION) failed: %d\n", errno);
goto errout_with_dev;
}
}
/* Start the timer */
tmrinfo("Starting.\n");
ret = ioctl(fd, TCIOC_START, 0);
if (ret < 0)
{
tmrerr("ERROR: ioctl(TCIOC_START) failed: %d\n", errno);
goto errout_with_dev;
}
#endif
goto success;
errout_with_dev:
close(fd);
errout:
return ERROR;
success:
return OK;
#else
return -ENOSYS;
#endif
}
#endif /* CONFIG_TIMER */