Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 23:42:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed two duplicate devices in netlist.

Browse Source
This commit is contained in:
Couriersud 2014-01-11 19:11:05 +00:00
parent 320bb3263a
commit 02c926d422
9 changed files with 34 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nl_examples/bjt.c
View File

@ -13,12 +13,12 @@ NETLIST_START(bjt)
NETDEV_PARAM(clk.FREQ, 1000) // 1000 Hz
NETDEV_SOLVER(Solver)
NETDEV_PARAM(Solver.FREQ, 48000)
NETDEV_ANALOG_CONST(V5, 5)
NETDEV_ANALOG_CONST(V3, 3.5)
NETDEV_ANALOG_INPUT(V5, 5)
NETDEV_ANALOG_INPUT(V3, 3.5)
/* NPN - example */
NETDEV_QNPN(Q, "BC237B")
NETDEV_QJT_SW(Q, "BC237B")
NETDEV_R(RB, 1000)
NETDEV_R(RC, 1000)

4
nl_examples/bjt_eb.c
View File

@ -14,8 +14,8 @@ NETLIST_START(bjt)
NETDEV_SOLVER(Solver)
NETDEV_PARAM(Solver.FREQ, 48000)
NETDEV_PARAM(Solver.ACCURACY, 1e-4)
NETDEV_ANALOG_CONST(V5, 5)
NETDEV_ANALOG_CONST(V3, 3.5)
NETDEV_ANALOG_INPUT(V5, 5)
NETDEV_ANALOG_INPUT(V3, 3.5)
/* NPN - example */

4
nl_examples/msx_mixer_stage.c
View File

@ -17,8 +17,8 @@ NETLIST_START(msx)
NETDEV_R(RAY8910, 2345) // Max Voltage
NETDEV_ANALOG_CONST(V5, 5)
NETDEV_ANALOG_CONST(V12, 12)
NETDEV_ANALOG_INPUT(V5, 5)
NETDEV_ANALOG_INPUT(V12, 12)
NETDEV_ANALOG_INPUT(SOUND)
NETDEV_PARAM(SOUND.OUT, 5)

2
nl_examples/ne555_astable.c
View File

@ -17,7 +17,7 @@ NETLIST_START(ne555_astable)
NETDEV_SOLVER(Solver)
NETDEV_PARAM(Solver.FREQ, 48000)
NETDEV_ANALOG_CONST(V5, 5) // 5V
NETDEV_ANALOG_INPUT(V5, 5) // 5V
/* Wiring up the ne555 */

4
nl_examples/test.c
View File

@ -14,8 +14,8 @@ NETLIST_START(bjt)
NETDEV_SOLVER(Solver)
NETDEV_PARAM(Solver.FREQ, 48000)
NETDEV_ANALOG_CONST(V3, 3)
NETDEV_ANALOG_CONST(STOPG, 0)
NETDEV_ANALOG_INPUT(V3, 3)
NETDEV_ANALOG_INPUT(STOPG, 0)
NET_ALIAS(SRSTQ, RYf.2)
NET_ALIAS(SRST, RYc.2)
NET_C(antenna, GND)

6
src/emu/netlist/devices/net_lib.c
View File

@ -260,10 +260,8 @@ void netlist_factory_t::initialize()
ENTRY(VCCS, NETDEV_VCCS, "-")
ENTRY(QBJT_EB, NETDEV_QBJT_EB, "model")
ENTRY(QBJT_switch, NETDEV_QBJT_SW, "model")
ENTRY(ttl_const, NETDEV_TTL_CONST, "CONST")
ENTRY(analog_const, NETDEV_ANALOG_CONST, "CONST")
ENTRY(logic_input, NETDEV_LOGIC_INPUT, "-")
ENTRY(analog_input, NETDEV_ANALOG_INPUT, "-")
ENTRY(ttl_input, NETDEV_TTL_INPUT, "IN")
ENTRY(analog_input, NETDEV_ANALOG_INPUT, "IN")
ENTRY(log, NETDEV_LOG, "+I")
ENTRY(logD, NETDEV_LOGD, "+I,I2")
ENTRY(clock, NETDEV_CLOCK, "-") // FIXME

66
src/emu/netlist/devices/nld_system.c
View File

@ -4,52 +4,6 @@
*/
#include "nld_system.h"
//#include "nld_twoterm.h"
// ----------------------------------------------------------------------------------------
// netdev_const
// ----------------------------------------------------------------------------------------
NETLIB_START(ttl_const)
{
register_output("Q", m_Q);
register_param("CONST", m_const, 0);
}
NETLIB_RESET(ttl_const)
{
}
NETLIB_UPDATE(ttl_const)
{
OUTLOGIC(m_Q, m_const.Value(), NLTIME_IMMEDIATE);
}
NETLIB_UPDATE_PARAM(ttl_const)
{
OUTLOGIC(m_Q, m_const.Value(), NLTIME_IMMEDIATE);
}
NETLIB_START(analog_const)
{
register_output("Q", m_Q);
register_param("CONST", m_const, 0.0);
}
NETLIB_RESET(analog_const)
{
}
NETLIB_UPDATE(analog_const)
{
OUTANALOG(m_Q, m_const.Value(), NLTIME_IMMEDIATE);
}
NETLIB_UPDATE_PARAM(analog_const)
{
//m_Q.initial(m_const.Value());
OUTANALOG(m_Q, m_const.Value(), NLTIME_IMMEDIATE);
}
// ----------------------------------------------------------------------------------------
// clock
@ -85,24 +39,24 @@ NETLIB_UPDATE(clock)
// logic_input
// ----------------------------------------------------------------------------------------
NETLIB_START(logic_input)
NETLIB_START(ttl_input)
{
register_output("Q", m_Q);
register_param("OUT", m_OUT, 0);
register_param("IN", m_IN, 0);
}
NETLIB_RESET(logic_input)
NETLIB_RESET(ttl_input)
{
}
NETLIB_UPDATE(logic_input)
NETLIB_UPDATE(ttl_input)
{
OUTLOGIC(m_Q, m_OUT.Value() & 1, NLTIME_IMMEDIATE);
OUTLOGIC(m_Q, m_IN.Value() & 1, NLTIME_IMMEDIATE);
}
NETLIB_UPDATE_PARAM(logic_input)
NETLIB_UPDATE_PARAM(ttl_input)
{
OUTLOGIC(m_Q, m_OUT.Value() & 1, NLTIME_IMMEDIATE);
OUTLOGIC(m_Q, m_IN.Value() & 1, NLTIME_IMMEDIATE);
}
// ----------------------------------------------------------------------------------------
@ -112,7 +66,7 @@ NETLIB_UPDATE_PARAM(logic_input)
NETLIB_START(analog_input)
{
register_output("Q", m_Q);
register_param("OUT", m_OUT, 0.0);
register_param("IN", m_IN, 0.0);
}
NETLIB_RESET(analog_input)
@ -121,10 +75,10 @@ NETLIB_RESET(analog_input)
NETLIB_UPDATE(analog_input)
{
OUTANALOG(m_Q, m_OUT.Value(), NLTIME_IMMEDIATE);
OUTANALOG(m_Q, m_IN.Value(), NLTIME_IMMEDIATE);
}
NETLIB_UPDATE_PARAM(analog_input)
{
OUTANALOG(m_Q, m_OUT.Value(), NLTIME_IMMEDIATE);
OUTANALOG(m_Q, m_IN.Value(), NLTIME_IMMEDIATE);
}

38
src/emu/netlist/devices/nld_system.h
View File

@ -16,13 +16,13 @@
// Macros
// ----------------------------------------------------------------------------------------
#define NETDEV_TTL_CONST(_name, _v) \
NET_REGISTER_DEV(ttl_const, _name) \
NETDEV_PARAM(_name.CONST, _v)
#define NETDEV_TTL_INPUT(_name, _v) \
NET_REGISTER_DEV(ttl_input, _name) \
NETDEV_PARAM(_name.IN, _v)
#define NETDEV_ANALOG_CONST(_name, _v) \
NET_REGISTER_DEV(analog_const, _name) \
NETDEV_PARAM(_name.CONST, _v)
#define NETDEV_ANALOG_INPUT(_name, _v) \
NET_REGISTER_DEV(analog_input, _name) \
NETDEV_PARAM(_name.IN, _v)
#define NETDEV_MAINCLOCK(_name) \
NET_REGISTER_DEV(mainclock, _name)
@ -30,26 +30,6 @@
#define NETDEV_CLOCK(_name) \
NET_REGISTER_DEV(clock, _name)
#define NETDEV_LOGIC_INPUT(_name) \
NET_REGISTER_DEV(logic_input, _name)
#define NETDEV_ANALOG_INPUT(_name) \
NET_REGISTER_DEV(analog_input, _name)
// ----------------------------------------------------------------------------------------
// netdev_*_const
// ----------------------------------------------------------------------------------------
NETLIB_DEVICE_WITH_PARAMS(ttl_const,
netlist_ttl_output_t m_Q;
netlist_param_logic_t m_const;
);
NETLIB_DEVICE_WITH_PARAMS(analog_const,
netlist_analog_output_t m_Q;
netlist_param_double_t m_const;
);
// ----------------------------------------------------------------------------------------
// mainclock
// ----------------------------------------------------------------------------------------
@ -81,16 +61,16 @@ NETLIB_DEVICE_WITH_PARAMS(clock,
// Special support devices ...
// ----------------------------------------------------------------------------------------
NETLIB_DEVICE_WITH_PARAMS(logic_input,
NETLIB_DEVICE_WITH_PARAMS(ttl_input,
netlist_ttl_output_t m_Q;
netlist_param_logic_t m_OUT;
netlist_param_logic_t m_IN;
);
NETLIB_DEVICE_WITH_PARAMS(analog_input,
netlist_analog_output_t m_Q;
netlist_param_double_t m_OUT;
netlist_param_double_t m_IN;
);

6
src/emu/netlist/nl_setup.c
View File

@ -14,9 +14,9 @@
#include "analog/nld_twoterm.h"
static NETLIST_START(base)
NETDEV_TTL_CONST(ttlhigh, 1)
NETDEV_TTL_CONST(ttllow, 0)
NETDEV_ANALOG_CONST(GND, 0)
NETDEV_TTL_INPUT(ttlhigh, 1)
NETDEV_TTL_INPUT(ttllow, 0)
NETDEV_ANALOG_INPUT(GND, 0)
NET_MODEL(".model 1N914 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
NET_MODEL(".model 1N4148 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")