Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 07:45:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sched/clock: Fix a recently introduced name collision

Browse Source
This commit is contained in:
Gregory Nutt
2018-03-12 13:36:06 -06:00
parent 251924a734
commit e6e7dae05b
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/clock.h
+4 -1
View File
@@ -133,7 +133,10 @@
#define MSEC_PER_HOUR (MSEC_PER_MIN * MIN_PER_HOUR) #define MSEC_PER_HOUR (MSEC_PER_MIN * MIN_PER_HOUR)
#define DSEC_PER_HOUR (HSEC_PER_SEC * MIN_PER_HOUR) #define DSEC_PER_HOUR (HSEC_PER_SEC * MIN_PER_HOUR)
#define HSEC_PER_HOUR (DSEC_PER_MIN * MIN_PER_HOUR) #define HSEC_PER_HOUR (DSEC_PER_MIN * MIN_PER_HOUR)
#define SEC_PER_HOUR (SEC_PER_MIN * MIN_PER_HOUR) #define SEC_PER_HOUR (SEC_PER_MIN * MIN_PER_HOUR)
#define HOURS_PER_DAY 24L
#define SEC_PER_DAY (HOURS_PER_DAY * SEC_PER_HOUR)
/* If CONFIG_SCHED_TICKLESS is not defined, then the interrupt interval of /* If CONFIG_SCHED_TICKLESS is not defined, then the interrupt interval of
* the system timer is given by USEC_PER_TICK. This is the expected number * the system timer is given by USEC_PER_TICK. This is the expected number
sched/clock/clock_initialize.c
+2 -11
View File
@@ -1,7 +1,8 @@
/**************************************************************************** /****************************************************************************
* sched/clock/clock_initialize.c * sched/clock/clock_initialize.c
* *
* Copyright (C) 2007, 2009, 2011-2012, 2017 Gregory Nutt. All rights reserved. * Copyright (C) 2007, 2009, 2011-2012, 2017-2018 Gregory Nutt. All rights
* reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -58,16 +59,6 @@
# include "clock/clock_timekeeping.h" # include "clock/clock_timekeeping.h"
#endif #endif
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Standard time definitions (in units of seconds) */
#define SEC_PER_MIN ((time_t)60)
#define SEC_PER_HOUR ((time_t)60 * SEC_PER_MIN)
#define SEC_PER_DAY ((time_t)24 * SEC_PER_HOUR)
/**************************************************************************** /****************************************************************************
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/