diff options
author | 2014-01-06 15:01:01 +0000 | |
---|---|---|
committer | 2014-01-06 15:01:01 +0000 | |
commit | 2cc6ce813fcca65ae15e70abc05174be45cd5d0e (patch) | |
tree | 3d9c627a0c55857647e85310a1f8c791ea6815ac /src | |
parent | 1257728a35ec43adb1f4af31e49d5df0d8905306 (diff) |
Moved analog stuff into its new home. No wn.
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/emu.mak | 2 | ||||
-rw-r--r-- | src/emu/netlist/analog/nld_solver.c (renamed from src/emu/netlist/devices/nld_solver.c) | 0 | ||||
-rw-r--r-- | src/emu/netlist/analog/nld_solver.h (renamed from src/emu/netlist/devices/nld_solver.h) | 0 | ||||
-rw-r--r-- | src/emu/netlist/analog/nld_switches.c (renamed from src/emu/netlist/devices/nld_switches.c) | 0 | ||||
-rw-r--r-- | src/emu/netlist/analog/nld_switches.h (renamed from src/emu/netlist/devices/nld_switches.h) | 0 | ||||
-rw-r--r-- | src/emu/netlist/analog/nld_twoterm.c (renamed from src/emu/netlist/devices/nld_twoterm.c) | 1 | ||||
-rw-r--r-- | src/emu/netlist/analog/nld_twoterm.h (renamed from src/emu/netlist/devices/nld_twoterm.h) | 0 | ||||
-rw-r--r-- | src/emu/netlist/devices/net_lib.h | 8 | ||||
-rw-r--r-- | src/emu/netlist/devices/nld_legacy.h | 1 | ||||
-rw-r--r-- | src/emu/netlist/devices/nld_ne555.h | 2 | ||||
-rw-r--r-- | src/emu/netlist/devices/nld_system.c | 2 | ||||
-rw-r--r-- | src/emu/netlist/netlist.mak | 13 | ||||
-rw-r--r-- | src/emu/netlist/nl_base.c | 2 | ||||
-rw-r--r-- | src/emu/netlist/nl_setup.c | 4 |
14 files changed, 18 insertions, 17 deletions
diff --git a/src/emu/emu.mak b/src/emu/emu.mak index a37f5c8cec7..f4c452c8c2f 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -60,8 +60,6 @@ OBJDIRS += \ $(EMUOBJ)/bus/z88 \ $(EMUOBJ)/drivers \ $(EMUOBJ)/machine \ - $(EMUOBJ)/netlist \ - $(EMUOBJ)/netlist/devices \ $(EMUOBJ)/layout \ $(EMUOBJ)/imagedev \ $(EMUOBJ)/video \ diff --git a/src/emu/netlist/devices/nld_solver.c b/src/emu/netlist/analog/nld_solver.c index f78ef10c88e..f78ef10c88e 100644 --- a/src/emu/netlist/devices/nld_solver.c +++ b/src/emu/netlist/analog/nld_solver.c diff --git a/src/emu/netlist/devices/nld_solver.h b/src/emu/netlist/analog/nld_solver.h index 62af5d9ef9e..62af5d9ef9e 100644 --- a/src/emu/netlist/devices/nld_solver.h +++ b/src/emu/netlist/analog/nld_solver.h diff --git a/src/emu/netlist/devices/nld_switches.c b/src/emu/netlist/analog/nld_switches.c index b4b35c0c4a3..b4b35c0c4a3 100644 --- a/src/emu/netlist/devices/nld_switches.c +++ b/src/emu/netlist/analog/nld_switches.c diff --git a/src/emu/netlist/devices/nld_switches.h b/src/emu/netlist/analog/nld_switches.h index 4152643e1d8..4152643e1d8 100644 --- a/src/emu/netlist/devices/nld_switches.h +++ b/src/emu/netlist/analog/nld_switches.h diff --git a/src/emu/netlist/devices/nld_twoterm.c b/src/emu/netlist/analog/nld_twoterm.c index c37bc42e6a1..5dc493a9b84 100644 --- a/src/emu/netlist/devices/nld_twoterm.c +++ b/src/emu/netlist/analog/nld_twoterm.c @@ -4,7 +4,6 @@ */ #include "nld_twoterm.h" -#include "nld_system.h" #include "nld_solver.h" // ---------------------------------------------------------------------------------------- diff --git a/src/emu/netlist/devices/nld_twoterm.h b/src/emu/netlist/analog/nld_twoterm.h index 894afdfbf9b..894afdfbf9b 100644 --- a/src/emu/netlist/devices/nld_twoterm.h +++ b/src/emu/netlist/analog/nld_twoterm.h diff --git a/src/emu/netlist/devices/net_lib.h b/src/emu/netlist/devices/net_lib.h index 9e4698c724d..fbe953565fd 100644 --- a/src/emu/netlist/devices/net_lib.h +++ b/src/emu/netlist/devices/net_lib.h @@ -53,7 +53,6 @@ #include "../nl_base.h" #include "nld_signal.h" #include "nld_system.h" -#include "nld_twoterm.h" #include "nld_7400.h" #include "nld_7402.h" @@ -74,11 +73,12 @@ #include "nld_ne555.h" -#include "nld_switches.h" - #include "nld_log.h" -#include "nld_solver.h" +#include "../analog/nld_twoterm.h" +#include "../analog/nld_solver.h" +#include "../analog/nld_switches.h" + #include "nld_legacy.h" diff --git a/src/emu/netlist/devices/nld_legacy.h b/src/emu/netlist/devices/nld_legacy.h index 90608231bbd..57b5c2f0c4e 100644 --- a/src/emu/netlist/devices/nld_legacy.h +++ b/src/emu/netlist/devices/nld_legacy.h @@ -14,7 +14,6 @@ #define NLD_LEGACY_H_ #include "../nl_base.h" -#include "nld_twoterm.h" // ---------------------------------------------------------------------------------------- // Macros diff --git a/src/emu/netlist/devices/nld_ne555.h b/src/emu/netlist/devices/nld_ne555.h index 487e8d33789..809b0493e53 100644 --- a/src/emu/netlist/devices/nld_ne555.h +++ b/src/emu/netlist/devices/nld_ne555.h @@ -20,7 +20,7 @@ #define NLD_NE555_H_ #include "../nl_base.h" -#include "nld_twoterm.h" +#include "../analog/nld_twoterm.h" #define NETDEV_NE555(_name) \ NET_REGISTER_DEV(NE555, _name) diff --git a/src/emu/netlist/devices/nld_system.c b/src/emu/netlist/devices/nld_system.c index 98ff5735a26..a2b02f0f77a 100644 --- a/src/emu/netlist/devices/nld_system.c +++ b/src/emu/netlist/devices/nld_system.c @@ -4,7 +4,7 @@ */ #include "nld_system.h" -#include "nld_twoterm.h" +//#include "nld_twoterm.h" // ---------------------------------------------------------------------------------------- // netdev_const diff --git a/src/emu/netlist/netlist.mak b/src/emu/netlist/netlist.mak index 2afdd4ea6e4..6b3644d6c81 100644 --- a/src/emu/netlist/netlist.mak +++ b/src/emu/netlist/netlist.mak @@ -14,15 +14,23 @@ NETLISTSRC = $(EMUSRC)/netlist NETLISTOBJ = $(EMUOBJ)/netlist #------------------------------------------------- -# Core files +# Netlist dirs and files #------------------------------------------------- +OBJDIRS += \ + $(NETLISTOBJ) \ + $(NETLISTOBJ)/devices \ + $(NETLISTOBJ)/analog \ + NETLISTOBJS+= \ $(NETLISTOBJ)/nl_base.o \ $(NETLISTOBJ)/nl_parser.o \ $(NETLISTOBJ)/nl_setup.o \ $(NETLISTOBJ)/pstring.o \ $(NETLISTOBJ)/pstate.o \ + $(NETLISTOBJ)/analog/nld_solver.o \ + $(NETLISTOBJ)/analog/nld_twoterm.o \ + $(NETLISTOBJ)/analog/nld_switches.o \ $(NETLISTOBJ)/devices/nld_7404.o \ $(NETLISTOBJ)/devices/nld_7474.o \ $(NETLISTOBJ)/devices/nld_7483.o \ @@ -33,11 +41,8 @@ NETLISTOBJS+= \ $(NETLISTOBJ)/devices/nld_74153.o \ $(NETLISTOBJ)/devices/nld_9316.o \ $(NETLISTOBJ)/devices/nld_ne555.o \ - $(NETLISTOBJ)/devices/nld_switches.o \ $(NETLISTOBJ)/devices/nld_legacy.o \ $(NETLISTOBJ)/devices/net_lib.o \ $(NETLISTOBJ)/devices/nld_log.o \ - $(NETLISTOBJ)/devices/nld_solver.o \ $(NETLISTOBJ)/devices/nld_system.o \ - $(NETLISTOBJ)/devices/nld_twoterm.o \ diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c index eb86f8b93ea..87465e9f8ad 100644 --- a/src/emu/netlist/nl_base.c +++ b/src/emu/netlist/nl_base.c @@ -5,7 +5,7 @@ #include "nl_base.h" #include "devices/nld_system.h" -#include "devices/nld_solver.h" +#include "analog/nld_solver.h" #include "pstring.h" #include "nl_util.h" diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c index 3fe67a6db88..9ab988ec64f 100644 --- a/src/emu/netlist/nl_setup.c +++ b/src/emu/netlist/nl_setup.c @@ -10,8 +10,8 @@ #include "nl_parser.h" #include "nl_util.h" #include "devices/nld_system.h" -#include "devices/nld_solver.h" -#include "devices/nld_twoterm.h" +#include "analog/nld_solver.h" +#include "analog/nld_twoterm.h" static NETLIST_START(base) NETDEV_TTL_CONST(ttlhigh, 1) |