summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--nl_examples/kidniki.c4
-rw-r--r--scripts/src/netlist.lua14
-rw-r--r--src/emu/netlist/analog/nld_bjt.c2
-rw-r--r--src/emu/netlist/analog/nld_fourterm.c2
-rw-r--r--src/emu/netlist/analog/nld_twoterm.c2
-rw-r--r--src/emu/netlist/devices/net_lib.h2
-rw-r--r--src/emu/netlist/devices/nld_ne555.c2
-rw-r--r--src/emu/netlist/devices/nld_system.c2
-rw-r--r--src/emu/netlist/nl_base.c2
-rw-r--r--src/emu/netlist/nl_setup.c2
-rw-r--r--src/emu/netlist/solver/mat_cr.h (renamed from src/emu/netlist/analog/mat_cr.h)0
-rw-r--r--src/emu/netlist/solver/nld_ms_direct.h (renamed from src/emu/netlist/analog/nld_ms_direct.h)2
-rw-r--r--src/emu/netlist/solver/nld_ms_direct1.h (renamed from src/emu/netlist/analog/nld_ms_direct1.h)4
-rw-r--r--src/emu/netlist/solver/nld_ms_direct2.h (renamed from src/emu/netlist/analog/nld_ms_direct2.h)4
-rw-r--r--src/emu/netlist/solver/nld_ms_gmres.h (renamed from src/emu/netlist/analog/nld_ms_gmres.h)9
-rw-r--r--src/emu/netlist/solver/nld_ms_sor.h (renamed from src/emu/netlist/analog/nld_ms_sor.h)4
-rw-r--r--src/emu/netlist/solver/nld_ms_sor_mat.h (renamed from src/emu/netlist/analog/nld_ms_sor_mat.h)4
-rw-r--r--src/emu/netlist/solver/nld_solver.c (renamed from src/emu/netlist/analog/nld_solver.c)6
-rw-r--r--src/emu/netlist/solver/nld_solver.h (renamed from src/emu/netlist/analog/nld_solver.h)0
-rw-r--r--src/emu/netlist/solver/vector_base.h (renamed from src/emu/netlist/analog/vector_base.h)0
20 files changed, 34 insertions, 33 deletions
diff --git a/nl_examples/kidniki.c b/nl_examples/kidniki.c
index b5616611d6a..74312e4d27e 100644
--- a/nl_examples/kidniki.c
+++ b/nl_examples/kidniki.c
@@ -3,8 +3,8 @@
#include "netlist/devices/nld_system.h"
#include "netlist/analog/nld_bjt.h"
-#define USE_FRONTIERS 0
-#define USE_FIXED_STV 0
+#define USE_FRONTIERS 1
+#define USE_FIXED_STV 1
NETLIST_START(dummy)
SOLVER(Solver, 12000)
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index b0e3f0cab0b..a0dec61dc1e 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -55,18 +55,20 @@ project "netlist"
MAME_DIR .. "src/emu/netlist/analog/nld_bjt.h",
MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.c",
MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.h",
- MAME_DIR .. "src/emu/netlist/analog/nld_solver.c",
- MAME_DIR .. "src/emu/netlist/analog/nld_solver.h",
MAME_DIR .. "src/emu/netlist/analog/nld_switches.c",
MAME_DIR .. "src/emu/netlist/analog/nld_switches.h",
MAME_DIR .. "src/emu/netlist/analog/nld_twoterm.c",
MAME_DIR .. "src/emu/netlist/analog/nld_twoterm.h",
MAME_DIR .. "src/emu/netlist/analog/nld_opamps.c",
MAME_DIR .. "src/emu/netlist/analog/nld_opamps.h",
- MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct.h",
- MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct1.h",
- MAME_DIR .. "src/emu/netlist/analog/nld_ms_direct2.h",
- MAME_DIR .. "src/emu/netlist/analog/nld_ms_gauss_seidel.h",
+ MAME_DIR .. "src/emu/netlist/solver/nld_solver.c",
+ MAME_DIR .. "src/emu/netlist/solver/nld_solver.h",
+ MAME_DIR .. "src/emu/netlist/solver/nld_ms_direct.h",
+ MAME_DIR .. "src/emu/netlist/solver/nld_ms_direct1.h",
+ MAME_DIR .. "src/emu/netlist/solver/nld_ms_direct2.h",
+ MAME_DIR .. "src/emu/netlist/solver/nld_ms_sor.h",
+ MAME_DIR .. "src/emu/netlist/solver/nld_ms_sor_math.h",
+ MAME_DIR .. "src/emu/netlist/solver/nld_ms_gmres.h",
MAME_DIR .. "src/emu/netlist/devices/nld_4020.c",
MAME_DIR .. "src/emu/netlist/devices/nld_4020.h",
MAME_DIR .. "src/emu/netlist/devices/nld_4066.c",
diff --git a/src/emu/netlist/analog/nld_bjt.c b/src/emu/netlist/analog/nld_bjt.c
index 99e778ae107..b8b711cf92b 100644
--- a/src/emu/netlist/analog/nld_bjt.c
+++ b/src/emu/netlist/analog/nld_bjt.c
@@ -5,9 +5,9 @@
*
*/
+#include <solver/nld_solver.h>
#include "nld_bjt.h"
#include "../nl_setup.h"
-#include "nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/analog/nld_fourterm.c b/src/emu/netlist/analog/nld_fourterm.c
index 9e735f1f25f..35038a88cd6 100644
--- a/src/emu/netlist/analog/nld_fourterm.c
+++ b/src/emu/netlist/analog/nld_fourterm.c
@@ -5,9 +5,9 @@
*
*/
+#include <solver/nld_solver.h>
#include "nld_fourterm.h"
#include "../nl_setup.h"
-#include "nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/analog/nld_twoterm.c b/src/emu/netlist/analog/nld_twoterm.c
index 707fd1640d3..1cb1a70caf6 100644
--- a/src/emu/netlist/analog/nld_twoterm.c
+++ b/src/emu/netlist/analog/nld_twoterm.c
@@ -5,10 +5,10 @@
*
*/
+#include <solver/nld_solver.h>
#include <algorithm>
#include "nld_twoterm.h"
-#include "nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/devices/net_lib.h b/src/emu/netlist/devices/net_lib.h
index 9c0664ecc3e..4b7e7a4ebec 100644
--- a/src/emu/netlist/devices/net_lib.h
+++ b/src/emu/netlist/devices/net_lib.h
@@ -57,10 +57,10 @@
#include "../analog/nld_bjt.h"
#include "../analog/nld_fourterm.h"
-#include "../analog/nld_solver.h"
#include "../analog/nld_switches.h"
#include "../analog/nld_twoterm.h"
#include "../analog/nld_opamps.h"
+#include "../solver/nld_solver.h"
#include "nld_legacy.h"
diff --git a/src/emu/netlist/devices/nld_ne555.c b/src/emu/netlist/devices/nld_ne555.c
index c33422012f8..3c5e288a806 100644
--- a/src/emu/netlist/devices/nld_ne555.c
+++ b/src/emu/netlist/devices/nld_ne555.c
@@ -5,9 +5,9 @@
*
*/
+#include <solver/nld_solver.h>
#include "nld_ne555.h"
#include "../nl_setup.h"
-#include "../analog/nld_solver.h"
#define R_OFF (1E20)
#define R_ON (25) // Datasheet states a maximum discharge of 200mA, R = 5V / 0.2
diff --git a/src/emu/netlist/devices/nld_system.c b/src/emu/netlist/devices/nld_system.c
index ef87b7a94c7..bf998170400 100644
--- a/src/emu/netlist/devices/nld_system.c
+++ b/src/emu/netlist/devices/nld_system.c
@@ -5,8 +5,8 @@
*
*/
+#include <solver/nld_solver.h>
#include "nld_system.h"
-#include "../analog/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c
index cfe3c6c8b8d..6a38cfa57bc 100644
--- a/src/emu/netlist/nl_base.c
+++ b/src/emu/netlist/nl_base.c
@@ -5,6 +5,7 @@
*
*/
+#include <solver/nld_solver.h>
#include <cstring>
#include <algorithm>
#include <cstdio>
@@ -13,7 +14,6 @@
#include "nl_base.h"
#include "devices/nld_system.h"
-#include "analog/nld_solver.h"
#include "nl_util.h"
const netlist::netlist_time netlist::netlist_time::zero = netlist::netlist_time::from_raw(0);
diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c
index 75b526608c9..6887042d440 100644
--- a/src/emu/netlist/nl_setup.c
+++ b/src/emu/netlist/nl_setup.c
@@ -5,6 +5,7 @@
*
*/
+#include <solver/nld_solver.h>
#include <cstdio>
#include "plib/palloc.h"
@@ -15,7 +16,6 @@
#include "nl_factory.h"
#include "devices/net_lib.h"
#include "devices/nld_system.h"
-#include "analog/nld_solver.h"
#include "analog/nld_twoterm.h"
static NETLIST_START(base)
diff --git a/src/emu/netlist/analog/mat_cr.h b/src/emu/netlist/solver/mat_cr.h
index 9322a74c045..9322a74c045 100644
--- a/src/emu/netlist/analog/mat_cr.h
+++ b/src/emu/netlist/solver/mat_cr.h
diff --git a/src/emu/netlist/analog/nld_ms_direct.h b/src/emu/netlist/solver/nld_ms_direct.h
index 4f77650873c..e8eb9898ed8 100644
--- a/src/emu/netlist/analog/nld_ms_direct.h
+++ b/src/emu/netlist/solver/nld_ms_direct.h
@@ -10,7 +10,7 @@
#include <algorithm>
-#include "nld_solver.h"
+#include "../solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/analog/nld_ms_direct1.h b/src/emu/netlist/solver/nld_ms_direct1.h
index 8cbeae5fc16..d2009846053 100644
--- a/src/emu/netlist/analog/nld_ms_direct1.h
+++ b/src/emu/netlist/solver/nld_ms_direct1.h
@@ -8,8 +8,8 @@
#ifndef NLD_MS_DIRECT1_H_
#define NLD_MS_DIRECT1_H_
-#include "nld_solver.h"
-#include "nld_ms_direct.h"
+#include "../solver/nld_ms_direct.h"
+#include "../solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/analog/nld_ms_direct2.h b/src/emu/netlist/solver/nld_ms_direct2.h
index e634f81ace2..79f9e55d908 100644
--- a/src/emu/netlist/analog/nld_ms_direct2.h
+++ b/src/emu/netlist/solver/nld_ms_direct2.h
@@ -8,8 +8,8 @@
#ifndef NLD_MS_DIRECT2_H_
#define NLD_MS_DIRECT2_H_
-#include "nld_solver.h"
-#include "nld_ms_direct.h"
+#include "../solver/nld_ms_direct.h"
+#include "../solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/analog/nld_ms_gmres.h b/src/emu/netlist/solver/nld_ms_gmres.h
index 997fb825056..66593a2f320 100644
--- a/src/emu/netlist/analog/nld_ms_gmres.h
+++ b/src/emu/netlist/solver/nld_ms_gmres.h
@@ -14,11 +14,10 @@
#include <algorithm>
-#include "nld_solver.h"
-#include "nld_ms_direct.h"
-
-#include "mat_cr.h"
-#include "vector_base.h"
+#include "../solver/mat_cr.h"
+#include "../solver/nld_ms_direct.h"
+#include "../solver/nld_solver.h"
+#include "../solver/vector_base.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/analog/nld_ms_sor.h b/src/emu/netlist/solver/nld_ms_sor.h
index b1ced97df5a..24238d64fc5 100644
--- a/src/emu/netlist/analog/nld_ms_sor.h
+++ b/src/emu/netlist/solver/nld_ms_sor.h
@@ -14,8 +14,8 @@
#include <algorithm>
-#include "nld_solver.h"
-#include "nld_ms_direct.h"
+#include "../solver/nld_ms_direct.h"
+#include "../solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/analog/nld_ms_sor_mat.h b/src/emu/netlist/solver/nld_ms_sor_mat.h
index 1f658b0d6cd..dbb3c7563d4 100644
--- a/src/emu/netlist/analog/nld_ms_sor_mat.h
+++ b/src/emu/netlist/solver/nld_ms_sor_mat.h
@@ -14,8 +14,8 @@
#include <algorithm>
-#include "nld_solver.h"
-#include "nld_ms_direct.h"
+#include "../solver/nld_ms_direct.h"
+#include "../solver/nld_solver.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/emu/netlist/analog/nld_solver.c b/src/emu/netlist/solver/nld_solver.c
index 7a3b77f140f..c848b599b8a 100644
--- a/src/emu/netlist/analog/nld_solver.c
+++ b/src/emu/netlist/solver/nld_solver.c
@@ -35,7 +35,7 @@
#include "nld_ms_sor.h"
#include "nld_ms_sor_mat.h"
#include "nld_ms_gmres.h"
-#include "nld_twoterm.h"
+//#include "nld_twoterm.h"
#include "../nl_lists.h"
#if HAS_OPENMP
@@ -428,8 +428,8 @@ matrix_solver_t * NETLIB_NAME(solver)::create_solver(int size, const int gs_thre
}
else
{
- //typedef matrix_solver_SOR_t<m_N,_storage_N> solver_GS;
- typedef matrix_solver_GMRES_t<m_N,_storage_N> solver_GS;
+ typedef matrix_solver_SOR_t<m_N,_storage_N> solver_GS;
+ //typedef matrix_solver_GMRES_t<m_N,_storage_N> solver_GS;
return palloc(solver_GS, &m_params, size);
}
}
diff --git a/src/emu/netlist/analog/nld_solver.h b/src/emu/netlist/solver/nld_solver.h
index 1b20906aff3..1b20906aff3 100644
--- a/src/emu/netlist/analog/nld_solver.h
+++ b/src/emu/netlist/solver/nld_solver.h
diff --git a/src/emu/netlist/analog/vector_base.h b/src/emu/netlist/solver/vector_base.h
index 6374fc91095..6374fc91095 100644
--- a/src/emu/netlist/analog/vector_base.h
+++ b/src/emu/netlist/solver/vector_base.h