nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 09:49:21 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

clock: Move the content of include/nuttx/time.h to include/nuttx/clock.h

Browse source 
and remove include/nuttx/time.h to reduce the nuttx specific header files

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-06-25 03:04:06 +08:00 committed by Petro Karashchenko
parent 3344697afc
commit 7f80b4aeba
23 changed files with 120 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/src/lpc43xx/lpc43_rtc.c
View file

@ -30,7 +30,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
#include <arch/board/board.h>

2
arch/arm/src/stm32/stm32_rtcc.c
View file

@ -31,7 +31,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
#include <arch/board/board.h>

2
arch/arm/src/stm32/stm32f40xxx_rtcc.c
View file

@ -34,7 +34,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
#include "arm_internal.h"
#include "stm32_rcc.h"

2
arch/arm/src/stm32/stm32l15xxx_rtcc.c
View file

@ -33,7 +33,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
#include <arch/board/board.h>

2
arch/arm/src/stm32f7/stm32_rtc.c
View file

@ -32,7 +32,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
#include "arm_internal.h"
#include "stm32_rcc.h"

2
arch/arm/src/stm32h7/stm32_rtc.c
View file

@ -32,7 +32,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
#include "arm_internal.h"
#include "stm32_rcc.h"

2
arch/arm/src/stm32l4/stm32l4_rtc.c
View file

@ -34,7 +34,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
#include <arch/board/board.h>

2
arch/arm/src/stm32wb/stm32wb_rtc.c
View file

@ -31,7 +31,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
#include <arch/board/board.h>
#include "arm_internal.h"

1
drivers/sensors/dhtxx.c
View file

@ -33,7 +33,6 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/signal.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
#include <nuttx/mutex.h>
#include <nuttx/sensors/dhtxx.h>

102
include/nuttx/clock.h
View file

@ -28,6 +28,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <stdbool.h>
#include <stdint.h>
#include <time.h>
@ -202,6 +203,56 @@
# define INITIAL_SYSTEM_TIMER_TICKS 0
#endif
/* If Gregorian time is not supported, then neither is Julian */
#ifndef CONFIG_GREGORIAN_TIME
# undef CONFIG_JULIAN_TIME
#else
# define JD_OF_EPOCH 2440588 /* Julian Date of noon, J1970 */
# ifdef CONFIG_JULIAN_TIME
# define GREG_DUTC -141427 /* Default is October 15, 1582 */
# define GREG_YEAR 1582
# define GREG_MONTH 10
# define GREG_DAY 15
# endif /* CONFIG_JULIAN_TIME */
#endif /* !CONFIG_GREGORIAN_TIME */
#define SECSPERMIN 60
#define MINSPERHOUR 60
#define HOURSPERDAY 24
#define DAYSPERWEEK 7
#define DAYSPERNYEAR 365
#define DAYSPERLYEAR 366
#define MONSPERYEAR 12
#define TM_SUNDAY 0
#define TM_MONDAY 1
#define TM_TUESDAY 2
#define TM_WEDNESDAY 3
#define TM_THURSDAY 4
#define TM_FRIDAY 5
#define TM_SATURDAY 6
#define TM_JANUARY 0
#define TM_FEBRUARY 1
#define TM_MARCH 2
#define TM_APRIL 3
#define TM_MAY 4
#define TM_JUNE 5
#define TM_JULY 6
#define TM_AUGUST 7
#define TM_SEPTEMBER 8
#define TM_OCTOBER 9
#define TM_NOVEMBER 10
#define TM_DECEMBER 11
#define TM_YEAR_BASE (1900)
#define TM_WDAY_BASE TM_MONDAY
#define EPOCH_YEAR 1970
#define EPOCH_WDAY TM_THURSDAY
/****************************************************************************
* Public Types
****************************************************************************/
@ -324,6 +375,57 @@ void clock_timespec_subtract(FAR const struct timespec *ts1,
FAR const struct timespec *ts2,
FAR struct timespec *ts3);
/****************************************************************************
* Name: clock_isleapyear
*
* Description:
* Return true if the specified year is a leap year
*
****************************************************************************/
int clock_isleapyear(int year);
/****************************************************************************
* Name: clock_daysbeforemonth
*
* Description:
* Get the number of days that occurred before the beginning of the month.
*
****************************************************************************/
int clock_daysbeforemonth(int month, bool leapyear);
/****************************************************************************
* Name: clock_dayoftheweek
*
* Description:
* Get the day of the week
*
* Input Parameters:
* mday - The day of the month 1 - 31
* month - The month of the year 1 - 12
* year - the year including the 1900
*
* Returned Value:
* Zero based day of the week 0-6, 0 = Sunday, 1 = Monday... 6 = Saturday
*
****************************************************************************/
int clock_dayoftheweek(int mday, int month, int year);
/****************************************************************************
* Name: clock_calendar2utc
*
* Description:
* Calendar/UTC conversion based on algorithms from p. 604
* of Seidelman, P. K. 1992. Explanatory Supplement to
* the Astronomical Almanac. University Science Books,
* Mill Valley.
*
****************************************************************************/
time_t clock_calendar2utc(int year, int month, int day);
/****************************************************************************
* Name: clock_synchronize
*

159
include/nuttx/time.h
View file

@ -1,159 +0,0 @@
/****************************************************************************
* include/nuttx/time.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_TIME_H
#define __INCLUDE_NUTTX_TIME_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdbool.h>
#include <time.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* If Gregorian time is not supported, then neither is Julian */
#ifndef CONFIG_GREGORIAN_TIME
# undef CONFIG_JULIAN_TIME
#else
# define JD_OF_EPOCH 2440588 /* Julian Date of noon, J1970 */
# ifdef CONFIG_JULIAN_TIME
# define GREG_DUTC -141427 /* Default is October 15, 1582 */
# define GREG_YEAR 1582
# define GREG_MONTH 10
# define GREG_DAY 15
# endif /* CONFIG_JULIAN_TIME */
#endif /* !CONFIG_GREGORIAN_TIME */
#define SECSPERMIN 60
#define MINSPERHOUR 60
#define HOURSPERDAY 24
#define DAYSPERWEEK 7
#define DAYSPERNYEAR 365
#define DAYSPERLYEAR 366
#define MONSPERYEAR 12
#define TM_SUNDAY 0
#define TM_MONDAY 1
#define TM_TUESDAY 2
#define TM_WEDNESDAY 3
#define TM_THURSDAY 4
#define TM_FRIDAY 5
#define TM_SATURDAY 6
#define TM_JANUARY 0
#define TM_FEBRUARY 1
#define TM_MARCH 2
#define TM_APRIL 3
#define TM_MAY 4
#define TM_JUNE 5
#define TM_JULY 6
#define TM_AUGUST 7
#define TM_SEPTEMBER 8
#define TM_OCTOBER 9
#define TM_NOVEMBER 10
#define TM_DECEMBER 11
#define TM_YEAR_BASE 1900
#define TM_WDAY_BASE TM_MONDAY
#define EPOCH_YEAR 1970
#define EPOCH_WDAY TM_THURSDAY
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
/****************************************************************************
* Name: clock_isleapyear
*
* Description:
* Return true if the specified year is a leap year
*
****************************************************************************/
int clock_isleapyear(int year);
/****************************************************************************
* Name: clock_daysbeforemonth
*
* Description:
* Get the number of days that occurred before the beginning of the month.
*
****************************************************************************/
int clock_daysbeforemonth(int month, bool leapyear);
/****************************************************************************
* Name: clock_dayoftheweek
*
* Description:
* Get the day of the week
*
* Input Parameters:
* mday - The day of the month 1 - 31
* month - The month of the year 1 - 12
* year - the year including the 1900
*
* Returned Value:
* Zero based day of the week 0-6, 0 = Sunday, 1 = Monday... 6 = Saturday
*
****************************************************************************/
int clock_dayoftheweek(int mday, int month, int year);
/****************************************************************************
* Name: clock_calendar2utc
*
* Description:
* Calendar/UTC conversion based on algorithms from p. 604
* of Seidelman, P. K. 1992. Explanatory Supplement to
* the Astronomical Almanac. University Science Books,
* Mill Valley.
*
****************************************************************************/
time_t clock_calendar2utc(int year, int month, int day);
#undef EXTERN
#ifdef __cplusplus
}
#endif
#endif /* __INCLUDE_NUTTX_TIME_H */

2
libs/libc/time/lib_asctimer.c
View file

@ -28,7 +28,7 @@
#include <sys/param.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
/****************************************************************************
* Private Data

2
libs/libc/time/lib_calendar2utc.c
View file

@ -28,7 +28,7 @@
#include <time.h>
#include <debug.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
/****************************************************************************
* Private Functions

2
libs/libc/time/lib_dayofweek.c
View file

@ -27,7 +27,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
/****************************************************************************
* Pre-processor Definitions

2
libs/libc/time/lib_daysbeforemonth.c
View file

@ -27,7 +27,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
/****************************************************************************
* Private Data

2
libs/libc/time/lib_gmtime.c
View file

@ -28,7 +28,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
/****************************************************************************
* Public Functions

1
libs/libc/time/lib_gmtimer.c
View file

@ -28,7 +28,6 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
/****************************************************************************

2
libs/libc/time/lib_isleapyear.c
View file

@ -24,7 +24,7 @@
#include <nuttx/config.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
/****************************************************************************
* Pre-processor Definitions

2
libs/libc/time/lib_localtime.c
View file

@ -60,7 +60,7 @@
#include <sys/param.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
#include <nuttx/init.h>
#include <nuttx/fs/fs.h>
#include <nuttx/mutex.h>

2
libs/libc/time/lib_strftime.c
View file

@ -28,7 +28,7 @@
#include <stdio.h>
#include <debug.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
/****************************************************************************
* Pre-processor Definitions

2
libs/libc/time/lib_strptime.c
View file

@ -36,7 +36,7 @@
#include <locale.h>
#include <strings.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
/****************************************************************************
* Pre-processor Definitions

2
libs/libc/time/lib_timegm.c
View file

@ -27,7 +27,7 @@
#include <time.h>
#include <debug.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
/****************************************************************************
* Pre-processor Definitions

1
sched/clock/clock_initialize.c
View file

@ -36,7 +36,6 @@
#include <nuttx/arch.h>
#include <nuttx/clock.h>
#include <nuttx/time.h>
#include "clock/clock.h"
#ifdef CONFIG_CLOCK_TIMEKEEPING