diff options
Diffstat (limited to 'src/lib/netlist/devices')
109 files changed, 135 insertions, 135 deletions
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp index 14f7de04222..4475ee32c9b 100644 --- a/src/lib/netlist/devices/net_lib.cpp +++ b/src/lib/netlist/devices/net_lib.cpp @@ -8,8 +8,8 @@ // *************************************************************************** #include "net_lib.h" -#include "netlist/nl_factory.h" -#include "netlist/solver/nld_solver.h" +#include "nl_factory.h" +#include "solver/nld_solver.h" #define NETLIB_DEVICE_DECL(chip) extern factory::constructor_ptr_t decl_ ## chip diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h index aa6b6f922e6..b5fd52bf032 100644 --- a/src/lib/netlist/devices/net_lib.h +++ b/src/lib/netlist/devices/net_lib.h @@ -10,7 +10,7 @@ /// Discrete netlist implementation. /// -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #ifdef RES_R #warning "Do not include rescap.h in a netlist environment" @@ -108,12 +108,12 @@ NETLIST_EXTERNAL(base_lib) #include "../macro/nlm_roms_lib.h" #include "../macro/nlm_ttl74xx_lib.h" -#include "netlist/analog/nld_bjt.h" -#include "netlist/analog/nld_fourterm.h" -#include "netlist/analog/nld_mosfet.h" -#include "netlist/analog/nld_opamps.h" -#include "netlist/analog/nld_switches.h" -#include "netlist/analog/nld_twoterm.h" +#include "../analog/nld_bjt.h" +#include "../analog/nld_fourterm.h" +#include "../analog/nld_mosfet.h" +#include "../analog/nld_opamps.h" +#include "../analog/nld_switches.h" +#include "../analog/nld_twoterm.h" #include "nld_legacy.h" #endif diff --git a/src/lib/netlist/devices/nld_2102A.cpp b/src/lib/netlist/devices/nld_2102A.cpp index e2fcd7ef9e1..0fddde0bd2d 100644 --- a/src/lib/netlist/devices/nld_2102A.cpp +++ b/src/lib/netlist/devices/nld_2102A.cpp @@ -22,7 +22,7 @@ */ #include "nld_2102A.h" -#include "netlist/nl_base.h" +#include "nl_base.h" #define ADDR2BYTE(a) ((a) >> 3) #define ADDR2BIT(a) ((a) & 0x7) diff --git a/src/lib/netlist/devices/nld_2102A.h b/src/lib/netlist/devices/nld_2102A.h index 30e693f0e00..fb0693e1012 100644 --- a/src/lib/netlist/devices/nld_2102A.h +++ b/src/lib/netlist/devices/nld_2102A.h @@ -4,7 +4,7 @@ #ifndef NLD_2102A_H_ #define NLD_2102A_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // expects: RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI) #define RAM_2102A(...) \ diff --git a/src/lib/netlist/devices/nld_4006.h b/src/lib/netlist/devices/nld_4006.h index 86092c254dc..c86d7ad86ee 100644 --- a/src/lib/netlist/devices/nld_4006.h +++ b/src/lib/netlist/devices/nld_4006.h @@ -4,7 +4,7 @@ #ifndef NLD_4006_H_ #define NLD_4006_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define CD4006(name) \ NET_REGISTER_DEV(CD4006, name) diff --git a/src/lib/netlist/devices/nld_4013.cpp b/src/lib/netlist/devices/nld_4013.cpp index 66d03e09fbd..eca94c328a5 100644 --- a/src/lib/netlist/devices/nld_4013.cpp +++ b/src/lib/netlist/devices/nld_4013.cpp @@ -39,8 +39,8 @@ * FIXME: Check that (*) is emulated properly */ -#include "netlist/nl_base.h" -#include "netlist/nl_factory.h" +#include "nl_base.h" +#include "nl_factory.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_4013.h b/src/lib/netlist/devices/nld_4013.h index 7a2623bb8df..1569358357b 100644 --- a/src/lib/netlist/devices/nld_4013.h +++ b/src/lib/netlist/devices/nld_4013.h @@ -4,7 +4,7 @@ #ifndef NLD_4013_H_ #define NLD_4013_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: CD4013(name, cCLOCK, cDATA, cRESET, cSET) #define CD4013(...) \ diff --git a/src/lib/netlist/devices/nld_4017.h b/src/lib/netlist/devices/nld_4017.h index e97c45586ca..7f89c4b9cfe 100644 --- a/src/lib/netlist/devices/nld_4017.h +++ b/src/lib/netlist/devices/nld_4017.h @@ -4,7 +4,7 @@ #ifndef NLD_4017_H_ #define NLD_4017_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define CD4017(name) \ NET_REGISTER_DEV(CD4017, name) diff --git a/src/lib/netlist/devices/nld_4020.h b/src/lib/netlist/devices/nld_4020.h index 440a164910c..e80156045df 100644 --- a/src/lib/netlist/devices/nld_4020.h +++ b/src/lib/netlist/devices/nld_4020.h @@ -4,7 +4,7 @@ #ifndef NLD_4020_H_ #define NLD_4020_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : CD4020(name) #define CD4020(...) \ diff --git a/src/lib/netlist/devices/nld_4053.cpp b/src/lib/netlist/devices/nld_4053.cpp index fb61415f01d..38b37fd3393 100644 --- a/src/lib/netlist/devices/nld_4053.cpp +++ b/src/lib/netlist/devices/nld_4053.cpp @@ -25,8 +25,8 @@ #include "nld_4053.h" -#include "netlist/analog/nlid_twoterm.h" -#include "netlist/solver/nld_solver.h" +#include "analog/nlid_twoterm.h" +#include "solver/nld_solver.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_4053.h b/src/lib/netlist/devices/nld_4053.h index 83636ef636c..6c6334b349f 100644 --- a/src/lib/netlist/devices/nld_4053.h +++ b/src/lib/netlist/devices/nld_4053.h @@ -3,7 +3,7 @@ #ifndef NLD_4053_H_ #define NLD_4053_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // FIXME: Implement pure CMOS version diff --git a/src/lib/netlist/devices/nld_4066.cpp b/src/lib/netlist/devices/nld_4066.cpp index 8260cf0303e..8cfa07f3b71 100644 --- a/src/lib/netlist/devices/nld_4066.cpp +++ b/src/lib/netlist/devices/nld_4066.cpp @@ -23,8 +23,8 @@ #include "nld_4066.h" -#include "netlist/analog/nlid_twoterm.h" -#include "netlist/solver/nld_solver.h" +#include "analog/nlid_twoterm.h" +#include "solver/nld_solver.h" namespace netlist diff --git a/src/lib/netlist/devices/nld_4066.h b/src/lib/netlist/devices/nld_4066.h index f30369f28d3..7815466aa08 100644 --- a/src/lib/netlist/devices/nld_4066.h +++ b/src/lib/netlist/devices/nld_4066.h @@ -4,7 +4,7 @@ #ifndef NLD_4066_H_ #define NLD_4066_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // FIXME: Implement pure CMOS version diff --git a/src/lib/netlist/devices/nld_4316.cpp b/src/lib/netlist/devices/nld_4316.cpp index 0c6c10cc71f..1eed4fa9ba6 100644 --- a/src/lib/netlist/devices/nld_4316.cpp +++ b/src/lib/netlist/devices/nld_4316.cpp @@ -23,8 +23,8 @@ */ #include "nld_4316.h" -#include "netlist/analog/nlid_twoterm.h" -#include "netlist/solver/nld_solver.h" +#include "analog/nlid_twoterm.h" +#include "solver/nld_solver.h" namespace netlist { namespace devices { diff --git a/src/lib/netlist/devices/nld_4316.h b/src/lib/netlist/devices/nld_4316.h index 35c94bd30a0..599430f4576 100644 --- a/src/lib/netlist/devices/nld_4316.h +++ b/src/lib/netlist/devices/nld_4316.h @@ -4,7 +4,7 @@ #ifndef NLD_4316_H_ #define NLD_4316_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define CD4316_GATE(name) \ NET_REGISTER_DEV(CD4316_GATE, name) diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp index b176d460d5c..1e52368b417 100644 --- a/src/lib/netlist/devices/nld_74107.cpp +++ b/src/lib/netlist/devices/nld_74107.cpp @@ -62,7 +62,7 @@ */ #include "nld_74107.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74107.h b/src/lib/netlist/devices/nld_74107.h index 91b21f6be7d..c3d65523a9f 100644 --- a/src/lib/netlist/devices/nld_74107.h +++ b/src/lib/netlist/devices/nld_74107.h @@ -4,7 +4,7 @@ #ifndef NLD_74107_H_ #define NLD_74107_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define TTL_74107(...) \ NET_REGISTER_DEVEXT(TTL_74107, __VA_ARGS__) diff --git a/src/lib/netlist/devices/nld_74113.cpp b/src/lib/netlist/devices/nld_74113.cpp index fe8e6054d71..98a8de63e01 100644 --- a/src/lib/netlist/devices/nld_74113.cpp +++ b/src/lib/netlist/devices/nld_74113.cpp @@ -58,7 +58,7 @@ */ #include "nld_74113.h" -#include "netlist/nl_base.h" +#include "nl_base.h" // FIXME: this can probably be merged with nld_7473.cpp // FIXME: timing, see 74107 for example, use template diff --git a/src/lib/netlist/devices/nld_74113.h b/src/lib/netlist/devices/nld_74113.h index 0a33de8cac6..e0b531daadc 100644 --- a/src/lib/netlist/devices/nld_74113.h +++ b/src/lib/netlist/devices/nld_74113.h @@ -4,7 +4,7 @@ #ifndef NLD_74113_H_ #define NLD_74113_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_74113(name, cCLK, cJ, cK, cCLRQ) #define TTL_74113(...) \ diff --git a/src/lib/netlist/devices/nld_74123.cpp b/src/lib/netlist/devices/nld_74123.cpp index a7651c9de6c..00a5047f764 100644 --- a/src/lib/netlist/devices/nld_74123.cpp +++ b/src/lib/netlist/devices/nld_74123.cpp @@ -46,7 +46,7 @@ * */ -#include "netlist/analog/nlid_twoterm.h" +#include "analog/nlid_twoterm.h" #include "nlid_system.h" namespace netlist diff --git a/src/lib/netlist/devices/nld_74123.h b/src/lib/netlist/devices/nld_74123.h index be07c60f6d4..3c780fb83a6 100644 --- a/src/lib/netlist/devices/nld_74123.h +++ b/src/lib/netlist/devices/nld_74123.h @@ -4,7 +4,7 @@ #ifndef NLD_74123_H_ #define NLD_74123_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define TTL_74123(name) \ NET_REGISTER_DEV(TTL_74123, name) diff --git a/src/lib/netlist/devices/nld_74125.h b/src/lib/netlist/devices/nld_74125.h index d192d776977..07d749e0c02 100644 --- a/src/lib/netlist/devices/nld_74125.h +++ b/src/lib/netlist/devices/nld_74125.h @@ -8,7 +8,7 @@ #ifndef NLD_74125_H_ #define NLD_74125_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define TTL_74125_GATE(...) \ NET_REGISTER_DEV(TTL_74125_GATE, __VA_ARGS__) diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp index d26de50819e..9e5a68149c5 100644 --- a/src/lib/netlist/devices/nld_74153.cpp +++ b/src/lib/netlist/devices/nld_74153.cpp @@ -43,7 +43,7 @@ */ #include "nld_74153.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74153.h b/src/lib/netlist/devices/nld_74153.h index b291e1dd231..11bfe0e2bb4 100644 --- a/src/lib/netlist/devices/nld_74153.h +++ b/src/lib/netlist/devices/nld_74153.h @@ -4,7 +4,7 @@ #ifndef NLD_74153_H_ #define NLD_74153_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_74153(name, cC0, cC1, cC2, cC3, cA, cB, cG) #define TTL_74153(...) \ diff --git a/src/lib/netlist/devices/nld_74164.cpp b/src/lib/netlist/devices/nld_74164.cpp index 36d794e315e..25331e8f3ae 100644 --- a/src/lib/netlist/devices/nld_74164.cpp +++ b/src/lib/netlist/devices/nld_74164.cpp @@ -47,7 +47,7 @@ **********************************************************************/ #include "nld_74164.h" -#include "netlist/nl_base.h" +#include "nl_base.h" // FIXME: clk input to be separated - only falling edge relevant diff --git a/src/lib/netlist/devices/nld_74164.h b/src/lib/netlist/devices/nld_74164.h index f732301e1f9..9ec3b98c10c 100644 --- a/src/lib/netlist/devices/nld_74164.h +++ b/src/lib/netlist/devices/nld_74164.h @@ -4,7 +4,7 @@ #ifndef NLD_74164_H_ #define NLD_74164_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_74164(name, cA, cB, cCLRQ, cCLK) #define TTL_74164(...) \ diff --git a/src/lib/netlist/devices/nld_74165.cpp b/src/lib/netlist/devices/nld_74165.cpp index 1da604aef36..15647afb6d7 100644 --- a/src/lib/netlist/devices/nld_74165.cpp +++ b/src/lib/netlist/devices/nld_74165.cpp @@ -25,7 +25,7 @@ */ #include "nld_74165.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74165.h b/src/lib/netlist/devices/nld_74165.h index 72e1a415342..5b0b2820135 100644 --- a/src/lib/netlist/devices/nld_74165.h +++ b/src/lib/netlist/devices/nld_74165.h @@ -4,7 +4,7 @@ #ifndef NLD_74165_H_ #define NLD_74165_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH) #define TTL_74165(...) \ diff --git a/src/lib/netlist/devices/nld_74166.cpp b/src/lib/netlist/devices/nld_74166.cpp index e2b7901ff3c..243281ca527 100644 --- a/src/lib/netlist/devices/nld_74166.cpp +++ b/src/lib/netlist/devices/nld_74166.cpp @@ -25,7 +25,7 @@ */ #include "nld_74166.h" -#include "netlist/nl_base.h" +#include "nl_base.h" // FIXME: separate handlers for inputs diff --git a/src/lib/netlist/devices/nld_74166.h b/src/lib/netlist/devices/nld_74166.h index 8184c2610d3..00434994d80 100644 --- a/src/lib/netlist/devices/nld_74166.h +++ b/src/lib/netlist/devices/nld_74166.h @@ -4,7 +4,7 @@ #ifndef NLD_74166_H_ #define NLD_74166_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ) #define TTL_74166(...) \ diff --git a/src/lib/netlist/devices/nld_74174.cpp b/src/lib/netlist/devices/nld_74174.cpp index 9949503ef42..1414ddd3145 100644 --- a/src/lib/netlist/devices/nld_74174.cpp +++ b/src/lib/netlist/devices/nld_74174.cpp @@ -34,7 +34,7 @@ */ #include "nld_74174.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74174.h b/src/lib/netlist/devices/nld_74174.h index 572cf560aae..91cef8fdd74 100644 --- a/src/lib/netlist/devices/nld_74174.h +++ b/src/lib/netlist/devices/nld_74174.h @@ -4,7 +4,7 @@ #ifndef NLD_74174_H_ #define NLD_74174_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ) #define TTL_74174(...) \ diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp index aa7993ada7b..0b2f125d1b1 100644 --- a/src/lib/netlist/devices/nld_74175.cpp +++ b/src/lib/netlist/devices/nld_74175.cpp @@ -34,7 +34,7 @@ */ #include "nld_74175.h" -#include "netlist/nl_base.h" +#include "nl_base.h" // FIXME: optimize diff --git a/src/lib/netlist/devices/nld_74175.h b/src/lib/netlist/devices/nld_74175.h index ae9faa9bae0..377320b14f0 100644 --- a/src/lib/netlist/devices/nld_74175.h +++ b/src/lib/netlist/devices/nld_74175.h @@ -4,7 +4,7 @@ #ifndef NLD_74175_H_ #define NLD_74175_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : TTL_74175(name, pCLK, pD1, pD2, pD3, pD4, pCLRQ) // auto connect: VCC, GND diff --git a/src/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp index f7c49bdd56d..0c1864f4394 100644 --- a/src/lib/netlist/devices/nld_74192.cpp +++ b/src/lib/netlist/devices/nld_74192.cpp @@ -27,7 +27,7 @@ */ #include "nld_74192.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74192.h b/src/lib/netlist/devices/nld_74192.h index 2331c151bb9..1248a07961c 100644 --- a/src/lib/netlist/devices/nld_74192.h +++ b/src/lib/netlist/devices/nld_74192.h @@ -4,7 +4,7 @@ #ifndef NLD_74192_H_ #define NLD_74192_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : TTL_74192(name, pA, pB, pC, pD, pCLEAR, pLOADQ, pCU, pCD) // auto connect: VCC, GND diff --git a/src/lib/netlist/devices/nld_74193.cpp b/src/lib/netlist/devices/nld_74193.cpp index 1fcec366aa5..5754cd2eea1 100644 --- a/src/lib/netlist/devices/nld_74193.cpp +++ b/src/lib/netlist/devices/nld_74193.cpp @@ -24,7 +24,7 @@ */ #include "nld_74193.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74193.h b/src/lib/netlist/devices/nld_74193.h index fc9a1254c2f..42c790107a2 100644 --- a/src/lib/netlist/devices/nld_74193.h +++ b/src/lib/netlist/devices/nld_74193.h @@ -4,7 +4,7 @@ #ifndef NLD_74193_H_ #define NLD_74193_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : TTL_74193(name, pA, pB, pC, pD, pCLEAR, pLOADQ, pCU, pCD) // auto connect: VCC, GND diff --git a/src/lib/netlist/devices/nld_74194.cpp b/src/lib/netlist/devices/nld_74194.cpp index e29fb947228..cc0b048d95d 100644 --- a/src/lib/netlist/devices/nld_74194.cpp +++ b/src/lib/netlist/devices/nld_74194.cpp @@ -25,7 +25,7 @@ #include "nld_74194.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74194.h b/src/lib/netlist/devices/nld_74194.h index 43830f8fa0e..c380190d6fe 100644 --- a/src/lib/netlist/devices/nld_74194.h +++ b/src/lib/netlist/devices/nld_74194.h @@ -3,7 +3,7 @@ #ifndef NLD_74194_H_ #define NLD_74194_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : TTL_74194(name, pCLK, pS0, pS1, pSRIN, pA, pB, pC, pD, pSLIN, pCLRQ) // auto connect: VCC, GND diff --git a/src/lib/netlist/devices/nld_74365.cpp b/src/lib/netlist/devices/nld_74365.cpp index 6906547fc35..ce93d336158 100644 --- a/src/lib/netlist/devices/nld_74365.cpp +++ b/src/lib/netlist/devices/nld_74365.cpp @@ -23,7 +23,7 @@ */ #include "nld_74365.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74365.h b/src/lib/netlist/devices/nld_74365.h index 1084bce6d85..5900991e156 100644 --- a/src/lib/netlist/devices/nld_74365.h +++ b/src/lib/netlist/devices/nld_74365.h @@ -3,7 +3,7 @@ #ifndef NLD_74365_H_ #define NLD_74365_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : TTL_74365(name, pG1Q, pG2Q, pA1, pA2, pA3, pA4, pA5, pA6) // auto connect: VCC, GND diff --git a/src/lib/netlist/devices/nld_74377.cpp b/src/lib/netlist/devices/nld_74377.cpp index 8d5381ce92a..45427bde827 100644 --- a/src/lib/netlist/devices/nld_74377.cpp +++ b/src/lib/netlist/devices/nld_74377.cpp @@ -49,7 +49,7 @@ */ #include "nld_74377.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74377.h b/src/lib/netlist/devices/nld_74377.h index 9b3d2b87210..7157abec99f 100644 --- a/src/lib/netlist/devices/nld_74377.h +++ b/src/lib/netlist/devices/nld_74377.h @@ -4,7 +4,7 @@ #ifndef NLD_74377_H_ #define NLD_74377_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define TTL_74377_GATE(name) \ diff --git a/src/lib/netlist/devices/nld_74393.cpp b/src/lib/netlist/devices/nld_74393.cpp index 38e42475eda..765c73a7880 100644 --- a/src/lib/netlist/devices/nld_74393.cpp +++ b/src/lib/netlist/devices/nld_74393.cpp @@ -20,7 +20,7 @@ */ #include "nld_74393.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74393.h b/src/lib/netlist/devices/nld_74393.h index cf4d3b82932..664b7ce91eb 100644 --- a/src/lib/netlist/devices/nld_74393.h +++ b/src/lib/netlist/devices/nld_74393.h @@ -4,7 +4,7 @@ #ifndef NLD_74393_H_ #define NLD_74393_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_74393(name, cCP, cMR) #define TTL_74393(...) \ diff --git a/src/lib/netlist/devices/nld_7448.h b/src/lib/netlist/devices/nld_7448.h index d9b6d49078d..937ea87e090 100644 --- a/src/lib/netlist/devices/nld_7448.h +++ b/src/lib/netlist/devices/nld_7448.h @@ -4,7 +4,7 @@ #ifndef NLD_7448_H_ #define NLD_7448_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : TTL_7448(name, pA, pB, pC, pD, pLTQ, pBIQ, pRBIQ) // auto connect: VCC, GND diff --git a/src/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp index 429958d02d5..35487bd12f9 100644 --- a/src/lib/netlist/devices/nld_7450.cpp +++ b/src/lib/netlist/devices/nld_7450.cpp @@ -22,7 +22,7 @@ */ #include "nld_7450.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7450.h b/src/lib/netlist/devices/nld_7450.h index f12d1b6d844..7a58605f20c 100644 --- a/src/lib/netlist/devices/nld_7450.h +++ b/src/lib/netlist/devices/nld_7450.h @@ -4,7 +4,7 @@ #ifndef NLD_7450_H_ #define NLD_7450_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_7450_ANDORINVERT(name, cI1, cI2, cI3, cI4) #define TTL_7450_ANDORINVERT(...) \ diff --git a/src/lib/netlist/devices/nld_7473.cpp b/src/lib/netlist/devices/nld_7473.cpp index 805321e997e..8826df0239d 100644 --- a/src/lib/netlist/devices/nld_7473.cpp +++ b/src/lib/netlist/devices/nld_7473.cpp @@ -58,7 +58,7 @@ */ #include "nld_7473.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7473.h b/src/lib/netlist/devices/nld_7473.h index 0ba195d4476..6aedd619dac 100644 --- a/src/lib/netlist/devices/nld_7473.h +++ b/src/lib/netlist/devices/nld_7473.h @@ -4,7 +4,7 @@ #ifndef NLD_7473_H_ #define NLD_7473_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_7473(name, cCLK, cJ, cK, cCLRQ) #define TTL_7473(...) \ diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp index 2bf97703374..42d5acfc9af 100644 --- a/src/lib/netlist/devices/nld_7474.cpp +++ b/src/lib/netlist/devices/nld_7474.cpp @@ -41,7 +41,7 @@ */ #include "nld_7474.h" -#include "netlist/nl_base.h" +#include "nl_base.h" #include <array> diff --git a/src/lib/netlist/devices/nld_7474.h b/src/lib/netlist/devices/nld_7474.h index d44a2759e67..7ae42fc750b 100644 --- a/src/lib/netlist/devices/nld_7474.h +++ b/src/lib/netlist/devices/nld_7474.h @@ -4,7 +4,7 @@ #ifndef NLD_7474_H_ #define NLD_7474_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_7474(name, cCLK, cD, cCLRQ, cPREQ) #define TTL_7474(...) \ diff --git a/src/lib/netlist/devices/nld_7475.cpp b/src/lib/netlist/devices/nld_7475.cpp index 785906e7b9b..d8b6bbe84db 100644 --- a/src/lib/netlist/devices/nld_7475.cpp +++ b/src/lib/netlist/devices/nld_7475.cpp @@ -35,7 +35,7 @@ */ #include "nld_7475.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7475.h b/src/lib/netlist/devices/nld_7475.h index 0e44886f7de..988061e3c6b 100644 --- a/src/lib/netlist/devices/nld_7475.h +++ b/src/lib/netlist/devices/nld_7475.h @@ -4,7 +4,7 @@ #ifndef NLD_7475_H_ #define NLD_7475_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define TTL_7475_GATE(...) \ NET_REGISTER_DEVEXT(TTL_7475_GATE, __VA_ARGS__) diff --git a/src/lib/netlist/devices/nld_7483.cpp b/src/lib/netlist/devices/nld_7483.cpp index 08905727ef4..0e20ab76b63 100644 --- a/src/lib/netlist/devices/nld_7483.cpp +++ b/src/lib/netlist/devices/nld_7483.cpp @@ -25,7 +25,7 @@ */ #include "nld_7483.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7483.h b/src/lib/netlist/devices/nld_7483.h index a8751f2a7c5..e2ede42246a 100644 --- a/src/lib/netlist/devices/nld_7483.h +++ b/src/lib/netlist/devices/nld_7483.h @@ -4,7 +4,7 @@ #ifndef NLD_7483_H_ #define NLD_7483_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_7483(name, cA1, cA2, cA3, cA4, cB1, cB2, cB3, cB4, cCI) #define TTL_7483(...) \ diff --git a/src/lib/netlist/devices/nld_7485.cpp b/src/lib/netlist/devices/nld_7485.cpp index 0d960ac9006..7cce2fa8ad8 100644 --- a/src/lib/netlist/devices/nld_7485.cpp +++ b/src/lib/netlist/devices/nld_7485.cpp @@ -23,7 +23,7 @@ */ #include "nld_7485.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7485.h b/src/lib/netlist/devices/nld_7485.h index 1211c47c4d5..8d140b57c4d 100644 --- a/src/lib/netlist/devices/nld_7485.h +++ b/src/lib/netlist/devices/nld_7485.h @@ -4,7 +4,7 @@ #ifndef NLD_7485_H_ #define NLD_7485_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN) #define TTL_7485(...) \ diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp index aa8388c2615..8dcf6ab2655 100644 --- a/src/lib/netlist/devices/nld_7490.cpp +++ b/src/lib/netlist/devices/nld_7490.cpp @@ -53,7 +53,7 @@ */ #include "nld_7490.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7490.h b/src/lib/netlist/devices/nld_7490.h index 725ebb8b949..06a18f19c8d 100644 --- a/src/lib/netlist/devices/nld_7490.h +++ b/src/lib/netlist/devices/nld_7490.h @@ -4,7 +4,7 @@ #ifndef NLD_7490_H_ #define NLD_7490_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92) #define TTL_7490(...) \ diff --git a/src/lib/netlist/devices/nld_7492.cpp b/src/lib/netlist/devices/nld_7492.cpp index 56a579dcb8a..3bf120f3c68 100644 --- a/src/lib/netlist/devices/nld_7492.cpp +++ b/src/lib/netlist/devices/nld_7492.cpp @@ -50,7 +50,7 @@ * */ -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7492.h b/src/lib/netlist/devices/nld_7492.h index c4cab8909e8..366e1c079c6 100644 --- a/src/lib/netlist/devices/nld_7492.h +++ b/src/lib/netlist/devices/nld_7492.h @@ -4,7 +4,7 @@ #ifndef NLD_7492_H_ #define NLD_7492_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_7492(name, cA, cB, cR1, cR2) #define TTL_7492(...) \ diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp index 2fce9523c0b..17cf8eb5ff1 100644 --- a/src/lib/netlist/devices/nld_7493.cpp +++ b/src/lib/netlist/devices/nld_7493.cpp @@ -55,7 +55,7 @@ */ #include "nld_7493.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist diff --git a/src/lib/netlist/devices/nld_7493.h b/src/lib/netlist/devices/nld_7493.h index 34041d61373..86bbc6a1482 100644 --- a/src/lib/netlist/devices/nld_7493.h +++ b/src/lib/netlist/devices/nld_7493.h @@ -4,7 +4,7 @@ #ifndef NLD_7493_H_ #define NLD_7493_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_7493(name, cCLKA, cCLKB, cR1, cR2) #define TTL_7493(...) \ diff --git a/src/lib/netlist/devices/nld_7497.cpp b/src/lib/netlist/devices/nld_7497.cpp index 6f5f30e8811..b43ff7dcfe2 100644 --- a/src/lib/netlist/devices/nld_7497.cpp +++ b/src/lib/netlist/devices/nld_7497.cpp @@ -38,7 +38,7 @@ */ #include "nld_7497.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_7497.h b/src/lib/netlist/devices/nld_7497.h index c187ad24b3b..befebb8d64e 100644 --- a/src/lib/netlist/devices/nld_7497.h +++ b/src/lib/netlist/devices/nld_7497.h @@ -4,7 +4,7 @@ #ifndef NLD_7497_H_ #define NLD_7497_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_7497(name, cCLK, cSTRB, cEN, cUNITY, cCLR, cB0, cB1, cB2, cB3, cB4, cB5) #define TTL_7497(...) \ diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp index d9822492c80..27eee588957 100644 --- a/src/lib/netlist/devices/nld_74ls629.cpp +++ b/src/lib/netlist/devices/nld_74ls629.cpp @@ -60,7 +60,7 @@ #include "nld_74ls629.h" -#include "netlist/analog/nlid_twoterm.h" +#include "analog/nlid_twoterm.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_74ls629.h b/src/lib/netlist/devices/nld_74ls629.h index 840dae357b8..ff467d46cea 100644 --- a/src/lib/netlist/devices/nld_74ls629.h +++ b/src/lib/netlist/devices/nld_74ls629.h @@ -4,7 +4,7 @@ #ifndef NLD_74LS629_H_ #define NLD_74LS629_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define SN74LS629(name, ...) \ NET_REGISTER_DEVEXT(SN74LS629, name,__VA_ARGS__) diff --git a/src/lib/netlist/devices/nld_8277.cpp b/src/lib/netlist/devices/nld_8277.cpp index e7f87c9336f..939f1a32ecc 100644 --- a/src/lib/netlist/devices/nld_8277.cpp +++ b/src/lib/netlist/devices/nld_8277.cpp @@ -19,7 +19,7 @@ */ #include "nld_8277.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_8277.h b/src/lib/netlist/devices/nld_8277.h index 0b98e15760b..54deeccb230 100644 --- a/src/lib/netlist/devices/nld_8277.h +++ b/src/lib/netlist/devices/nld_8277.h @@ -4,7 +4,7 @@ #ifndef NLD_8277_H_ #define NLD_8277_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : TTL_8277(name, pRESET, pCLK, pCLKA, pD0A, pD1A, pDSA, pCLKB, pD0B, pD1B, pDSB) // auto connect: VCC, GND diff --git a/src/lib/netlist/devices/nld_82S115.cpp b/src/lib/netlist/devices/nld_82S115.cpp index 317b16e5e80..d96be04c053 100644 --- a/src/lib/netlist/devices/nld_82S115.cpp +++ b/src/lib/netlist/devices/nld_82S115.cpp @@ -26,7 +26,7 @@ */ #include "nld_82S115.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_82S115.h b/src/lib/netlist/devices/nld_82S115.h index c3f22dffee4..b5d6dcf58a5 100644 --- a/src/lib/netlist/devices/nld_82S115.h +++ b/src/lib/netlist/devices/nld_82S115.h @@ -4,7 +4,7 @@ #ifndef NLD_82S115_H_ #define NLD_82S115_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // expects: PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE) #define PROM_82S115(...) \ diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp index ee798e11eb5..bdc6a15132d 100644 --- a/src/lib/netlist/devices/nld_82S16.cpp +++ b/src/lib/netlist/devices/nld_82S16.cpp @@ -23,7 +23,7 @@ */ #include "nld_82S16.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_82S16.h b/src/lib/netlist/devices/nld_82S16.h index 60e6fb22994..ef73e631b16 100644 --- a/src/lib/netlist/devices/nld_82S16.h +++ b/src/lib/netlist/devices/nld_82S16.h @@ -4,7 +4,7 @@ #ifndef NLD_82S16_H_ #define NLD_82S16_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define TTL_82S16(name) \ NET_REGISTER_DEV(TTL_82S16, name) diff --git a/src/lib/netlist/devices/nld_9316.h b/src/lib/netlist/devices/nld_9316.h index 008104888ef..baefb42a758 100644 --- a/src/lib/netlist/devices/nld_9316.h +++ b/src/lib/netlist/devices/nld_9316.h @@ -4,7 +4,7 @@ #ifndef NLD_9316_H_ #define NLD_9316_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_9316(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD) #define TTL_9316(...) \ diff --git a/src/lib/netlist/devices/nld_9321.cpp b/src/lib/netlist/devices/nld_9321.cpp index 1634e4f13f0..81bd6a86a7e 100644 --- a/src/lib/netlist/devices/nld_9321.cpp +++ b/src/lib/netlist/devices/nld_9321.cpp @@ -19,7 +19,7 @@ */ #include "nld_9321.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_9321.h b/src/lib/netlist/devices/nld_9321.h index 41bf89fed2a..8283dbde20c 100644 --- a/src/lib/netlist/devices/nld_9321.h +++ b/src/lib/netlist/devices/nld_9321.h @@ -4,7 +4,7 @@ #ifndef NLD_9321_H_ #define NLD_9321_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_9321(name, cAE, cA0, cA1, cBE, cB0, cB1) #define TTL_9321(...) \ diff --git a/src/lib/netlist/devices/nld_9322.cpp b/src/lib/netlist/devices/nld_9322.cpp index bfc643b27ae..1167ece79d9 100644 --- a/src/lib/netlist/devices/nld_9322.cpp +++ b/src/lib/netlist/devices/nld_9322.cpp @@ -19,7 +19,7 @@ */ #include "nld_9322.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_9322.h b/src/lib/netlist/devices/nld_9322.h index 8a33f66959b..0584974da2e 100644 --- a/src/lib/netlist/devices/nld_9322.h +++ b/src/lib/netlist/devices/nld_9322.h @@ -4,7 +4,7 @@ #ifndef NLD_9322_H_ #define NLD_9322_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage: TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE) #define TTL_9322(...) \ diff --git a/src/lib/netlist/devices/nld_am2847.cpp b/src/lib/netlist/devices/nld_am2847.cpp index 89034dc518b..9a35b5f8ac9 100644 --- a/src/lib/netlist/devices/nld_am2847.cpp +++ b/src/lib/netlist/devices/nld_am2847.cpp @@ -19,7 +19,7 @@ */ #include "nld_am2847.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_am2847.h b/src/lib/netlist/devices/nld_am2847.h index abf91184f4d..bf7c3b8a635 100644 --- a/src/lib/netlist/devices/nld_am2847.h +++ b/src/lib/netlist/devices/nld_am2847.h @@ -4,7 +4,7 @@ #ifndef NLD_AM2847_H_ #define NLD_AM2847_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define TTL_AM2847(...) \ NET_REGISTER_DEVEXT(TTL_AM2847, __VA_ARGS__) diff --git a/src/lib/netlist/devices/nld_dm9314.cpp b/src/lib/netlist/devices/nld_dm9314.cpp index 8aa842c0214..215316f9d42 100644 --- a/src/lib/netlist/devices/nld_dm9314.cpp +++ b/src/lib/netlist/devices/nld_dm9314.cpp @@ -19,7 +19,7 @@ */ #include "nld_dm9314.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_dm9314.h b/src/lib/netlist/devices/nld_dm9314.h index 107b25464a6..03aebb16f14 100644 --- a/src/lib/netlist/devices/nld_dm9314.h +++ b/src/lib/netlist/devices/nld_dm9314.h @@ -4,7 +4,7 @@ #ifndef NLD_DM9314_H_ #define NLD_DM9314_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : TTL_9314(name, pEQ, pMRQ, pS0Q, pS1Q, pS2Q, pS3Q, pD0, pD1, pD2, pD3) // auto connect: VCC, GND diff --git a/src/lib/netlist/devices/nld_dm9334.cpp b/src/lib/netlist/devices/nld_dm9334.cpp index aa69d2c949d..251604bdf93 100644 --- a/src/lib/netlist/devices/nld_dm9334.cpp +++ b/src/lib/netlist/devices/nld_dm9334.cpp @@ -63,7 +63,7 @@ */ #include "nld_dm9334.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_dm9334.h b/src/lib/netlist/devices/nld_dm9334.h index 052ab58fc82..9e48fbf2cb3 100644 --- a/src/lib/netlist/devices/nld_dm9334.h +++ b/src/lib/netlist/devices/nld_dm9334.h @@ -4,7 +4,7 @@ #ifndef NLD_DM9334_H_ #define NLD_DM9334_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : TTL_9334(name, pCQ, pEQ, pD, pA0, pA1, pA2) // auto connect: VCC, GND diff --git a/src/lib/netlist/devices/nld_legacy.cpp b/src/lib/netlist/devices/nld_legacy.cpp index ba66ae1bf94..ca8893a59aa 100644 --- a/src/lib/netlist/devices/nld_legacy.cpp +++ b/src/lib/netlist/devices/nld_legacy.cpp @@ -6,7 +6,7 @@ */ #include "nld_legacy.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_legacy.h b/src/lib/netlist/devices/nld_legacy.h index f33ec9eedf2..a91074a4056 100644 --- a/src/lib/netlist/devices/nld_legacy.h +++ b/src/lib/netlist/devices/nld_legacy.h @@ -11,7 +11,7 @@ #ifndef NLD_LEGACY_H_ #define NLD_LEGACY_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // ---------------------------------------------------------------------------------------- // Macros diff --git a/src/lib/netlist/devices/nld_log.cpp b/src/lib/netlist/devices/nld_log.cpp index dacc208f5a0..f60029748ce 100644 --- a/src/lib/netlist/devices/nld_log.cpp +++ b/src/lib/netlist/devices/nld_log.cpp @@ -15,7 +15,7 @@ * */ -#include "netlist/nl_base.h" +#include "nl_base.h" #include "nld_log.h" #include "plib/pfmtlog.h" #include "plib/pmulti_threading.h" diff --git a/src/lib/netlist/devices/nld_log.h b/src/lib/netlist/devices/nld_log.h index 470506a430e..cf52e52a4f9 100644 --- a/src/lib/netlist/devices/nld_log.h +++ b/src/lib/netlist/devices/nld_log.h @@ -4,7 +4,7 @@ #ifndef NLD_LOG_H_ #define NLD_LOG_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define LOG(name, cI) \ NET_REGISTER_DEV(LOG, name) \ diff --git a/src/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp index b55593eb10d..cf33660005a 100644 --- a/src/lib/netlist/devices/nld_mm5837.cpp +++ b/src/lib/netlist/devices/nld_mm5837.cpp @@ -17,8 +17,8 @@ */ #include "nld_mm5837.h" -#include "netlist/analog/nlid_twoterm.h" -#include "netlist/solver/nld_matrix_solver.h" +#include "analog/nlid_twoterm.h" +#include "solver/nld_matrix_solver.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_mm5837.h b/src/lib/netlist/devices/nld_mm5837.h index 9c8380c8220..1bc6b5addee 100644 --- a/src/lib/netlist/devices/nld_mm5837.h +++ b/src/lib/netlist/devices/nld_mm5837.h @@ -4,7 +4,7 @@ #ifndef NLD_MM5837_H_ #define NLD_MM5837_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define MM5837(name) \ NET_REGISTER_DEV(MM5837, name) diff --git a/src/lib/netlist/devices/nld_ne555.cpp b/src/lib/netlist/devices/nld_ne555.cpp index 2175ae2c7f5..c132a88eda3 100644 --- a/src/lib/netlist/devices/nld_ne555.cpp +++ b/src/lib/netlist/devices/nld_ne555.cpp @@ -3,8 +3,8 @@ #include "nld_ne555.h" -#include "netlist/analog/nlid_twoterm.h" -#include "netlist/solver/nld_solver.h" +#include "analog/nlid_twoterm.h" +#include "solver/nld_solver.h" #include "plib/pmath.h" diff --git a/src/lib/netlist/devices/nld_ne555.h b/src/lib/netlist/devices/nld_ne555.h index 2c7fc8c22aa..1033b00cb67 100644 --- a/src/lib/netlist/devices/nld_ne555.h +++ b/src/lib/netlist/devices/nld_ne555.h @@ -4,7 +4,7 @@ #ifndef NLD_NE555_H_ #define NLD_NE555_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : NE555(name) #define NE555(...) \ diff --git a/src/lib/netlist/devices/nld_r2r_dac.cpp b/src/lib/netlist/devices/nld_r2r_dac.cpp index 703ba3a536e..da571930601 100644 --- a/src/lib/netlist/devices/nld_r2r_dac.cpp +++ b/src/lib/netlist/devices/nld_r2r_dac.cpp @@ -43,9 +43,9 @@ * */ -#include "netlist/nl_base.h" -#include "netlist/analog/nlid_twoterm.h" -#include "netlist/nl_factory.h" +#include "nl_base.h" +#include "analog/nlid_twoterm.h" +#include "nl_factory.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_r2r_dac.h b/src/lib/netlist/devices/nld_r2r_dac.h index 85af880bddb..8a8f1c90f47 100644 --- a/src/lib/netlist/devices/nld_r2r_dac.h +++ b/src/lib/netlist/devices/nld_r2r_dac.h @@ -4,7 +4,7 @@ #ifndef NLD_R2R_DAC_H_ #define NLD_R2R_DAC_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define R2R_DAC(name, p_VIN, p_R, p_N) \ NET_REGISTER_DEVEXT(R2R_DAC, name, p_VIN, p_R, p_N) diff --git a/src/lib/netlist/devices/nld_roms.cpp b/src/lib/netlist/devices/nld_roms.cpp index f873f357d1e..de440b4a8d2 100644 --- a/src/lib/netlist/devices/nld_roms.cpp +++ b/src/lib/netlist/devices/nld_roms.cpp @@ -5,8 +5,8 @@ * */ -#include "netlist/nl_base.h" -#include "netlist/nl_factory.h" +#include "nl_base.h" +#include "nl_factory.h" template <typename N, typename T> constexpr bool TOR(N n, T &a) diff --git a/src/lib/netlist/devices/nld_roms.h b/src/lib/netlist/devices/nld_roms.h index e8cf1b2398c..0a8c09d8cf1 100644 --- a/src/lib/netlist/devices/nld_roms.h +++ b/src/lib/netlist/devices/nld_roms.h @@ -8,7 +8,7 @@ #ifndef NLD_ROMS_H_ #define NLD_ROMS_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // PROM_82S126(name, cCE1Q, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7) #define PROM_82S126(...) \ diff --git a/src/lib/netlist/devices/nld_schmitt.cpp b/src/lib/netlist/devices/nld_schmitt.cpp index e201fe822d1..6b49739e107 100644 --- a/src/lib/netlist/devices/nld_schmitt.cpp +++ b/src/lib/netlist/devices/nld_schmitt.cpp @@ -7,10 +7,10 @@ #include "nld_schmitt.h" -#include "netlist/analog/nlid_twoterm.h" -#include "netlist/nl_base.h" -#include "netlist/nl_errstr.h" -#include "netlist/solver/nld_solver.h" +#include "analog/nlid_twoterm.h" +#include "nl_base.h" +#include "nl_errstr.h" +#include "solver/nld_solver.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_schmitt.h b/src/lib/netlist/devices/nld_schmitt.h index fbc10706b23..87b8626edda 100644 --- a/src/lib/netlist/devices/nld_schmitt.h +++ b/src/lib/netlist/devices/nld_schmitt.h @@ -8,7 +8,7 @@ #ifndef NLD_SCHMITT_H_ #define NLD_SCHMITT_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // ---------------------------------------------------------------------------------------- // Macros diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp index a1477b6dce4..a633e8074f7 100644 --- a/src/lib/netlist/devices/nld_system.cpp +++ b/src/lib/netlist/devices/nld_system.cpp @@ -5,8 +5,8 @@ * */ -#include "netlist/solver/nld_solver.h" -#include "netlist/solver/nld_matrix_solver.h" +#include "solver/nld_solver.h" +#include "solver/nld_matrix_solver.h" #include "nlid_system.h" namespace netlist diff --git a/src/lib/netlist/devices/nld_system.h b/src/lib/netlist/devices/nld_system.h index 36317a6b1b9..2f174731dde 100644 --- a/src/lib/netlist/devices/nld_system.h +++ b/src/lib/netlist/devices/nld_system.h @@ -9,7 +9,7 @@ #ifndef NLD_SYSTEM_H_ #define NLD_SYSTEM_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // ----------------------------------------------------------------------------- // Macros diff --git a/src/lib/netlist/devices/nld_tms4800.cpp b/src/lib/netlist/devices/nld_tms4800.cpp index b52af34ca6a..abe63edda6e 100644 --- a/src/lib/netlist/devices/nld_tms4800.cpp +++ b/src/lib/netlist/devices/nld_tms4800.cpp @@ -26,7 +26,7 @@ */ #include "nld_tms4800.h" -#include "netlist/nl_base.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nld_tms4800.h b/src/lib/netlist/devices/nld_tms4800.h index 57abe34e031..dc2eaa7a16d 100644 --- a/src/lib/netlist/devices/nld_tms4800.h +++ b/src/lib/netlist/devices/nld_tms4800.h @@ -4,7 +4,7 @@ #ifndef NLD_TMS4800_H_ #define NLD_TMS4800_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" // usage : ROM_TMS4800(name, pAR, pOE1, pOE2, pA0, pA1, pA2, pA3, pA4, pA5, pA6, pA7, pA8, pA9, pA10) // auto connect: VCC, GND diff --git a/src/lib/netlist/devices/nld_tristate.cpp b/src/lib/netlist/devices/nld_tristate.cpp index 013a0514420..97dbb0a7750 100644 --- a/src/lib/netlist/devices/nld_tristate.cpp +++ b/src/lib/netlist/devices/nld_tristate.cpp @@ -8,7 +8,7 @@ */ #include "nld_tristate.h" -#include "netlist/nl_base.h" +#include "nl_base.h" // FIXME: netlist now supports proper tristate outputs. All of this is legacy // now and needs to be removed at some time. diff --git a/src/lib/netlist/devices/nld_tristate.h b/src/lib/netlist/devices/nld_tristate.h index 0cb32c73d12..3c60846cb31 100644 --- a/src/lib/netlist/devices/nld_tristate.h +++ b/src/lib/netlist/devices/nld_tristate.h @@ -4,7 +4,7 @@ #ifndef NLD_TRISTATE_H_ #define NLD_TRISTATE_H_ -#include "netlist/nl_setup.h" +#include "../nl_setup.h" #define TTL_TRISTATE(name, cCEQ1, cD1, cCEQ2, cD2) \ NET_REGISTER_DEV(TTL_TRISTATE, name) \ diff --git a/src/lib/netlist/devices/nlid_proxy.h b/src/lib/netlist/devices/nlid_proxy.h index bdae6c1b851..74ad3469d63 100644 --- a/src/lib/netlist/devices/nlid_proxy.h +++ b/src/lib/netlist/devices/nlid_proxy.h @@ -11,8 +11,8 @@ #ifndef NLID_PROXY_H_ #define NLID_PROXY_H_ -#include "netlist/analog/nlid_twoterm.h" -#include "netlist/nl_base.h" +#include "analog/nlid_twoterm.h" +#include "nl_base.h" namespace netlist { diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h index d00339e852b..2e43544339a 100644 --- a/src/lib/netlist/devices/nlid_system.h +++ b/src/lib/netlist/devices/nlid_system.h @@ -7,12 +7,12 @@ /// \file nlid_system.h /// -#include "netlist/analog/nlid_twoterm.h" -#include "netlist/nl_base.h" -#include "netlist/nl_factory.h" -#include "netlist/plib/prandom.h" -#include "netlist/plib/pstonum.h" -#include "netlist/plib/putil.h" +#include "analog/nlid_twoterm.h" +#include "nl_base.h" +#include "nl_factory.h" +#include "plib/prandom.h" +#include "plib/pstonum.h" +#include "plib/putil.h" #include <random> diff --git a/src/lib/netlist/devices/nlid_truthtable.h b/src/lib/netlist/devices/nlid_truthtable.h index e9daa32e47d..fade2a6087e 100644 --- a/src/lib/netlist/devices/nlid_truthtable.h +++ b/src/lib/netlist/devices/nlid_truthtable.h @@ -9,7 +9,7 @@ #define NLID_TRUTHTABLE_H_ #include "nl_factory.h" -#include "nl_setup.h" +#include "../nl_setup.h" #define USE_TT_ALTERNATIVE (0) |