[libc] move clock_time to time.

1 files changed, 183 insertions, 189 deletions

diff --git a/components/libc/compilers/newlib/syscalls.c b/components/libc/compilers/newlib/syscalls.c
index 52d2361a04..514dda147f 100644
--- a/components/libc/compilers/newlib/syscalls.c
+++ b/components/libc/compilers/newlib/syscalls.c
@@ -17,86 +17,86 @@ int
 _close_r(struct _reent *ptr, int fd)
 {
 #ifndef RT_USING_DFS
-	return 0;
+    return 0;
 #else
-	return close(fd);
+    return close(fd);
 #endif
 }
 
 int
 _execve_r(struct _reent *ptr, const char * name, char *const *argv, char *const *env)
 {
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
 }
 
 int
 _fcntl_r(struct _reent *ptr, int fd, int cmd, int arg)
 {
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
 }
 
 int
 _fork_r(struct _reent *ptr)
 {
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
 }
 
 int
 _fstat_r(struct _reent *ptr, int fd, struct stat *pstat)
 {
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
 }
 
 int
 _getpid_r(struct _reent *ptr)
 {
-	return 0;
+    return 0;
 }
 
 int
 _isatty_r(struct _reent *ptr, int fd)
 {
-	if (fd >=0 && fd < 3) return 1;
+    if (fd >=0 && fd < 3) return 1;
 
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
 }
 
 int
 _kill_r(struct _reent *ptr, int pid, int sig)
 {
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
 }
 
 int
 _link_r(struct _reent *ptr, const char *old, const char *new)
 {
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
 }
 
 _off_t
 _lseek_r(struct _reent *ptr, int fd, _off_t pos, int whence)
 {
 #ifndef RT_USING_DFS
-	return 0;
+    return 0;
 #else
-	_off_t rc;
+    _off_t rc;
 
-	rc = lseek(fd, pos, whence);
-	return rc;
+    rc = lseek(fd, pos, whence);
+    return rc;
 #endif
 }
 
@@ -104,12 +104,12 @@ int
 _mkdir_r(struct _reent *ptr, const char *name, int mode)
 {
 #ifndef RT_USING_DFS
-	return 0;
+    return 0;
 #else
-	int rc;
+    int rc;
 
-	rc = mkdir(name, mode);
-	return rc;
+    rc = mkdir(name, mode);
+    return rc;
 #endif
 }
 
@@ -117,12 +117,12 @@ int
 _open_r(struct _reent *ptr, const char *file, int flags, int mode)
 {
 #ifndef RT_USING_DFS
-	return 0;
+    return 0;
 #else
-	int rc;
+    int rc;
 
-	rc = open(file, flags, mode);
-	return rc;
+    rc = open(file, flags, mode);
+    return rc;
 #endif
 }
 
@@ -130,12 +130,12 @@ _ssize_t
 _read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes)
 {
 #ifndef RT_USING_DFS
-	return 0;
+    return 0;
 #else
-	_ssize_t rc;
+    _ssize_t rc;
 
-	rc = read(fd, buf, nbytes);
-	return rc;
+    rc = read(fd, buf, nbytes);
+    return rc;
 #endif
 }
 
@@ -143,62 +143,62 @@ int
 _rename_r(struct _reent *ptr, const char *old, const char *new)
 {
 #ifndef RT_USING_DFS
-	return 0;
+    return 0;
 #else
-	int rc;
+    int rc;
 
-	rc = rename(old, new);
-	return rc;
+    rc = rename(old, new);
+    return rc;
 #endif
 }
 
 void *
 _sbrk_r(struct _reent *ptr, ptrdiff_t incr)
 {
-	/* no use this routine to get memory */
-	return RT_NULL;
+    /* no use this routine to get memory */
+    return RT_NULL;
 }
 
 int
 _stat_r(struct _reent *ptr, const char *file, struct stat *pstat)
 {
 #ifndef RT_USING_DFS
-	return 0;
+    return 0;
 #else
-	int rc;
+    int rc;
 
-	rc = stat(file, pstat);
-	return rc;
+    rc = stat(file, pstat);
+    return rc;
 #endif
 }
 
 _CLOCK_T_
 _times_r(struct _reent *ptr, struct tms *ptms)
 {
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
 }
 
 int
 _unlink_r(struct _reent *ptr, const char *file)
 {
 #ifndef RT_USING_DFS
-	return 0;
+    return 0;
 #else
-	int rc;
+    int rc;
 
-	rc = unlink(file);
-	return rc;
+    rc = unlink(file);
+    return rc;
 #endif
 }
 
 int
 _wait_r(struct _reent *ptr, int *status)
 {
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
 }
 
 #ifdef RT_USING_DEVICE
@@ -206,133 +206,127 @@ _ssize_t
 _write_r(struct _reent *ptr, int fd, const void *buf, size_t nbytes)
 {
 #ifndef RT_USING_DFS
-	if (fd == 0)
-	{
-		rt_device_t console;
+    if (fd == 0)
+    {
+        rt_device_t console;
 
-		console = rt_console_get_device();
-		if (console) return rt_device_write(console, -1, buf, nbytes);
-	}
+        console = rt_console_get_device();
+        if (console) return rt_device_write(console, -1, buf, nbytes);
+    }
 
     return 0;
 
 #else
-	_ssize_t rc;
+    _ssize_t rc;
 
-	rc = write(fd, buf, nbytes);
-	return rc;
+    rc = write(fd, buf, nbytes);
+    return rc;
 #endif
 }
 #endif
 
-#ifndef RT_USING_PTHREADS
+#ifdef RT_USING_PTHREADS
 
-#ifndef MILLISECOND_PER_SECOND
-#define MILLISECOND_PER_SECOND	1000UL
-#endif
+#include <clock_time.h>
+/* POSIX timer provides clock_gettime function */
+#include <time.h>
+int
+_gettimeofday_r(struct _reent *ptr, struct timeval *__tp, void *__tzp)
+{
+    struct timespec tp;
 
-#ifndef MICROSECOND_PER_SECOND
-#define MICROSECOND_PER_SECOND	1000000UL
-#endif
+    if (clock_gettime(CLOCK_REALTIME, &tp) == 0)
+    {
+        if (__tp != RT_NULL)
+        {
+            __tp->tv_sec  = tp.tv_sec;
+            __tp->tv_usec = tp.tv_nsec / 1000UL;
+        }
 
-#ifndef NANOSECOND_PER_SECOND
-#define NANOSECOND_PER_SECOND	1000000000UL
-#endif
+        return tp.tv_sec;
+    }
+
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
+}
 
-#define MILLISECOND_PER_TICK	(MILLISECOND_PER_SECOND / RT_TICK_PER_SECOND)
-#define MICROSECOND_PER_TICK	(MICROSECOND_PER_SECOND / RT_TICK_PER_SECOND)
-#define NANOSECOND_PER_TICK		(NANOSECOND_PER_SECOND  / RT_TICK_PER_SECOND)
+#else
+
+#define MILLISECOND_PER_SECOND  1000UL
+#define MICROSECOND_PER_SECOND  1000000UL
+#define NANOSECOND_PER_SECOND   1000000000UL
 
+#define MILLISECOND_PER_TICK    (MILLISECOND_PER_SECOND / RT_TICK_PER_SECOND)
+#define MICROSECOND_PER_TICK    (MICROSECOND_PER_SECOND / RT_TICK_PER_SECOND)
+#define NANOSECOND_PER_TICK     (NANOSECOND_PER_SECOND  / RT_TICK_PER_SECOND)
 
 struct timeval _timevalue = {0};
 #ifdef RT_USING_DEVICE
 static void libc_system_time_init(void)
 {
-	time_t time;
-	rt_tick_t tick;
-	rt_device_t device;
+    time_t time;
+    rt_tick_t tick;
+    rt_device_t device;
 
-	time = 0;
-	device = rt_device_find("rtc");
-	if (device != RT_NULL)
-	{
-		/* get realtime seconds */
-		rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
-	}
+    time = 0;
+    device = rt_device_find("rtc");
+    if (device != RT_NULL)
+    {
+        /* get realtime seconds */
+        rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
+    }
 
-	/* get tick */
-	tick = rt_tick_get();
+    /* get tick */
+    tick = rt_tick_get();
 
-	_timevalue.tv_usec = MICROSECOND_PER_SECOND - (tick%RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK;
-	_timevalue.tv_sec = time - tick/RT_TICK_PER_SECOND - 1;
+    _timevalue.tv_usec = MICROSECOND_PER_SECOND - (tick%RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK;
+    _timevalue.tv_sec = time - tick/RT_TICK_PER_SECOND - 1;
 }
 #endif
 
 int libc_get_time(struct timespec *time)
 {
-	rt_tick_t tick;
-	static rt_bool_t inited = 0;
+    rt_tick_t tick;
+    static rt_bool_t inited = 0;
 
-	RT_ASSERT(time != RT_NULL);
+    RT_ASSERT(time != RT_NULL);
 
-	/* initialize system time */
-	if (inited == 0)
-	{
-		libc_system_time_init();
-		inited = 1;
-	}
+    /* initialize system time */
+    if (inited == 0)
+    {
+        libc_system_time_init();
+        inited = 1;
+    }
 
-	/* get tick */
-	tick = rt_tick_get();
+    /* get tick */
+    tick = rt_tick_get();
 
-	time->tv_sec = _timevalue.tv_sec + tick / RT_TICK_PER_SECOND;
-	time->tv_nsec = (_timevalue.tv_usec + (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK) * 1000;
+    time->tv_sec = _timevalue.tv_sec + tick / RT_TICK_PER_SECOND;
+    time->tv_nsec = (_timevalue.tv_usec + (tick % RT_TICK_PER_SECOND) * MICROSECOND_PER_TICK) * 1000;
 
-	return 0;
+    return 0;
 }
 
 int
 _gettimeofday_r(struct _reent *ptr, struct timeval *__tp, void *__tzp)
 {
-	struct timespec tp;
-
-	if (libc_get_time(&tp) == 0)
-	{
-		if (__tp != RT_NULL)
-		{
-			__tp->tv_sec  = tp.tv_sec;
-			__tp->tv_usec = tp.tv_nsec / 1000UL;
-		}
-
-		return tp.tv_sec;
-	}
-
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
-}
-#else
-/* POSIX thread provides clock_gettime function */
-#include <time.h>
-int
-_gettimeofday_r(struct _reent *ptr, struct timeval *__tp, void *__tzp)
-{
-	struct timespec tp;
+    struct timespec tp;
 
-	if (clock_gettime(CLOCK_REALTIME, &tp) == 0)
-	{
-		if (__tp != RT_NULL)
-		{
-			__tp->tv_sec  = tp.tv_sec;
-			__tp->tv_usec = tp.tv_nsec / 1000UL;
-		}
+    if (libc_get_time(&tp) == 0)
+    {
+        if (__tp != RT_NULL)
+        {
+            __tp->tv_sec  = tp.tv_sec;
+            __tp->tv_usec = tp.tv_nsec / 1000UL;
+        }
 
-		return tp.tv_sec;
-	}
+        return tp.tv_sec;
+    }
 
-	/* return "not supported" */
-	ptr->_errno = ENOTSUP;
-	return -1;
+    /* return "not supported" */
+    ptr->_errno = ENOTSUP;
+    return -1;
 }
 #endif
 
@@ -340,64 +334,64 @@ _gettimeofday_r(struct _reent *ptr, struct timeval *__tp, void *__tzp)
 void *
 _malloc_r (struct _reent *ptr, size_t size)
 {
-	void* result;
+    void* result;
 
-	result = (void*)rt_malloc (size);
-	if (result == RT_NULL)
-	{
-		ptr->_errno = ENOMEM;
-	}
+    result = (void*)rt_malloc (size);
+    if (result == RT_NULL)
+    {
+        ptr->_errno = ENOMEM;
+    }
 
-	return result;
+    return result;
 }
 
 void *
 _realloc_r (struct _reent *ptr, void *old, size_t newlen)
 {
-	void* result;
+    void* result;
 
-	result = (void*)rt_realloc (old, newlen);
-	if (result == RT_NULL)
-	{
-		ptr->_errno = ENOMEM;
-	}
+    result = (void*)rt_realloc (old, newlen);
+    if (result == RT_NULL)
+    {
+        ptr->_errno = ENOMEM;
+    }
 
-	return result;
+    return result;
 }
 
 void *_calloc_r (struct _reent *ptr, size_t size, size_t len)
 {
-	void* result;
+    void* result;
 
-	result = (void*)rt_calloc (size, len);
-	if (result == RT_NULL)
-	{
-		ptr->_errno = ENOMEM;
-	}
+    result = (void*)rt_calloc (size, len);
+    if (result == RT_NULL)
+    {
+        ptr->_errno = ENOMEM;
+    }
 
-	return result;
+    return result;
 }
 
 void 
 _free_r (struct _reent *ptr, void *addr)
 {
-	rt_free (addr);
+    rt_free (addr);
 }
 
 void
 _exit (int status)
 {
 #ifdef RT_USING_MODULE
-	rt_module_t module;
+    rt_module_t module;
 
-	module = rt_module_self();
-	if (module != RT_NULL)
-	{
-		struct rt_list_node *list;
-		struct rt_object *object;
+    module = rt_module_self();
+    if (module != RT_NULL)
+    {
+        struct rt_list_node *list;
+        struct rt_object *object;
 
-		rt_enter_critical();
-		
+        rt_enter_critical();
+        
         /* delete all threads in the module */
         list = &module->module_object[RT_Object_Class_Thread].object_list;
         while (list->next != list)
@@ -414,19 +408,19 @@ _exit (int status)
                 rt_thread_delete((rt_thread_t)object);
             }
         }
-		/* delete main thread */
-		rt_thread_delete(module->module_thread);
-		rt_exit_critical();
+        /* delete main thread */
+        rt_thread_delete(module->module_thread);
+        rt_exit_critical();
 
-		/* re-schedule */
-		rt_schedule();
-	}
+        /* re-schedule */
+        rt_schedule();
+    }
 #endif
-	
-	rt_kprintf("thread:%s exit with %d\n", rt_thread_self()->name, status);
-	RT_ASSERT(0);
+    
+    rt_kprintf("thread:%s exit with %d\n", rt_thread_self()->name, status);
+    RT_ASSERT(0);
 
-	while (1);
+    while (1);
 }
 
 void 
@@ -438,7 +432,7 @@ _system(const char *s)
 
 void __libc_init_array(void)
 {
-	/* we not use __libc init_aray to initialize C++ objects */
+    /* we not use __libc init_aray to initialize C++ objects */
 }
 
 void abort(void)
@@ -453,5 +447,5 @@ void abort(void)
         rt_schedule();
     }
 
-	while (1);
+    while (1);
 }