From f790841641f8dace165b51088959586ef596ff81 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 9 Oct 2017 06:48:51 -0600 Subject: [PATCH] Fix a copy paste error in recent config/z80sim change. --- configs/z80sim/src/Makefile | 4 ++-- configs/z80sim/src/z80_serial.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/z80sim/src/Makefile b/configs/z80sim/src/Makefile index 0c5e71b255..2bedb8da15 100644 --- a/configs/z80sim/src/Makefile +++ b/configs/z80sim/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ # configs/z80sim/src/Makefile # -# Copyright (C) 2007, 2008, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008, 2012, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ ASRCS = CSRCS = z80_irq.c z80_timerisr.c z80_lowputc.c -ifneq ($(CONFIG_DISABLE_SIGNALS),y) +ifneq ($(CONFIG_NFILE_DESCRIPTOR),0) CSRCS += z80_serial.c endif diff --git a/configs/z80sim/src/z80_serial.c b/configs/z80sim/src/z80_serial.c index 42606643e8..a71da233f9 100644 --- a/configs/z80sim/src/z80_serial.c +++ b/configs/z80sim/src/z80_serial.c @@ -55,7 +55,7 @@ #include "up_arch.h" #include "up_internal.h" -#ifdef USE_SERIALDRIVER +#if defined(USE_SERIALDRIVER) && CONFIG_NFILE_DESCRIPTORS > 0 /**************************************************************************** * Private Function Prototypes @@ -335,7 +335,8 @@ void up_serialinit(void) (void)uart_register("/dev/console", &g_uartport); (void)uart_register("/dev/ttyS0", &g_uartport); } -#endif /* USE_SERIALDRIVER */ + +#endif /* USE_SERIALDRIVER && CONFIG_NFILE_DESCRIPTORS > 0 */ /**************************************************************************** * Name: up_putc