mirror of
https://github.com/apache/nuttx.git
synced 2026-06-07 17:33:08 +08:00
Remove CONFIG_DISABLE_CLOCK
This commit is contained in:
@@ -142,8 +142,6 @@ struct cpuload_s
|
||||
* Public Data
|
||||
****************************************************************************/
|
||||
|
||||
#if !defined(CONFIG_DISABLE_CLOCK)
|
||||
|
||||
/* Access to raw system clock ***********************************************/
|
||||
/* Direct access to the system timer/counter is supported only if (1) the
|
||||
* system timer counter is available (i.e., we are not configured to use
|
||||
@@ -288,5 +286,4 @@ int clock_cpuload(int pid, FAR struct cpuload_s *cpuload);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* !CONFIG_DISABLE_CLOCK */
|
||||
#endif /* _INCLUDE_NUTTX_CLOCK_H */
|
||||
|
||||
@@ -96,13 +96,11 @@ struct socket
|
||||
|
||||
#ifdef CONFIG_NET_SOCKOPTS
|
||||
sockopt_t s_options; /* Selected socket options */
|
||||
#ifndef CONFIG_DISABLE_CLOCK
|
||||
socktimeo_t s_rcvtimeo; /* Receive timeout value (in deciseconds) */
|
||||
socktimeo_t s_sndtimeo; /* Send timeout value (in deciseconds) */
|
||||
#ifdef CONFIG_NET_SOLINGER
|
||||
socktimeo_t s_linger; /* Linger timeout value (in deciseconds) */
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
FAR void *s_conn; /* Connection: struct tcp_conn_s or udp_conn_s */
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
|
||||
/* ICMP configuration options */
|
||||
|
||||
#if !defined(CONFIG_NET_ICMP) || defined(CONFIG_DISABLE_CLOCK)
|
||||
#ifndef CONFIG_NET_ICMP
|
||||
# undef CONFIG_NET_ICMP_PING
|
||||
#endif
|
||||
|
||||
|
||||
+7
-11
@@ -2,7 +2,7 @@
|
||||
* include/sys/syscall.h
|
||||
* This file contains the system call numbers.
|
||||
*
|
||||
* Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
|
||||
* Copyright (C) 2011-2014 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -173,16 +173,12 @@
|
||||
* NuttX configuration.
|
||||
*/
|
||||
|
||||
#ifndef CONFIG_DISABLE_CLOCK
|
||||
# define SYS_clock_systimer (__SYS_clock+0)
|
||||
# define SYS_clock_getres (__SYS_clock+1)
|
||||
# define SYS_clock_gettime (__SYS_clock+2)
|
||||
# define SYS_clock_settime (__SYS_clock+3)
|
||||
# define SYS_gettimeofday (__SYS_clock+4)
|
||||
# define __SYS_timers (__SYS_clock+5)
|
||||
#else
|
||||
# define __SYS_timers __SYS_clock
|
||||
#endif
|
||||
#define SYS_clock_systimer (__SYS_clock+0)
|
||||
#define SYS_clock_getres (__SYS_clock+1)
|
||||
#define SYS_clock_gettime (__SYS_clock+2)
|
||||
#define SYS_clock_settime (__SYS_clock+3)
|
||||
#define SYS_gettimeofday (__SYS_clock+4)
|
||||
#define __SYS_timers (__SYS_clock+5)
|
||||
|
||||
/* The following are defined only if POSIX timers are supported */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user