From 011a8261eb2518c09d85f269b51a763a0be059bd Mon Sep 17 00:00:00 2001 From: couriersud Date: Fri, 10 Apr 2020 14:48:40 +0200 Subject: [PATCH] netlist: Fix parsing of netlists by nltool. (nw) --- src/mame/audio/nl_konami.cpp | 6 ++---- src/mame/audio/nl_segas16b.cpp | 4 +--- src/mame/machine/nl_palestra.cpp | 6 ++---- src/mame/machine/nl_rebound.cpp | 6 ++---- src/mame/machine/nl_tp1983.cpp | 6 ++---- src/mame/machine/nl_tp1985.cpp | 6 ++---- 6 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/mame/audio/nl_konami.cpp b/src/mame/audio/nl_konami.cpp index af1bec71882..aedb1d2f8a2 100644 --- a/src/mame/audio/nl_konami.cpp +++ b/src/mame/audio/nl_konami.cpp @@ -2,10 +2,6 @@ // copyright-holders:Couriersud #include "netlist/devices/net_lib.h" -#ifdef NLBASE_H_ -#error Somehow nl_base.h made it into the include chain. -#endif - /* * M51516L pins: * @@ -25,6 +21,8 @@ * */ +//NL_CONTAINS konami2x konami1x + static NETLIST_START(filter) CD4066_GATE(G1) PARAM(G1.BASER, 270.0) diff --git a/src/mame/audio/nl_segas16b.cpp b/src/mame/audio/nl_segas16b.cpp index 21c2ae3bdfb..f15677c072b 100644 --- a/src/mame/audio/nl_segas16b.cpp +++ b/src/mame/audio/nl_segas16b.cpp @@ -2,9 +2,7 @@ // copyright-holders:Couriersud #include "netlist/devices/net_lib.h" -#ifdef NLBASE_H_ -#error Somehow nl_base.h made it into the include chain. -#endif +//NL_CONTAINS segas16b_audio NETLIST_START(segas16b_audio) SOLVER(Solver, 48000) diff --git a/src/mame/machine/nl_palestra.cpp b/src/mame/machine/nl_palestra.cpp index 28f86f9d6af..4a1fe42900c 100644 --- a/src/mame/machine/nl_palestra.cpp +++ b/src/mame/machine/nl_palestra.cpp @@ -21,10 +21,8 @@ ***************************************************************************/ -#ifndef __PLIB_PREPROCESSOR__ - #define NL_PROHIBIT_BASEH_INCLUDE 1 - #include "netlist/devices/net_lib.h" -#endif +#define NL_PROHIBIT_BASEH_INCLUDE 1 +#include "netlist/devices/net_lib.h" #define SLOW_BUT_ACCURATE 0 diff --git a/src/mame/machine/nl_rebound.cpp b/src/mame/machine/nl_rebound.cpp index 17b477c4d10..3a2884d8da6 100644 --- a/src/mame/machine/nl_rebound.cpp +++ b/src/mame/machine/nl_rebound.cpp @@ -64,10 +64,8 @@ * */ -#ifndef __PLIB_PREPROCESSOR__ - #define NL_PROHIBIT_BASEH_INCLUDE 1 - #include "netlist/devices/net_lib.h" -#endif +#define NL_PROHIBIT_BASEH_INCLUDE 1 +#include "netlist/devices/net_lib.h" static NETLIST_START(rebound_schematics) diff --git a/src/mame/machine/nl_tp1983.cpp b/src/mame/machine/nl_tp1983.cpp index 48cc2968ff0..f6f65157964 100644 --- a/src/mame/machine/nl_tp1983.cpp +++ b/src/mame/machine/nl_tp1983.cpp @@ -7,10 +7,8 @@ ***************************************************************************/ -#ifndef __PLIB_PREPROCESSOR__ - #define NL_PROHIBIT_BASEH_INCLUDE 1 - #include "netlist/devices/net_lib.h" -#endif +#define NL_PROHIBIT_BASEH_INCLUDE 1 +#include "netlist/devices/net_lib.h" // gray scale #define SB3 0 diff --git a/src/mame/machine/nl_tp1985.cpp b/src/mame/machine/nl_tp1985.cpp index f8e4c33a3f2..fea7e8af2d5 100644 --- a/src/mame/machine/nl_tp1985.cpp +++ b/src/mame/machine/nl_tp1985.cpp @@ -7,10 +7,8 @@ ***************************************************************************/ -#ifndef __PLIB_PREPROCESSOR__ - #define NL_PROHIBIT_BASEH_INCLUDE 1 - #include "netlist/devices/net_lib.h" -#endif +#define NL_PROHIBIT_BASEH_INCLUDE 1 +#include "netlist/devices/net_lib.h" // gray scale #define SB3 0