diff --git a/arch/sim/src/sim/up_ajoystick.c b/arch/sim/src/sim/up_ajoystick.c index 017c98ccc8..1e1743826a 100644 --- a/arch/sim/src/sim/up_ajoystick.c +++ b/arch/sim/src/sim/up_ajoystick.c @@ -50,8 +50,6 @@ #include "up_internal.h" -#ifdef CONFIG_AJOYSTICK - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -253,5 +251,3 @@ int up_buttonevent(int x, int y, int buttons) return OK; } - -#endif /* CONFIG_AJOYSTICK */ diff --git a/arch/sim/src/sim/up_checkstack.c b/arch/sim/src/sim/up_checkstack.c index 160d0a460c..f8be93f036 100644 --- a/arch/sim/src/sim/up_checkstack.c +++ b/arch/sim/src/sim/up_checkstack.c @@ -52,8 +52,6 @@ #include "sched/sched.h" #include "up_internal.h" -#ifdef CONFIG_STACK_COLORATION - /**************************************************************************** * Private Function Prototypes ****************************************************************************/ @@ -207,5 +205,3 @@ ssize_t up_check_stack_remain(void) { return up_check_tcbstack_remain(this_task()); } - -#endif /* CONFIG_STACK_COLORATION */ diff --git a/arch/sim/src/sim/up_cpuidlestack.c b/arch/sim/src/sim/up_cpuidlestack.c index d7e374662c..7179808e9b 100644 --- a/arch/sim/src/sim/up_cpuidlestack.c +++ b/arch/sim/src/sim/up_cpuidlestack.c @@ -46,8 +46,6 @@ #include "up_internal.h" -#ifdef CONFIG_SMP - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -104,5 +102,3 @@ int up_cpu_idlestack(int cpu, FAR struct tcb_s *tcb, size_t stack_size) tcb->adj_stack_ptr = NULL; return OK; } - -#endif /* CONFIG_SMP */ diff --git a/arch/sim/src/sim/up_ioexpander.c b/arch/sim/src/sim/up_ioexpander.c index 7f9180bfab..36e1d4a0cc 100644 --- a/arch/sim/src/sim/up_ioexpander.c +++ b/arch/sim/src/sim/up_ioexpander.c @@ -50,8 +50,6 @@ #include "up_internal.h" -#ifdef CONFIG_SIM_IOEXPANDER - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -861,5 +859,3 @@ FAR struct ioexpander_dev_s *sim_ioexpander_initialize(void) return &priv->dev; } - -#endif /* CONFIG_SIM_IOEXPANDER */ diff --git a/arch/sim/src/sim/up_netdriver.c b/arch/sim/src/sim/up_netdriver.c index b7b9b8dbd2..488f56bdc3 100644 --- a/arch/sim/src/sim/up_netdriver.c +++ b/arch/sim/src/sim/up_netdriver.c @@ -44,8 +44,6 @@ #include -#ifdef CONFIG_NET_ETHERNET - #include #include #include @@ -377,5 +375,3 @@ int netdriver_setmacaddr(unsigned char *macaddr) memcpy(g_sim_dev.d_mac.ether.ether_addr_octet, macaddr, IFHWADDRLEN); return 0; } - -#endif /* CONFIG_NET_ETHERNET */ diff --git a/arch/sim/src/sim/up_qspiflash.c b/arch/sim/src/sim/up_qspiflash.c index bffc36e3b7..359e3c127f 100644 --- a/arch/sim/src/sim/up_qspiflash.c +++ b/arch/sim/src/sim/up_qspiflash.c @@ -53,8 +53,6 @@ #include "up_internal.h" -#if defined(CONFIG_SIM_QSPIFLASH) - /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ @@ -602,5 +600,3 @@ FAR struct qspi_dev_s *up_qspiflashinitialize() leave_critical_section(flags); return (FAR struct qspi_dev_s *)priv; } - -#endif /* CONFIG_SIM_QSPIFLASH */ diff --git a/arch/sim/src/sim/up_romgetc.c b/arch/sim/src/sim/up_romgetc.c index 955674d894..3e0a75921f 100644 --- a/arch/sim/src/sim/up_romgetc.c +++ b/arch/sim/src/sim/up_romgetc.c @@ -41,8 +41,6 @@ #include -#ifdef CONFIG_ARCH_ROMGETC - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -86,4 +84,3 @@ char up_romgetc(FAR const char *ptr) return *ptr; } -#endif diff --git a/arch/sim/src/sim/up_schednote.c b/arch/sim/src/sim/up_schednote.c index ece96e988c..225eaf9b0d 100644 --- a/arch/sim/src/sim/up_schednote.c +++ b/arch/sim/src/sim/up_schednote.c @@ -42,9 +42,6 @@ #include #include -#if defined(CONFIG_SCHED_INSTRUMENTATION) && \ - !defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -207,5 +204,3 @@ void sched_note_csection(FAR struct tcb_s *tcb, bool enter) #endif } #endif - -#endif /* CONFIG_SCHED_INSTRUMENTATION && !CONFIG_SCHED_INSTRUMENTATION_BUFFER */ diff --git a/arch/sim/src/sim/up_smpsignal.c b/arch/sim/src/sim/up_smpsignal.c index 126269c4c4..a2d953d50b 100644 --- a/arch/sim/src/sim/up_smpsignal.c +++ b/arch/sim/src/sim/up_smpsignal.c @@ -46,8 +46,6 @@ #include "sched/sched.h" #include "up_internal.h" -#ifdef CONFIG_SMP - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -177,5 +175,3 @@ void up_cpu_started(void) sched_note_start(tcb); #endif } - -#endif /* CONFIG_SMP */ diff --git a/arch/sim/src/sim/up_spiflash.c b/arch/sim/src/sim/up_spiflash.c index e97e08859e..1308bc7f4c 100644 --- a/arch/sim/src/sim/up_spiflash.c +++ b/arch/sim/src/sim/up_spiflash.c @@ -52,8 +52,6 @@ #include "up_internal.h" -#if defined(CONFIG_SIM_SPIFLASH) - /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ @@ -953,5 +951,3 @@ FAR struct spi_dev_s *up_spiflashinitialize(FAR const char *name) leave_critical_section(flags); return (FAR struct spi_dev_s *)priv; } - -#endif /* CONFIG_SIM_SPIFLASH */ diff --git a/arch/sim/src/sim/up_tapdev.c b/arch/sim/src/sim/up_tapdev.c index fc38d4c83e..aa9c4a43bd 100644 --- a/arch/sim/src/sim/up_tapdev.c +++ b/arch/sim/src/sim/up_tapdev.c @@ -38,8 +38,6 @@ * ****************************************************************************/ -#ifndef __CYGWIN__ - /**************************************************************************** * Included Files ****************************************************************************/ @@ -394,5 +392,3 @@ void tapdev_ifdown(void) } #endif } - -#endif /* !__CYGWIN__ */ diff --git a/arch/sim/src/sim/up_wpcap.c b/arch/sim/src/sim/up_wpcap.c index 5c754f45c3..d4305266c6 100644 --- a/arch/sim/src/sim/up_wpcap.c +++ b/arch/sim/src/sim/up_wpcap.c @@ -38,8 +38,6 @@ * ****************************************************************************/ -#ifdef __CYGWIN__ - /**************************************************************************** * Included Files ****************************************************************************/ @@ -310,5 +308,3 @@ void wpcap_send(unsigned char *buf, unsigned int buflen) error_exit("error on send\n"); } } - -#endif /* __CYGWIN__ */