Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 17:48:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch/z80/src: Fix ez80 compile problems due to New ZDS-II toolchain and ongoing bit rot due to non-C89 code creeping into the core OS.

Browse Source
This commit is contained in:
Gregory Nutt
2019-06-02 15:36:38 -06:00
parent 6a98b2825e
commit fc79fc5ce1
13 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/z80/src/Makefile.zdsiil
+1 -1
View File
@@ -42,7 +42,7 @@ ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)} WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)}
WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)} WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
USRINCLUDES = -usrinc:'.;$(WSCHEDSRCDIR);$(WARCHSRCDIR);$(WARCHSRCDIR)\common' USRINCLUDES = -usrinc:'.;$(WSCHEDSRCDIR);$(WARCHSRCDIR)$(DELIM)chip;$(WARCHSRCDIR)$(DELIM)common'
INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
arch/z80/src/Makefile.zdsiiw
+1 -1
View File
@@ -39,7 +39,7 @@
SCHEDSRCDIR = $(TOPDIR)$(DELIM)sched SCHEDSRCDIR = $(TOPDIR)$(DELIM)sched
ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common" USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR)$(DELIM)chip;$(ARCHSRCDIR)$(DELIM)common"
INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
arch/z80/src/common/up_initialize.c
+1
View File
@@ -48,6 +48,7 @@
#include <nuttx/drivers/drivers.h> #include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h> #include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h> #include <nuttx/net/loopback.h>
#include <nuttx/net/telnet.h>
#include <nuttx/net/tun.h> #include <nuttx/net/tun.h>
#include <nuttx/syslog/syslog.h> #include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h> #include <nuttx/syslog/syslog_console.h>
arch/z80/src/ez80/ez80_initialstate.c
+1 -1
View File
@@ -43,7 +43,7 @@
#include <string.h> #include <string.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include "chip/chip.h" #include "chip.h"
#include "up_internal.h" #include "up_internal.h"
#include "up_arch.h" #include "up_arch.h"
arch/z80/src/ez80/ez80_lowuart.c
+1 -1
View File
@@ -46,7 +46,7 @@
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/sched.h> #include <nuttx/sched.h>
#include "chip/chip.h" #include "chip.h"
#include "common/up_internal.h" #include "common/up_internal.h"
#ifdef USE_LOWSERIALINIT #ifdef USE_LOWSERIALINIT
arch/z80/src/ez80/ez80_serial.c
+5 -1
View File
@@ -53,7 +53,7 @@
#include <nuttx/serial/serial.h> #include <nuttx/serial/serial.h>
#include <arch/io.h> #include <arch/io.h>
#include "chip/chip.h" #include "chip.h"
#include "up_internal.h" #include "up_internal.h"
#ifdef USE_SERIALDRIVER #ifdef USE_SERIALDRIVER
@@ -154,6 +154,7 @@ static uart_dev_t g_uart0port =
{ 0 }, /* closesem */ { 0 }, /* closesem */
{ 0 }, /* xmitsem */ { 0 }, /* xmitsem */
{ 0 }, /* recvsem */ { 0 }, /* recvsem */
{ 0 }, /* pollsem */
{ {
{ 0 }, /* xmit.sem */ { 0 }, /* xmit.sem */
0, /* xmit.head */ 0, /* xmit.head */
@@ -170,6 +171,7 @@ static uart_dev_t g_uart0port =
}, },
&g_uart_ops, /* ops */ &g_uart_ops, /* ops */
&g_uart0priv, /* priv */ &g_uart0priv, /* priv */
NULL, /* pollfds */
}; };
#endif #endif
@@ -199,6 +201,7 @@ static uart_dev_t g_uart1port =
{ 0 }, /* closesem */ { 0 }, /* closesem */
{ 0 }, /* xmitsem */ { 0 }, /* xmitsem */
{ 0 }, /* recvsem */ { 0 }, /* recvsem */
{ 0 }, /* pollsem */
{ {
{ 0 }, /* xmit.sem */ { 0 }, /* xmit.sem */
0, /* xmit.head */ 0, /* xmit.head */
@@ -215,6 +218,7 @@ static uart_dev_t g_uart1port =
}, },
&g_uart_ops, /* ops */ &g_uart_ops, /* ops */
&g_uart1priv, /* priv */ &g_uart1priv, /* priv */
NULL, /* pollfds */
}; };
#endif #endif
arch/z80/src/ez80/ez80_timerisr.c
+1 -1
View File
@@ -45,7 +45,7 @@
#include <arch/io.h> #include <arch/io.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include "chip/chip.h" #include "chip.h"
#include "clock/clock.h" #include "clock/clock.h"
#include "up_internal.h" #include "up_internal.h"
arch/z80/src/z8/chip.h
+1 -1
View File
@@ -1,6 +1,6 @@
/************************************************************************************ /************************************************************************************
* arch/z80/src/z8/chip.h * arch/z80/src/z8/chip.h
* arch/z80/src/chip/chip.h * arch/z80/src/chip.h
* *
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
arch/z80/src/z8/z8_initialstate.c
+1 -1
View File
@@ -44,7 +44,7 @@
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/sched.h> #include <nuttx/sched.h>
#include "chip/chip.h" #include "chip.h"
#include "up_internal.h" #include "up_internal.h"
#include "up_arch.h" #include "up_arch.h"
arch/z80/src/z8/z8_lowuart.c
+1 -1
View File
@@ -46,7 +46,7 @@
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/sched.h> #include <nuttx/sched.h>
#include "chip/chip.h" #include "chip.h"
#include "common/up_internal.h" #include "common/up_internal.h"
#ifdef USE_LOWSERIALINIT #ifdef USE_LOWSERIALINIT
arch/z80/src/z8/z8_serial.c
+5 -1
View File
@@ -53,7 +53,7 @@
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial/serial.h> #include <nuttx/serial/serial.h>
#include "chip/chip.h" #include "chip.h"
#include "up_internal.h" #include "up_internal.h"
#ifdef USE_SERIALDRIVER #ifdef USE_SERIALDRIVER
@@ -163,6 +163,7 @@ static uart_dev_t g_uart0port =
{ 0 }, /* closesem */ { 0 }, /* closesem */
{ 0 }, /* xmitsem */ { 0 }, /* xmitsem */
{ 0 }, /* recvsem */ { 0 }, /* recvsem */
{ 0 }, /* pollsem */
{ {
{ 0 }, /* xmit.sem */ { 0 }, /* xmit.sem */
0, /* xmit.head */ 0, /* xmit.head */
@@ -179,6 +180,7 @@ static uart_dev_t g_uart0port =
}, },
&g_uart_ops, /* ops */ &g_uart_ops, /* ops */
&g_uart0priv, /* priv */ &g_uart0priv, /* priv */
NULL, /* pollfds */
}; };
/* This describes the state of the DM320 uart1 port. */ /* This describes the state of the DM320 uart1 port. */
@@ -208,6 +210,7 @@ static uart_dev_t g_uart1port =
{ 0 }, /* closesem */ { 0 }, /* closesem */
{ 0 }, /* xmitsem */ { 0 }, /* xmitsem */
{ 0 }, /* recvsem */ { 0 }, /* recvsem */
{ 0 }, /* pollsem */
{ {
{ 0 }, /* xmit.sem */ { 0 }, /* xmit.sem */
0, /* xmit.head */ 0, /* xmit.head */
@@ -224,6 +227,7 @@ static uart_dev_t g_uart1port =
}, },
&g_uart_ops, /* ops */ &g_uart_ops, /* ops */
&g_uart1priv, /* priv */ &g_uart1priv, /* priv */
NULL, /* pollfds */
}; };
/* Now, which one with be tty0/console and which tty1? */ /* Now, which one with be tty0/console and which tty1? */
arch/z80/src/z8/z8_timerisr.c
+1 -1
View File
@@ -45,7 +45,7 @@
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include "chip/chip.h" #include "chip.h"
#include "clock/clock.h" #include "clock/clock.h"
#include "up_internal.h" #include "up_internal.h"
include/signal.h
+2 -3
View File
@@ -53,14 +53,13 @@
/******************************************************************************** /********************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
********************************************************************************/ ********************************************************************************/
/* Signal set management definitions and macros. */ /* Signal set management definitions and macros. */
#define NULL_SIGNAL_SET ((sigset_t)0x00000000) #define NULL_SIGNAL_SET ((sigset_t)0x00000000)
#define ALL_SIGNAL_SET ((sigset_t)0xffffffff) #define ALL_SIGNAL_SET ((sigset_t)0xffffffff)
#define MIN_SIGNO 0 #define MIN_SIGNO 0
#define MAX_SIGNO 31 #define MAX_SIGNO 31
#define GOOD_SIGNO(s) ((((unsigned)(s))<=MAX_SIGNO)) #define GOOD_SIGNO(s) ((((unsigned)(s)) <= MAX_SIGNO))
#define SIGNO2SET(s) ((sigset_t)1 << (s)) #define SIGNO2SET(s) ((sigset_t)1 << (s))
/* All signals are "real time" signals */ /* All signals are "real time" signals */
@@ -75,7 +74,7 @@
* following table. * following table.
* *
* This is not POSIX compliant behavior! Per OpenGroup.org: The following * This is not POSIX compliant behavior! Per OpenGroup.org: The following
* signals and default signal action s must be supported on all * signals and default signal actions must be supported on all
* implementations: * implementations:
* *
* ---------- ------- ---------------------------------------------------- * ---------- ------- ----------------------------------------------------