chess*: un-public classes (nw)

This commit is contained in:
hap 2019-02-21 15:25:15 +01:00
parent 03493a0405
commit b82c6fad58
21 changed files with 48 additions and 44 deletions

View File

@ -153,7 +153,7 @@ void as12_state::as12(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(15250)); // active for 15.25us
TIMER(config, "irq_off").configure_periodic(FUNC(as12_state::irq_off<M6502_IRQ_LINE>), irq_period);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(as12_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_as12);
/* sound hardware */
@ -163,7 +163,7 @@ void as12_state::as12(machine_config &config)
/* cartridge */
generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat"));
cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this));
cartslot.set_device_load(device_image_load_delegate(&as12_state::device_image_load_scc_cartridge, this));
SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
}

View File

@ -179,7 +179,6 @@ public:
{ }
// machine drivers
void brc_base(machine_config &config);
void ubc(machine_config &config);
void vbrc(machine_config &config);
void bv3(machine_config &config);
@ -187,6 +186,8 @@ public:
virtual DECLARE_INPUT_CHANGED_MEMBER(reset_button) override;
private:
void brc_base(machine_config &config);
// devices/pointers
required_device<i8041_device> m_mcu;
required_device<i8243_device> m_i8243;
@ -436,7 +437,7 @@ void card_state::brc_base(machine_config &config)
m_i8243->p6_out_cb().set(FUNC(card_state::ioexp_port_w<2>));
m_i8243->p7_out_cb().set(FUNC(card_state::ioexp_port_w<3>));
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(card_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_vbrc);
}

View File

@ -232,7 +232,7 @@ void ccx_state::ccx(machine_config &config)
m_ppi8255->tri_pb_callback().set_constant(0);
m_ppi8255->out_pc_callback().set(FUNC(ccx_state::ppi_portc_w));
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(ccx_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_cc10);
/* sound hardware */

View File

@ -199,7 +199,7 @@ void bcc_state::bkc(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &bcc_state::main_map);
m_maincpu->set_addrmap(AS_IO, &bcc_state::main_io);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(bcc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_bkc);
}

View File

@ -152,7 +152,7 @@ void chesster_state::chesster(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(2600)); // active for 2.6us
TIMER(config, "irq_off").configure_periodic(FUNC(chesster_state::irq_off<M6502_IRQ_LINE>), irq_period);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(chesster_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_chesster);
/* sound hardware */

View File

@ -515,7 +515,7 @@ void csc_state::csc(machine_config &config)
m_pia[1]->writepb_handler().set(FUNC(csc_state::pia1_pb_w));
m_pia[1]->ca2_handler().set(FUNC(csc_state::pia1_ca2_w));
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(csc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_csc);
/* sound hardware */
@ -556,7 +556,7 @@ void csc_state::rsc(machine_config &config)
m_pia[0]->ca2_handler().set(FUNC(csc_state::pia0_ca2_w));
m_pia[0]->cb2_handler().set(FUNC(csc_state::pia0_cb2_w));
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(csc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_rsc_v2);
/* sound hardware */

View File

@ -148,7 +148,7 @@ void dsc_state::dsc(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_usec(41)); // active for 41us
TIMER(config, "irq_off").configure_periodic(FUNC(dsc_state::irq_off<INPUT_LINE_IRQ0>), irq_period);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(dsc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_dsc);
/* sound hardware */

View File

@ -260,7 +260,7 @@ void desdis_state::fdes2100d(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(15250)); // active for 15.25us
TIMER(config, "irq_off").configure_periodic(FUNC(desdis_state::irq_off<M6502_IRQ_LINE>), irq_period);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(desdis_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_desdis);
/* sound hardware */
@ -289,7 +289,7 @@ void desmas_state::fdes2265(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(6000)); // active for 6us
TIMER(config, "irq_off").configure_periodic(FUNC(desmas_state::irq_off<M68K_IRQ_4>), irq_period);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(desmas_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_desdis_68kr);
/* sound hardware */

View File

@ -180,7 +180,6 @@ public:
{ }
// machine drivers
void eag_base(machine_config &config);
void eag(machine_config &config);
void eagv5(machine_config &config);
void eagv7(machine_config &config);
@ -191,6 +190,8 @@ public:
void init_eag();
protected:
void eag_base(machine_config &config);
// devices/pointers
optional_device<ram_device> m_ram;
@ -445,7 +446,7 @@ void excel68k_state::fex68k(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(1528)); // active for 1.525us
TIMER(config, "irq_off").configure_periodic(FUNC(excel68k_state::irq_off<M68K_IRQ_2>), irq_period);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(excel68k_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_ex_68k);
/* sound hardware */
@ -484,7 +485,7 @@ void eag_state::eag_base(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(eag_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_eag_68k);
/* sound hardware */
@ -494,7 +495,7 @@ void eag_state::eag_base(machine_config &config)
/* cartridge */
generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat"));
cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this));
cartslot.set_device_load(device_image_load_delegate(&eag_state::device_image_load_scc_cartridge, this));
SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
}

View File

@ -65,7 +65,6 @@ public:
{ }
// machine drivers
void eas_base(machine_config &config);
void eas(machine_config &config);
void eag(machine_config &config);
void pc(machine_config &config);
@ -73,6 +72,8 @@ public:
template <int Language> void init_eag();
private:
void eas_base(machine_config &config);
// devices/pointers
optional_device<i8255_device> m_ppi8255;
@ -315,7 +316,7 @@ void elite_state::eas_base(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_hz(38.4_kHz_XTAL*2)); // edge!
TIMER(config, "irq_off").configure_periodic(FUNC(elite_state::irq_off<M6502_IRQ_LINE>), irq_period);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(elite_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_eas);
/* sound hardware */
@ -329,7 +330,7 @@ void elite_state::eas_base(machine_config &config)
/* cartridge */
generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat"));
cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this));
cartslot.set_device_load(device_image_load_delegate(&elite_state::device_image_load_scc_cartridge, this));
SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
}

View File

@ -348,7 +348,7 @@ void excel_state::fexcel(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(15250)); // active for 15.25us
TIMER(config, "irq_off").configure_periodic(FUNC(excel_state::irq_off<M6502_IRQ_LINE>), irq_period);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(excel_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_ex);
/* sound hardware */

View File

@ -109,7 +109,7 @@ void phantom_state::fphantom(machine_config &config)
m_maincpu->set_periodic_int(FUNC(phantom_state::irq0_line_hold), attotime::from_hz(600)); // guessed
m_maincpu->set_addrmap(AS_PROGRAM, &phantom_state::main_map);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(phantom_state::display_decay_tick), attotime::from_msec(1));
//config.set_default_layout(layout_fidel_phantom);
/* sound hardware */

View File

@ -181,7 +181,7 @@ void sc12_state::sc12(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_nsec(15250)); // active for 15.25us
TIMER(config, "irq_off").configure_periodic(FUNC(sc12_state::irq_off<M6502_IRQ_LINE>), irq_period);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(sc12_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_sc12);
/* sound hardware */
@ -191,7 +191,7 @@ void sc12_state::sc12(machine_config &config)
/* cartridge */
generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat"));
cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this));
cartslot.set_device_load(device_image_load_delegate(&sc12_state::device_image_load_scc_cartridge, this));
SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
}

View File

@ -185,7 +185,7 @@ void sc6_state::sc6(machine_config &config)
m_maincpu->t0_in_cb().set(FUNC(sc6_state::input6_r));
m_maincpu->t1_in_cb().set(FUNC(sc6_state::input7_r));
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(sc6_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_sc6);
/* sound hardware */

View File

@ -126,7 +126,7 @@ void scc_state::scc(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &scc_state::main_map);
m_maincpu->set_addrmap(AS_IO, &scc_state::main_io);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(scc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_sc8);
/* sound hardware */

View File

@ -218,7 +218,7 @@ void sc9_state::sc9d(machine_config &config)
m_irq_on->set_start_delay(irq_period - attotime::from_usec(41)); // active for 41us
TIMER(config, "irq_off").configure_periodic(FUNC(sc9_state::irq_off<M6502_IRQ_LINE>), irq_period);
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(sc9_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_sc9);
/* sound hardware */
@ -228,7 +228,7 @@ void sc9_state::sc9d(machine_config &config)
/* cartridge */
generic_cartslot_device &cartslot(GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "fidel_scc", "bin,dat"));
cartslot.set_device_load(device_image_load_delegate(&fidelbase_state::device_image_load_scc_cartridge, this));
cartslot.set_device_load(device_image_load_delegate(&sc9_state::device_image_load_scc_cartridge, this));
SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
}

View File

@ -304,7 +304,7 @@ void vcc_state::vcc(machine_config &config)
m_ppi8255->in_pc_callback().set(FUNC(vcc_state::ppi_portc_r));
m_ppi8255->out_pc_callback().set(FUNC(vcc_state::ppi_portc_w));
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(vcc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_vcc);
/* sound hardware */

View File

@ -375,7 +375,7 @@ void vsc_state::vsc(machine_config &config)
m_z80pio->in_pb_callback().set(FUNC(vsc_state::pio_portb_r));
m_z80pio->out_pb_callback().set(FUNC(vsc_state::pio_portb_w));
TIMER(config, "display_decay").configure_periodic(FUNC(fidelbase_state::display_decay_tick), attotime::from_msec(1));
TIMER(config, "display_decay").configure_periodic(FUNC(vsc_state::display_decay_tick), attotime::from_msec(1));
config.set_default_layout(layout_fidel_vsc);
/* sound hardware */

View File

@ -28,6 +28,7 @@ public:
m_display_maxx(0)
{ }
protected:
// devices/pointers
optional_ioport_array<16> m_inp_matrix; // max 16
output_finder<0x20, 0x20> m_out_x;
@ -57,7 +58,6 @@ public:
void set_display_segmask(u32 digits, u32 mask);
void display_matrix(int maxx, int maxy, u32 setx, u32 sety, bool update = true);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
};

View File

@ -38,6 +38,13 @@ public:
m_cart(*this, "cartslot")
{ }
// in case reset button is directly tied to maincpu reset pin
virtual DECLARE_INPUT_CHANGED_MEMBER(reset_button) { m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); }
// speech rom language, normally 0=English, 1=German, 2=French, 3=Spanish
template<int Language> void init_language() { m_language = Language; }
protected:
// devices/pointers
required_device<cpu_device> m_maincpu;
optional_device<timer_device> m_irq_on;
@ -49,20 +56,15 @@ public:
optional_device<dac_bit_interface> m_dac;
optional_device<generic_slot_device> m_cart;
// cross-compatible cartridges(opening book modules)
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(scc_cartridge);
virtual DECLARE_READ8_MEMBER(cartridge_r);
// in case reset button is directly tied to maincpu reset pin
virtual DECLARE_INPUT_CHANGED_MEMBER(reset_button) { m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); }
// speech rom language, normally 0=English, 1=German, 2=French, 3=Spanish
template<int Language> void init_language() { m_language = Language; }
int m_language;
u8 m_speech_data;
u8 m_speech_bank; // speech rom higher address bits
// cross-compatible cartridges(opening book modules)
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(scc_cartridge);
virtual DECLARE_READ8_MEMBER(cartridge_r);
// periodic interrupts
template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(Line, ASSERT_LINE); }
template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(Line, CLEAR_LINE); }
@ -74,7 +76,6 @@ public:
void div_trampoline(address_map &map);
u16 m_div_status;
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
};

View File

@ -33,6 +33,10 @@ public:
m_lcd(*this, "hd44780")
{ }
// in case reset button is directly tied to maincpu reset pin
virtual DECLARE_INPUT_CHANGED_MEMBER(reset_button) { m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); }
protected:
// devices/pointers
required_device<cpu_device> m_maincpu;
optional_device<timer_device> m_irq_on;
@ -41,9 +45,6 @@ public:
optional_device<dac_bit_interface> m_dac;
optional_device<hd44780_device> m_lcd;
// in case reset button is directly tied to maincpu reset pin
virtual DECLARE_INPUT_CHANGED_MEMBER(reset_button) { m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); }
// periodic interrupts
template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(Line, ASSERT_LINE); }
template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(Line, CLEAR_LINE); }
@ -54,7 +55,6 @@ public:
u8 m_lcd_control;
u8 m_lcd_data;
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
};