Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-06 10:29:38 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Aligned builtin device identification with parser device

Browse Source 
identification. (nw)
This commit is contained in:
couriersud 2015-07-19 02:06:25 +02:00
parent 1c9b70aabd
commit 3b35c7a12e
56 changed files with 128 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,7 @@ void netlist_mame_analog_output_t::custom_netlist_additions(netlist::setup_t &se
pstring dname = "OUT_" + m_in;
m_delegate.bind_relative_to(owner()->machine().root_device());
NETLIB_NAME(analog_callback) *dev = downcast<NETLIB_NAME(analog_callback) *>(
setup.register_dev("nld_analog_callback", dname));
setup.register_dev("NETDEV_CALLBACK", dname));
dev->register_callback(m_delegate);
setup.register_link(dname + ".IN", m_in);
@ -173,7 +173,7 @@ void netlist_mame_stream_input_t::custom_netlist_additions(netlist::setup_t &set
{
NETLIB_NAME(sound_in) *snd_in = setup.netlist().get_first_device<NETLIB_NAME(sound_in)>();
if (snd_in == NULL)
snd_in = dynamic_cast<NETLIB_NAME(sound_in) *>(setup.register_dev("nld_sound_in", "STREAM_INPUT"));
snd_in = dynamic_cast<NETLIB_NAME(sound_in) *>(setup.register_dev("NETDEV_SOUND_IN", "STREAM_INPUT"));
pstring sparam = pstring::sprintf("STREAM_INPUT.CHAN%d", m_channel);
setup.register_param(sparam, m_param_name);
@ -213,7 +213,7 @@ void netlist_mame_stream_output_t::custom_netlist_additions(netlist::setup_t &se
pstring sname = pstring::sprintf("STREAM_OUT_%d", m_channel);
//snd_out = dynamic_cast<NETLIB_NAME(sound_out) *>(setup.register_dev("nld_sound_out", sname));
setup.register_dev("nld_sound_out", sname);
setup.register_dev("NETDEV_SOUND_OUT", sname);
setup.register_param(sname + ".CHAN" , m_channel);
setup.register_param(sname + ".MULT", m_mult);

2
src/emu/netlist/analog/nld_bjt.h
View File

@ -16,7 +16,7 @@
// ----------------------------------------------------------------------------------------
#define QBJT_SW(_name, _model) \
NET_REGISTER_DEV(QBJT_switch, _name) \
NET_REGISTER_DEV(QBJT_SW, _name) \
NETDEV_PARAMI(_name, model, _model)
#define QBJT_EB(_name, _model) \

4
src/emu/netlist/analog/nld_switches.h
View File

@ -18,10 +18,10 @@
// ----------------------------------------------------------------------------------------
#define SWITCH(_name) \
NET_REGISTER_DEV(switch1, _name)
NET_REGISTER_DEV(SWITCH, _name)
#define SWITCH2(_name) \
NET_REGISTER_DEV(switch2, _name)
NET_REGISTER_DEV(SWITCH2, _name)
// ----------------------------------------------------------------------------------------
// Devices ...

6
src/emu/netlist/analog/nld_twoterm.h
View File

@ -40,7 +40,7 @@
// ----------------------------------------------------------------------------------------
#define RES(_name, _R) \
NET_REGISTER_DEV(R, _name) \
NET_REGISTER_DEV(RES, _name) \
NETDEV_PARAMI(_name, R, _R)
#define POT(_name, _R) \
@ -54,12 +54,12 @@
#define CAP(_name, _C) \
NET_REGISTER_DEV(C, _name) \
NET_REGISTER_DEV(CAP, _name) \
NETDEV_PARAMI(_name, C, _C)
/* Generic Diode */
#define DIODE(_name, _model) \
NET_REGISTER_DEV(D, _name) \
NET_REGISTER_DEV(DIODE, _name) \
NETDEV_PARAMI(_name, model, _model)
#define VS(_name, _V) \

2
src/emu/netlist/devices/nld_4020.h
View File

@ -32,7 +32,7 @@
/* FIXME: only used in mario.c */
#define CD4020_WI(_name, _IP, _RESET, _VDD, _VSS) \
NET_REGISTER_DEV(CD4020, _name) \
NET_REGISTER_DEV(CD4020_WI, _name) \
NET_CONNECT(_name, IP, _IP) \
NET_CONNECT(_name, RESET, _RESET) \
NET_CONNECT(_name, VDD, _VDD) \

4
src/emu/netlist/devices/nld_7400.h
View File

@ -36,12 +36,12 @@
#include "nld_truthtable.h"
#define TTL_7400_NAND(_name, _A, _B) \
NET_REGISTER_DEV(7400, _name) \
NET_REGISTER_DEV(TTL_7400_NAND, _name) \
NET_CONNECT(_name, A, _A) \
NET_CONNECT(_name, B, _B)
#define TTL_7400_DIP(_name) \
NET_REGISTER_DEV(7400_dip, _name)
NET_REGISTER_DEV(TTL_7400_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7402.h
View File

@ -36,12 +36,12 @@
#include "nld_truthtable.h"
#define TTL_7402_NOR(_name, _I1, _I2) \
NET_REGISTER_DEV(7402, _name) \
NET_REGISTER_DEV(TTL_7402_NOR, _name) \
NET_CONNECT(_name, A, _I1) \
NET_CONNECT(_name, B, _I2)
#define TTL_7402_DIP(_name) \
NET_REGISTER_DEV(7402_dip, _name)
NET_REGISTER_DEV(TTL_7402_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7404.h
View File

@ -34,11 +34,11 @@
#include "nld_truthtable.h"
#define TTL_7404_INVERT(_name, _A) \
NET_REGISTER_DEV(7404, _name) \
NET_REGISTER_DEV(TTL_7404_INVERT, _name) \
NET_CONNECT(_name, A, _A)
#define TTL_7404_DIP(_name) \
NET_REGISTER_DEV(7404_dip, _name)
NET_REGISTER_DEV(TTL_7404_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7408.h
View File

@ -36,12 +36,12 @@
#include "nld_truthtable.h"
#define TTL_7408_AND(_name, _A, _B) \
NET_REGISTER_DEV(7408, _name) \
NET_REGISTER_DEV(TTL_7408_AND, _name) \
NET_CONNECT(_name, A, _A) \
NET_CONNECT(_name, B, _B)
#define TTL_7408_DIP(_name) \
NET_REGISTER_DEV(7408_dip, _name)
NET_REGISTER_DEV(TTL_7408_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7410.h
View File

@ -36,13 +36,13 @@
#include "nld_truthtable.h"
#define TTL_7410_NAND(_name, _I1, _I2, _I3) \
NET_REGISTER_DEV(7410, _name) \
NET_REGISTER_DEV(TTL_7410_NAND, _name) \
NET_CONNECT(_name, A, _I1) \
NET_CONNECT(_name, B, _I2) \
NET_CONNECT(_name, C, _I3)
#define TTL_7410_DIP(_name) \
NET_REGISTER_DEV(7410_dip, _name)
NET_REGISTER_DEV(TTL_7410_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_74107.h
View File

@ -62,7 +62,7 @@
#include "../nl_base.h"
#define TTL_74107A(_name, _CLK, _J, _K, _CLRQ) \
NET_REGISTER_DEV(74107A, _name) \
NET_REGISTER_DEV(TTL_74107A, _name) \
NET_CONNECT(_name, CLK, _CLK) \
NET_CONNECT(_name, J, _J) \
NET_CONNECT(_name, K, _K) \
@ -72,7 +72,7 @@
TTL_74107A(_name, _CLK, _J, _K, _CLRQ)
#define TTL_74107_DIP(_name) \
NET_REGISTER_DEV(74107_dip, _name)
NET_REGISTER_DEV(TTL_74107_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7411.h
View File

@ -36,13 +36,13 @@
#include "nld_truthtable.h"
#define TTL_7411_AND(_name, _I1, _I2, _I3) \
NET_REGISTER_DEV(7411, _name) \
NET_REGISTER_DEV(TTL_7411_AND, _name) \
NET_CONNECT(_name, A, _I1) \
NET_CONNECT(_name, B, _I2) \
NET_CONNECT(_name, C, _I3)
#define TTL_7411_DIP(_name) \
NET_REGISTER_DEV(7411_dip, _name)
NET_REGISTER_DEV(TTL_7411_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

8
src/emu/netlist/devices/nld_74123.h
View File

@ -54,7 +54,7 @@
#include "../analog/nld_twoterm.h"
#define TTL_74123(_name) \
NET_REGISTER_DEV(74123, _name)
NET_REGISTER_DEV(TTL_74123, _name)
NETLIB_NAMESPACE_DEVICES_START()
@ -85,7 +85,7 @@ public:
);
#define TTL_74123_DIP(_name) \
NET_REGISTER_DEV(74123_dip, _name)
NET_REGISTER_DEV(TTL_74123_DIP, _name)
NETLIB_DEVICE(74123_dip,
@ -99,7 +99,7 @@ NETLIB_DEVICE(74123_dip,
*/
#define TTL_9602_DIP(_name) \
NET_REGISTER_DEV(9602_dip, _name)
NET_REGISTER_DEV(TTL_9602_DIP, _name)
NETLIB_DEVICE(9602_dip,
@ -113,7 +113,7 @@ NETLIB_DEVICE(9602_dip,
*/
#define CD4538_DIP(_name) \
NET_REGISTER_DEV(4538_dip, _name)
NET_REGISTER_DEV(CD4538_DIP, _name)
NETLIB_DEVICE(4538_dip,
NETLIB_LOGIC_FAMILY(CD4XXX)

4
src/emu/netlist/devices/nld_74153.h
View File

@ -48,7 +48,7 @@
#include "../nl_base.h"
#define TTL_74153(_name, _C0, _C1, _C2, _C3, _A, _B, _G) \
NET_REGISTER_DEV(74153, _name) \
NET_REGISTER_DEV(TTL_74153, _name) \
NET_CONNECT(_name, C0, _C0) \
NET_CONNECT(_name, C1, _C1) \
NET_CONNECT(_name, C2, _C2) \
@ -58,7 +58,7 @@
NET_CONNECT(_name, G, _G)
#define TTL_74153_DIP(_name) \
NET_REGISTER_DEV(74153_dip, _name)
NET_REGISTER_DEV(TTL_74153_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_74175.h
View File

@ -39,9 +39,9 @@
#include "nld_signal.h"
#define TTL_74175(_name) \
NET_REGISTER_DEV(74175, _name)
NET_REGISTER_DEV(TTL_74175, _name)
#define TTL_74175_DIP(_name) \
NET_REGISTER_DEV(74175_dip, _name)
NET_REGISTER_DEV(TTL_74175_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_74192.h
View File

@ -33,10 +33,10 @@
#include "nld_9316.h"
#define TTL_74192(_name) \
NET_REGISTER_DEV(74192, _name)
NET_REGISTER_DEV(TTL_74192, _name)
#define TTL_74192_DIP(_name) \
NET_REGISTER_DEV(74192_dip, _name)
NET_REGISTER_DEV(TTL_74192_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_74193.h
View File

@ -29,10 +29,10 @@
#include "../nl_base.h"
#define TTL_74193(_name) \
NET_REGISTER_DEV(74193, _name)
NET_REGISTER_DEV(TTL_74193, _name)
#define TTL_74193_DIP(_name) \
NET_REGISTER_DEV(74193_dip, _name)
NET_REGISTER_DEV(TTL_74193_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7420.h
View File

@ -37,7 +37,7 @@
#include "nld_truthtable.h"
#define TTL_7420_NAND(_name, _I1, _I2, _I3, _I4) \
NET_REGISTER_DEV(7420, _name) \
NET_REGISTER_DEV(TTL_7420_NAND, _name) \
NET_CONNECT(_name, A, _I1) \
NET_CONNECT(_name, B, _I2) \
NET_CONNECT(_name, C, _I3) \
@ -45,7 +45,7 @@
#define TTL_7420_DIP(_name) \
NET_REGISTER_DEV(7420_dip, _name)
NET_REGISTER_DEV(TTL_7420_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7425.h
View File

@ -39,14 +39,14 @@
#include "nld_signal.h"
#define TTL_7425_NOR(_name, _I1, _I2, _I3, _I4) \
NET_REGISTER_DEV(7425, _name) \
NET_REGISTER_DEV(TTL_7425_NOR, _name) \
NET_CONNECT(_name, A, _I1) \
NET_CONNECT(_name, B, _I2) \
NET_CONNECT(_name, C, _I3) \
NET_CONNECT(_name, D, _I4)
#define TTL_7425_DIP(_name) \
NET_REGISTER_DEV(7425_dip, _name)
NET_REGISTER_DEV(TTL_7425_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7427.h
View File

@ -36,13 +36,13 @@
#include "nld_truthtable.h"
#define TTL_7427_NOR(_name, _I1, _I2, _I3) \
NET_REGISTER_DEV(7427, _name) \
NET_REGISTER_DEV(TTL_7427_NOR, _name) \
NET_CONNECT(_name, A, _I1) \
NET_CONNECT(_name, B, _I2) \
NET_CONNECT(_name, C, _I3)
#define TTL_7427_DIP(_name) \
NET_REGISTER_DEV(7427_dip, _name)
NET_REGISTER_DEV(TTL_7427_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

2
src/emu/netlist/devices/nld_74279.h
View File

@ -39,7 +39,7 @@
#include "nld_truthtable.h"
#define TTL_74279_DIP(_name) \
NET_REGISTER_DEV(74279_dip, _name)
NET_REGISTER_DEV(TTL_74279_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7430.h
View File

@ -41,7 +41,7 @@
#include "nld_truthtable.h"
#define TTL_7430_NAND(_name, _I1, _I2, _I3, _I4, _I5, _I6, _I7, _I8) \
NET_REGISTER_DEV(7430, _name) \
NET_REGISTER_DEV(TTL_7430_NAND, _name) \
NET_CONNECT(_name, A, _I1) \
NET_CONNECT(_name, B, _I2) \
NET_CONNECT(_name, C, _I3) \
@ -53,7 +53,7 @@
#define TTL_7430_DIP(_name) \
NET_REGISTER_DEV(7430_dip, _name)
NET_REGISTER_DEV(TTL_7430_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

10
src/emu/netlist/devices/nld_7432.h
View File

@ -35,13 +35,13 @@
#include "nld_signal.h"
#include "nld_truthtable.h"
#define TTL_7432_OR(_name, _I1, _I2) \
NET_REGISTER_DEV(7432, _name) \
NET_CONNECT(_name, A, _I1) \
#define TTL_7432_OR(_name, _I1, _I2) \
NET_REGISTER_DEV(TTL_7432_OR, _name) \
NET_CONNECT(_name, A, _I1) \
NET_CONNECT(_name, B, _I2)
#define TTL_7432_DIP(_name) \
NET_REGISTER_DEV(7432_dip, _name)
#define TTL_7432_DIP(_name) \
NET_REGISTER_DEV(TTL_7432_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7437.h
View File

@ -39,12 +39,12 @@
#include "nld_truthtable.h"
#define TTL_7437_NAND(_name, _A, _B) \
NET_REGISTER_DEV(7437, _name) \
NET_REGISTER_DEV(TTL_7437_NAND, _name) \
NET_CONNECT(_name, A, _A) \
NET_CONNECT(_name, B, _B)
#define TTL_7437_DIP(_name) \
NET_REGISTER_DEV(7437_dip, _name)
NET_REGISTER_DEV(TTL_7437_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7448.h
View File

@ -27,7 +27,7 @@
#include "../nl_base.h"
#define TTL_7448(_name, _A0, _A1, _A2, _A3, _LTQ, _BIQ, _RBIQ) \
NET_REGISTER_DEV(7448, _name) \
NET_REGISTER_DEV(TTL_7448, _name) \
NET_CONNECT(_name, A, _A0) \
NET_CONNECT(_name, B, _A1) \
NET_CONNECT(_name, C, _A2) \
@ -37,7 +37,7 @@
NET_CONNECT(_name, RBIQ, _RBIQ)
#define TTL_7448_DIP(_name) \
NET_REGISTER_DEV(7448_dip, _name)
NET_REGISTER_DEV(TTL_7448_DIP, _name)
/*
* FIXME: Using truthtable is a lot slower than the explicit device

4
src/emu/netlist/devices/nld_7450.h
View File

@ -27,14 +27,14 @@
#include "nld_signal.h"
#define TTL_7450_ANDORINVERT(_name, _I1, _I2, _I3, _I4) \
NET_REGISTER_DEV(7450, _name) \
NET_REGISTER_DEV(TTL_7450_ANDORINVERT, _name) \
NET_CONNECT(_name, A, _I1) \
NET_CONNECT(_name, B, _I2) \
NET_CONNECT(_name, C, _I3) \
NET_CONNECT(_name, D, _I4)
#define TTL_7450_DIP(_name) \
NET_REGISTER_DEV(7450_dip, _name)
NET_REGISTER_DEV(TTL_7450_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7474.h
View File

@ -45,14 +45,14 @@
#include "nld_signal.h"
#define TTL_7474(_name, _CLK, _D, _CLRQ, _PREQ) \
NET_REGISTER_DEV(7474, _name) \
NET_REGISTER_DEV(TTL_7474, _name) \
NET_CONNECT(_name, CLK, _CLK) \
NET_CONNECT(_name, D, _D) \
NET_CONNECT(_name, CLRQ, _CLRQ) \
NET_CONNECT(_name, PREQ, _PREQ)
#define TTL_7474_DIP(_name) \
NET_REGISTER_DEV(7474_dip, _name)
NET_REGISTER_DEV(TTL_7474_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7483.h
View File

@ -30,7 +30,7 @@
#include "../nl_base.h"
#define TTL_7483(_name, _A1, _A2, _A3, _A4, _B1, _B2, _B3, _B4, _CI) \
NET_REGISTER_DEV(7483, _name) \
NET_REGISTER_DEV(TTL_7483, _name) \
NET_CONNECT(_name, A1, _A1) \
NET_CONNECT(_name, A2, _A2) \
NET_CONNECT(_name, A3, _A3) \
@ -42,7 +42,7 @@
NET_CONNECT(_name, C0, _CI)
#define TTL_7483_DIP(_name) \
NET_REGISTER_DEV(7483_dip, _name)
NET_REGISTER_DEV(TTL_7483_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7486.h
View File

@ -36,13 +36,13 @@
#include "nld_truthtable.h"
#define TTL_7486_XOR(_name, _A, _B) \
NET_REGISTER_DEV(7486, _name) \
NET_REGISTER_DEV(TTL_7486_XOR, _name) \
NET_CONNECT(_name, A, _A) \
NET_CONNECT(_name, B, _B)
#define TTL_7486_DIP(_name) \
NET_REGISTER_DEV(7486_dip, _name)
NET_REGISTER_DEV(TTL_7486_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7490.h
View File

@ -58,7 +58,7 @@
#include "../nl_base.h"
#define TTL_7490(_name, _A, _B, _R1, _R2, _R91, _R92) \
NET_REGISTER_DEV(7490, _name) \
NET_REGISTER_DEV(TTL_7490, _name) \
NET_CONNECT(_name, A, _A) \
NET_CONNECT(_name, B, _B) \
NET_CONNECT(_name, R1, _R1) \
@ -67,7 +67,7 @@
NET_CONNECT(_name, R92, _R92)
#define TTL_7490_DIP(_name) \
NET_REGISTER_DEV(7490_dip, _name)
NET_REGISTER_DEV(TTL_7490_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_7493.h
View File

@ -60,14 +60,14 @@
#include "../nl_base.h"
#define TTL_7493(_name, _CLKA, _CLKB, _R1, _R2) \
NET_REGISTER_DEV(7493, _name) \
NET_REGISTER_DEV(TTL_7493, _name) \
NET_CONNECT(_name, CLKA, _CLKA) \
NET_CONNECT(_name, CLKB, _CLKB) \
NET_CONNECT(_name, R1, _R1) \
NET_CONNECT(_name, R2, _R2)
#define TTL_7493_DIP(_name) \
NET_REGISTER_DEV(7493_dip, _name)
NET_REGISTER_DEV(TTL_7493_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

2
src/emu/netlist/devices/nld_74ls629.h
View File

@ -60,7 +60,7 @@ public:
);
#define SN74LS629_DIP(_name, _cap1, _cap2) \
NET_REGISTER_DEV(SN74LS629_dip, _name) \
NET_REGISTER_DEV(SN74LS629_DIP, _name) \
NETDEV_PARAMI(_name, 1.CAP, _cap1) \
NETDEV_PARAMI(_name, 2.CAP, _cap2)

4
src/emu/netlist/devices/nld_82S16.h
View File

@ -27,9 +27,9 @@
#include "../nl_base.h"
#define TTL_82S16(_name) \
NET_REGISTER_DEV(82S16, _name)
NET_REGISTER_DEV(TTL_82S16, _name)
#define TTL_82S16_DIP(_name) \
NET_REGISTER_DEV(82S16_dip, _name)
NET_REGISTER_DEV(TTL_82S16_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_9310.h
View File

@ -48,7 +48,7 @@
#include "../nl_base.h"
#define TTL_9310(_name, _CLK, _ENP, _ENT, _CLRQ, _LOADQ, _A, _B, _C, _D) \
NET_REGISTER_DEV(9310, _name) \
NET_REGISTER_DEV(TTL_9310, _name) \
NET_CONNECT(_name, CLK, _CLK) \
NET_CONNECT(_name, ENP, _ENP) \
NET_CONNECT(_name, ENT, _ENT) \
@ -60,7 +60,7 @@
NET_CONNECT(_name, D, _D)
#define TTL_9310_DIP(_name) \
NET_REGISTER_DEV(9310_dip, _name)
NET_REGISTER_DEV(TTL_9310_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_9312.h
View File

@ -41,10 +41,10 @@
#include "nld_truthtable.h"
#define TTL_9312(_name) \
NET_REGISTER_DEV(9312, _name)
NET_REGISTER_DEV(TTL_9312, _name)
#define TTL_9312_DIP(_name) \
NET_REGISTER_DEV(9312_dip, _name)
NET_REGISTER_DEV(TTL_9312_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_9316.h
View File

@ -52,7 +52,7 @@
#include "../nl_base.h"
#define TTL_9316(_name, _CLK, _ENP, _ENT, _CLRQ, _LOADQ, _A, _B, _C, _D) \
NET_REGISTER_DEV(9316, _name) \
NET_REGISTER_DEV(TTL_9316, _name) \
NET_CONNECT(_name, CLK, _CLK) \
NET_CONNECT(_name, ENP, _ENP) \
NET_CONNECT(_name, ENT, _ENT) \
@ -64,7 +64,7 @@
NET_CONNECT(_name, D, _D)
#define TTL_9316_DIP(_name) \
NET_REGISTER_DEV(9316_dip, _name)
NET_REGISTER_DEV(TTL_9316_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

4
src/emu/netlist/devices/nld_legacy.h
View File

@ -22,10 +22,10 @@ NETLIB_NAMESPACE_DEVICES_START()
// ----------------------------------------------------------------------------------------
#define NETDEV_RSFF(_name) \
NET_REGISTER_DEV(nicRSFF, _name)
NET_REGISTER_DEV(NETDEV_RSFF, _name)
#define NETDEV_DELAY(_name) \
NET_REGISTER_DEV(nicDelay, _name)
NET_REGISTER_DEV(NETDEV_DELAY, _name)
// ----------------------------------------------------------------------------------------
// Devices ...

4
src/emu/netlist/devices/nld_log.h
View File

@ -21,7 +21,7 @@
#include "../nl_base.h"
#define LOG(_name, _I) \
NET_REGISTER_DEV(log, _name) \
NET_REGISTER_DEV(ÖPG, _name) \
NET_CONNECT(_name, I, _I)
NETLIB_NAMESPACE_DEVICES_START()
@ -34,7 +34,7 @@ protected:
);
#define LOGD(_name, _I, _I2) \
NET_REGISTER_DEV(logD, _name) \
NET_REGISTER_DEV(LOGD, _name) \
NET_CONNECT(_name, I, _I) \
NET_CONNECT(_name, I2, _I2)

2
src/emu/netlist/devices/nld_mm5837.h
View File

@ -23,7 +23,7 @@
#include "../analog/nld_twoterm.h"
#define MM5837_DIP(_name) \
NET_REGISTER_DEV(MM5837, _name)
NET_REGISTER_DEV(MM5837_DIP, _name)
NETLIB_NAMESPACE_DEVICES_START()

2
src/emu/netlist/devices/nld_ne555.h
View File

@ -46,7 +46,7 @@ NETLIB_DEVICE(NE555,
);
#define NE555_DIP(_name) \
NET_REGISTER_DEV(NE555_dip, _name)
NET_REGISTER_DEV(NE555_DIP, _name)
NETLIB_DEVICE_DERIVED_PURE(NE555_dip, NE555);

2
src/emu/netlist/devices/nld_r2r_dac.h
View File

@ -50,7 +50,7 @@
#include "../analog/nld_twoterm.h"
#define R2R_DAC(_name, _VIN, _R, _N) \
NET_REGISTER_DEV(r2r_dac, _name) \
NET_REGISTER_DEV(R2R_DAC, _name) \
NETDEV_PARAMI(_name, VIN, _VIN) \
NETDEV_PARAMI(_name, R, _R) \
NETDEV_PARAMI(_name, N, _N)

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

@ -19,40 +19,40 @@
// -----------------------------------------------------------------------------
#define TTL_INPUT(_name, _v) \
NET_REGISTER_DEV(logic_input, _name) \
NET_REGISTER_DEV(TTL_INPUT, _name) \
PARAM(_name.IN, _v)
#define LOGIC_INPUT(_name, _v, _family) \
NET_REGISTER_DEV(logic_input, _name) \
NET_REGISTER_DEV(LOGIC_INPUT, _name) \
PARAM(_name.IN, _v) \
PARAM(_name.FAMILY, _family)
#define ANALOG_INPUT(_name, _v) \
NET_REGISTER_DEV(analog_input, _name) \
NET_REGISTER_DEV(ANALOG_INPUT, _name) \
PARAM(_name.IN, _v)
#define MAINCLOCK(_name, _freq) \
NET_REGISTER_DEV(mainclock, _name) \
NET_REGISTER_DEV(MAINCLOCK, _name) \
PARAM(_name.FREQ, _freq)
#define CLOCK(_name, _freq) \
NET_REGISTER_DEV(clock, _name) \
NET_REGISTER_DEV(CLOCK, _name) \
PARAM(_name.FREQ, _freq)
#define EXTCLOCK(_name, _freq, _pattern) \
NET_REGISTER_DEV(extclock, _name) \
NET_REGISTER_DEV(EXTCLOCK, _name) \
PARAM(_name.FREQ, _freq) \
PARAM(_name.PATTERN, _pattern)
#define GNDA() \
NET_REGISTER_DEV(gnd, GND)
NET_REGISTER_DEV(GNDA, GND)
#define DUMMY_INPUT(_name) \
NET_REGISTER_DEV(dummy_input, _name)
NET_REGISTER_DEV(DUMMY_INPUT, _name)
//FIXME: Usage discouraged, use OPTIMIZE_FRONTIER instead
#define FRONTIER_DEV(_name, _IN, _G, _OUT) \
NET_REGISTER_DEV(frontier, _name) \
NET_REGISTER_DEV(FRONTIER_DEV, _name) \
NET_C(_IN, _name.I) \
NET_C(_G, _name.G) \
NET_C(_OUT, _name.Q)
@ -61,17 +61,17 @@
setup.register_frontier(# _attach, _r_in, _r_out);
#define RES_SWITCH(_name, _IN, _P1, _P2) \
NET_REGISTER_DEV(res_sw, _name) \
NET_REGISTER_DEV(RES_SWITCH, _name) \
NET_C(_IN, _name.I) \
NET_C(_P1, _name.1) \
NET_C(_P2, _name.2)
/* Default device to hold netlist parameters */
#define PARAMETERS(_name) \
NET_REGISTER_DEV(netlistparams, _name)
NET_REGISTER_DEV(PARAMETERS, _name)
#define AFUNC(_name, _N, _F) \
NET_REGISTER_DEV(function, _name) \
NET_REGISTER_DEV(AFUNC, _name) \
PARAM(_name.N, _N) \
PARAM(_name.FUNC, _F)

10
src/emu/netlist/macro/nlm_cd4xxx.h
View File

@ -21,23 +21,23 @@
* ---------------------------------------------------------------------------*/
#define CD4001_NOR(_name) \
NET_REGISTER_DEV_X(CD4001_NOR, _name)
NET_REGISTER_DEV(CD4001_NOR, _name)
#define CD4001_DIP(_name) \
NET_REGISTER_DEV_X(CD4001_DIP, _name)
NET_REGISTER_DEV(CD4001_DIP, _name)
/* ----------------------------------------------------------------------------
* DIP only macros
* ---------------------------------------------------------------------------*/
#define CD4020_DIP(_name) \
NET_REGISTER_DEV_X(CD4020_DIP, _name)
NET_REGISTER_DEV(CD4020_DIP, _name)
#define CD4066_DIP(_name) \
NET_REGISTER_DEV_X(CD4066_DIP, _name)
NET_REGISTER_DEV(CD4066_DIP, _name)
#define CD4016_DIP(_name) \
NET_REGISTER_DEV_X(CD4016_DIP, _name)
NET_REGISTER_DEV(CD4016_DIP, _name)
/* ----------------------------------------------------------------------------
* External declarations

2
src/emu/netlist/macro/nlm_opamp.h
View File

@ -10,7 +10,7 @@
* ---------------------------------------------------------------------------*/
#define MB3614_DIP(_name) \
NET_REGISTER_DEV_X(MB3614_DIP, _name)
NET_REGISTER_DEV(MB3614_DIP, _name)
/* ----------------------------------------------------------------------------
* External declarations

4
src/emu/netlist/macro/nlm_ttl74xx.h
View File

@ -10,10 +10,10 @@
* ---------------------------------------------------------------------------*/
#define TTL_7416_GATE(_name) \
NET_REGISTER_DEV_X(TTL_7416_GATE, _name)
NET_REGISTER_DEV(TTL_7416_GATE, _name)
#define TTL_7416_DIP(_name) \
NET_REGISTER_DEV_X(TTL7416_DIP, _name)
NET_REGISTER_DEV(TTL7416_DIP, _name)
/* ----------------------------------------------------------------------------
* External declarations

12
src/emu/netlist/nl_dice_compat.h
View File

@ -40,10 +40,14 @@ sed -e 's/#define \(.*\)"\(.*\)"[ \t]*,[ \t]*\(.*\)/NET_ALIAS(\1,\2.\3)/' src/ma
*/
#ifndef NL_CONVERT_CPP
#ifdef NETLIST_DEVELOPMENT
#ifndef NETLIST_DEVELOPMENT
#define NETLIST_DEVELOPMENT 0
#endif
#if (NETLIST_DEVELOPMENT)
#define CHIP(_n, _t) setup.register_dev( palloc(netlist::devices::nld_ ## _t ## _dip), _n);
#else
#define CHIP(_n, _t) setup.register_dev(NETLIB_NAME_STR(_t ## _dip), _n);
#define CHIP(_n, _t) setup.register_dev(NETLIB_NAME_STR_S(TTL_ ## _t ## _DIP), _n);
//#define CHIP(_n, _t) TTL_ ## _t ## _DIP(_n)
#endif
#define CONNECTION( ... ) CONNECTIONY( CONNECTIONX( __VA_ARGS__ ) )
@ -114,7 +118,7 @@ public:
#define CIRCUIT_LAYOUT_END NETLIST_END()
#define CHIP_555_Mono(_name, _pdesc) \
CHIP(# _name, NE555) \
NE555_DIP(_name) \
NET_C(_name.6, _name.7) \
RES(_name ## _R, (_pdesc)->r) \
CAP(_name ## _C, (_pdesc)->c) \
@ -126,7 +130,7 @@ public:
NET_CSTR(# _name ".1", "GND")
#define CHIP_555_Astable(_name, _pdesc) \
CHIP(# _name, NE555) \
NE555_DIP(_name) \
RES(_name ## _R1, (_pdesc)->r1) \
RES(_name ## _R2, (_pdesc)->r2) \
CAP(_name ## _C, (_pdesc)->c) \

2
src/emu/netlist/nl_factory.c
View File

@ -48,6 +48,7 @@ factory_list_t::~factory_list_t()
m_list.clear();
}
#if 0
device_t *factory_list_t::new_device_by_classname(const pstring &classname) const
{
for (std::size_t i=0; i < m_list.size(); i++)
@ -62,6 +63,7 @@ device_t *factory_list_t::new_device_by_classname(const pstring &classname) cons
}
return NULL; // appease code analysis
}
#endif
device_t *factory_list_t::new_device_by_name(const pstring &name, setup_t &setup) const
{

2
src/emu/netlist/nl_factory.h
View File

@ -82,7 +82,7 @@ namespace netlist
m_list.add(factory);
}
ATTR_COLD device_t *new_device_by_classname(const pstring &classname) const;
//ATTR_COLD device_t *new_device_by_classname(const pstring &classname) const;
ATTR_COLD device_t *new_device_by_name(const pstring &name, setup_t &setup) const;
ATTR_COLD base_factory_t * factory_by_name(const pstring &name, setup_t &setup) const;

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

@ -21,8 +21,8 @@
static NETLIST_START(base)
TTL_INPUT(ttlhigh, 1)
TTL_INPUT(ttllow, 0)
NET_REGISTER_DEV(gnd, GND)
NET_REGISTER_DEV(netlistparams, NETLIST)
NET_REGISTER_DEV(GND, GND)
NET_REGISTER_DEV(PARAMETER, NETLIST)
LOCAL_SOURCE(diode_models)
LOCAL_SOURCE(bjt_models)
@ -129,7 +129,8 @@ device_t *setup_t::register_dev(const pstring &classname, const pstring &name)
}
else
{
device_t *dev = factory().new_device_by_classname(classname);
device_t *dev = factory().new_device_by_name(classname, *this);
//device_t *dev = factory().new_device_by_classname(classname);
if (dev == NULL)
netlist().error("Class %s not found!\n", classname.cstr());
return register_dev(dev, name);
@ -344,7 +345,7 @@ void setup_t::register_frontier(const pstring attach, const double r_IN, const d
static int frontier_cnt = 0;
pstring frontier_name = pstring::sprintf("frontier_%d", frontier_cnt);
frontier_cnt++;
device_t *front = register_dev("nld_frontier", frontier_name);
device_t *front = register_dev("FRONTIER_DEV", frontier_name);
register_param(frontier_name + ".RIN", r_IN);
register_param(frontier_name + ".ROUT", r_OUT);
register_link(frontier_name + ".G", "GND");
@ -860,7 +861,7 @@ void setup_t::start_devices()
{
NL_VERBOSE_OUT(("%d: <%s>\n",i, ll[i].cstr()));
NL_VERBOSE_OUT(("%d: <%s>\n",i, ll[i].cstr()));
device_t *nc = factory().new_device_by_classname("nld_log");
device_t *nc = factory().new_device_by_name("LOG", *this);
pstring name = "log_" + ll[i];
register_dev(nc, name);
register_link(name + ".I", ll[i]);

5
src/emu/netlist/nl_setup.h
View File

@ -25,11 +25,8 @@
#define DIPPINS(_pin1, ...) \
setup.register_dippins_arr( #_pin1 ", " # __VA_ARGS__);
#define NET_REGISTER_DEV(_type, _name) \
setup.register_dev(NETLIB_NAME_STR(_type), # _name);
/* to be used to reference new library truthtable devices */
#define NET_REGISTER_DEV_X(_type, _name) \
#define NET_REGISTER_DEV(_type, _name) \
setup.register_dev(# _type, # _name);
#define NET_REGISTER_SIGNAL(_type, _name) \

2
src/emu/netlist/plib/plists.h
View File

@ -735,10 +735,8 @@ private:
const unsigned pos = hash % m_hash.size();
for (int ep = m_hash[pos]; ep != -1; ep = m_values[ep].m_next)
{
if (m_values[ep].m_hash == hash && m_values[ep].m_key == key )
return ep;
}
return -1;
}

2
src/emu/netlist/solver/nld_solver.h
View File

@ -22,7 +22,7 @@
// ----------------------------------------------------------------------------------------
#define SOLVER(_name, _freq) \
NET_REGISTER_DEV(solver, _name) \
NET_REGISTER_DEV(SOLVER, _name) \
PARAM(_name.FREQ, _freq)
// ----------------------------------------------------------------------------------------

8
src/mame/audio/nl_kidniki.c
View File

@ -16,16 +16,16 @@
#ifndef __PLIB_PREPROCESSOR__
#define MC14584B_GATE(_name) \
NET_REGISTER_DEV_X(MC14584B_GATE, _name)
NET_REGISTER_DEV(MC14584B_GATE, _name)
#define MC14584B_DIP(_name) \
NET_REGISTER_DEV_X(MC14584B_DIP, _name)
NET_REGISTER_DEV(MC14584B_DIP, _name)
#define LM324_DIP(_name) \
NET_REGISTER_DEV_X(LM324_DIP, _name)
NET_REGISTER_DEV(LM324_DIP, _name)
#define LM358_DIP(_name) \
NET_REGISTER_DEV_X(LM358_DIP, _name)
NET_REGISTER_DEV(LM358_DIP, _name)
NETLIST_EXTERNAL(kidniki_lib)

2
src/mame/drivers/nl_breakout.c
View File

@ -133,7 +133,7 @@ CIRCUIT_LAYOUT( breakout )
CHIP("F1", 9316)
NET_C(Y1.Q, F1.2)
CONNECTION("F1", 14, "H1", 13)
CONNECTION("F1", 14, d, 13)
CONNECTION("F1", 13, "H1", 12)
CONNECTION("F1", 15, "E1", 5)
CONNECTION(P, "F1", 1)

2
src/mame/drivers/nl_pong.c
View File

@ -16,7 +16,7 @@
#define TTL_7400A_NAND(_name, _A, _B) TTL_7400_NAND(_name, _A, _B)
#else
#define TTL_7400A_NAND(_name, _A, _B) \
NET_REGISTER_DEV_X(TTL_7400A_NAND, _name) \
NET_REGISTER_DEV(TTL_7400A_NAND, _name) \
NET_CONNECT(_name, A, _A) \
NET_CONNECT(_name, B, _B)
#endif

2
src/tools/nltool.c
View File

@ -210,7 +210,7 @@ public:
for (int i=0; i < ll.size(); i++)
{
pstring name = "log_" + ll[i];
/*netlist_device_t *nc = */ m_setup->register_dev("nld_log", name);
/*netlist_device_t *nc = */ m_setup->register_dev("LOG", name);
m_setup->register_link(name + ".I", ll[i]);
}
}