j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reorder TIMEKEEPING_UNLOCK; remove timekeeping.h

Browse source 
Based on code review by @ourairquality
This commit is contained in:
Jeff Kletsky 2018-02-23 20:01:12 -08:00
parent 6902615525
commit bb58626f47
2 changed files with 1 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/timekeeping/timekeeping.c
View file

@ -46,8 +46,6 @@
#include <time.h> #include <time.h>
#include "timekeeping.h"
/* #define here for easier use of other system clocks */ /* #define here for easier use of other system clocks */
#define GET_SYSTEM_CLOCK_US() sdk_system_get_time() #define GET_SYSTEM_CLOCK_US() sdk_system_get_time()
@ -113,7 +111,7 @@ extern void __tz_unlock(void);
#ifdef TIMEKEEPING_LOCK_USE_CRITICAL #ifdef TIMEKEEPING_LOCK_USE_CRITICAL
#define TIMEKEEPING_LOCK() do {TZ_LOCK; taskENTER_CRITICAL();} while (0) #define TIMEKEEPING_LOCK() do {TZ_LOCK; taskENTER_CRITICAL();} while (0)
#define TIMEKEEPING_UNLOCK() do {TZ_UNLOCK; taskEXIT_CRITICAL();} while (0) #define TIMEKEEPING_UNLOCK() do {taskEXIT_CRITICAL(); TZ_UNLOCK;} while (0)
#else #else
#define TIMEKEEPING_LOCK() TZ_LOCK #define TIMEKEEPING_LOCK() TZ_LOCK
#define TIMEKEEPING_UNLOCK() TZ_UNLOCK #define TIMEKEEPING_UNLOCK() TZ_UNLOCK

50
extras/timekeeping/timekeeping.h
View file

@ -1,50 +0,0 @@
/*
* Basic timekeeping functions
*
* Independent of clock discipline
*/
/*-
* Copyright (c) 2018, Jeff Kletsky
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* * 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.
*
* * Neither the name of the copyright holder 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
* HOLDER 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.
*/
#ifndef EXTRAS_TIMEKEEPING_TIMEKEEPING_H
#define EXTRAS_TIMEKEEPING_TIMEKEEPING_H
/* No implementation-specific declarations */
/* Public API already defined by
#include <sys/time.h>
#include <time.h>
#include <stdlib.h>
*/
#endif /* EXTRAS_TIMEKEEPING_TIMEKEEPING_H */