diff options
Diffstat (limited to 'src/lib/netlist/devices')
35 files changed, 317 insertions, 317 deletions
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp index fbff8508574..b989fdd73c9 100644 --- a/src/lib/netlist/devices/net_lib.cpp +++ b/src/lib/netlist/devices/net_lib.cpp @@ -143,8 +143,8 @@ static void initialize_factory(factory_list_t &factory) ENTRYX(9312, TTL_9312, "-") ENTRYX(9316, TTL_9316, "+CLK,ENP,ENT,CLRQ,LOADQ,A,B,C,D") ENTRYX(9322, TTL_9322, "-") - ENTRYX(9334, TTL_9334, "+CQ,EQ,D,A0,A1,A2") - ENTRYX(AM2847, TTL_AM2847, "+CP,INA,INB,INC,IND,RCA,RCB,RCC,RCD") + ENTRYX(9334, TTL_9334, "+CQ,EQ,D,A0,A1,A2") + ENTRYX(AM2847, TTL_AM2847, "+CP,INA,INB,INC,IND,RCA,RCB,RCC,RCD") ENTRYX(CD4020, CD4020, "") ENTRYX(CD4066_GATE, CD4066_GATE, "") /* entries with suffix WI are legacy only */ @@ -153,8 +153,8 @@ static void initialize_factory(factory_list_t &factory) ENTRYX(NE555, NE555, "-") ENTRYX(r2r_dac, R2R_DAC, "+VIN,R,N") ENTRYX(tristate, TTL_TRISTATE, "+CEQ1,D1,CEQ2,D2") - ENTRYX(tristate3, TTL_TRISTATE3, "-") - ENTRYX(2102A_dip, RAM_2102A_DIP, "-") + ENTRYX(tristate3, TTL_TRISTATE3, "-") + ENTRYX(2102A_dip, RAM_2102A_DIP, "-") ENTRYX(2716_dip, EPROM_2716_DIP, "-") ENTRYX(4538_dip, CD4538_DIP, "-") ENTRYX(7448_dip, TTL_7448_DIP, "-") @@ -191,7 +191,7 @@ static void initialize_factory(factory_list_t &factory) ENTRYX(9316_dip, TTL_9316_DIP, "-") ENTRYX(9322_dip, TTL_9322_DIP, "-") ENTRYX(9334_dip, TTL_9334_DIP, "-") - ENTRYX(AM2847_dip, TTL_AM2847_DIP, "-") + ENTRYX(AM2847_dip, TTL_AM2847_DIP, "-") ENTRYX(SN74LS629_dip, SN74LS629_DIP, "1.CAP1,2.CAP2") ENTRYX(NE555_dip, NE555_DIP, "-") ENTRYX(MM5837_dip, MM5837_DIP, "-") diff --git a/src/lib/netlist/devices/nld_2102A.cpp b/src/lib/netlist/devices/nld_2102A.cpp index 45a7ee53c34..da8ffc3cc1d 100644 --- a/src/lib/netlist/devices/nld_2102A.cpp +++ b/src/lib/netlist/devices/nld_2102A.cpp @@ -7,8 +7,8 @@ #include "nld_2102A.h" -#define ADDR2BYTE(a) ((a) >> 3) -#define ADDR2BIT(a) ((a) & 0x7) +#define ADDR2BYTE(a) ((a) >> 3) +#define ADDR2BIT(a) ((a) & 0x7) namespace netlist { diff --git a/src/lib/netlist/devices/nld_2102A.h b/src/lib/netlist/devices/nld_2102A.h index fe2feebf38e..bec20f9bd8c 100644 --- a/src/lib/netlist/devices/nld_2102A.h +++ b/src/lib/netlist/devices/nld_2102A.h @@ -26,20 +26,20 @@ #include "nl_setup.h" -#define RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI) \ - NET_REGISTER_DEV(RAM_2102A, name) \ - NET_CONNECT(name, CEQ, cCEQ) \ - NET_CONNECT(name, A0, cA0) \ - NET_CONNECT(name, A1, cA1) \ - NET_CONNECT(name, A2, cA2) \ - NET_CONNECT(name, A3, cA3) \ - NET_CONNECT(name, A4, cA4) \ - NET_CONNECT(name, A5, cA5) \ - NET_CONNECT(name, A6, cA6) \ - NET_CONNECT(name, A7, cA7) \ - NET_CONNECT(name, A8, cA8) \ - NET_CONNECT(name, A9, cA9) \ - NET_CONNECT(name, RWQ, cRWQ) \ +#define RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI) \ + NET_REGISTER_DEV(RAM_2102A, name) \ + NET_CONNECT(name, CEQ, cCEQ) \ + NET_CONNECT(name, A0, cA0) \ + NET_CONNECT(name, A1, cA1) \ + NET_CONNECT(name, A2, cA2) \ + NET_CONNECT(name, A3, cA3) \ + NET_CONNECT(name, A4, cA4) \ + NET_CONNECT(name, A5, cA5) \ + NET_CONNECT(name, A6, cA6) \ + NET_CONNECT(name, A7, cA7) \ + NET_CONNECT(name, A8, cA8) \ + NET_CONNECT(name, A9, cA9) \ + NET_CONNECT(name, RWQ, cRWQ) \ NET_CONNECT(name, DI, cDI) #define RAM_2102A_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_2716.cpp b/src/lib/netlist/devices/nld_2716.cpp index 45cedba592b..68cf4dcc134 100644 --- a/src/lib/netlist/devices/nld_2716.cpp +++ b/src/lib/netlist/devices/nld_2716.cpp @@ -78,10 +78,10 @@ namespace netlist for (std::size_t i=0; i<11; i++) a |= (m_A[i]() << i); - if (m_ROM() != nullptr) - { - d = ((std::uint_fast8_t*)(m_ROM()))[a]; - } + if (m_ROM() != nullptr) + { + d = ((std::uint_fast8_t*)(m_ROM()))[a]; + } if (m_last_EPQ) delay = NLTIME_FROM_NS(120); diff --git a/src/lib/netlist/devices/nld_2716.h b/src/lib/netlist/devices/nld_2716.h index 72a02a2166e..c96c726c11d 100644 --- a/src/lib/netlist/devices/nld_2716.h +++ b/src/lib/netlist/devices/nld_2716.h @@ -30,20 +30,20 @@ #include "nl_setup.h" -#define EPROM_2716(name, cGQ, cEPQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cA10) \ +#define EPROM_2716(name, cGQ, cEPQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cA10) \ NET_REGISTER_DEV(EPROM_2716, name) \ - NET_CONNECT(name, GQ, cGQ) \ - NET_CONNECT(name, EPQ, cEPQ) \ - NET_CONNECT(name, A0, cA0) \ - NET_CONNECT(name, A1, cA1) \ - NET_CONNECT(name, A2, cA2) \ - NET_CONNECT(name, A3, cA3) \ - NET_CONNECT(name, A4, cA4) \ - NET_CONNECT(name, A5, cA5) \ - NET_CONNECT(name, A6, cA6) \ - NET_CONNECT(name, A7, cA7) \ - NET_CONNECT(name, A8, cA8) \ - NET_CONNECT(name, A9, cA9) \ + NET_CONNECT(name, GQ, cGQ) \ + NET_CONNECT(name, EPQ, cEPQ) \ + NET_CONNECT(name, A0, cA0) \ + NET_CONNECT(name, A1, cA1) \ + NET_CONNECT(name, A2, cA2) \ + NET_CONNECT(name, A3, cA3) \ + NET_CONNECT(name, A4, cA4) \ + NET_CONNECT(name, A5, cA5) \ + NET_CONNECT(name, A6, cA6) \ + NET_CONNECT(name, A7, cA7) \ + NET_CONNECT(name, A8, cA8) \ + NET_CONNECT(name, A9, cA9) \ NET_CONNECT(name, A10, cA10) #define EPROM_2716_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_74107.h b/src/lib/netlist/devices/nld_74107.h index d6e10fc95a4..ed940f8170f 100644 --- a/src/lib/netlist/devices/nld_74107.h +++ b/src/lib/netlist/devices/nld_74107.h @@ -76,7 +76,7 @@ #define TTL_74107(name, cCLK, cJ, cK, cCLRQ) \ TTL_74107A(name, cCLK, cJ, cK, cCLRQ) -#define TTL_74107_DIP(name) \ +#define TTL_74107_DIP(name) \ NET_REGISTER_DEV(TTL_74107_DIP, name) #endif /* NLD_74107_H_ */ diff --git a/src/lib/netlist/devices/nld_74161.cpp b/src/lib/netlist/devices/nld_74161.cpp index 4d616d93015..d6e31f36417 100644 --- a/src/lib/netlist/devices/nld_74161.cpp +++ b/src/lib/netlist/devices/nld_74161.cpp @@ -96,31 +96,31 @@ namespace netlist netlist_sig_t tRippleCarryOut = 0; if (!m_CLRQ()) { - m_cnt = 0; + m_cnt = 0; } else if (m_CLK() && !m_last_CLK) { if (!m_LOADQ()) { - m_cnt = (m_D() << 3) | (m_C() << 2) + m_cnt = (m_D() << 3) | (m_C() << 2) | (m_B() << 1) | (m_A() << 0); - } + } else if (m_ENABLET() && m_ENABLEP()) { m_cnt++; if (m_cnt > MAXCNT) m_cnt = 0; - } + } } if (m_ENABLET() && (m_cnt == MAXCNT)) - { - tRippleCarryOut = 1; - } + { + tRippleCarryOut = 1; + } m_last_CLK = m_CLK(); - for (std::size_t i=0; i<4; i++) + for (std::size_t i=0; i<4; i++) m_Q[i].push((m_cnt >> i) & 1, delay[i]); m_RCO.push(tRippleCarryOut, NLTIME_FROM_NS(20)); //FIXME diff --git a/src/lib/netlist/devices/nld_74161.h b/src/lib/netlist/devices/nld_74161.h index efff5466593..1a6b6b2ca87 100644 --- a/src/lib/netlist/devices/nld_74161.h +++ b/src/lib/netlist/devices/nld_74161.h @@ -28,14 +28,14 @@ #include "nl_setup.h" #define TTL_74161(name, cA, cB, cC, cD, cCLRQ, cLOADQ, cCLK, cENABLEP, cENABLET) \ - NET_REGISTER_DEV(TTL_74161, name) \ - NET_CONNECT(name, A, cA) \ - NET_CONNECT(name, B, cB) \ - NET_CONNECT(name, C, cC) \ - NET_CONNECT(name, D, cD) \ - NET_CONNECT(name, CLRQ, cCLRQ) \ - NET_CONNECT(name, LOADQ, cLOADQ) \ - NET_CONNECT(name, CLK, cCLK) \ + NET_REGISTER_DEV(TTL_74161, name) \ + NET_CONNECT(name, A, cA) \ + NET_CONNECT(name, B, cB) \ + NET_CONNECT(name, C, cC) \ + NET_CONNECT(name, D, cD) \ + NET_CONNECT(name, CLRQ, cCLRQ) \ + NET_CONNECT(name, LOADQ, cLOADQ) \ + NET_CONNECT(name, CLK, cCLK) \ NET_CONNECT(name, ENABLEP, cENABLEP) \ NET_CONNECT(name, ENABLET, cENABLET) diff --git a/src/lib/netlist/devices/nld_74165.h b/src/lib/netlist/devices/nld_74165.h index a724cb81da7..30970f5a20e 100644 --- a/src/lib/netlist/devices/nld_74165.h +++ b/src/lib/netlist/devices/nld_74165.h @@ -29,19 +29,19 @@ #include "nl_setup.h" -#define TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH) \ - NET_REGISTER_DEV(TTL_74165, name) \ - NET_CONNECT(name, CLK, cCLK) \ - NET_CONNECT(name, CLKINH, cCLKINH) \ - NET_CONNECT(name, SH_LDQ, cSH_LDQ) \ - NET_CONNECT(name, SER, cSER) \ - NET_CONNECT(name, A, cA) \ - NET_CONNECT(name, B, cB) \ - NET_CONNECT(name, C, cC) \ - NET_CONNECT(name, D, cD) \ - NET_CONNECT(name, E, cE) \ - NET_CONNECT(name, F, cF) \ - NET_CONNECT(name, G, cG) \ +#define TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH) \ + NET_REGISTER_DEV(TTL_74165, name) \ + NET_CONNECT(name, CLK, cCLK) \ + NET_CONNECT(name, CLKINH, cCLKINH) \ + NET_CONNECT(name, SH_LDQ, cSH_LDQ) \ + NET_CONNECT(name, SER, cSER) \ + NET_CONNECT(name, A, cA) \ + NET_CONNECT(name, B, cB) \ + NET_CONNECT(name, C, cC) \ + NET_CONNECT(name, D, cD) \ + NET_CONNECT(name, E, cE) \ + NET_CONNECT(name, F, cF) \ + NET_CONNECT(name, G, cG) \ NET_CONNECT(name, H, cH) #define TTL_74165_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_74166.h b/src/lib/netlist/devices/nld_74166.h index 0bd3d7eaadd..bf5bbc8d0d8 100644 --- a/src/lib/netlist/devices/nld_74166.h +++ b/src/lib/netlist/devices/nld_74166.h @@ -29,20 +29,20 @@ #include "nl_setup.h" -#define TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ) \ - NET_REGISTER_DEV(TTL_74166, name) \ - NET_CONNECT(name, CLK, cCLK) \ - NET_CONNECT(name, CLKINH, cCLKINH) \ - NET_CONNECT(name, SH_LDQ, cSH_LDQ) \ - NET_CONNECT(name, SER, cSER) \ - NET_CONNECT(name, A, cA) \ - NET_CONNECT(name, B, cB) \ - NET_CONNECT(name, C, cC) \ - NET_CONNECT(name, D, cD) \ - NET_CONNECT(name, E, cE) \ - NET_CONNECT(name, F, cF) \ - NET_CONNECT(name, G, cG) \ - NET_CONNECT(name, H, cH) \ +#define TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ) \ + NET_REGISTER_DEV(TTL_74166, name) \ + NET_CONNECT(name, CLK, cCLK) \ + NET_CONNECT(name, CLKINH, cCLKINH) \ + NET_CONNECT(name, SH_LDQ, cSH_LDQ) \ + NET_CONNECT(name, SER, cSER) \ + NET_CONNECT(name, A, cA) \ + NET_CONNECT(name, B, cB) \ + NET_CONNECT(name, C, cC) \ + NET_CONNECT(name, D, cD) \ + NET_CONNECT(name, E, cE) \ + NET_CONNECT(name, F, cF) \ + NET_CONNECT(name, G, cG) \ + NET_CONNECT(name, H, cH) \ NET_CONNECT(name, CLRQ, cCLRQ) #define TTL_74166_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_74174.h b/src/lib/netlist/devices/nld_74174.h index 50398607f88..43125b6af96 100644 --- a/src/lib/netlist/devices/nld_74174.h +++ b/src/lib/netlist/devices/nld_74174.h @@ -38,15 +38,15 @@ #include "nl_setup.h" -#define TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ) \ - NET_REGISTER_DEV(TTL_74174, name) \ - NET_CONNECT(name, CLK, cCLK) \ - NET_CONNECT(name, D1, cD1) \ - NET_CONNECT(name, D2, cD2) \ - NET_CONNECT(name, D3, cD3) \ - NET_CONNECT(name, D4, cD4) \ - NET_CONNECT(name, D5, cD5) \ - NET_CONNECT(name, D6, cD6) \ +#define TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ) \ + NET_REGISTER_DEV(TTL_74174, name) \ + NET_CONNECT(name, CLK, cCLK) \ + NET_CONNECT(name, D1, cD1) \ + NET_CONNECT(name, D2, cD2) \ + NET_CONNECT(name, D3, cD3) \ + NET_CONNECT(name, D4, cD4) \ + NET_CONNECT(name, D5, cD5) \ + NET_CONNECT(name, D6, cD6) \ NET_CONNECT(name, CLRQ, cCLRQ) #define TTL_74174_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_74175.h b/src/lib/netlist/devices/nld_74175.h index 9487bc926ab..27dd01a2360 100644 --- a/src/lib/netlist/devices/nld_74175.h +++ b/src/lib/netlist/devices/nld_74175.h @@ -38,13 +38,13 @@ #include "nl_setup.h" -#define TTL_74175(name, cCLK, cD1, cD2, cD3, cD4, cCLRQ) \ - NET_REGISTER_DEV(TTL_74175, name) \ - NET_CONNECT(name, CLK, cCLK) \ - NET_CONNECT(name, D1, cD1) \ - NET_CONNECT(name, D2, cD2) \ - NET_CONNECT(name, D3, cD3) \ - NET_CONNECT(name, D4, cD4) \ +#define TTL_74175(name, cCLK, cD1, cD2, cD3, cD4, cCLRQ) \ + NET_REGISTER_DEV(TTL_74175, name) \ + NET_CONNECT(name, CLK, cCLK) \ + NET_CONNECT(name, D1, cD1) \ + NET_CONNECT(name, D2, cD2) \ + NET_CONNECT(name, D3, cD3) \ + NET_CONNECT(name, D4, cD4) \ NET_CONNECT(name, CLRQ, cCLRQ) #define TTL_74175_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_74192.h b/src/lib/netlist/devices/nld_74192.h index 1afb152961a..8c82006fe6c 100644 --- a/src/lib/netlist/devices/nld_74192.h +++ b/src/lib/netlist/devices/nld_74192.h @@ -31,15 +31,15 @@ #include "nl_setup.h" -#define TTL_74192(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD) \ - NET_REGISTER_DEV(TTL_74192, name) \ - NET_CONNECT(name, A, cA) \ - NET_CONNECT(name, B, cB) \ - NET_CONNECT(name, C, cC) \ - NET_CONNECT(name, D, cD) \ - NET_CONNECT(name, CLEAR, cCLEAR) \ - NET_CONNECT(name, LOADQ, cLOADQ) \ - NET_CONNECT(name, CU, cCU) \ +#define TTL_74192(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD) \ + NET_REGISTER_DEV(TTL_74192, name) \ + NET_CONNECT(name, A, cA) \ + NET_CONNECT(name, B, cB) \ + NET_CONNECT(name, C, cC) \ + NET_CONNECT(name, D, cD) \ + NET_CONNECT(name, CLEAR, cCLEAR) \ + NET_CONNECT(name, LOADQ, cLOADQ) \ + NET_CONNECT(name, CU, cCU) \ NET_CONNECT(name, CD, cCD) #define TTL_74192_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_74193.h b/src/lib/netlist/devices/nld_74193.h index f89eb782911..53b6165e9f9 100644 --- a/src/lib/netlist/devices/nld_74193.h +++ b/src/lib/netlist/devices/nld_74193.h @@ -28,15 +28,15 @@ #include "nl_setup.h" -#define TTL_74193(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD) \ - NET_REGISTER_DEV(TTL_74193, name) \ - NET_CONNECT(name, A, cA) \ - NET_CONNECT(name, B, cB) \ - NET_CONNECT(name, C, cC) \ - NET_CONNECT(name, D, cD) \ +#define TTL_74193(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD) \ + NET_REGISTER_DEV(TTL_74193, name) \ + NET_CONNECT(name, A, cA) \ + NET_CONNECT(name, B, cB) \ + NET_CONNECT(name, C, cC) \ + NET_CONNECT(name, D, cD) \ NET_CONNECT(name, CLEAR, cCLEAR) \ NET_CONNECT(name, LOADQ, cLOADQ) \ - NET_CONNECT(name, CU, cCU) \ + NET_CONNECT(name, CU, cCU) \ NET_CONNECT(name, CD, cCD) #define TTL_74193_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_74194.h b/src/lib/netlist/devices/nld_74194.h index 703cf85a916..3207495c725 100644 --- a/src/lib/netlist/devices/nld_74194.h +++ b/src/lib/netlist/devices/nld_74194.h @@ -28,17 +28,17 @@ #include "nl_setup.h" -#define TTL_74194(name, cCLK, cS0, cS1, cSRIN, cA, cB, cC, cD, cSLIN, cCLRQ) \ - NET_REGISTER_DEV(TTL_74194, name) \ - NET_CONNECT(name, CLK, cCLK) \ - NET_CONNECT(name, S0, cS0) \ - NET_CONNECT(name, S1, cC1) \ - NET_CONNECT(name, SRIN, cSRIN) \ - NET_CONNECT(name, A, cA) \ - NET_CONNECT(name, B, cB) \ - NET_CONNECT(name, C, cC) \ - NET_CONNECT(name, D, cD) \ - NET_CONNECT(name, SLIN, cSLIN) \ +#define TTL_74194(name, cCLK, cS0, cS1, cSRIN, cA, cB, cC, cD, cSLIN, cCLRQ) \ + NET_REGISTER_DEV(TTL_74194, name) \ + NET_CONNECT(name, CLK, cCLK) \ + NET_CONNECT(name, S0, cS0) \ + NET_CONNECT(name, S1, cC1) \ + NET_CONNECT(name, SRIN, cSRIN) \ + NET_CONNECT(name, A, cA) \ + NET_CONNECT(name, B, cB) \ + NET_CONNECT(name, C, cC) \ + NET_CONNECT(name, D, cD) \ + NET_CONNECT(name, SLIN, cSLIN) \ NET_CONNECT(name, CLRQ, cCLRQ) #define TTL_74194_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_74365.h b/src/lib/netlist/devices/nld_74365.h index 65bfd1a2a57..2a7fb230e5e 100644 --- a/src/lib/netlist/devices/nld_74365.h +++ b/src/lib/netlist/devices/nld_74365.h @@ -27,15 +27,15 @@ #include "nl_setup.h" -#define TTL_74365(name, cG1Q, cG2Q, cA1, cA2, cA3, cA4, cA5, cA6) \ - NET_REGISTER_DEV(TTL_74365, name) \ - NET_CONNECT(name, G1Q, cG1Q) \ - NET_CONNECT(name, G2Q, cG2Q) \ - NET_CONNECT(name, A1, cA1) \ - NET_CONNECT(name, A2, cA2) \ - NET_CONNECT(name, A3, cA3) \ - NET_CONNECT(name, A4, cA4) \ - NET_CONNECT(name, A5, cA5) \ +#define TTL_74365(name, cG1Q, cG2Q, cA1, cA2, cA3, cA4, cA5, cA6) \ + NET_REGISTER_DEV(TTL_74365, name) \ + NET_CONNECT(name, G1Q, cG1Q) \ + NET_CONNECT(name, G2Q, cG2Q) \ + NET_CONNECT(name, A1, cA1) \ + NET_CONNECT(name, A2, cA2) \ + NET_CONNECT(name, A3, cA3) \ + NET_CONNECT(name, A4, cA4) \ + NET_CONNECT(name, A5, cA5) \ NET_CONNECT(name, A6, cA6) #define TTL_74365_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_7473.cpp b/src/lib/netlist/devices/nld_7473.cpp index e65e8676065..fc73b97c201 100644 --- a/src/lib/netlist/devices/nld_7473.cpp +++ b/src/lib/netlist/devices/nld_7473.cpp @@ -18,14 +18,14 @@ namespace netlist , m_J(*this, "J") , m_K(*this, "K") , m_CLRQ(*this, "CLRQ") - , m_last_CLK(*this, "m_last_CLK", 0) - , m_q(*this, "m_q", 0) + , m_last_CLK(*this, "m_last_CLK", 0) + , m_q(*this, "m_q", 0) , m_Q(*this, "Q") , m_QQ(*this, "QQ") { } - NETLIB_RESETI(); + NETLIB_RESETI(); NETLIB_UPDATEI(); public: @@ -34,10 +34,10 @@ namespace netlist logic_input_t m_K; logic_input_t m_CLRQ; - state_var<unsigned> m_last_CLK; - state_var<unsigned> m_q; + state_var<unsigned> m_last_CLK; + state_var<unsigned> m_q; - logic_output_t m_Q; + logic_output_t m_Q; logic_output_t m_QQ; }; @@ -104,38 +104,38 @@ namespace netlist NETLIB_SUB(7473A) m_2; }; - NETLIB_RESET(7473) - { - m_last_CLK = 0; - } + NETLIB_RESET(7473) + { + m_last_CLK = 0; + } - NETLIB_UPDATE(7473) + NETLIB_UPDATE(7473) { const auto JK = (m_J() << 1) | m_K(); if (m_CLRQ()) { if (!m_CLK() && m_last_CLK) - { - switch (JK) - { - case 1: // (!m_J) & m_K)) - m_q = 0; - break; - case 2: // (m_J) & !m_K)) - m_q = 1; - break; - case 3: // (m_J) & m_K)) - m_q ^= 1; - break; - default: - case 0: - break; - } - } + { + switch (JK) + { + case 1: // (!m_J) & m_K)) + m_q = 0; + break; + case 2: // (m_J) & !m_K)) + m_q = 1; + break; + case 3: // (m_J) & m_K)) + m_q ^= 1; + break; + default: + case 0: + break; + } + } } - m_last_CLK = m_CLK(); + m_last_CLK = m_CLK(); m_Q.push(m_q, NLTIME_FROM_NS(20)); // FIXME: timing m_QQ.push(m_q ^ 1, NLTIME_FROM_NS(20)); // FIXME: timing diff --git a/src/lib/netlist/devices/nld_7473.h b/src/lib/netlist/devices/nld_7473.h index 58927048e2e..344e768cc44 100644 --- a/src/lib/netlist/devices/nld_7473.h +++ b/src/lib/netlist/devices/nld_7473.h @@ -62,21 +62,21 @@ #include "nl_setup.h" -#define TTL_7473(name, cCLK, cJ, cK, cCLRQ) \ - NET_REGISTER_DEV(TTL_7473, name) \ - NET_CONNECT(name, CLK, cCLK) \ - NET_CONNECT(name, J, cJ) \ - NET_CONNECT(name, K, cK) \ +#define TTL_7473(name, cCLK, cJ, cK, cCLRQ) \ + NET_REGISTER_DEV(TTL_7473, name) \ + NET_CONNECT(name, CLK, cCLK) \ + NET_CONNECT(name, J, cJ) \ + NET_CONNECT(name, K, cK) \ NET_CONNECT(name, CLRQ, cCLRQ) -#define TTL_7473A(name, cCLK, cJ, cK, cCLRQ) \ +#define TTL_7473A(name, cCLK, cJ, cK, cCLRQ) \ TTL_7473(name, cCLK, cJ, cK, cCLRQ) -#define TTL_7473_DIP(name) \ +#define TTL_7473_DIP(name) \ NET_REGISTER_DEV(TTL_7473_DIP, name) -#define TTL_7473A_DIP(name) \ +#define TTL_7473A_DIP(name) \ NET_REGISTER_DEV(TTL_7473A_DIP, name) #endif /* NLD_7473_H_ */ diff --git a/src/lib/netlist/devices/nld_7475.cpp b/src/lib/netlist/devices/nld_7475.cpp index e788824f940..3c26c1ce439 100644 --- a/src/lib/netlist/devices/nld_7475.cpp +++ b/src/lib/netlist/devices/nld_7475.cpp @@ -128,7 +128,7 @@ namespace netlist m_last_Q = 0; } - NETLIB_UPDATE(7477) + NETLIB_UPDATE(7477) { netlist_sig_t c1c2 = m_C1C2(); netlist_sig_t c3c4 = m_C3C4(); diff --git a/src/lib/netlist/devices/nld_7475.h b/src/lib/netlist/devices/nld_7475.h index ea7d668acd5..5689d6aa1e8 100644 --- a/src/lib/netlist/devices/nld_7475.h +++ b/src/lib/netlist/devices/nld_7475.h @@ -37,26 +37,26 @@ #include "nl_setup.h" -#define PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) \ - NET_CONNECT(name, C1C2, cC1C2) \ - NET_CONNECT(name, C3C4, cC3C4) \ - NET_CONNECT(name, D1, cD1) \ - NET_CONNECT(name, D2, cD2) \ - NET_CONNECT(name, D3, cD3) \ +#define PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) \ + NET_CONNECT(name, C1C2, cC1C2) \ + NET_CONNECT(name, C3C4, cC3C4) \ + NET_CONNECT(name, D1, cD1) \ + NET_CONNECT(name, D2, cD2) \ + NET_CONNECT(name, D3, cD3) \ NET_CONNECT(name, D4, cD4) -#define TTL_7475(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) \ - NET_REGISTER_DEV(TTL_7475, name) \ +#define TTL_7475(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) \ + NET_REGISTER_DEV(TTL_7475, name) \ PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) -#define TTL_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) \ - NET_REGISTER_DEV(TTL_7477, name) \ +#define TTL_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) \ + NET_REGISTER_DEV(TTL_7477, name) \ PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) -#define TTL_7475_DIP(name) \ +#define TTL_7475_DIP(name) \ NET_REGISTER_DEV(TTL_7475_DIP, name) -#define TTL_7477_DIP(name) \ +#define TTL_7477_DIP(name) \ NET_REGISTER_DEV(TTL_7477_DIP, name) #endif /* NLD_7475_H_ */ diff --git a/src/lib/netlist/devices/nld_7485.h b/src/lib/netlist/devices/nld_7485.h index d97a323e416..77ff6b0d530 100644 --- a/src/lib/netlist/devices/nld_7485.h +++ b/src/lib/netlist/devices/nld_7485.h @@ -26,17 +26,17 @@ #include "nl_setup.h" #define TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN) \ - NET_REGISTER_DEV(TTL_7485, name) \ - NET_CONNECT(name, A0, cA0) \ - NET_CONNECT(name, A1, cA1) \ - NET_CONNECT(name, A2, cA2) \ - NET_CONNECT(name, A3, cA3) \ - NET_CONNECT(name, B0, cB0) \ - NET_CONNECT(name, B1, cB1) \ - NET_CONNECT(name, B2, cB2) \ - NET_CONNECT(name, B3, cB3) \ - NET_CONNECT(name, LTIN, cLTIN) \ - NET_CONNECT(name, EQIN, cEQIN) \ + NET_REGISTER_DEV(TTL_7485, name) \ + NET_CONNECT(name, A0, cA0) \ + NET_CONNECT(name, A1, cA1) \ + NET_CONNECT(name, A2, cA2) \ + NET_CONNECT(name, A3, cA3) \ + NET_CONNECT(name, B0, cB0) \ + NET_CONNECT(name, B1, cB1) \ + NET_CONNECT(name, B2, cB2) \ + NET_CONNECT(name, B3, cB3) \ + NET_CONNECT(name, LTIN, cLTIN) \ + NET_CONNECT(name, EQIN, cEQIN) \ NET_CONNECT(name, GTIN, cGTIN) #define TTL_7485_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_82S115.cpp b/src/lib/netlist/devices/nld_82S115.cpp index a4a375ee364..873acef549d 100644 --- a/src/lib/netlist/devices/nld_82S115.cpp +++ b/src/lib/netlist/devices/nld_82S115.cpp @@ -101,7 +101,7 @@ namespace netlist m_last_O = o; - // FIXME: Outputs are tristate. This needs to be properly implemented + // FIXME: Outputs are tristate. This needs to be properly implemented for (std::size_t i=0; i<8; i++) m_O[i].push((o >> i) & 1, NLTIME_FROM_NS(40)); // FIXME: Timing } diff --git a/src/lib/netlist/devices/nld_82S115.h b/src/lib/netlist/devices/nld_82S115.h index 34ab5bf2534..e8b538dbc95 100644 --- a/src/lib/netlist/devices/nld_82S115.h +++ b/src/lib/netlist/devices/nld_82S115.h @@ -30,19 +30,19 @@ #include "nl_setup.h" -#define PROM_82S115(name, cCE1, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE) \ - NET_REGISTER_DEV(PROM_82S115, name) \ - NET_CONNECT(name, CE1Q, cCE1Q) \ - NET_CONNECT(name, CE2Q, cCE2Q) \ - NET_CONNECT(name, A0, cA0) \ - NET_CONNECT(name, A1, cA1) \ - NET_CONNECT(name, A2, cA2) \ - NET_CONNECT(name, A3, cA3) \ - NET_CONNECT(name, A4, cA4) \ - NET_CONNECT(name, A5, cA5) \ - NET_CONNECT(name, A6, cA6) \ - NET_CONNECT(name, A7, cA7) \ - NET_CONNECT(name, A8, cA8) \ +#define PROM_82S115(name, cCE1, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE) \ + NET_REGISTER_DEV(PROM_82S115, name) \ + NET_CONNECT(name, CE1Q, cCE1Q) \ + NET_CONNECT(name, CE2Q, cCE2Q) \ + NET_CONNECT(name, A0, cA0) \ + NET_CONNECT(name, A1, cA1) \ + NET_CONNECT(name, A2, cA2) \ + NET_CONNECT(name, A3, cA3) \ + NET_CONNECT(name, A4, cA4) \ + NET_CONNECT(name, A5, cA5) \ + NET_CONNECT(name, A6, cA6) \ + NET_CONNECT(name, A7, cA7) \ + NET_CONNECT(name, A8, cA8) \ NET_CONNECT(name, STROBE, cSTROBE) #define PROM_82S115_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_82S123.cpp b/src/lib/netlist/devices/nld_82S123.cpp index c4a54dd79c5..ab0a58b1b59 100644 --- a/src/lib/netlist/devices/nld_82S123.cpp +++ b/src/lib/netlist/devices/nld_82S123.cpp @@ -66,13 +66,13 @@ namespace netlist for (std::size_t i=0; i<5; i++) a |= (m_A[i]() << i); - if (m_ROM() != nullptr) - o = ((std::uint_fast8_t*)(m_ROM()))[a]; + if (m_ROM() != nullptr) + o = ((std::uint_fast8_t*)(m_ROM()))[a]; delay = NLTIME_FROM_NS(50); } - // FIXME: Outputs are tristate. This needs to be properly implemented + // FIXME: Outputs are tristate. This needs to be properly implemented for (std::size_t i=0; i<8; i++) m_O[i].push((o >> i) & 1, delay); } diff --git a/src/lib/netlist/devices/nld_82S123.h b/src/lib/netlist/devices/nld_82S123.h index 08130009ec7..a04e169ae93 100644 --- a/src/lib/netlist/devices/nld_82S123.h +++ b/src/lib/netlist/devices/nld_82S123.h @@ -27,13 +27,13 @@ #include "nl_setup.h" -#define PROM_82S123(name, cCEQ, cA0, cA1, cA2, cA3, cA4) \ - NET_REGISTER_DEV(PROM_82S123, name) \ - NET_CONNECT(name, CEQ, cCEQ) \ - NET_CONNECT(name, A0, cA0) \ - NET_CONNECT(name, A1, cA1) \ - NET_CONNECT(name, A2, cA2) \ - NET_CONNECT(name, A3, cA3) \ +#define PROM_82S123(name, cCEQ, cA0, cA1, cA2, cA3, cA4) \ + NET_REGISTER_DEV(PROM_82S123, name) \ + NET_CONNECT(name, CEQ, cCEQ) \ + NET_CONNECT(name, A0, cA0) \ + NET_CONNECT(name, A1, cA1) \ + NET_CONNECT(name, A2, cA2) \ + NET_CONNECT(name, A3, cA3) \ NET_CONNECT(name, A4, cA4) #define PROM_82S123_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_82S126.cpp b/src/lib/netlist/devices/nld_82S126.cpp index 9d481a8a877..dd1d6ad0dc8 100644 --- a/src/lib/netlist/devices/nld_82S126.cpp +++ b/src/lib/netlist/devices/nld_82S126.cpp @@ -68,13 +68,13 @@ namespace netlist for (std::size_t i=0; i<8; i++) a |= (m_A[i]() << i); - if (m_ROM() != nullptr) - o = ((std::uint_fast8_t*)(m_ROM()))[a]; + if (m_ROM() != nullptr) + o = ((std::uint_fast8_t*)(m_ROM()))[a]; delay = NLTIME_FROM_NS(50); } - // FIXME: Outputs are tristate. This needs to be properly implemented + // FIXME: Outputs are tristate. This needs to be properly implemented for (std::size_t i=0; i<4; i++) m_O[i].push((o >> i) & 1, delay); } diff --git a/src/lib/netlist/devices/nld_82S126.h b/src/lib/netlist/devices/nld_82S126.h index 5da2398e3c3..27dd2217497 100644 --- a/src/lib/netlist/devices/nld_82S126.h +++ b/src/lib/netlist/devices/nld_82S126.h @@ -26,17 +26,17 @@ #include "nl_setup.h" -#define PROM_82S126(name, cCE1Q, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7) \ - NET_REGISTER_DEV(PROM_82S126, name) \ - NET_CONNECT(name, CE1Q, cCE1Q) \ - NET_CONNECT(name, CE2Q, cCE2Q) \ - NET_CONNECT(name, A0, cA0) \ - NET_CONNECT(name, A1, cA1) \ - NET_CONNECT(name, A2, cA2) \ - NET_CONNECT(name, A3, cA3) \ - NET_CONNECT(name, A4, cA4) \ - NET_CONNECT(name, A5, cA5) \ - NET_CONNECT(name, A6, cA6) \ +#define PROM_82S126(name, cCE1Q, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7) \ + NET_REGISTER_DEV(PROM_82S126, name) \ + NET_CONNECT(name, CE1Q, cCE1Q) \ + NET_CONNECT(name, CE2Q, cCE2Q) \ + NET_CONNECT(name, A0, cA0) \ + NET_CONNECT(name, A1, cA1) \ + NET_CONNECT(name, A2, cA2) \ + NET_CONNECT(name, A3, cA3) \ + NET_CONNECT(name, A4, cA4) \ + NET_CONNECT(name, A5, cA5) \ + NET_CONNECT(name, A6, cA6) \ NET_CONNECT(name, A7, cA7) #define PROM_82S126_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_9312.h b/src/lib/netlist/devices/nld_9312.h index c5f4104edd4..5608ba9aefb 100644 --- a/src/lib/netlist/devices/nld_9312.h +++ b/src/lib/netlist/devices/nld_9312.h @@ -39,19 +39,19 @@ #include "nl_setup.h" -#define TTL_9312(name, cA, cB, cC, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7, cSTROBE) \ - NET_REGISTER_DEV(TTL_9312, name) \ - NET_CONNECT(name, A, cA) \ - NET_CONNECT(name, B, cB) \ - NET_CONNECT(name, C, cC) \ - NET_CONNECT(name, D0, cD0) \ - NET_CONNECT(name, D1, cD1) \ - NET_CONNECT(name, D2, cD2) \ - NET_CONNECT(name, D3, cD3) \ - NET_CONNECT(name, D4, cD4) \ - NET_CONNECT(name, D5, cD5) \ - NET_CONNECT(name, D6, cD6) \ - NET_CONNECT(name, D7, cD7) \ +#define TTL_9312(name, cA, cB, cC, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7, cSTROBE) \ + NET_REGISTER_DEV(TTL_9312, name) \ + NET_CONNECT(name, A, cA) \ + NET_CONNECT(name, B, cB) \ + NET_CONNECT(name, C, cC) \ + NET_CONNECT(name, D0, cD0) \ + NET_CONNECT(name, D1, cD1) \ + NET_CONNECT(name, D2, cD2) \ + NET_CONNECT(name, D3, cD3) \ + NET_CONNECT(name, D4, cD4) \ + NET_CONNECT(name, D5, cD5) \ + NET_CONNECT(name, D6, cD6) \ + NET_CONNECT(name, D7, cD7) \ NET_CONNECT(name, STROBE, cSTROBE) #define TTL_9312_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_9316.h b/src/lib/netlist/devices/nld_9316.h index ce5951bf85b..b0be896a6bd 100644 --- a/src/lib/netlist/devices/nld_9316.h +++ b/src/lib/netlist/devices/nld_9316.h @@ -44,8 +44,8 @@ * * Naming conventions follow National Semiconductor datasheet * - * TODO: DM74161 is compatible to DM9316 (both asynchronous clear) - * DM74163 has asynchronous clear (on L to H transition of clock) + * TODO: DM74161 is compatible to DM9316 (both asynchronous clear) + * DM74163 has asynchronous clear (on L to H transition of clock) */ #ifndef NLD_9316_H_ diff --git a/src/lib/netlist/devices/nld_9322.h b/src/lib/netlist/devices/nld_9322.h index e47bb9eda32..08ec6efcd93 100644 --- a/src/lib/netlist/devices/nld_9322.h +++ b/src/lib/netlist/devices/nld_9322.h @@ -23,17 +23,17 @@ #include "nl_setup.h" -#define TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE) \ - NET_REGISTER_DEV(TTL_9322, name) \ - NET_CONNECT(name, SELECT, cSELECT) \ - NET_CONNECT(name, A1, cA1) \ - NET_CONNECT(name, B1, cB1) \ - NET_CONNECT(name, A2, cA2) \ - NET_CONNECT(name, B2, cB2) \ - NET_CONNECT(name, A3, cA3) \ - NET_CONNECT(name, B3, cB3) \ - NET_CONNECT(name, A4, cA4) \ - NET_CONNECT(name, B4, cB4) \ +#define TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE) \ + NET_REGISTER_DEV(TTL_9322, name) \ + NET_CONNECT(name, SELECT, cSELECT) \ + NET_CONNECT(name, A1, cA1) \ + NET_CONNECT(name, B1, cB1) \ + NET_CONNECT(name, A2, cA2) \ + NET_CONNECT(name, B2, cB2) \ + NET_CONNECT(name, A3, cA3) \ + NET_CONNECT(name, B3, cB3) \ + NET_CONNECT(name, A4, cA4) \ + NET_CONNECT(name, B4, cB4) \ NET_CONNECT(name, STROBE, cSTROBE) #define TTL_9322_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_am2847.cpp b/src/lib/netlist/devices/nld_am2847.cpp index b831b196798..ec4eafc8dd6 100644 --- a/src/lib/netlist/devices/nld_am2847.cpp +++ b/src/lib/netlist/devices/nld_am2847.cpp @@ -105,7 +105,7 @@ namespace netlist m_C.shift(); m_D.shift(); } - m_last_CP = m_CP(); + m_last_CP = m_CP(); } inline NETLIB_FUNC_VOID(Am2847_shifter, shift, (void)) diff --git a/src/lib/netlist/devices/nld_am2847.h b/src/lib/netlist/devices/nld_am2847.h index 2429db98123..a820961ea2c 100644 --- a/src/lib/netlist/devices/nld_am2847.h +++ b/src/lib/netlist/devices/nld_am2847.h @@ -23,16 +23,16 @@ #include "nl_setup.h" -#define TTL_AM2847(name, cCP, cINA, cINB, cINC, cIND, cRCA, cRCB, cRCC, cRCD) \ - NET_REGISTER_DEV(TTL_AM2847, name) \ - NET_CONNECT(name, CP, cCP) \ - NET_CONNECT(name, INA, cINA) \ - NET_CONNECT(name, INB, cINB) \ - NET_CONNECT(name, INC, cINC) \ - NET_CONNECT(name, IND, cIND) \ - NET_CONNECT(name, RCA, cRCA) \ - NET_CONNECT(name, RCB, cRCB) \ - NET_CONNECT(name, RCC, cRCC) \ +#define TTL_AM2847(name, cCP, cINA, cINB, cINC, cIND, cRCA, cRCB, cRCC, cRCD) \ + NET_REGISTER_DEV(TTL_AM2847, name) \ + NET_CONNECT(name, CP, cCP) \ + NET_CONNECT(name, INA, cINA) \ + NET_CONNECT(name, INB, cINB) \ + NET_CONNECT(name, INC, cINC) \ + NET_CONNECT(name, IND, cIND) \ + NET_CONNECT(name, RCA, cRCA) \ + NET_CONNECT(name, RCB, cRCB) \ + NET_CONNECT(name, RCC, cRCC) \ NET_CONNECT(name, RCD, cRCD) #define TTL_AM2847_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_dm9334.h b/src/lib/netlist/devices/nld_dm9334.h index 0a896b66d6d..813ea225add 100644 --- a/src/lib/netlist/devices/nld_dm9334.h +++ b/src/lib/netlist/devices/nld_dm9334.h @@ -67,13 +67,13 @@ #include "nl_setup.h" -#define TTL_9334(name, cCQ, cEQ, cD, cA0, cA1, cA2) \ - NET_REGISTER_DEV(TTL_9334, name) \ - NET_CONNECT(name, CQ, cCQ) \ - NET_CONNECT(name, EQ, cEQ) \ - NET_CONNECT(name, D, cD) \ - NET_CONNECT(name, A0, cA0) \ - NET_CONNECT(name, A1, cA1) \ +#define TTL_9334(name, cCQ, cEQ, cD, cA0, cA1, cA2) \ + NET_REGISTER_DEV(TTL_9334, name) \ + NET_CONNECT(name, CQ, cCQ) \ + NET_CONNECT(name, EQ, cEQ) \ + NET_CONNECT(name, D, cD) \ + NET_CONNECT(name, A0, cA0) \ + NET_CONNECT(name, A1, cA1) \ NET_CONNECT(name, A2, cA2) #define TTL_9334_DIP(name) \ diff --git a/src/lib/netlist/devices/nld_tristate.cpp b/src/lib/netlist/devices/nld_tristate.cpp index 571f5f8c334..db21468685e 100644 --- a/src/lib/netlist/devices/nld_tristate.cpp +++ b/src/lib/netlist/devices/nld_tristate.cpp @@ -28,24 +28,24 @@ namespace netlist logic_output_t m_Q; }; - NETLIB_OBJECT(tristate3) - { - NETLIB_CONSTRUCTOR(tristate3) - , m_CEQ(*this, {{ "CEQ1", "CEQ2", "CEQ3" }} ) - , m_D(*this, {{ "D1", "D2", "D3" }} ) - , m_Q(*this, "Q") - { - } + NETLIB_OBJECT(tristate3) + { + NETLIB_CONSTRUCTOR(tristate3) + , m_CEQ(*this, {{ "CEQ1", "CEQ2", "CEQ3" }} ) + , m_D(*this, {{ "D1", "D2", "D3" }} ) + , m_Q(*this, "Q") + { + } - NETLIB_UPDATEI(); + NETLIB_UPDATEI(); - protected: - object_array_t<logic_input_t, 3> m_CEQ; - object_array_t<logic_input_t, 3> m_D; - logic_output_t m_Q; - }; + protected: + object_array_t<logic_input_t, 3> m_CEQ; + object_array_t<logic_input_t, 3> m_D; + logic_output_t m_Q; + }; - NETLIB_UPDATE(tristate) + NETLIB_UPDATE(tristate) { unsigned q = 0; if (!m_CEQ[0]()) @@ -56,21 +56,21 @@ namespace netlist m_Q.push(q, NLTIME_FROM_NS(1)); } - NETLIB_UPDATE(tristate3) - { - unsigned q = 0; - if (!m_CEQ[0]()) - q |= m_D[0](); - if (!m_CEQ[1]()) - q |= m_D[1](); - if (!m_CEQ[2]()) - q |= m_D[2](); + NETLIB_UPDATE(tristate3) + { + unsigned q = 0; + if (!m_CEQ[0]()) + q |= m_D[0](); + if (!m_CEQ[1]()) + q |= m_D[1](); + if (!m_CEQ[2]()) + q |= m_D[2](); - m_Q.push(q, NLTIME_FROM_NS(1)); - } + m_Q.push(q, NLTIME_FROM_NS(1)); + } - NETLIB_DEVICE_IMPL(tristate) - NETLIB_DEVICE_IMPL(tristate3) + NETLIB_DEVICE_IMPL(tristate) + NETLIB_DEVICE_IMPL(tristate3) } //namespace devices } // namespace netlist diff --git a/src/lib/netlist/devices/nld_tristate.h b/src/lib/netlist/devices/nld_tristate.h index e0e40491d8f..604ae7f03fd 100644 --- a/src/lib/netlist/devices/nld_tristate.h +++ b/src/lib/netlist/devices/nld_tristate.h @@ -12,20 +12,20 @@ #include "nl_setup.h" -#define TTL_TRISTATE(name, cCEQ1, cD1, cCEQ2, cD2) \ - NET_REGISTER_DEV(TTL_TRISTATE, name) \ - NET_CONNECT(name, CEQ1, cCEQ1) \ - NET_CONNECT(name, D1, cD1) \ - NET_CONNECT(name, CEQ2, cCEQ2) \ +#define TTL_TRISTATE(name, cCEQ1, cD1, cCEQ2, cD2) \ + NET_REGISTER_DEV(TTL_TRISTATE, name) \ + NET_CONNECT(name, CEQ1, cCEQ1) \ + NET_CONNECT(name, D1, cD1) \ + NET_CONNECT(name, CEQ2, cCEQ2) \ NET_CONNECT(name, D2, cD2) -#define TTL_TRISTATE3(name, cCEQ1, cD1, cCEQ2, cD2, cCEQ3, cD3) \ - NET_REGISTER_DEV(TTL_TRISTATE3, name) \ - NET_CONNECT(name, CEQ1, cCEQ1) \ - NET_CONNECT(name, D1, cD1) \ - NET_CONNECT(name, CEQ2, cCEQ2) \ +#define TTL_TRISTATE3(name, cCEQ1, cD1, cCEQ2, cD2, cCEQ3, cD3) \ + NET_REGISTER_DEV(TTL_TRISTATE3, name) \ + NET_CONNECT(name, CEQ1, cCEQ1) \ + NET_CONNECT(name, D1, cD1) \ + NET_CONNECT(name, CEQ2, cCEQ2) \ NET_CONNECT(name, D2, cD2) \ - NET_CONNECT(name, CEQ3, cCEQ3) \ - NET_CONNECT(name, D3, cD3) + NET_CONNECT(name, CEQ3, cCEQ3) \ + NET_CONNECT(name, D3, cD3) #endif /* NLD_TRISTATE_H_ */ |