Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-05 20:33:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

netlist: Move macros where they belong. (nw)

Browse Source
This commit is contained in:
couriersud 2020-04-18 16:15:43 +02:00
parent 37b953ec41
commit d324eb18fe
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/netlist/analog/nld_twoterm.h
View File

@ -40,23 +40,4 @@
#define CS(name, pI) \ #define CS(name, pI) \
NET_REGISTER_DEVEXT(CS, name, pI) NET_REGISTER_DEVEXT(CS, name, pI)
// -----------------------------------------------------------------------------
// Generic macros
// -----------------------------------------------------------------------------
#ifdef RES_R
#warning "Do not include rescap.h in a netlist environment"
#endif
#ifndef RES_R
#define RES_R(res) (res)
#define RES_K(res) ((res) * 1e3)
#define RES_M(res) ((res) * 1e6)
#define CAP_U(cap) ((cap) * 1e-6)
#define CAP_N(cap) ((cap) * 1e-9)
#define CAP_P(cap) ((cap) * 1e-12)
#define IND_U(ind) ((ind) * 1e-6)
#define IND_N(ind) ((ind) * 1e-9)
#define IND_P(ind) ((ind) * 1e-12)
#endif
#endif // NLD_TWOTERM_H_ #endif // NLD_TWOTERM_H_

7
src/lib/netlist/devices/net_lib.h
View File

@ -14,10 +14,6 @@
//#define NL_AUTO_DEVICES 1 //#define NL_AUTO_DEVICES 1
#ifdef NL_AUTO_DEVICES
#include "nld_devinc.h"
// FIXME: copied from nld_twoterm.h
#ifdef RES_R #ifdef RES_R
#warning "Do not include rescap.h in a netlist environment" #warning "Do not include rescap.h in a netlist environment"
#endif #endif
@ -33,6 +29,9 @@
#define IND_P(ind) ((ind) * 1e-12) #define IND_P(ind) ((ind) * 1e-12)
#endif #endif
#ifdef NL_AUTO_DEVICES
#include "nld_devinc.h"
#include "netlist/macro/nlm_cd4xxx.h" #include "netlist/macro/nlm_cd4xxx.h"
#include "netlist/macro/nlm_opamp.h" #include "netlist/macro/nlm_opamp.h"
#include "netlist/macro/nlm_other.h" #include "netlist/macro/nlm_other.h"