From cd417249c913d964e44a73cac0aa5b86b45fc897 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sun, 8 Oct 2017 09:47:06 -0600
Subject: [PATCH] configs/z80sim: Fix a naming problem.  Also, don't try to
 build the serial driver if CONFIG_NFILE_DESCRIPTOR=0.

---
 configs/z80sim/src/z80_irq.c      | 2 +-
 configs/z80sim/src/z80_timerisr.c | 4 ++--
 libc/stdio/Make.defs              | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configs/z80sim/src/z80_irq.c b/configs/z80sim/src/z80_irq.c
index 27f3c393e97..29a0358d748 100644
--- a/configs/z80sim/src/z80_irq.c
+++ b/configs/z80sim/src/z80_irq.c
@@ -67,7 +67,7 @@ void up_irqinitialize(void)
    * NOTE:  Normally, there are seperate enables for "global" interrupts
    * and specific device interrupts.  In such a "normal" case, the timer
    * interrupt should be attached and enabled in the function
-   * z80sim_timer_initialize()
+   * z80_timer_initialize()
    */
 
   irq_attach(Z80_IRQ_SYSTIMER, (xcpt_t)z80sim_timerisr, NULL);
diff --git a/configs/z80sim/src/z80_timerisr.c b/configs/z80sim/src/z80_timerisr.c
index a230652d5cc..d791316bccf 100644
--- a/configs/z80sim/src/z80_timerisr.c
+++ b/configs/z80sim/src/z80_timerisr.c
@@ -68,7 +68,7 @@ int z80sim_timerisr(int irq, FAR chipreg_t *regs, void *arg)
 }
 
 /****************************************************************************
- * Function:  z80sim_timer_initialize
+ * Function:  z80_timer_initialize
  *
  * Description:
  *   This function is called during start-up to initialize the timer
@@ -76,7 +76,7 @@ int z80sim_timerisr(int irq, FAR chipreg_t *regs, void *arg)
  *
  ****************************************************************************/
 
-void z80sim_timer_initialize(void)
+void z80_timer_initialize(void)
 {
   /* The timer interrupt was attached in up_irqinitialize -- see comments there */
 }
diff --git a/libc/stdio/Make.defs b/libc/stdio/Make.defs
index 38a62d69c10..c5d15856485 100644
--- a/libc/stdio/Make.defs
+++ b/libc/stdio/Make.defs
@@ -43,15 +43,14 @@ CSRCS += lib_vsnprintf.c lib_libvsprintf.c lib_dprintf.c lib_vdprintf.c
 CSRCS += lib_meminstream.c lib_memoutstream.c lib_memsistream.c
 CSRCS += lib_memsostream.c lib_lowoutstream.c
 CSRCS += lib_zeroinstream.c lib_nullinstream.c lib_nulloutstream.c
-CSRCS += lib_sscanf.c
+CSRCS += lib_sscanf.c lib_libnoflush.c lib_libsnoflush.c
 
 # The remaining sources files depend upon file descriptors
 
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
 
 CSRCS += lib_rawinstream.c lib_rawoutstream.c lib_rawsistream.c
-CSRCS += lib_rawsostream.c lib_libnoflush.c lib_libsnoflush.c
-CSRCS += lib_remove.c
+CSRCS += lib_rawsostream.c lib_remove.c
 
 # And these depend upon both file descriptors and C streams