mirror of
https://github.com/holub/mame
synced 2025-05-28 16:43:04 +03:00
netlist: Move macros where they belong. (nw)
This commit is contained in:
parent
37b953ec41
commit
d324eb18fe
@ -40,23 +40,4 @@
|
||||
#define 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_
|
||||
|
@ -14,10 +14,6 @@
|
||||
|
||||
//#define NL_AUTO_DEVICES 1
|
||||
|
||||
#ifdef NL_AUTO_DEVICES
|
||||
#include "nld_devinc.h"
|
||||
|
||||
// FIXME: copied from nld_twoterm.h
|
||||
#ifdef RES_R
|
||||
#warning "Do not include rescap.h in a netlist environment"
|
||||
#endif
|
||||
@ -33,6 +29,9 @@
|
||||
#define IND_P(ind) ((ind) * 1e-12)
|
||||
#endif
|
||||
|
||||
#ifdef NL_AUTO_DEVICES
|
||||
#include "nld_devinc.h"
|
||||
|
||||
#include "netlist/macro/nlm_cd4xxx.h"
|
||||
#include "netlist/macro/nlm_opamp.h"
|
||||
#include "netlist/macro/nlm_other.h"
|
||||
|
Loading…
Reference in New Issue
Block a user