diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-04-01 12:37:44 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-04-01 12:37:44 -0600 |
| commit | 05988ab6d7bd07be7f874e78a89fea1e6e7cf9c3 (patch) | |
| tree | d4ea6f24e116312d807f43a99ef8bbc5c92dd6b5 /nuttx | |
| parent | ea2f66e68f04f45959a545516e8c34f3e87f2f7e (diff) | |
| download | px4-nuttx-05988ab6d7bd07be7f874e78a89fea1e6e7cf9c3.tar.gz px4-nuttx-05988ab6d7bd07be7f874e78a89fea1e6e7cf9c3.tar.bz2 px4-nuttx-05988ab6d7bd07be7f874e78a89fea1e6e7cf9c3.zip | |
Move include/nuttx/timer.h, rtc.h and watchdog.h to include/nuttx/timers/.
Diffstat (limited to 'nuttx')
40 files changed, 56 insertions, 56 deletions
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 8695be591..2f6c63f2c 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -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 "upper half" and "lower half" 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 "upper half" and "lower half" 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 "upper half" and "lower half" drivers. The watchdog timer driver uses a standard character driver framework. </li> diff --git a/nuttx/arch/arm/src/c5471/c5471_watchdog.c b/nuttx/arch/arm/src/c5471/c5471_watchdog.c index a77ed6d8b..e09cfbdae 100644 --- a/nuttx/arch/arm/src/c5471/c5471_watchdog.c +++ b/nuttx/arch/arm/src/c5471/c5471_watchdog.c @@ -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" diff --git a/nuttx/arch/arm/src/sam34/sam_rtt.c b/nuttx/arch/arm/src/sam34/sam_rtt.c index da223e211..9e0293fcb 100644 --- a/nuttx/arch/arm/src/sam34/sam_rtt.c +++ b/nuttx/arch/arm/src/sam34/sam_rtt.c @@ -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" diff --git a/nuttx/arch/arm/src/sam34/sam_tc.c b/nuttx/arch/arm/src/sam34/sam_tc.c index 470c7c77c..9b55d9c5c 100644 --- a/nuttx/arch/arm/src/sam34/sam_tc.c +++ b/nuttx/arch/arm/src/sam34/sam_tc.c @@ -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" diff --git a/nuttx/arch/arm/src/sam34/sam_wdt.c b/nuttx/arch/arm/src/sam34/sam_wdt.c index 7ed5d9dd5..f60b58661 100644 --- a/nuttx/arch/arm/src/sam34/sam_wdt.c +++ b/nuttx/arch/arm/src/sam34/sam_wdt.c @@ -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" diff --git a/nuttx/arch/arm/src/sama5/sam_wdt.c b/nuttx/arch/arm/src/sama5/sam_wdt.c index 706f8e8a3..b04e13260 100644 --- a/nuttx/arch/arm/src/sama5/sam_wdt.c +++ b/nuttx/arch/arm/src/sama5/sam_wdt.c @@ -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" diff --git a/nuttx/arch/arm/src/stm32/stm32_iwdg.c b/nuttx/arch/arm/src/stm32/stm32_iwdg.c index ad5ae7819..a4e80b8dd 100644 --- a/nuttx/arch/arm/src/stm32/stm32_iwdg.c +++ b/nuttx/arch/arm/src/stm32/stm32_iwdg.c @@ -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" diff --git a/nuttx/arch/arm/src/stm32/stm32_rtc.h b/nuttx/arch/arm/src/stm32/stm32_rtc.h index 19ea7621b..f873bd28f 100644 --- a/nuttx/arch/arm/src/stm32/stm32_rtc.h +++ b/nuttx/arch/arm/src/stm32/stm32_rtc.h @@ -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; diff --git a/nuttx/arch/arm/src/stm32/stm32_rtc_lowerhalf.c b/nuttx/arch/arm/src/stm32/stm32_rtc_lowerhalf.c index ecc64f47a..aff1575be 100644 --- a/nuttx/arch/arm/src/stm32/stm32_rtc_lowerhalf.c +++ b/nuttx/arch/arm/src/stm32/stm32_rtc_lowerhalf.c @@ -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; diff --git a/nuttx/arch/arm/src/stm32/stm32_rtcounter.c b/nuttx/arch/arm/src/stm32/stm32_rtcounter.c index e27f5a54d..c5842f2af 100644 --- a/nuttx/arch/arm/src/stm32/stm32_rtcounter.c +++ b/nuttx/arch/arm/src/stm32/stm32_rtcounter.c @@ -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> diff --git a/nuttx/arch/arm/src/stm32/stm32_wwdg.c b/nuttx/arch/arm/src/stm32/stm32_wwdg.c index 2f5208aa3..3b056af6c 100644 --- a/nuttx/arch/arm/src/stm32/stm32_wwdg.c +++ b/nuttx/arch/arm/src/stm32/stm32_wwdg.c @@ -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" diff --git a/nuttx/arch/arm/src/tiva/tiva_timerlow32.c b/nuttx/arch/arm/src/tiva/tiva_timerlow32.c index a4226c62e..458ab8fa0 100644 --- a/nuttx/arch/arm/src/tiva/tiva_timerlow32.c +++ b/nuttx/arch/arm/src/tiva/tiva_timerlow32.c @@ -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> diff --git a/nuttx/configs/cloudctrl/src/stm32_watchdog.c b/nuttx/configs/cloudctrl/src/stm32_watchdog.c index 04a8b5fe2..0497c9aa0 100644 --- a/nuttx/configs/cloudctrl/src/stm32_watchdog.c +++ b/nuttx/configs/cloudctrl/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/fire-stm32v2/src/stm32_watchdog.c b/nuttx/configs/fire-stm32v2/src/stm32_watchdog.c index ce1e3ec16..dd420c342 100644 --- a/nuttx/configs/fire-stm32v2/src/stm32_watchdog.c +++ b/nuttx/configs/fire-stm32v2/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/hymini-stm32v/src/stm32_watchdog.c b/nuttx/configs/hymini-stm32v/src/stm32_watchdog.c index 386efd8d6..db143f67b 100644 --- a/nuttx/configs/hymini-stm32v/src/stm32_watchdog.c +++ b/nuttx/configs/hymini-stm32v/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/maple/src/stm32_watchdog.c b/nuttx/configs/maple/src/stm32_watchdog.c index 9110efac4..af65f057d 100644 --- a/nuttx/configs/maple/src/stm32_watchdog.c +++ b/nuttx/configs/maple/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/mikroe-stm32f4/src/stm32_watchdog.c b/nuttx/configs/mikroe-stm32f4/src/stm32_watchdog.c index 3d59646e2..71cf65061 100644 --- a/nuttx/configs/mikroe-stm32f4/src/stm32_watchdog.c +++ b/nuttx/configs/mikroe-stm32f4/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_boot.c b/nuttx/configs/sam4s-xplained-pro/src/sam_boot.c index 607bc3557..981b2d7ce 100644 --- a/nuttx/configs/sam4s-xplained-pro/src/sam_boot.c +++ b/nuttx/configs/sam4s-xplained-pro/src/sam_boot.c @@ -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" diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_nsh.c b/nuttx/configs/sam4s-xplained-pro/src/sam_nsh.c index 8c9293455..a3025f98d 100644 --- a/nuttx/configs/sam4s-xplained-pro/src/sam_nsh.c +++ b/nuttx/configs/sam4s-xplained-pro/src/sam_nsh.c @@ -60,7 +60,7 @@ #endif #ifdef CONFIG_TIMER -# include <nuttx/timer.h> +# include <nuttx/timers/timer.h> #endif #ifdef CONFIG_SYSTEM_USBMONITOR diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_tc.c b/nuttx/configs/sam4s-xplained-pro/src/sam_tc.c index bad80cc3e..8d228f3b8 100755 --- a/nuttx/configs/sam4s-xplained-pro/src/sam_tc.c +++ b/nuttx/configs/sam4s-xplained-pro/src/sam_tc.c @@ -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> diff --git a/nuttx/configs/sam4s-xplained-pro/src/sam_wdt.c b/nuttx/configs/sam4s-xplained-pro/src/sam_wdt.c index 4df566c98..c43fb1b8e 100644 --- a/nuttx/configs/sam4s-xplained-pro/src/sam_wdt.c +++ b/nuttx/configs/sam4s-xplained-pro/src/sam_wdt.c @@ -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> diff --git a/nuttx/configs/shenzhou/src/stm32_watchdog.c b/nuttx/configs/shenzhou/src/stm32_watchdog.c index 8c689f0a9..ba14425cf 100644 --- a/nuttx/configs/shenzhou/src/stm32_watchdog.c +++ b/nuttx/configs/shenzhou/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/spark/src/stm32_watchdog.c b/nuttx/configs/spark/src/stm32_watchdog.c index a27261ce8..1c41b1ddc 100644 --- a/nuttx/configs/spark/src/stm32_watchdog.c +++ b/nuttx/configs/spark/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/stm3210e-eval/src/stm32_watchdog.c b/nuttx/configs/stm3210e-eval/src/stm32_watchdog.c index c44d74bdd..5aab00353 100644 --- a/nuttx/configs/stm3210e-eval/src/stm32_watchdog.c +++ b/nuttx/configs/stm3210e-eval/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/stm3220g-eval/src/stm32_watchdog.c b/nuttx/configs/stm3220g-eval/src/stm32_watchdog.c index 215092a04..a00a4b91a 100644 --- a/nuttx/configs/stm3220g-eval/src/stm32_watchdog.c +++ b/nuttx/configs/stm3220g-eval/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/stm3240g-eval/src/stm32_watchdog.c b/nuttx/configs/stm3240g-eval/src/stm32_watchdog.c index ef93c86c1..3583db2cf 100644 --- a/nuttx/configs/stm3240g-eval/src/stm32_watchdog.c +++ b/nuttx/configs/stm3240g-eval/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/stm32_tiny/src/stm32_watchdog.c b/nuttx/configs/stm32_tiny/src/stm32_watchdog.c index a722dd737..a2ae5963f 100644 --- a/nuttx/configs/stm32_tiny/src/stm32_watchdog.c +++ b/nuttx/configs/stm32_tiny/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/stm32f3discovery/src/stm32_watchdog.c b/nuttx/configs/stm32f3discovery/src/stm32_watchdog.c index ff8072f31..72bc6b548 100644 --- a/nuttx/configs/stm32f3discovery/src/stm32_watchdog.c +++ b/nuttx/configs/stm32f3discovery/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/stm32f4discovery/src/stm32_bringup.c b/nuttx/configs/stm32f4discovery/src/stm32_bringup.c index 0e4f55b43..30caca3e7 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32_bringup.c +++ b/nuttx/configs/stm32f4discovery/src/stm32_bringup.c @@ -62,7 +62,7 @@ */ #ifdef HAVE_RTC_DRIVER -# include <nuttx/rtc.h> +# include <nuttx/timers/rtc.h> # include "stm32_rtc.h" #endif diff --git a/nuttx/configs/stm32f4discovery/src/stm32_watchdog.c b/nuttx/configs/stm32f4discovery/src/stm32_watchdog.c index c1a659d0e..79809f284 100644 --- a/nuttx/configs/stm32f4discovery/src/stm32_watchdog.c +++ b/nuttx/configs/stm32f4discovery/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/configs/stm32ldiscovery/src/stm32_watchdog.c b/nuttx/configs/stm32ldiscovery/src/stm32_watchdog.c index ec6a569ee..d4faf0e6a 100644 --- a/nuttx/configs/stm32ldiscovery/src/stm32_watchdog.c +++ b/nuttx/configs/stm32ldiscovery/src/stm32_watchdog.c @@ -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" diff --git a/nuttx/drivers/README.txt b/nuttx/drivers/README.txt index 9c8c4d9b7..39b461092 100644 --- a/nuttx/drivers/README.txt +++ b/nuttx/drivers/README.txt @@ -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: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/nuttx/drivers/timers/Kconfig b/nuttx/drivers/timers/Kconfig index 5e918b65b..2502b1d8d 100644 --- a/nuttx/drivers/timers/Kconfig +++ b/nuttx/drivers/timers/Kconfig @@ -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 diff --git a/nuttx/drivers/timers/rtc.c b/nuttx/drivers/timers/rtc.c index 68f7366af..6d39b6c99 100644 --- a/nuttx/drivers/timers/rtc.c +++ b/nuttx/drivers/timers/rtc.c @@ -47,7 +47,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/fs/fs.h> -#include <nuttx/rtc.h> +#include <nuttx/timers/rtc.h> /**************************************************************************** * Private Types diff --git a/nuttx/drivers/timers/timer.c b/nuttx/drivers/timers/timer.c index fe81fc44f..57c2c0eca 100644 --- a/nuttx/drivers/timers/timer.c +++ b/nuttx/drivers/timers/timer.c @@ -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 diff --git a/nuttx/drivers/timers/watchdog.c b/nuttx/drivers/timers/watchdog.c index d46f7f99e..e6bef99ac 100644 --- a/nuttx/drivers/timers/watchdog.c +++ b/nuttx/drivers/timers/watchdog.c @@ -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 diff --git a/nuttx/include/nuttx/rtc.h b/nuttx/include/nuttx/timers/rtc.h index 5f7b40778..d714e040f 100644 --- a/nuttx/include/nuttx/rtc.h +++ b/nuttx/include/nuttx/timers/rtc.h @@ -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 */ diff --git a/nuttx/include/nuttx/timer.h b/nuttx/include/nuttx/timers/timer.h index bc090f365..8e6926083 100644 --- a/nuttx/include/nuttx/timer.h +++ b/nuttx/include/nuttx/timers/timer.h @@ -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 */ diff --git a/nuttx/include/nuttx/watchdog.h b/nuttx/include/nuttx/timers/watchdog.h index 2daa38142..a9ebc1f81 100644 --- a/nuttx/include/nuttx/watchdog.h +++ b/nuttx/include/nuttx/timers/watchdog.h @@ -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 */ diff --git a/nuttx/include/time.h b/nuttx/include/time.h index a5eb238f5..4b21270d9 100644 --- a/nuttx/include/time.h +++ b/nuttx/include/time.h @@ -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. */ |