Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-23 23:05:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move include/nuttx/timer.h, rtc.h and watchdog.h to include/nuttx/timers/.

Browse Source
This commit is contained in:
Gregory Nutt
2015-04-01 12:37:44 -06:00
parent 6342459cdb
commit 0ec67181c9
40 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/NuttxPortingGuide.html
+3 -3
View File
@@ -4598,7 +4598,7 @@ void board_led_off(int led);
</p>
<ul>
<li><b>Interface Definition</b>.
The header file for the NuttX timer driver reside at <code>include/nuttx/timer.h</code>.
The header file for the NuttX timer driver reside at <code>include/nuttx/timers/timer.h</code>.
This header file includes both the application level interface to the timer driver as well as the interface between the &quot;upper half&quot; and &quot;lower half&quot; drivers.
The timer driver uses a standard character driver framework.
</li>
@@ -4627,7 +4627,7 @@ void board_led_off(int led);
</p>
<ul>
<li><b>Interface Definition</b>.
The header file for the NuttX RTC driver reside at <code>include/nuttx/rtc.h</code>.
The header file for the NuttX RTC driver reside at <code>include/nuttx/timers/rtc.h</code>.
This header file includes both the application level interface to the RTC driver as well as the interface between the &quot;upper half&quot; and &quot;lower half&quot; drivers.
The RTC driver uses a standard character driver framework.
</li>
@@ -4656,7 +4656,7 @@ void board_led_off(int led);
</p>
<ul>
<li><b>Interface Definition</b>.
The header file for the NuttX watchdog timer driver reside at <code>include/nuttx/watchdog.h</code>.
The header file for the NuttX watchdog timer driver reside at <code>include/nuttx/timers/watchdog.h</code>.
This header file includes both the application level interface to the watchdog timer driver as well as the interface between the &quot;upper half&quot; and &quot;lower half&quot; drivers.
The watchdog timer driver uses a standard character driver framework.
</li>
arch/arm/src/c5471/c5471_watchdog.c
+1 -1
View File
@@ -48,7 +48,7 @@
#include <nuttx/fs/fs.h>
#include <nuttx/irq.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchog.h>
#include <arch/watchdog.h>
#include "chip.h"
arch/arm/src/sam34/sam_rtt.c
+1 -1
View File
@@ -46,7 +46,7 @@
#include <stdint.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/timer.h>
#include <nuttx/timers/timer.h>
#include <arch/board/board.h>
#include "up_arch.h"
arch/arm/src/sam34/sam_tc.c
+1 -1
View File
@@ -47,7 +47,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/timer.h>
#include <nuttx/timers/timer.h>
#include <arch/board/board.h>
#include "up_arch.h"
arch/arm/src/sam34/sam_wdt.c
+1 -1
View File
@@ -47,7 +47,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchog.h>
#include <arch/board/board.h>
#include "up_arch.h"
arch/arm/src/sama5/sam_wdt.c
+1 -1
View File
@@ -44,7 +44,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchog.h>
#include <arch/board/board.h>
#include "up_arch.h"
arch/arm/src/stm32/stm32_iwdg.c
+1 -1
View File
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/clock.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchog.h>
#include <arch/board/board.h>
#include "up_arch.h"
arch/arm/src/stm32/stm32_rtc.h
+1 -1
View File
@@ -189,7 +189,7 @@ int stm32_rtc_cancelalarm(void);
* Description:
* Instantiate the RTC lower half driver for the STM32. General usage:
*
* #include <nuttx/rtc.h>
* #include <nuttx/timers/rtc.h>
* #include "stm32_rtc.h>
*
* struct rtc_lowerhalf_s *lower;
arch/arm/src/stm32/stm32_rtc_lowerhalf.c
+2 -2
View File
@@ -44,7 +44,7 @@
#include <errno.h>
#include <nuttx/arch.h>
#include <nuttx/rtc.h>
#include <nuttx/timers/rtc.h>
#include "chip.h"
#include "stm32_rtc.h"
@@ -265,7 +265,7 @@ static int stm32_settime(FAR struct rtc_lowerhalf_s *lower,
* Description:
* Instantiate the RTC lower half driver for the STM32. General usage:
*
* #include <nuttx/rtc.h>
* #include <nuttx/timers/rtc.h>
* #include "stm32_rtc.h>
*
* struct rtc_lowerhalf_s *lower;
arch/arm/src/stm32/stm32_rtcounter.c
+1 -1
View File
@@ -61,7 +61,7 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/rtc.h>
#include <nuttx/timers/rtc.h>
#include <arch/board/board.h>
#include <stdlib.h>
arch/arm/src/stm32/stm32_wwdg.c
+1 -1
View File
@@ -44,7 +44,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchog.h>
#include <arch/board/board.h>
#include "up_arch.h"
arch/arm/src/tiva/tiva_timerlow32.c
+1 -1
View File
@@ -48,7 +48,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
#include <nuttx/timer.h>
#include <nuttx/timers/timer.h>
#include <arch/board/board.h>
configs/cloudctrl/src/stm32_watchdog.c
+1 -1
View File
@@ -43,7 +43,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/fire-stm32v2/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/hymini-stm32v/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/maple/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/mikroe-stm32f4/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/sam4s-xplained-pro/src/sam_boot.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <debug.h>
#include <nuttx/board.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "sam4s-xplained-pro.h"
configs/sam4s-xplained-pro/src/sam_nsh.c
+1 -1
View File
@@ -60,7 +60,7 @@
#endif
#ifdef CONFIG_TIMER
# include <nuttx/timer.h>
# include <nuttx/timers/timer.h>
#endif
#ifdef CONFIG_SYSTEM_USBMONITOR
configs/sam4s-xplained-pro/src/sam_tc.c
+1 -1
View File
@@ -49,7 +49,7 @@
#include <fcntl.h>
#include <nuttx/arch.h>
#include <nuttx/timer.h>
#include <nuttx/timers/timer.h>
#include <nuttx/clock.h>
#include <nuttx/kthread.h>
configs/sam4s-xplained-pro/src/sam_wdt.c
+1 -1
View File
@@ -48,7 +48,7 @@
#include <stdio.h>
#include <fcntl.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include <nuttx/kthread.h>
configs/shenzhou/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/spark/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/stm3210e-eval/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/stm3220g-eval/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/stm3240g-eval/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/stm32_tiny/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/stm32f3discovery/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/stm32f4discovery/src/stm32_bringup.c
+1 -1
View File
@@ -62,7 +62,7 @@
*/
#ifdef HAVE_RTC_DRIVER
# include <nuttx/rtc.h>
# include <nuttx/timers/rtc.h>
# include "stm32_rtc.h"
#endif
configs/stm32f4discovery/src/stm32_watchdog.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
configs/stm32ldiscovery/src/stm32_watchdog.c
+1 -1
View File
@@ -43,7 +43,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "stm32_wdg.h"
drivers/README.txt
+2 -2
View File
@@ -38,7 +38,7 @@ ramdisk.c
timer.c
Provides the "upper half" for a generic timer driver. See
include/nuttx/timer.h for more information.
include/nuttx/timers/timer.h for more information.
rwbuffer.c
A facility that can be use by any block driver in-order to add
@@ -46,7 +46,7 @@ rwbuffer.c
watchdog.c
Provides the "upper half" for a generic watchdog driver. See
include/nuttx/watchdog.h for more information.
include/nuttx/timers/watchdog.h for more information.
Subdirectories of this directory:
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
drivers/timers/Kconfig
+4 -4
View File
@@ -8,7 +8,7 @@ menuconfig TIMER
default n
---help---
This selection enables building of the "upper-half" timer
driver. See include/nuttx/timer.h for further timer driver
driver. See include/nuttx/timers/timer.h for further timer driver
information.
menuconfig RTC
@@ -16,7 +16,7 @@ menuconfig RTC
default n
---help---
This selection enables configuration of a real time clock (RTCdriver.
See include/nuttx/rtc.h for further RTC driver information.
See include/nuttx/timers/rtc.h for further RTC driver information.
Most RTC drivers are MCU specific and may require other specific
settings.
@@ -73,7 +73,7 @@ config RTC_DRIVER
default n
---help---
This selection enables building of the "upper-half" RTC
driver. See include/nuttx/rtc.h for further RTC driver
driver. See include/nuttx/timers/rtc.h for further RTC driver
information.
if RTC_DRIVER
@@ -122,7 +122,7 @@ menuconfig WATCHDOG
default n
---help---
This selection enables building of the "upper-half" watchdog timer
driver. See include/nuttx/watchdog.h for further watchdog timer driver
driver. See include/nuttx/timers/watchdog.h for further watchdog timer driver
information.
if WATCHDOG
drivers/timers/rtc.c
+1 -1
View File
@@ -47,7 +47,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/rtc.h>
#include <nuttx/timers/rtc.h>
/****************************************************************************
* Private Types
drivers/timers/timer.c
+1 -1
View File
@@ -53,7 +53,7 @@
#include <nuttx/fs/fs.h>
#include <nuttx/irq.h>
#include <nuttx/kmalloc.h>
#include <nuttx/timer.h>
#include <nuttx/timers/timer.h>
#ifdef CONFIG_TIMER
drivers/timers/watchdog.c
+1 -1
View File
@@ -52,7 +52,7 @@
#include <nuttx/fs/fs.h>
#include <nuttx/irq.h>
#include <nuttx/kmalloc.h>
#include <nuttx/watchdog.h>
#include <nuttx/timers/watchdog.h>
#ifdef CONFIG_WATCHDOG
include/nuttx/rtc.h → include/nuttx/timers/rtc.h
+4 -4
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* include/nuttx/rtc.h
* include/nuttx/timers/rtc.h
*
* Copyright(C) 2011 Uros Platise. All rights reserved.
* Author: Uros Platise <uros.platise@isotel.eu>
@@ -38,8 +38,8 @@
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_RTC_H
#define __INCLUDE_NUTTX_RTC_H
#ifndef __INCLUDE_NUTTX_TIMERS_RTC_H
#define __INCLUDE_NUTTX_TIMERS_RTC_H
/****************************************************************************
* Included Files
@@ -487,4 +487,4 @@ int rtc_initialize(int minor, FAR struct rtc_lowerhalf_s *lower);
#endif /* CONFIG_RTC_DRIVER */
#endif /* CONFIG_RTC */
#endif /* __INCLUDE_NUTTX_RTC_H */
#endif /* __INCLUDE_NUTTX_TIMERS_RTC_H */
include/nuttx/timer.h → include/nuttx/timers/timer.h
+4 -4
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* include/nuttx/timer.h
* include/nuttx/timers/timer.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_TIMER_H
#define __INCLUDE_NUTTX_TIMER_H
#ifndef __INCLUDE_NUTTX_TIMERS_TIMER_H
#define __INCLUDE_NUTTX_TIMERS_TIMER_H
/****************************************************************************
* Included Files
@@ -262,4 +262,4 @@ void timer_unregister(FAR void *handle);
#endif
#endif /* CONFIG_TIMER */
#endif /* __INCLUDE_NUTTX_TIMER_H */
#endif /* __INCLUDE_NUTTX_TIMERS_TIMER_H */
include/nuttx/watchdog.h → include/nuttx/timers/watchdog.h
+4 -4
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* include/nuttx/watchdog.h
* include/nuttx/timers/watchog.h
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_WATCHDOG_H
#define __INCLUDE_NUTTX_WATCHDOG_H
#ifndef __INCLUDE_NUTTX_TIMERS_WATCHDOG_H
#define __INCLUDE_NUTTX_TIMERS_WATCHDOG_H
/****************************************************************************
* Included Files
@@ -291,4 +291,4 @@ int up_wdginitialize(void);
#endif
#endif /* CONFIG_WATCHDOG */
#endif /* __INCLUDE_NUTTX_WATCHDOG_H */
#endif /* __INCLUDE_NUTTX_TIMERS_WATCHDOG_H */
include/time.h
+1 -1
View File
@@ -124,7 +124,7 @@ struct timespec
* REVISIT: This structure could be packed better using uint8_t's and
* uint16_t's. The standard definition does, however, call out type int for
* all of the members. NOTE: Any changes to this structure must be also be
* reflected in struct rtc_time defined in include/nuttx/rtc.h; these two
* reflected in struct rtc_time defined in include/nuttx/timers/rtc.h; these two
* structures must be cast compatible.
*/