From bb3ac09be26edb370df20dd23d939087308f65c0 Mon Sep 17 00:00:00 2001 From: couriersud Date: Sat, 9 May 2015 21:12:02 +0200 Subject: Downsizing ... Removed netlist_ttl_input_t and netlist_ttl_output_t. The logic family is governed by the chip and defaults to TTL. However individual devices may change the logic family of their inputs and outputs as well. Implementing special output/input characteristics of "S", "LS", "HC", ... you name it, devices is now pretty easy. Theoretically e.g. a "LS_HighPrecision" proxy could be used to model the output down to the transistor level. [Couriersud] --- src/emu/netlist/analog/nld_solver.h | 8 ++++---- src/emu/netlist/devices/nld_4020.h | 6 +++--- src/emu/netlist/devices/nld_7404.h | 4 ++-- src/emu/netlist/devices/nld_74107.h | 12 ++++++------ src/emu/netlist/devices/nld_74123.h | 16 ++++++++-------- src/emu/netlist/devices/nld_74153.h | 14 +++++++------- src/emu/netlist/devices/nld_74175.h | 10 +++++----- src/emu/netlist/devices/nld_74192.h | 14 +++++++------- src/emu/netlist/devices/nld_74193.h | 22 +++++++++++----------- src/emu/netlist/devices/nld_7448.h | 28 ++++++++++++++-------------- src/emu/netlist/devices/nld_7450.h | 10 +++++----- src/emu/netlist/devices/nld_7474.h | 12 ++++++------ src/emu/netlist/devices/nld_7483.h | 28 ++++++++++++++-------------- src/emu/netlist/devices/nld_7486.h | 6 +++--- src/emu/netlist/devices/nld_7490.h | 14 +++++++------- src/emu/netlist/devices/nld_7493.h | 8 ++++---- src/emu/netlist/devices/nld_82S16.h | 14 +++++++------- src/emu/netlist/devices/nld_9310.h | 28 ++++++++++++++-------------- src/emu/netlist/devices/nld_9312.h | 14 +++++++------- src/emu/netlist/devices/nld_9316.h | 28 ++++++++++++++-------------- src/emu/netlist/devices/nld_legacy.h | 12 ++++++------ src/emu/netlist/devices/nld_signal.h | 8 ++++---- src/emu/netlist/devices/nld_system.h | 16 ++++++++-------- src/emu/netlist/devices/nld_truthtable.h | 4 ++-- src/emu/netlist/nl_base.c | 9 --------- src/emu/netlist/nl_base.h | 19 ------------------- 26 files changed, 168 insertions(+), 196 deletions(-) (limited to 'src/emu/netlist') diff --git a/src/emu/netlist/analog/nld_solver.h b/src/emu/netlist/analog/nld_solver.h index 1bb411e6690..4bba6a6d5b7 100644 --- a/src/emu/netlist/analog/nld_solver.h +++ b/src/emu/netlist/analog/nld_solver.h @@ -151,8 +151,8 @@ private: dev_list_t m_step_devices; dev_list_t m_dynamic_devices; - netlist_ttl_input_t m_fb_sync; - netlist_ttl_output_t m_Q_sync; + netlist_logic_input_t m_fb_sync; + netlist_logic_output_t m_Q_sync; ATTR_HOT void step(const netlist_time delta); @@ -181,8 +181,8 @@ protected: ATTR_HOT void reset(); ATTR_HOT void update_param(); - netlist_ttl_input_t m_fb_step; - netlist_ttl_output_t m_Q_step; + netlist_logic_input_t m_fb_step; + netlist_logic_output_t m_Q_step; netlist_param_double_t m_freq; netlist_param_double_t m_sync_delay; diff --git a/src/emu/netlist/devices/nld_4020.h b/src/emu/netlist/devices/nld_4020.h index 10d5fa4e1da..34d6ee69fe1 100644 --- a/src/emu/netlist/devices/nld_4020.h +++ b/src/emu/netlist/devices/nld_4020.h @@ -45,18 +45,18 @@ NETLIB_SUBDEVICE(4020_sub, NETLIB_LOGIC_FAMILY(CD4000) ATTR_HOT void update_outputs(const UINT16 cnt); - netlist_ttl_input_t m_IP; + netlist_logic_input_t m_IP; UINT16 m_cnt; - netlist_ttl_output_t m_Q[14]; + netlist_logic_output_t m_Q[14]; ); NETLIB_DEVICE(4020, NETLIB_LOGIC_FAMILY(CD4000) NETLIB_NAME(4020_sub) sub; NETLIB_NAME(vdd_vss) m_supply; - netlist_ttl_input_t m_RESET; + netlist_logic_input_t m_RESET; ); NETLIB_DEVICE_DERIVED(4020_dip, 4020, diff --git a/src/emu/netlist/devices/nld_7404.h b/src/emu/netlist/devices/nld_7404.h index f96eb355251..f74210bc958 100644 --- a/src/emu/netlist/devices/nld_7404.h +++ b/src/emu/netlist/devices/nld_7404.h @@ -34,8 +34,8 @@ NETLIB_DEVICE(7404, public: - netlist_ttl_input_t m_I; - netlist_ttl_output_t m_Q; + netlist_logic_input_t m_I; + netlist_logic_output_t m_Q; ); #define TTL_7404_INVERT(_name, _A) \ diff --git a/src/emu/netlist/devices/nld_74107.h b/src/emu/netlist/devices/nld_74107.h index 150516a00c3..ba2462c55c5 100644 --- a/src/emu/netlist/devices/nld_74107.h +++ b/src/emu/netlist/devices/nld_74107.h @@ -75,10 +75,10 @@ NET_REGISTER_DEV(74107_dip, _name) NETLIB_SUBDEVICE(74107Asub, - netlist_ttl_input_t m_clk; + netlist_logic_input_t m_clk; - netlist_ttl_output_t m_Q; - netlist_ttl_output_t m_QQ; + netlist_logic_output_t m_Q; + netlist_logic_output_t m_QQ; netlist_sig_t m_Q1; netlist_sig_t m_Q2; @@ -92,9 +92,9 @@ NETLIB_DEVICE(74107A, public: NETLIB_NAME(74107Asub) sub; - netlist_ttl_input_t m_J; - netlist_ttl_input_t m_K; - netlist_ttl_input_t m_clrQ; + netlist_logic_input_t m_J; + netlist_logic_input_t m_K; + netlist_logic_input_t m_clrQ; ); diff --git a/src/emu/netlist/devices/nld_74123.h b/src/emu/netlist/devices/nld_74123.h index a5c9f430577..79c6021b025 100644 --- a/src/emu/netlist/devices/nld_74123.h +++ b/src/emu/netlist/devices/nld_74123.h @@ -48,14 +48,14 @@ public: NETLIB_NAME(res_sw) m_RP; NETLIB_NAME(res_sw) m_RN; - netlist_ttl_output_t m_RP_Q; - netlist_ttl_output_t m_RN_Q; - - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; - netlist_ttl_input_t m_CLRQ; - netlist_ttl_output_t m_Q; - netlist_ttl_output_t m_QQ; + netlist_logic_output_t m_RP_Q; + netlist_logic_output_t m_RN_Q; + + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; + netlist_logic_input_t m_CLRQ; + netlist_logic_output_t m_Q; + netlist_logic_output_t m_QQ; netlist_analog_input_t m_CV; diff --git a/src/emu/netlist/devices/nld_74153.h b/src/emu/netlist/devices/nld_74153.h index 03c942f9a70..16024114d4b 100644 --- a/src/emu/netlist/devices/nld_74153.h +++ b/src/emu/netlist/devices/nld_74153.h @@ -61,10 +61,10 @@ NET_REGISTER_DEV(74153_dip, _name) NETLIB_SUBDEVICE(74153sub, - netlist_ttl_input_t m_C[4]; - netlist_ttl_input_t m_G; + netlist_logic_input_t m_C[4]; + netlist_logic_input_t m_G; - netlist_ttl_output_t m_Y; + netlist_logic_output_t m_Y; int m_chan; ); @@ -72,16 +72,16 @@ NETLIB_SUBDEVICE(74153sub, NETLIB_DEVICE(74153, public: NETLIB_NAME(74153sub) m_sub; - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; ); NETLIB_DEVICE(74153_dip, NETLIB_NAME(74153sub) m_1; NETLIB_NAME(74153sub) m_2; - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; ); #endif /* NLD_74153_H_ */ diff --git a/src/emu/netlist/devices/nld_74175.h b/src/emu/netlist/devices/nld_74175.h index 08c825ca09e..e7719d33a9e 100644 --- a/src/emu/netlist/devices/nld_74175.h +++ b/src/emu/netlist/devices/nld_74175.h @@ -46,9 +46,9 @@ NETLIB_SUBDEVICE(74175_sub, - netlist_ttl_input_t m_CLK; - netlist_ttl_output_t m_Q[4]; - netlist_ttl_output_t m_QQ[4]; + netlist_logic_input_t m_CLK; + netlist_logic_output_t m_Q[4]; + netlist_logic_output_t m_QQ[4]; netlist_sig_t m_clrq; UINT8 m_data; @@ -57,8 +57,8 @@ NETLIB_SUBDEVICE(74175_sub, NETLIB_DEVICE(74175, NETLIB_NAME(74175_sub) m_sub; - netlist_ttl_input_t m_D[4]; - netlist_ttl_input_t m_CLRQ; + netlist_logic_input_t m_D[4]; + netlist_logic_input_t m_CLRQ; ); NETLIB_DEVICE_DERIVED(74175_dip, 74175, diff --git a/src/emu/netlist/devices/nld_74192.h b/src/emu/netlist/devices/nld_74192.h index 036358db9b5..f616421811d 100644 --- a/src/emu/netlist/devices/nld_74192.h +++ b/src/emu/netlist/devices/nld_74192.h @@ -42,18 +42,18 @@ NETLIB_DEVICE(74192, ATTR_HOT void update_outputs(); NETLIB_NAME(9316_subABCD) m_ABCD; - netlist_ttl_input_t m_CLEAR; - netlist_ttl_input_t m_LOADQ; - netlist_ttl_input_t m_CU; - netlist_ttl_input_t m_CD; + netlist_logic_input_t m_CLEAR; + netlist_logic_input_t m_LOADQ; + netlist_logic_input_t m_CU; + netlist_logic_input_t m_CD; INT8 m_cnt; UINT8 m_last_CU; UINT8 m_last_CD; - netlist_ttl_output_t m_Q[4]; - netlist_ttl_output_t m_BORROWQ; - netlist_ttl_output_t m_CARRYQ; + netlist_logic_output_t m_Q[4]; + netlist_logic_output_t m_BORROWQ; + netlist_logic_output_t m_CARRYQ; ); NETLIB_DEVICE_DERIVED(74192_dip, 74192, diff --git a/src/emu/netlist/devices/nld_74193.h b/src/emu/netlist/devices/nld_74193.h index ffe92f5fd94..6a3eefe60ba 100644 --- a/src/emu/netlist/devices/nld_74193.h +++ b/src/emu/netlist/devices/nld_74193.h @@ -37,22 +37,22 @@ NETLIB_DEVICE(74193, ATTR_HOT void update_outputs(); - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; - netlist_ttl_input_t m_C; - netlist_ttl_input_t m_D; - netlist_ttl_input_t m_CLEAR; - netlist_ttl_input_t m_LOADQ; - netlist_ttl_input_t m_CU; - netlist_ttl_input_t m_CD; + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; + netlist_logic_input_t m_C; + netlist_logic_input_t m_D; + netlist_logic_input_t m_CLEAR; + netlist_logic_input_t m_LOADQ; + netlist_logic_input_t m_CU; + netlist_logic_input_t m_CD; INT8 m_cnt; UINT8 m_last_CU; UINT8 m_last_CD; - netlist_ttl_output_t m_Q[4]; - netlist_ttl_output_t m_BORROWQ; - netlist_ttl_output_t m_CARRYQ; + netlist_logic_output_t m_Q[4]; + netlist_logic_output_t m_BORROWQ; + netlist_logic_output_t m_CARRYQ; ); NETLIB_DEVICE_DERIVED(74193_dip, 74193, diff --git a/src/emu/netlist/devices/nld_7448.h b/src/emu/netlist/devices/nld_7448.h index 2c06638f93a..72aed7fa6f1 100644 --- a/src/emu/netlist/devices/nld_7448.h +++ b/src/emu/netlist/devices/nld_7448.h @@ -43,29 +43,29 @@ NETLIB_SUBDEVICE(7448_sub, ATTR_HOT void update_outputs(UINT8 v); static const UINT8 tab7448[16][7]; - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; - netlist_ttl_input_t m_C; - netlist_ttl_input_t m_D; - netlist_ttl_input_t m_RBIQ; + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; + netlist_logic_input_t m_C; + netlist_logic_input_t m_D; + netlist_logic_input_t m_RBIQ; UINT8 m_state; - netlist_ttl_output_t m_a; - netlist_ttl_output_t m_b; - netlist_ttl_output_t m_c; - netlist_ttl_output_t m_d; - netlist_ttl_output_t m_e; - netlist_ttl_output_t m_f; - netlist_ttl_output_t m_g; + netlist_logic_output_t m_a; + netlist_logic_output_t m_b; + netlist_logic_output_t m_c; + netlist_logic_output_t m_d; + netlist_logic_output_t m_e; + netlist_logic_output_t m_f; + netlist_logic_output_t m_g; ); NETLIB_DEVICE(7448, public: NETLIB_NAME(7448_sub) sub; - netlist_ttl_input_t m_LTQ; - netlist_ttl_input_t m_BIQ; + netlist_logic_input_t m_LTQ; + netlist_logic_input_t m_BIQ; ); NETLIB_DEVICE_DERIVED(7448_dip, 7448, diff --git a/src/emu/netlist/devices/nld_7450.h b/src/emu/netlist/devices/nld_7450.h index bb15005ad10..4a08f552d68 100644 --- a/src/emu/netlist/devices/nld_7450.h +++ b/src/emu/netlist/devices/nld_7450.h @@ -38,11 +38,11 @@ NETLIB_DEVICE(7450, public: - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; - netlist_ttl_input_t m_C; - netlist_ttl_input_t m_D; - netlist_ttl_output_t m_Q; + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; + netlist_logic_input_t m_C; + netlist_logic_input_t m_D; + netlist_logic_output_t m_Q; ); NETLIB_DEVICE(7450_dip, diff --git a/src/emu/netlist/devices/nld_7474.h b/src/emu/netlist/devices/nld_7474.h index d2d8ac08cf2..a4c4e44466f 100644 --- a/src/emu/netlist/devices/nld_7474.h +++ b/src/emu/netlist/devices/nld_7474.h @@ -55,11 +55,11 @@ NET_REGISTER_DEV(7474_dip, _name) NETLIB_SUBDEVICE(7474sub, - netlist_ttl_input_t m_CLK; + netlist_logic_input_t m_CLK; INT8 m_nextD; - netlist_ttl_output_t m_Q; - netlist_ttl_output_t m_QQ; + netlist_logic_output_t m_Q; + netlist_logic_output_t m_QQ; ATTR_HOT inline void newstate(const UINT8 stateQ, const UINT8 stateQQ); ); @@ -68,9 +68,9 @@ NETLIB_DEVICE(7474, public: NETLIB_NAME(7474sub) sub; - netlist_ttl_input_t m_D; - netlist_ttl_input_t m_CLRQ; - netlist_ttl_input_t m_PREQ; + netlist_logic_input_t m_D; + netlist_logic_input_t m_CLRQ; + netlist_logic_input_t m_PREQ; ); NETLIB_DEVICE(7474_dip, diff --git a/src/emu/netlist/devices/nld_7483.h b/src/emu/netlist/devices/nld_7483.h index d2da6ecc517..d9730d9f94e 100644 --- a/src/emu/netlist/devices/nld_7483.h +++ b/src/emu/netlist/devices/nld_7483.h @@ -45,23 +45,23 @@ NET_REGISTER_DEV(7483_dip, _name) NETLIB_DEVICE(7483, - netlist_ttl_input_t m_C0; - netlist_ttl_input_t m_A1; - netlist_ttl_input_t m_A2; - netlist_ttl_input_t m_A3; - netlist_ttl_input_t m_A4; - netlist_ttl_input_t m_B1; - netlist_ttl_input_t m_B2; - netlist_ttl_input_t m_B3; - netlist_ttl_input_t m_B4; + netlist_logic_input_t m_C0; + netlist_logic_input_t m_A1; + netlist_logic_input_t m_A2; + netlist_logic_input_t m_A3; + netlist_logic_input_t m_A4; + netlist_logic_input_t m_B1; + netlist_logic_input_t m_B2; + netlist_logic_input_t m_B3; + netlist_logic_input_t m_B4; UINT8 m_lastr; - netlist_ttl_output_t m_S1; - netlist_ttl_output_t m_S2; - netlist_ttl_output_t m_S3; - netlist_ttl_output_t m_S4; - netlist_ttl_output_t m_C4; + netlist_logic_output_t m_S1; + netlist_logic_output_t m_S2; + netlist_logic_output_t m_S3; + netlist_logic_output_t m_S4; + netlist_logic_output_t m_C4; ); diff --git a/src/emu/netlist/devices/nld_7486.h b/src/emu/netlist/devices/nld_7486.h index d9f8608be6f..6037c46bff1 100644 --- a/src/emu/netlist/devices/nld_7486.h +++ b/src/emu/netlist/devices/nld_7486.h @@ -41,9 +41,9 @@ NETLIB_DEVICE(7486, public: - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; - netlist_ttl_output_t m_Q; + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; + netlist_logic_output_t m_Q; ); #define TTL_7486_DIP(_name) \ diff --git a/src/emu/netlist/devices/nld_7490.h b/src/emu/netlist/devices/nld_7490.h index 4b4d84ff612..7dccdf01bda 100644 --- a/src/emu/netlist/devices/nld_7490.h +++ b/src/emu/netlist/devices/nld_7490.h @@ -73,18 +73,18 @@ NETLIB_DEVICE(7490, ATTR_HOT void update_outputs(); - netlist_ttl_input_t m_R1; - netlist_ttl_input_t m_R2; - netlist_ttl_input_t m_R91; - netlist_ttl_input_t m_R92; - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; + netlist_logic_input_t m_R1; + netlist_logic_input_t m_R2; + netlist_logic_input_t m_R91; + netlist_logic_input_t m_R92; + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; UINT8 m_cnt; UINT8 m_last_A; UINT8 m_last_B; - netlist_ttl_output_t m_Q[4]; + netlist_logic_output_t m_Q[4]; ); NETLIB_DEVICE_DERIVED(7490_dip, 7490, diff --git a/src/emu/netlist/devices/nld_7493.h b/src/emu/netlist/devices/nld_7493.h index 8c856048a7c..d18374e3e5c 100644 --- a/src/emu/netlist/devices/nld_7493.h +++ b/src/emu/netlist/devices/nld_7493.h @@ -70,15 +70,15 @@ NET_REGISTER_DEV(7493_dip, _name) NETLIB_SUBDEVICE(7493ff, - netlist_ttl_input_t m_I; - netlist_ttl_output_t m_Q; + netlist_logic_input_t m_I; + netlist_logic_output_t m_Q; UINT8 m_reset; ); NETLIB_DEVICE(7493, - netlist_ttl_input_t m_R1; - netlist_ttl_input_t m_R2; + netlist_logic_input_t m_R1; + netlist_logic_input_t m_R2; NETLIB_NAME(7493ff) A; NETLIB_NAME(7493ff) B; diff --git a/src/emu/netlist/devices/nld_82S16.h b/src/emu/netlist/devices/nld_82S16.h index 1d3c64e0ca6..e834094f09d 100644 --- a/src/emu/netlist/devices/nld_82S16.h +++ b/src/emu/netlist/devices/nld_82S16.h @@ -33,13 +33,13 @@ NETLIB_DEVICE(82S16, - netlist_ttl_input_t m_A[8]; - netlist_ttl_input_t m_CE1Q; - netlist_ttl_input_t m_CE2Q; - netlist_ttl_input_t m_CE3Q; - netlist_ttl_input_t m_WEQ; - netlist_ttl_input_t m_DIN; - netlist_ttl_output_t m_DOUTQ; + netlist_logic_input_t m_A[8]; + netlist_logic_input_t m_CE1Q; + netlist_logic_input_t m_CE2Q; + netlist_logic_input_t m_CE3Q; + netlist_logic_input_t m_WEQ; + netlist_logic_input_t m_DIN; + netlist_logic_output_t m_DOUTQ; //netlist_state_t m_ram; UINT8 m_ram[256]; diff --git a/src/emu/netlist/devices/nld_9310.h b/src/emu/netlist/devices/nld_9310.h index 95e3061bdca..9f555060030 100644 --- a/src/emu/netlist/devices/nld_9310.h +++ b/src/emu/netlist/devices/nld_9310.h @@ -63,10 +63,10 @@ NET_REGISTER_DEV(9310_dip, _name) NETLIB_SUBDEVICE(9310_subABCD, - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; - netlist_ttl_input_t m_C; - netlist_ttl_input_t m_D; + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; + netlist_logic_input_t m_C; + netlist_logic_input_t m_D; ATTR_HOT inline UINT8 read_ABCD() const { @@ -79,27 +79,27 @@ NETLIB_SUBDEVICE(9310_sub, ATTR_HOT inline void update_outputs_all(const UINT8 cnt, const netlist_time out_delay); ATTR_HOT inline void update_outputs(const UINT8 cnt); - netlist_ttl_input_t m_CLK; + netlist_logic_input_t m_CLK; UINT8 m_cnt; NETLIB_NAME(9310_subABCD) *m_ABCD; netlist_sig_t m_loadq; netlist_sig_t m_ent; - netlist_ttl_output_t m_QA; - netlist_ttl_output_t m_QB; - netlist_ttl_output_t m_QC; - netlist_ttl_output_t m_QD; - netlist_ttl_output_t m_RC; + netlist_logic_output_t m_QA; + netlist_logic_output_t m_QB; + netlist_logic_output_t m_QC; + netlist_logic_output_t m_QD; + netlist_logic_output_t m_RC; ); NETLIB_DEVICE(9310, NETLIB_NAME(9310_sub) sub; NETLIB_NAME(9310_subABCD) subABCD; - netlist_ttl_input_t m_ENP; - netlist_ttl_input_t m_ENT; - netlist_ttl_input_t m_CLRQ; - netlist_ttl_input_t m_LOADQ; + netlist_logic_input_t m_ENP; + netlist_logic_input_t m_ENT; + netlist_logic_input_t m_CLRQ; + netlist_logic_input_t m_LOADQ; ); NETLIB_DEVICE_DERIVED(9310_dip, 9310, diff --git a/src/emu/netlist/devices/nld_9312.h b/src/emu/netlist/devices/nld_9312.h index 055419808dc..32eabe68506 100644 --- a/src/emu/netlist/devices/nld_9312.h +++ b/src/emu/netlist/devices/nld_9312.h @@ -49,13 +49,13 @@ NETLIB_TRUTHTABLE(9312, 12, 2, 0); NETLIB_DEVICE(9312, public: // C, B, A, G,D0,D1,D2,D3,D4,D5,D6,D7| Y,YQ - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; - netlist_ttl_input_t m_C; - netlist_ttl_input_t m_G; - netlist_ttl_input_t m_D[8]; - netlist_ttl_output_t m_Y; - netlist_ttl_output_t m_YQ; + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; + netlist_logic_input_t m_C; + netlist_logic_input_t m_G; + netlist_logic_input_t m_D[8]; + netlist_logic_output_t m_Y; + netlist_logic_output_t m_YQ; UINT8 m_last_chan; UINT8 m_last_G; diff --git a/src/emu/netlist/devices/nld_9316.h b/src/emu/netlist/devices/nld_9316.h index 57de7efee51..ed1e1d4d5c3 100644 --- a/src/emu/netlist/devices/nld_9316.h +++ b/src/emu/netlist/devices/nld_9316.h @@ -67,10 +67,10 @@ NET_REGISTER_DEV(9316_dip, _name) NETLIB_SUBDEVICE(9316_subABCD, - netlist_ttl_input_t m_A; - netlist_ttl_input_t m_B; - netlist_ttl_input_t m_C; - netlist_ttl_input_t m_D; + netlist_logic_input_t m_A; + netlist_logic_input_t m_B; + netlist_logic_input_t m_C; + netlist_logic_input_t m_D; ATTR_HOT inline UINT8 read_ABCD() const { @@ -83,13 +83,13 @@ NETLIB_SUBDEVICE(9316_sub, ATTR_HOT inline void update_outputs_all(const UINT8 cnt, const netlist_time out_delay); ATTR_HOT inline void update_outputs(const UINT8 cnt); - netlist_ttl_input_t m_CLK; + netlist_logic_input_t m_CLK; - netlist_ttl_output_t m_QA; - netlist_ttl_output_t m_QB; - netlist_ttl_output_t m_QC; - netlist_ttl_output_t m_QD; - netlist_ttl_output_t m_RC; + netlist_logic_output_t m_QA; + netlist_logic_output_t m_QB; + netlist_logic_output_t m_QC; + netlist_logic_output_t m_QD; + netlist_logic_output_t m_RC; UINT8 m_cnt; NETLIB_NAME(9316_subABCD) *m_ABCD; @@ -101,10 +101,10 @@ NETLIB_SUBDEVICE(9316_sub, NETLIB_DEVICE(9316, NETLIB_NAME(9316_sub) sub; NETLIB_NAME(9316_subABCD) subABCD; - netlist_ttl_input_t m_ENP; - netlist_ttl_input_t m_ENT; - netlist_ttl_input_t m_CLRQ; - netlist_ttl_input_t m_LOADQ; + netlist_logic_input_t m_ENP; + netlist_logic_input_t m_ENT; + netlist_logic_input_t m_CLRQ; + netlist_logic_input_t m_LOADQ; ); NETLIB_DEVICE_DERIVED(9316_dip, 9316, diff --git a/src/emu/netlist/devices/nld_legacy.h b/src/emu/netlist/devices/nld_legacy.h index 5ace1a82b90..c82f172781d 100644 --- a/src/emu/netlist/devices/nld_legacy.h +++ b/src/emu/netlist/devices/nld_legacy.h @@ -30,18 +30,18 @@ // ---------------------------------------------------------------------------------------- NETLIB_DEVICE(nicRSFF, - netlist_ttl_input_t m_S; - netlist_ttl_input_t m_R; + netlist_logic_input_t m_S; + netlist_logic_input_t m_R; - netlist_ttl_output_t m_Q; - netlist_ttl_output_t m_QQ; + netlist_logic_output_t m_Q; + netlist_logic_output_t m_QQ; ); NETLIB_DEVICE_WITH_PARAMS(nicDelay, - netlist_ttl_input_t m_I; + netlist_logic_input_t m_I; - netlist_ttl_output_t m_Q; + netlist_logic_output_t m_Q; netlist_param_int_t m_L_to_H; netlist_param_int_t m_H_to_L; diff --git a/src/emu/netlist/devices/nld_signal.h b/src/emu/netlist/devices/nld_signal.h index e73e941d8c2..20242336307 100644 --- a/src/emu/netlist/devices/nld_signal.h +++ b/src/emu/netlist/devices/nld_signal.h @@ -98,8 +98,8 @@ public: } public: - netlist_ttl_input_t m_i[_numdev]; - netlist_ttl_output_t m_Q[1]; + netlist_logic_input_t m_i[_numdev]; + netlist_logic_output_t m_Q[1]; INT32 m_active; }; @@ -175,8 +175,8 @@ public: } public: - netlist_ttl_input_t m_i[2]; - netlist_ttl_output_t m_Q[1]; + netlist_logic_input_t m_i[2]; + netlist_logic_output_t m_Q[1]; INT32 m_active; }; diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h index cfadb192d6e..623cd0cd889 100644 --- a/src/emu/netlist/devices/nld_system.h +++ b/src/emu/netlist/devices/nld_system.h @@ -62,7 +62,7 @@ NETLIB_DEVICE_WITH_PARAMS(mainclock, public: - netlist_ttl_output_t m_Q; + netlist_logic_output_t m_Q; netlist_param_double_t m_freq; netlist_time m_inc; @@ -75,8 +75,8 @@ public: // ----------------------------------------------------------------------------- NETLIB_DEVICE_WITH_PARAMS(clock, - netlist_ttl_input_t m_feedback; - netlist_ttl_output_t m_Q; + netlist_logic_input_t m_feedback; + netlist_logic_output_t m_Q; netlist_param_double_t m_freq; netlist_time m_inc; @@ -87,8 +87,8 @@ NETLIB_DEVICE_WITH_PARAMS(clock, // ----------------------------------------------------------------------------- NETLIB_DEVICE_WITH_PARAMS(extclock, - netlist_ttl_input_t m_feedback; - netlist_ttl_output_t m_Q; + netlist_logic_input_t m_feedback; + netlist_logic_output_t m_Q; netlist_param_double_t m_freq; netlist_param_str_t m_pattern; @@ -105,7 +105,7 @@ NETLIB_DEVICE_WITH_PARAMS(extclock, // ----------------------------------------------------------------------------- NETLIB_DEVICE_WITH_PARAMS(ttl_input, - netlist_ttl_output_t m_Q; + netlist_logic_output_t m_Q; netlist_param_logic_t m_IN; ); @@ -230,7 +230,7 @@ public: netlist_param_double_t m_RON; netlist_param_double_t m_ROFF; - netlist_ttl_input_t m_I; + netlist_logic_input_t m_I; NETLIB_NAME(R) m_R; protected: @@ -320,7 +320,7 @@ protected: const netlist_logic_family_desc_t *m_logic_family; - netlist_ttl_input_t m_I; + netlist_logic_input_t m_I; private: }; diff --git a/src/emu/netlist/devices/nld_truthtable.h b/src/emu/netlist/devices/nld_truthtable.h index f645770ade8..549d9c1665e 100644 --- a/src/emu/netlist/devices/nld_truthtable.h +++ b/src/emu/netlist/devices/nld_truthtable.h @@ -233,8 +233,8 @@ public: } } - netlist_ttl_input_t m_i[m_NI]; - netlist_ttl_output_t m_Q[m_NO]; + netlist_logic_input_t m_i[m_NI]; + netlist_logic_output_t m_Q[m_NO]; private: diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c index ac876f72023..15f4852e16f 100644 --- a/src/emu/netlist/nl_base.c +++ b/src/emu/netlist/nl_base.c @@ -911,15 +911,6 @@ ATTR_COLD void netlist_logic_output_t::initial(const netlist_sig_t val) net().as_logic().initial(val); } -// ---------------------------------------------------------------------------------------- -// netlist_ttl_output_t -// ---------------------------------------------------------------------------------------- - -ATTR_COLD netlist_ttl_output_t::netlist_ttl_output_t() - : netlist_logic_output_t() -{ -} - // ---------------------------------------------------------------------------------------- // netlist_analog_output_t // ---------------------------------------------------------------------------------------- diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h index 809097956f6..1a3d5d1d6c2 100644 --- a/src/emu/netlist/nl_base.h +++ b/src/emu/netlist/nl_base.h @@ -566,17 +566,6 @@ public: }; -// ----------------------------------------------------------------------------- -// netlist_ttl_input_t -// ----------------------------------------------------------------------------- - -class netlist_ttl_input_t : public netlist_logic_input_t -{ -public: - ATTR_COLD netlist_ttl_input_t() - : netlist_logic_input_t() { } -}; - // ----------------------------------------------------------------------------- // netlist_analog_input_t // ----------------------------------------------------------------------------- @@ -817,14 +806,6 @@ private: nld_base_d_to_a_proxy *m_proxy; }; -class netlist_ttl_output_t : public netlist_logic_output_t -{ -public: - - ATTR_COLD netlist_ttl_output_t(); - -}; - class netlist_analog_output_t : public netlist_output_t { NETLIST_PREVENT_COPYING(netlist_analog_output_t) -- cgit v1.2.3-70-g09d2