Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove clock_systimer32 and clock_systimer64. There is now only clock_systimer

Browse Source
This commit is contained in:
Gregory Nutt
2016-01-21 16:49:24 -06:00
parent b04e2ea021
commit 032ad1b70b
9 changed files with 37 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
syscall/syscall.csv
+1 -2
View File
@@ -11,8 +11,7 @@
"clock_getres","time.h","","int","clockid_t","struct timespec*"
"clock_gettime","time.h","","int","clockid_t","struct timespec*"
"clock_settime","time.h","","int","clockid_t","const struct timespec*"
"clock_systimer32","nuttx/clock.h","!defined(__HAVE_KERNEL_GLOBALS) && !defined(CONFIG_SYSTEM_TIME64)","uint32_t"
"clock_systimer64","nuttx/clock.h","!defined(__HAVE_KERNEL_GLOBALS) && defined(CONFIG_SYSTEM_TIME64)","uint64_t"
"clock_systimer","nuttx/clock.h","!defined(__HAVE_KERNEL_GLOBALS)","systime_t"
"close","unistd.h","CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0","int","int"
"closedir","dirent.h","CONFIG_NFILE_DESCRIPTORS > 0","int","FAR DIR*"
"connect","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","FAR const struct sockaddr*","socklen_t"
1 _exit unistd.h void int
11 clock_getres time.h int clockid_t
12 clock_gettime time.h int clockid_t
13 clock_settime time.h int clockid_t
14 clock_systimer32 clock_systimer nuttx/clock.h !defined(__HAVE_KERNEL_GLOBALS) && !defined(CONFIG_SYSTEM_TIME64) !defined(__HAVE_KERNEL_GLOBALS) uint32_t systime_t
clock_systimer64 nuttx/clock.h !defined(__HAVE_KERNEL_GLOBALS) && defined(CONFIG_SYSTEM_TIME64) uint64_t
15 close unistd.h CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0 int int
16 closedir dirent.h CONFIG_NFILE_DESCRIPTORS > 0 int FAR DIR*
17 connect sys/socket.h CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET) int int
syscall/syscall_clock_systimer.c
+4 -11
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* syscall/syscall_clock_systimer.c
*
* Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2011-2012, 2014, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
****************************************************************************/
/****************************************************************************
* Name: syscall_clock_systimer32/64
* Name: syscall_clock_systimer
*
* Description:
* In the kernel build, proxying for clock_systimer() must be handled
@@ -74,14 +74,7 @@
*
****************************************************************************/
#ifdef CONFIG_SYSTEM_TIME64
uint64_t syscall_clock_systimer64(void)
systime_t syscall_clock_systimer(void)
{
return clock_systimer64();
return clock_systime();
}
#else
uint32_t syscall_clock_systimer32(void)
{
return clock_systimer32();
}
#endif
syscall/syscall_funclookup.c
+1 -5
View File
@@ -99,11 +99,7 @@
* have an address that can be included in the g_funclookup[] table.
*/
#ifdef CONFIG_SYSTEM_TIME64
uint64_t syscall_clock_systimer64(void);
#else
uint32_t syscall_clock_systimer32(void);
#endif
systime_t syscall_clock_systimer(void);
/****************************************************************************
* Pre-processor Definitions
syscall/syscall_lookup.h
+1 -5
View File
@@ -148,11 +148,7 @@ SYSCALL_LOOKUP(up_assert, 2, STUB_up_assert)
* NuttX configuration.
*/
#ifdef CONFIG_SYSTEM_TIME64
SYSCALL_LOOKUP(syscall_clock_systimer64, 0, STUB_clock_systimer64)
#else
SYSCALL_LOOKUP(syscall_clock_systimer32, 0, STUB_clock_systimer32)
#endif
SYSCALL_LOOKUP(syscall_clock_systimer, 0, STUB_clock_systimer)
SYSCALL_LOOKUP(clock_getres, 2, STUB_clock_getres)
SYSCALL_LOOKUP(clock_gettime, 2, STUB_clock_gettime)
SYSCALL_LOOKUP(clock_settime, 2, STUB_clock_settime)
syscall/syscall_stublookup.c
+1 -5
View File
@@ -150,11 +150,7 @@ uintptr_t STUB_nanosleep(int nbr, uintptr_t parm1, uintptr_t parm2);
* NuttX configuration.
*/
#ifdef CONFIG_SYSTEM_TIME64
uintptr_t STUB_clock_systimer64(int nbr);
#else
uintptr_t STUB_clock_systimer32(int nbr);
#endif
uintptr_t STUB_clock_systimer(int nbr);
uintptr_t STUB_clock_getres(int nbr, uintptr_t parm1, uintptr_t parm2);
uintptr_t STUB_clock_gettime(int nbr, uintptr_t parm1, uintptr_t parm2);
uintptr_t STUB_clock_settime(int nbr, uintptr_t parm1, uintptr_t parm2);