Use C99 variadic syntax (..., __VA_ARGS). Renamed a member in nld_4066 as well.

This commit is contained in:
Couriersud 2014-03-03 00:02:29 +00:00
parent 8063dd2953
commit b658d3a8bf
3 changed files with 10 additions and 10 deletions

View File

@ -30,10 +30,10 @@ NETLIB_RESET(4066)
NETLIB_UPDATE(4066)
{
double sup = (supply->vdd() - supply->vss());
double sup = (m_supply->vdd() - m_supply->vss());
double low = 0.45 * sup;
double high = 0.55 * sup;
double in = INPANALOG(m_control) - supply->vss();
double in = INPANALOG(m_control) - m_supply->vss();
double rON = 270.0 * 5.0 / sup;
if (in < low)
@ -51,8 +51,8 @@ NETLIB_UPDATE(4066)
NETLIB_START(4066_dip)
{
register_sub(supply, "supply");
m_A.supply = m_B.supply = m_C.supply = m_D.supply = &supply;
register_sub(m_supply, "supply");
m_A.m_supply = m_B.m_supply = m_C.m_supply = m_D.m_supply = &m_supply;
register_sub(m_A, "A");
register_sub(m_B, "B");
register_sub(m_C, "C");
@ -64,7 +64,7 @@ NETLIB_START(4066_dip)
register_subalias("4", m_B.m_R.m_N);
register_subalias("5", m_B.m_control);
register_subalias("6", m_C.m_control);
register_input("7", supply.m_vss);
register_input("7", m_supply.m_vss);
register_subalias("8", m_C.m_R.m_P);
register_subalias("9", m_C.m_R.m_N);
@ -72,7 +72,7 @@ NETLIB_START(4066_dip)
register_subalias("11", m_D.m_R.m_N);
register_subalias("12", m_D.m_control);
register_subalias("13", m_A.m_control);
register_input("14", supply.m_vdd);
register_input("14", m_supply.m_vdd);
}

View File

@ -45,7 +45,7 @@ public:
netlist_analog_input_t m_control;
NETLIB_NAME(R) m_R;
NETLIB_NAME(vdd_vss) *supply;
NETLIB_NAME(vdd_vss) *m_supply;
);
NETLIB_DEVICE(4066_dip,
@ -54,7 +54,7 @@ NETLIB_DEVICE(4066_dip,
NETLIB_NAME(4066) m_B;
NETLIB_NAME(4066) m_C;
NETLIB_NAME(4066) m_D;
NETLIB_NAME(vdd_vss) supply;
NETLIB_NAME(vdd_vss) m_supply;
);
#endif /* NLD_4066_H_ */

View File

@ -38,8 +38,8 @@
#define NET_CONNECT(_name, _input, _output) \
setup.register_link(# _name "." # _input, # _output);
#define NET_C(_term1, _terms...) \
setup.register_link_arr( #_term1 ", " # _terms);
#define NET_C(_term1, ...) \
setup.register_link_arr( #_term1 ", " # __VA_ARGS__);
#define PARAM(_name, _val) \
setup.register_param(# _name, _val);