From df5e7686759064ac69d8124d35e088be1972ffae Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 1 Oct 2014 08:40:52 -0600
Subject: [PATCH] Mostly cosmetic changes to simulator

---
 arch/sim/src/Makefile        | 17 +++++++++++++----
 arch/sim/src/nuttx-names.dat |  2 ++
 arch/sim/src/up_internal.h   |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index b2f0b020e9..0143dcffc2 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -44,12 +44,17 @@ CSRCS  = up_initialize.c up_idle.c up_interruptcontext.c up_initialstate.c
 CSRCS += up_createstack.c up_usestack.c up_releasestack.c up_stackframe.c
 CSRCS += up_unblocktask.c up_blocktask.c up_releasepending.c
 CSRCS += up_reprioritizertr.c up_exit.c up_schedulesigaction.c up_spiflash.c
-CSRCS += up_allocateheap.c up_devconsole.c up_uartwait.c
+CSRCS += up_allocateheap.c up_devconsole.c
 
-HOSTSRCS = up_hostusleep.c up_simuart.c
+HOSTSRCS = up_hostusleep.c
 
 ifeq ($(CONFIG_SCHED_TICKLESS),y)
-CSRCS += up_tickless.c
+  CSRCS += up_tickless.c
+endif
+
+ifeq ($(CONFIG_DEV_CONSOLE),y)
+  CSRCS += up_uartwait.c
+  HOSTSRCS += up_simuart.c
 endif
 
 ifeq ($(CONFIG_NX_LCDDRIVER),y)
@@ -118,7 +123,11 @@ STDLIBS += -lpthread
 # are called only from the host OS-specific logic (HOSTOBJS)
 
 LINKOBJS = up_head$(OBJEXT)
-REQUIREDOBJS = $(LINKOBJS) up_uartwait$(OBJEXT)
+REQUIREDOBJS = $(LINKOBJS)
+
+ifeq ($(CONFIG_DEV_CONSOLE),y)
+  REQUIREDOBJS += up_uartwait$(OBJEXT)
+endif
 
 ifeq ($(CONFIG_SIM_X11FB),y)
 ifeq ($(CONFIG_SIM_TOUCHSCREEN),y)
diff --git a/arch/sim/src/nuttx-names.dat b/arch/sim/src/nuttx-names.dat
index 2a478515fe..6491586c2d 100644
--- a/arch/sim/src/nuttx-names.dat
+++ b/arch/sim/src/nuttx-names.dat
@@ -1,4 +1,5 @@
 calloc         NXcalloc
+clock_gettime  NXclock_gettime
 close          NXclose
 closedir       NXclosedir
 dup            NXdup
@@ -18,6 +19,7 @@ mkdir          NXmkdir
 mount          NXmount
 open           NXopen
 opendir        NXopendir
+nanosleep      NXnanosleep
 pthread_create NXpthread_create
 read           NXread
 realloc        NXrealloc
diff --git a/arch/sim/src/up_internal.h b/arch/sim/src/up_internal.h
index b6b24c1eee..da0c0c2bbe 100644
--- a/arch/sim/src/up_internal.h
+++ b/arch/sim/src/up_internal.h
@@ -132,7 +132,7 @@
  **************************************************************************/
 
 /**************************************************************************
- * Public Variables
+ * Public Data
  **************************************************************************/
 
 #ifndef __ASSEMBLY__