diff options
Diffstat (limited to 'src/emu/netlist')
| -rw-r--r-- | src/emu/netlist/devices/net_lib.c | 2 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_74175.c | 4 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_74175.h | 3 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_74192.h | 4 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_74193.h | 2 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_82S16.c | 36 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_82S16.h | 3 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_9312.c | 2 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_9312.h | 3 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_legacy.c | 1 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_signal.h | 4 | ||||
| -rw-r--r-- | src/emu/netlist/devices/nld_truthtable.h | 2 | ||||
| -rw-r--r-- | src/emu/netlist/nl_base.c | 2 | ||||
| -rw-r--r-- | src/emu/netlist/nl_base.h | 2 | ||||
| -rw-r--r-- | src/emu/netlist/nl_config.h | 2 | ||||
| -rw-r--r-- | src/emu/netlist/nl_dice_compat.h | 14 |
16 files changed, 40 insertions, 46 deletions
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c index ef0873d376a..93efac4c1a7 100644 --- a/src/emu/netlist/devices/net_lib.c +++ b/src/emu/netlist/devices/net_lib.c @@ -122,7 +122,7 @@ void nl_initialize_factory(netlist_factory_t &factory) ENTRY(74175, TTL_74175, "-") ENTRY(74192, TTL_74192, "-") ENTRY(74193, TTL_74193, "-") - //ENTRY(74279, TTL_74279, "-") // only dip available + //ENTRY(74279, TTL_74279, "-") // only dip available ENTRY(SN74LS629, SN74LS629, "CAP") ENTRY(82S16, TTL_82S16, "-") ENTRY(9310, TTL_9310, "-") diff --git a/src/emu/netlist/devices/nld_74175.c b/src/emu/netlist/devices/nld_74175.c index b84f4d458ee..6d4db58703d 100644 --- a/src/emu/netlist/devices/nld_74175.c +++ b/src/emu/netlist/devices/nld_74175.c @@ -32,7 +32,7 @@ NETLIB_UPDATE(74175) NETLIB_START(74175) { - register_input("CLK", m_CLK); + register_input("CLK", m_CLK); register_input("CLRQ", m_CLRQ); register_input("D1", m_D[0]); @@ -60,7 +60,7 @@ NETLIB_RESET(74175) NETLIB_START(74175_dip) { - register_input("9", m_CLK); + register_input("9", m_CLK); register_input("1", m_CLRQ); register_input("4", m_D[0]); diff --git a/src/emu/netlist/devices/nld_74175.h b/src/emu/netlist/devices/nld_74175.h index 9c138755a50..28e7bc96d4e 100644 --- a/src/emu/netlist/devices/nld_74175.h +++ b/src/emu/netlist/devices/nld_74175.h @@ -39,8 +39,7 @@ #include "nld_signal.h" #define TTL_74175(_name) \ - NET_REGISTER_DEV(74175, _name) \ - + NET_REGISTER_DEV(74175, _name) #define TTL_74175_DIP(_name) \ NET_REGISTER_DEV(74175_dip, _name) diff --git a/src/emu/netlist/devices/nld_74192.h b/src/emu/netlist/devices/nld_74192.h index 017d51f558b..bc4a11a5360 100644 --- a/src/emu/netlist/devices/nld_74192.h +++ b/src/emu/netlist/devices/nld_74192.h @@ -4,7 +4,7 @@ * nld_74192.h * * DM74192: Synchronous 4-Bit Binary Counter with Dual Clock - * Decade counter + * Decade counter * * FIXME: This should be merged with the 74193 which counts to 16 * @@ -31,7 +31,7 @@ #include "../nl_base.h" -#define TTL_74192(_name) \ +#define TTL_74192(_name) \ NET_REGISTER_DEV(74192, _name) #define TTL_74192_DIP(_name) \ diff --git a/src/emu/netlist/devices/nld_74193.h b/src/emu/netlist/devices/nld_74193.h index 92d97c1f6fb..fc2a7de8105 100644 --- a/src/emu/netlist/devices/nld_74193.h +++ b/src/emu/netlist/devices/nld_74193.h @@ -28,7 +28,7 @@ #include "../nl_base.h" -#define TTL_74193(_name) \ +#define TTL_74193(_name) \ NET_REGISTER_DEV(74193, _name) #define TTL_74193_DIP(_name) \ diff --git a/src/emu/netlist/devices/nld_82S16.c b/src/emu/netlist/devices/nld_82S16.c index 4981377d366..047f90f9589 100644 --- a/src/emu/netlist/devices/nld_82S16.c +++ b/src/emu/netlist/devices/nld_82S16.c @@ -32,14 +32,14 @@ NETLIB_UPDATE(82S16) NETLIB_START(82S16) { - register_input("A0", m_A[0]); - register_input("A1", m_A[1]); - register_input("A2", m_A[2]); - register_input("A3", m_A[3]); - register_input("A4", m_A[4]); - register_input("A5", m_A[5]); - register_input("A6", m_A[6]); - register_input("A7", m_A[7]); + register_input("A0", m_A[0]); + register_input("A1", m_A[1]); + register_input("A2", m_A[2]); + register_input("A3", m_A[3]); + register_input("A4", m_A[4]); + register_input("A5", m_A[5]); + register_input("A6", m_A[6]); + register_input("A7", m_A[7]); register_input("CE1Q", m_CE1Q); register_input("CE2Q", m_CE2Q); @@ -63,16 +63,16 @@ NETLIB_RESET(82S16) NETLIB_START(82S16_dip) { - register_input("2", m_A[0]); - register_input("1", m_A[1]); - register_input("15", m_A[2]); - register_input("14", m_A[3]); - register_input("7", m_A[4]); - register_input("9", m_A[5]); - register_input("10", m_A[6]); - register_input("11", m_A[7]); - - register_input("3", m_CE1Q); + register_input("2", m_A[0]); + register_input("1", m_A[1]); + register_input("15", m_A[2]); + register_input("14", m_A[3]); + register_input("7", m_A[4]); + register_input("9", m_A[5]); + register_input("10", m_A[6]); + register_input("11", m_A[7]); + + register_input("3", m_CE1Q); register_input("4", m_CE2Q); register_input("5", m_CE3Q); diff --git a/src/emu/netlist/devices/nld_82S16.h b/src/emu/netlist/devices/nld_82S16.h index 652fbbc13a1..6992e252ca3 100644 --- a/src/emu/netlist/devices/nld_82S16.h +++ b/src/emu/netlist/devices/nld_82S16.h @@ -27,8 +27,7 @@ #include "../nl_base.h" #define TTL_82S16(_name) \ - NET_REGISTER_DEV(82S16, _name) \ - + NET_REGISTER_DEV(82S16, _name) #define TTL_82S16_DIP(_name) \ NET_REGISTER_DEV(82S16_dip, _name) diff --git a/src/emu/netlist/devices/nld_9312.c b/src/emu/netlist/devices/nld_9312.c index 6651848e3a9..2bdaf0714d5 100644 --- a/src/emu/netlist/devices/nld_9312.c +++ b/src/emu/netlist/devices/nld_9312.c @@ -24,7 +24,7 @@ nld_9312::truthtable_t nld_9312::m_ttbl; /* FIXME: Data changes are propagating faster than changing selects A,B,C - * Please refer to data sheet. + * Please refer to data sheet. * This would require a state machine, thus we do not * do this right now. */ diff --git a/src/emu/netlist/devices/nld_9312.h b/src/emu/netlist/devices/nld_9312.h index 98fd0c7177d..677197d00cf 100644 --- a/src/emu/netlist/devices/nld_9312.h +++ b/src/emu/netlist/devices/nld_9312.h @@ -40,8 +40,7 @@ #include "nld_signal.h" #define TTL_9312(_name) \ - NET_REGISTER_DEV(9312, _name) \ - + NET_REGISTER_DEV(9312, _name) //#if (USE_TRUTHTABLE) #include "nld_truthtable.h" NETLIB_TRUTHTABLE(9312, 12, 2, 0); diff --git a/src/emu/netlist/devices/nld_legacy.c b/src/emu/netlist/devices/nld_legacy.c index 31feeef4515..554476c52c3 100644 --- a/src/emu/netlist/devices/nld_legacy.c +++ b/src/emu/netlist/devices/nld_legacy.c @@ -53,7 +53,6 @@ NETLIB_RESET(nicDelay) NETLIB_UPDATE_PARAM(nicDelay) { - } NETLIB_UPDATE(nicDelay) diff --git a/src/emu/netlist/devices/nld_signal.h b/src/emu/netlist/devices/nld_signal.h index 59d9880cc5e..591d45287bc 100644 --- a/src/emu/netlist/devices/nld_signal.h +++ b/src/emu/netlist/devices/nld_signal.h @@ -78,7 +78,7 @@ public: // FIXME: this check is needed because update is called during startup as well //if (m_active == 0 && netlist().use_deactivate()) - // return; + // return; for (int i = 0; i< _numdev; i++) { @@ -152,7 +152,7 @@ public: // FIXME: this check is needed because update is called during startup as well //if (m_active == 0 && netlist().use_deactivate()) - // return; + // return; m_i[0].activate(); m_i[1].activate(); diff --git a/src/emu/netlist/devices/nld_truthtable.h b/src/emu/netlist/devices/nld_truthtable.h index bfb66f827b3..a503a77d856 100644 --- a/src/emu/netlist/devices/nld_truthtable.h +++ b/src/emu/netlist/devices/nld_truthtable.h @@ -186,7 +186,7 @@ public: { // FIXME: this check is needed because update is called during startup as well //if (m_active == 0 && UNEXPECTED(netlist().use_deactivate())) - // return; + // return; UINT32 state = 0; for (int i = 0; i < m_NI; i++) diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c index ca66ff57025..c545c29e914 100644 --- a/src/emu/netlist/nl_base.c +++ b/src/emu/netlist/nl_base.c @@ -139,7 +139,7 @@ netlist_base_t::netlist_base_t() : netlist_object_t(NETLIST, GENERIC), m_stop(netlist_time::zero), // FIXME:: Use a parameter to set this on a schematics per schematics basis - m_use_deactivate(USE_DEACTIVE_DEVICE), + m_use_deactivate(USE_DEACTIVE_DEVICE), m_time(netlist_time::zero), m_queue(*this), m_mainclock(NULL), diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h index 11267d69aa6..4e83546c184 100644 --- a/src/emu/netlist/nl_base.h +++ b/src/emu/netlist/nl_base.h @@ -1216,7 +1216,7 @@ protected: private: netlist_time m_stop; // target time for current queue processing - bool m_use_deactivate; + bool m_use_deactivate; netlist_time m_time; netlist_queue_t m_queue; diff --git a/src/emu/netlist/nl_config.h b/src/emu/netlist/nl_config.h index 26d5f5620b1..f4154c1f102 100644 --- a/src/emu/netlist/nl_config.h +++ b/src/emu/netlist/nl_config.h @@ -37,7 +37,7 @@ #define USE_DEACTIVE_DEVICE (0) -#define USE_TRUTHTABLE (0) +#define USE_TRUTHTABLE (0) // The following adds about 10% performance ... diff --git a/src/emu/netlist/nl_dice_compat.h b/src/emu/netlist/nl_dice_compat.h index 1b72f93a0b2..552797cfbc9 100644 --- a/src/emu/netlist/nl_dice_compat.h +++ b/src/emu/netlist/nl_dice_compat.h @@ -110,22 +110,21 @@ public: #define CHIP_9602_Mono(_name, _pdesc) \ CHIP(# _name, 9602) \ - NET_C(VCC, _name.16) \ - NET_C(GND, _name.8) \ + NET_C(VCC, _name.16) \ + NET_C(GND, _name.8) \ RES(_name ## _R1, (_pdesc)->r1) \ CAP(_name ## _C1, (_pdesc)->c1) \ RES(_name ## _R2, (_pdesc)->r2) \ NET_C(_name.1, _name ## _C1.1) \ NET_C(_name.2, _name ## _C1.2) \ NET_C(_name.2, _name ## _R1.2) \ - NET_C(VCC, _name ## _R1.1) \ + NET_C(VCC, _name ## _R1.1) \ if (((_pdesc)->c2)>1e-15) { \ CAP(_name ## _C2, (_pdesc)->c2) \ NET_C(_name.15, _name ## _C2.1) \ NET_C(_name.14, _name ## _C2.2) }\ NET_C(_name.14, _name ## _R2.2) \ - NET_C(VCC, _name ## _R2.1) \ - + NET_C(VCC, _name ## _R2.1) #define CHIP_SERIES_RC(_name, _pdesc) \ RES(_name ## _R, (_pdesc)->r) \ CAP(_name ## _C, (_pdesc)->c) \ @@ -153,7 +152,7 @@ public: ALIAS(_name.3, _name.QQ) /* FIXME: Alternative implementation using capacitor. - * This is a transitional implementation + * This is a transitional implementation */ inline int CAPACITOR_tc(const double c, const double r) @@ -166,7 +165,6 @@ inline int CAPACITOR_tc(const double c, const double r) #define CHIP_CAPACITOR(_name, _pdesc) \ NETDEV_DELAY(_name) \ NETDEV_PARAMI(_name, L_TO_H, CAPACITOR_tc((_pdesc)->c, (_pdesc)->r)) \ - NETDEV_PARAMI(_name, H_TO_HL, CAPACITOR_tc((_pdesc)->c, (_pdesc)->r)) \ - + NETDEV_PARAMI(_name, H_TO_HL, CAPACITOR_tc((_pdesc)->c, (_pdesc)->r)) #endif /* NL_DICE_COMPAT_H_ */ |
