diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-07 12:35:24 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-07 12:35:24 -0600 |
| commit | 6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458 (patch) | |
| tree | d1f3f6268bff752463cec686ca851f7b0f619051 /nuttx/include | |
| parent | c029edd96276fe7efa15992a5dd0da47920a2adb (diff) | |
| download | px4-nuttx-6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458.tar.gz px4-nuttx-6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458.tar.bz2 px4-nuttx-6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458.zip | |
Remove CONFIG_DISABLE_CLOCK
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/clock.h | 3 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/net.h | 2 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/netconfig.h | 2 | ||||
| -rw-r--r-- | nuttx/include/sys/syscall.h | 18 |
4 files changed, 8 insertions, 17 deletions
diff --git a/nuttx/include/nuttx/clock.h b/nuttx/include/nuttx/clock.h index ed460d1d2..210310603 100644 --- a/nuttx/include/nuttx/clock.h +++ b/nuttx/include/nuttx/clock.h @@ -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 */ diff --git a/nuttx/include/nuttx/net/net.h b/nuttx/include/nuttx/net/net.h index e3cbc73bc..eab830cae 100644 --- a/nuttx/include/nuttx/net/net.h +++ b/nuttx/include/nuttx/net/net.h @@ -96,14 +96,12 @@ 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 */ diff --git a/nuttx/include/nuttx/net/netconfig.h b/nuttx/include/nuttx/net/netconfig.h index 5f4164a27..08bbfc08a 100644 --- a/nuttx/include/nuttx/net/netconfig.h +++ b/nuttx/include/nuttx/net/netconfig.h @@ -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 diff --git a/nuttx/include/sys/syscall.h b/nuttx/include/sys/syscall.h index 142c583ac..b7e76f032 100644 --- a/nuttx/include/sys/syscall.h +++ b/nuttx/include/sys/syscall.h @@ -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 */ |