From 80c9f0496fd38a1ff2afba40ee4a4e7d200ac3a0 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Wed, 14 Feb 2018 19:11:44 +0100 Subject: devices/bus: made some methods private now that it's possible (nw) --- src/devices/bus/a2bus/a2applicard.h | 13 +++--- src/devices/bus/a2bus/a2softcard.h | 12 +++--- src/devices/bus/a2bus/a2themill.h | 12 +++--- src/devices/bus/a2bus/pc_xporter.h | 51 +++++++++++------------ src/devices/bus/a2bus/transwarp.h | 12 +++--- src/devices/bus/abcbus/db411223.h | 5 ++- src/devices/bus/abcbus/fd2.h | 9 ++-- src/devices/bus/abcbus/hdc.h | 5 ++- src/devices/bus/abcbus/lux10828.h | 15 +++---- src/devices/bus/abcbus/lux21046.h | 24 +++++------ src/devices/bus/abcbus/lux21056.h | 31 +++++++------- src/devices/bus/abcbus/unidisk.h | 5 ++- src/devices/bus/abckb/abc77.h | 16 ++++---- src/devices/bus/abckb/abc99.h | 23 ++++++----- src/devices/bus/adamnet/ddp.h | 17 ++++---- src/devices/bus/adamnet/fdc.h | 20 ++++----- src/devices/bus/adamnet/kb.h | 24 ++++++----- src/devices/bus/adamnet/printer.h | 21 +++++----- src/devices/bus/adamnet/spi.h | 13 +++--- src/devices/bus/amiga/keyboard/a500.h | 36 ++++++++-------- src/devices/bus/amiga/zorro/a2232.h | 45 ++++++++++---------- src/devices/bus/amiga/zorro/buddha.h | 33 ++++++++------- src/devices/bus/bbc/tube/tube_6502.h | 9 ++-- src/devices/bus/bbc/tube/tube_65c102.h | 9 ++-- src/devices/bus/bbc/tube/tube_80186.h | 5 ++- src/devices/bus/bbc/tube/tube_80286.h | 11 ++--- src/devices/bus/bbc/tube/tube_arm.h | 9 ++-- src/devices/bus/bbc/tube/tube_casper.h | 3 +- src/devices/bus/bbc/tube/tube_z80.h | 15 +++---- src/devices/bus/bbc/tube/tube_zep100.h | 23 ++++++----- src/devices/bus/c64/cpm.h | 12 +++--- src/devices/bus/c64/fcc.h | 9 ++-- src/devices/bus/c64/multiscreen.h | 3 +- src/devices/bus/c64/supercpu.h | 3 +- src/devices/bus/cbm2/hrg.h | 8 +++- src/devices/bus/cbmiec/c1541.h | 17 ++++---- src/devices/bus/cbmiec/c1571.h | 3 +- src/devices/bus/cbmiec/c1581.h | 3 +- src/devices/bus/cbmiec/cmdhd.h | 8 ++-- src/devices/bus/cbmiec/fd2000.h | 8 +++- src/devices/bus/cbmiec/interpod.h | 4 +- src/devices/bus/cbmiec/serialbox.h | 3 +- src/devices/bus/cbmiec/vic1515.h | 6 ++- src/devices/bus/cbmiec/vic1520.h | 4 +- src/devices/bus/cbus/mpu_pc98.h | 4 +- src/devices/bus/centronics/comxpl80.h | 16 ++++---- src/devices/bus/centronics/epson_ex800.h | 20 ++++----- src/devices/bus/centronics/epson_lx800.h | 13 +++--- src/devices/bus/centronics/epson_lx810l.h | 18 ++++---- src/devices/bus/centronics/nec_p72.h | 3 +- src/devices/bus/cgenie/expansion/floppy.h | 16 ++++---- src/devices/bus/compis/hrg.h | 6 ++- src/devices/bus/dmv/k230.h | 29 ++++++------- src/devices/bus/ecbbus/grip.h | 25 ++++++------ src/devices/bus/econet/e01.h | 36 ++++++++-------- src/devices/bus/einstein/pipe/silicon_disc.h | 10 ++--- src/devices/bus/epson_sio/pf10.h | 26 ++++++------ src/devices/bus/epson_sio/tf20.h | 14 +++---- src/devices/bus/hp80_io/82937.h | 18 ++++---- src/devices/bus/hp9845_io/98034.h | 25 ++++++------ src/devices/bus/hp9845_io/98035.h | 25 ++++++------ src/devices/bus/ieee488/c2031.h | 3 +- src/devices/bus/ieee488/c8280.h | 10 ++--- src/devices/bus/ieee488/hardbox.h | 5 ++- src/devices/bus/ieee488/hp9895.h | 61 ++++++++++++++-------------- src/devices/bus/ieee488/shark.h | 5 ++- src/devices/bus/ieee488/softbox.h | 9 ++-- src/devices/bus/imi7000/imi5000h.h | 5 ++- src/devices/bus/interpro/sr/gt.h | 34 ++++++++-------- src/devices/bus/interpro/sr/sr.h | 4 +- src/devices/bus/isa/aha1542.h | 3 +- src/devices/bus/isa/dectalk.h | 25 ++++++------ src/devices/bus/isa/finalchs.h | 19 +++++---- src/devices/bus/isa/ibm_mfc.h | 11 ++--- src/devices/bus/isa/ide.h | 12 +++--- src/devices/bus/isa/mcd.h | 14 ++++--- src/devices/bus/isa/num9rev.h | 25 ++++++------ src/devices/bus/isa/pgc.h | 19 +++++---- src/devices/bus/isa/sb16.h | 35 ++++++++-------- src/devices/bus/isa/stereo_fx.h | 45 ++++++++++---------- src/devices/bus/isa/wdxt_gen.h | 3 +- src/devices/bus/kc/d004.h | 22 +++++----- src/devices/bus/megadrive/svp.h | 28 +++++++------ src/devices/bus/msx_cart/bm_012.h | 3 +- src/devices/bus/msx_cart/konami.h | 17 ++++---- src/devices/bus/msx_cart/moonsound.h | 14 +++---- src/devices/bus/newbrain/fdc.h | 13 +++--- src/devices/bus/odyssey2/chess.h | 5 ++- src/devices/bus/oricext/jasmin.h | 15 ++++--- src/devices/bus/oricext/microdisc.h | 10 +++-- src/devices/bus/pc_kbd/iskr1030.h | 9 ++-- src/devices/bus/pc_kbd/keytro.h | 33 +++++++-------- src/devices/bus/pc_kbd/msnat.h | 24 ++++++----- src/devices/bus/pet/hsg.h | 25 +++++++----- src/devices/bus/pet/superpet.h | 9 ++-- src/devices/bus/plus4/c1551.h | 9 ++-- src/devices/bus/psi_kbd/ergoline.h | 10 ++--- src/devices/bus/s100/djdma.h | 6 ++- src/devices/bus/scsi/s1410.h | 10 +++-- src/devices/bus/snes/event.h | 29 ++++++------- src/devices/bus/snes/sa1.h | 27 ++++++------ src/devices/bus/snes/sfx.h | 22 +++++----- src/devices/bus/snes/sgb.h | 20 +++++---- src/devices/bus/snes/upd.h | 42 +++++++++++-------- src/devices/bus/spc1000/fdd.h | 20 ++++----- src/devices/bus/tiki100/8088.h | 11 ++--- src/devices/bus/vcs/harmony_melody.h | 16 ++++---- src/devices/bus/vme/vme_fccpu20.h | 12 +++--- src/devices/bus/vme/vme_fcisio.h | 15 +++---- src/devices/bus/vme/vme_fcscsi.h | 27 ++++++------ src/devices/bus/vme/vme_hcpu30.h | 9 ++-- src/devices/bus/vme/vme_mvme350.h | 4 +- src/devices/bus/wangpc/rtc.h | 5 ++- src/devices/bus/wangpc/tig.h | 5 ++- src/devices/bus/wangpc/wdc.h | 28 ++++++------- 115 files changed, 968 insertions(+), 854 deletions(-) diff --git a/src/devices/bus/a2bus/a2applicard.h b/src/devices/bus/a2bus/a2applicard.h index 395d5fa0850..90bf01ddece 100644 --- a/src/devices/bus/a2bus/a2applicard.h +++ b/src/devices/bus/a2bus/a2applicard.h @@ -27,13 +27,9 @@ public: // construction/destruction a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( dma_r ); - DECLARE_WRITE8_MEMBER( dma_w ); DECLARE_READ8_MEMBER( z80_io_r ); DECLARE_WRITE8_MEMBER( z80_io_w ); - void z80_io(address_map &map); - void z80_mem(address_map &map); protected: a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -47,14 +43,19 @@ protected: virtual void write_c0nx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; - required_device m_z80; - private: + required_device m_z80; bool m_bROMAtZ80Zero; bool m_z80stat, m_6502stat; uint8_t m_toz80, m_to6502; uint8_t m_z80ram[64*1024]; uint8_t *m_z80rom; + + DECLARE_READ8_MEMBER( dma_r ); + DECLARE_WRITE8_MEMBER( dma_w ); + + void z80_io(address_map &map); + void z80_mem(address_map &map); }; // device type definition diff --git a/src/devices/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h index 8c9d2aad6cd..e206cc805ae 100644 --- a/src/devices/bus/a2bus/a2softcard.h +++ b/src/devices/bus/a2bus/a2softcard.h @@ -25,10 +25,6 @@ public: // construction/destruction a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( dma_r ); - DECLARE_WRITE8_MEMBER( dma_w ); - - void z80_mem(address_map &map); protected: a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -40,11 +36,15 @@ protected: virtual void write_cnxx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; - required_device m_z80; - private: + required_device m_z80; bool m_bEnabled; bool m_FirstZ80Boot; + + DECLARE_READ8_MEMBER( dma_r ); + DECLARE_WRITE8_MEMBER( dma_w ); + + void z80_mem(address_map &map); }; // device type definition diff --git a/src/devices/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h index f9c9d622564..113ccdbb9ec 100644 --- a/src/devices/bus/a2bus/a2themill.h +++ b/src/devices/bus/a2bus/a2themill.h @@ -27,10 +27,6 @@ public: // construction/destruction a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( dma_r ); - DECLARE_WRITE8_MEMBER( dma_w ); - - void m6809_mem(address_map &map); protected: a2bus_themill_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -43,13 +39,17 @@ protected: virtual void write_c0nx(uint8_t offset, uint8_t data) override; virtual bool take_c800() override; - required_device m_6809; - private: + required_device m_6809; bool m_bEnabled; bool m_flipAddrSpace; bool m_6809Mode; uint8_t m_status; + + DECLARE_READ8_MEMBER( dma_r ); + DECLARE_WRITE8_MEMBER( dma_w ); + + void m6809_mem(address_map &map); }; // device type definition diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h index d1419887155..a17ba3944f1 100644 --- a/src/devices/bus/a2bus/pc_xporter.h +++ b/src/devices/bus/a2bus/pc_xporter.h @@ -40,6 +40,13 @@ public: DECLARE_READ16_MEMBER(pc_bios_r); +protected: + a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_add_mconfig(machine_config &config) override; + // overrides of standard a2bus slot functions virtual uint8_t read_c0nx(uint8_t offset) override; virtual void write_c0nx(uint8_t offset, uint8_t data) override; @@ -48,23 +55,7 @@ public: virtual uint8_t read_c800(uint16_t offset) override; virtual void write_c800(uint16_t offset, uint8_t data) override; - DECLARE_READ8_MEMBER( kbd_6502_r ); - DECLARE_WRITE8_MEMBER( kbd_6502_w ); - - DECLARE_WRITE_LINE_MEMBER( pc_speaker_set_spkrdata ); - - DECLARE_WRITE8_MEMBER(pc_page_w); - DECLARE_WRITE8_MEMBER(nmi_enable_w); - - void pc_io(address_map &map); - void pc_map(address_map &map); -protected: - a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - virtual void device_start() override; - virtual void device_reset() override; - virtual void device_add_mconfig(machine_config &config) override; - +private: required_device m_v30; required_device m_pic8259; required_device m_dma8237; @@ -83,7 +74,15 @@ protected: uint8_t m_nmi_enabled; -private: + uint8_t m_ram[768*1024]; + uint8_t m_c800_ram[0x400]; + uint8_t m_regs[0x400]; + uint32_t m_offset; + address_space *m_pcmem_space, *m_pcio_space; + bool m_reset_during_halt; + + uint8_t m_6845_reg; + // interface to the keyboard DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w ); DECLARE_WRITE_LINE_MEMBER( keyboard_data_w ); @@ -107,16 +106,18 @@ private: DECLARE_WRITE_LINE_MEMBER( pc_dack2_w ); DECLARE_WRITE_LINE_MEMBER( pc_dack3_w ); - uint8_t m_ram[768*1024]; - uint8_t m_c800_ram[0x400]; - uint8_t m_regs[0x400]; - uint32_t m_offset; - address_space *m_pcmem_space, *m_pcio_space; - bool m_reset_during_halt; + DECLARE_READ8_MEMBER( kbd_6502_r ); + DECLARE_WRITE8_MEMBER( kbd_6502_w ); - uint8_t m_6845_reg; + DECLARE_WRITE_LINE_MEMBER( pc_speaker_set_spkrdata ); + + DECLARE_WRITE8_MEMBER(pc_page_w); + DECLARE_WRITE8_MEMBER(nmi_enable_w); void pc_select_dma_channel(int channel, bool state); + + void pc_io(address_map &map); + void pc_map(address_map &map); }; // device type definition diff --git a/src/devices/bus/a2bus/transwarp.h b/src/devices/bus/a2bus/transwarp.h index 98d2e842506..8b42aefa7e5 100644 --- a/src/devices/bus/a2bus/transwarp.h +++ b/src/devices/bus/a2bus/transwarp.h @@ -25,12 +25,6 @@ public: // construction/destruction a2bus_transwarp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual const tiny_rom_entry *device_rom_region() const override; - - DECLARE_READ8_MEMBER( dma_r ); - DECLARE_WRITE8_MEMBER( dma_w ); - - void m65c02_mem(address_map &map); protected: a2bus_transwarp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -40,6 +34,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual const tiny_rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions virtual bool take_c800() override; @@ -53,6 +48,11 @@ private: required_region_ptr m_rom; required_ioport m_dsw1, m_dsw2; + DECLARE_READ8_MEMBER( dma_r ); + DECLARE_WRITE8_MEMBER( dma_w ); + + void m65c02_mem(address_map &map); + void hit_slot(int slot); }; diff --git a/src/devices/bus/abcbus/db411223.h b/src/devices/bus/abcbus/db411223.h index 56533f84fef..e126d9cfb18 100644 --- a/src/devices/bus/abcbus/db411223.h +++ b/src/devices/bus/abcbus/db411223.h @@ -29,8 +29,6 @@ public: // construction/destruction databoard_4112_23_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void databoard_4112_23_io(address_map &map); - void databoard_4112_23_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -53,6 +51,9 @@ private: required_device m_maincpu; bool m_cs; + + void databoard_4112_23_io(address_map &map); + void databoard_4112_23_mem(address_map &map); }; diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h index fbd4e4c48c2..dfe8b3e66e4 100644 --- a/src/devices/bus/abcbus/fd2.h +++ b/src/devices/bus/abcbus/fd2.h @@ -33,10 +33,6 @@ public: // construction/destruction abc_fd2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( status_w ); - - void abc_fd2_io(address_map &map); - void abc_fd2_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -61,8 +57,13 @@ private: DECLARE_READ8_MEMBER( pio_pb_r ); DECLARE_WRITE8_MEMBER( pio_pb_w ); + DECLARE_WRITE8_MEMBER( status_w ); + DECLARE_FLOPPY_FORMATS( floppy_formats ); + void abc_fd2_io(address_map &map); + void abc_fd2_mem(address_map &map); + required_device m_maincpu; required_device m_pio; required_device m_fdc; diff --git a/src/devices/bus/abcbus/hdc.h b/src/devices/bus/abcbus/hdc.h index c9cde8b8ab5..a8a1c6ca17b 100644 --- a/src/devices/bus/abcbus/hdc.h +++ b/src/devices/bus/abcbus/hdc.h @@ -31,8 +31,6 @@ public: // construction/destruction abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void abc_hdc_io(address_map &map); - void abc_hdc_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -47,6 +45,9 @@ protected: private: required_device m_maincpu; + + void abc_hdc_io(address_map &map); + void abc_hdc_mem(address_map &map); }; diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h index 62ab005715b..22a9959402d 100644 --- a/src/devices/bus/abcbus/lux10828.h +++ b/src/devices/bus/abcbus/lux10828.h @@ -55,13 +55,6 @@ public: // construction/destruction luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( ctrl_w ); - DECLARE_WRITE8_MEMBER( status_w ); - DECLARE_READ8_MEMBER( fdc_r ); - DECLARE_WRITE8_MEMBER( fdc_w ); - - void luxor_55_10828_io(address_map &map); - void luxor_55_10828_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -89,8 +82,16 @@ private: DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + DECLARE_WRITE8_MEMBER( ctrl_w ); + DECLARE_WRITE8_MEMBER( status_w ); + DECLARE_READ8_MEMBER( fdc_r ); + DECLARE_WRITE8_MEMBER( fdc_w ); + DECLARE_FLOPPY_FORMATS( floppy_formats ); + void luxor_55_10828_io(address_map &map); + void luxor_55_10828_mem(address_map &map); + required_device m_maincpu; required_device m_pio; required_device m_fdc; diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index 7b6f270547b..57e60ccabb9 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -54,18 +54,6 @@ public: // construction/destruction luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_READ8_MEMBER( out_r ); - DECLARE_WRITE8_MEMBER( inp_w ); - DECLARE_WRITE8_MEMBER( _4b_w ); - DECLARE_WRITE8_MEMBER( _9b_w ); - DECLARE_WRITE8_MEMBER( _8a_w ); - DECLARE_READ8_MEMBER( _9a_r ); - - DECLARE_FLOPPY_FORMATS( floppy_formats ); - - void luxor_55_21046_io(address_map &map); - void luxor_55_21046_mem(address_map &map); protected: luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -88,6 +76,8 @@ protected: virtual void abcbus_c3(uint8_t data) override; virtual void abcbus_c4(uint8_t data) override; + DECLARE_FLOPPY_FORMATS( floppy_formats ); + private: DECLARE_WRITE_LINE_MEMBER( dma_int_w ); @@ -98,6 +88,16 @@ private: DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); + DECLARE_READ8_MEMBER( out_r ); + DECLARE_WRITE8_MEMBER( inp_w ); + DECLARE_WRITE8_MEMBER( _4b_w ); + DECLARE_WRITE8_MEMBER( _9b_w ); + DECLARE_WRITE8_MEMBER( _8a_w ); + DECLARE_READ8_MEMBER( _9a_r ); + + void luxor_55_21046_io(address_map &map); + void luxor_55_21046_mem(address_map &map); + required_device m_maincpu; required_device m_dma; required_device m_fdc; diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h index 544e2c786fa..78e4b0d2b33 100644 --- a/src/devices/bus/abcbus/lux21056.h +++ b/src/devices/bus/abcbus/lux21056.h @@ -32,21 +32,6 @@ public: // construction/destruction luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( sasi_status_r ); - DECLARE_WRITE8_MEMBER( stat_w ); - DECLARE_READ8_MEMBER( out_r ); - DECLARE_WRITE8_MEMBER( inp_w ); - DECLARE_READ8_MEMBER( sasi_data_r ); - DECLARE_WRITE8_MEMBER( sasi_data_w ); - DECLARE_READ8_MEMBER( rdy_reset_r ); - DECLARE_WRITE8_MEMBER( rdy_reset_w ); - DECLARE_READ8_MEMBER( sasi_sel_r ); - DECLARE_WRITE8_MEMBER( sasi_sel_w ); - DECLARE_READ8_MEMBER( sasi_rst_r ); - DECLARE_WRITE8_MEMBER( sasi_rst_w ); - - void luxor_55_21056_io(address_map &map); - void luxor_55_21056_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -79,6 +64,22 @@ private: DECLARE_WRITE_LINE_MEMBER( write_sasi_msg ); DECLARE_WRITE_LINE_MEMBER( write_sasi_bsy ); + DECLARE_READ8_MEMBER( sasi_status_r ); + DECLARE_WRITE8_MEMBER( stat_w ); + DECLARE_READ8_MEMBER( out_r ); + DECLARE_WRITE8_MEMBER( inp_w ); + DECLARE_READ8_MEMBER( sasi_data_r ); + DECLARE_WRITE8_MEMBER( sasi_data_w ); + DECLARE_READ8_MEMBER( rdy_reset_r ); + DECLARE_WRITE8_MEMBER( rdy_reset_w ); + DECLARE_READ8_MEMBER( sasi_sel_r ); + DECLARE_WRITE8_MEMBER( sasi_sel_w ); + DECLARE_READ8_MEMBER( sasi_rst_r ); + DECLARE_WRITE8_MEMBER( sasi_rst_w ); + + void luxor_55_21056_io(address_map &map); + void luxor_55_21056_mem(address_map &map); + required_device m_maincpu; required_device m_dma; required_device m_sasibus; diff --git a/src/devices/bus/abcbus/unidisk.h b/src/devices/bus/abcbus/unidisk.h index 1b26b503054..27cd7db78f2 100644 --- a/src/devices/bus/abcbus/unidisk.h +++ b/src/devices/bus/abcbus/unidisk.h @@ -29,8 +29,6 @@ public: // construction/destruction unidisk_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void unidisk_io(address_map &map); - void unidisk_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -53,6 +51,9 @@ private: required_device m_maincpu; bool m_cs; + + void unidisk_io(address_map &map); + void unidisk_mem(address_map &map); }; diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h index 39ee020cda9..95e740dd01f 100644 --- a/src/devices/bus/abckb/abc77.h +++ b/src/devices/bus/abckb/abc77.h @@ -32,15 +32,8 @@ public: // construction/destruction abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // abc_keyboard_interface overrides - virtual void txd_w(int state) override; - DECLARE_INPUT_CHANGED_MEMBER( keyboard_reset ); - DECLARE_WRITE8_MEMBER( j3_w ); - - void abc77_io(address_map &map); - void abc77_map(address_map &map); protected: abc77_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -54,6 +47,10 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; + // abc_keyboard_interface overrides + virtual void txd_w(int state) override; + +private: enum { TIMER_SERIAL, @@ -83,11 +80,14 @@ protected: emu_timer *m_serial_timer; emu_timer *m_reset_timer; -private: DECLARE_READ8_MEMBER( p1_r ); DECLARE_WRITE8_MEMBER( p2_w ); DECLARE_READ_LINE_MEMBER( t1_r ); DECLARE_WRITE_LINE_MEMBER( prog_w ); + DECLARE_WRITE8_MEMBER( j3_w ); + + void abc77_io(address_map &map); + void abc77_map(address_map &map); }; diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h index 06d4c42e40b..5a997fc3858 100644 --- a/src/devices/bus/abckb/abc99.h +++ b/src/devices/bus/abckb/abc99.h @@ -31,19 +31,8 @@ public: // construction/destruction abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // abc_keyboard_interface overrides - virtual void txd_w(int state) override; - DECLARE_INPUT_CHANGED_MEMBER( keyboard_reset ); - DECLARE_WRITE8_MEMBER( z2_led_w ); - DECLARE_READ8_MEMBER( z5_p1_r ); - DECLARE_WRITE8_MEMBER( z5_p2_w ); - DECLARE_READ8_MEMBER( z5_t1_r ); - - void abc99_z2_io(address_map &map); - void abc99_z2_mem(address_map &map); - void abc99_z5_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -55,6 +44,9 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; + // abc_keyboard_interface overrides + virtual void txd_w(int state) override; + private: enum { @@ -88,6 +80,15 @@ private: DECLARE_READ_LINE_MEMBER( z2_t0_r ); DECLARE_READ_LINE_MEMBER( z2_t1_r ); + DECLARE_WRITE8_MEMBER( z2_led_w ); + DECLARE_READ8_MEMBER( z5_p1_r ); + DECLARE_WRITE8_MEMBER( z5_p2_w ); + DECLARE_READ8_MEMBER( z5_t1_r ); + + void abc99_z2_io(address_map &map); + void abc99_z2_mem(address_map &map); + void abc99_z5_mem(address_map &map); + emu_timer *m_serial_timer; emu_timer *m_mouse_timer; diff --git a/src/devices/bus/adamnet/ddp.h b/src/devices/bus/adamnet/ddp.h index 30953cdcceb..2fc77dfb73d 100644 --- a/src/devices/bus/adamnet/ddp.h +++ b/src/devices/bus/adamnet/ddp.h @@ -31,14 +31,6 @@ public: // construction/destruction adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_WRITE8_MEMBER( p1_w ); - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); - DECLARE_READ8_MEMBER( p4_r ); - - void adam_ddp_io(address_map &map); - void adam_ddp_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -50,6 +42,7 @@ protected: // device_adamnet_card_interface overrides virtual void adamnet_reset_w(int state) override; +private: required_device m_maincpu; required_device m_ddp0; required_device m_ddp1; @@ -57,6 +50,14 @@ protected: int m_wr0; int m_wr1; int m_track; + + DECLARE_WRITE8_MEMBER( p1_w ); + DECLARE_READ8_MEMBER( p2_r ); + DECLARE_WRITE8_MEMBER( p2_w ); + DECLARE_READ8_MEMBER( p4_r ); + + void adam_ddp_io(address_map &map); + void adam_ddp_mem(address_map &map); }; diff --git a/src/devices/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h index 05d4ceb0a82..80e54ac39d6 100644 --- a/src/devices/bus/adamnet/fdc.h +++ b/src/devices/bus/adamnet/fdc.h @@ -31,15 +31,6 @@ public: // construction/destruction adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_READ8_MEMBER( data_r ); - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_WRITE8_MEMBER( p1_w ); - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); - - void adam_fdc_io(address_map &map); - void adam_fdc_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -52,6 +43,7 @@ protected: // device_adamnet_card_interface overrides virtual void adamnet_reset_w(int state) override; +private: required_device m_maincpu; required_device m_fdc; required_device m_connector; @@ -59,8 +51,16 @@ protected: required_shared_ptr m_ram; required_ioport m_sw3; -private: DECLARE_FLOPPY_FORMATS( floppy_formats ); + + DECLARE_READ8_MEMBER( data_r ); + DECLARE_READ8_MEMBER( p1_r ); + DECLARE_WRITE8_MEMBER( p1_w ); + DECLARE_READ8_MEMBER( p2_r ); + DECLARE_WRITE8_MEMBER( p2_w ); + + void adam_fdc_io(address_map &map); + void adam_fdc_mem(address_map &map); }; diff --git a/src/devices/bus/adamnet/kb.h b/src/devices/bus/adamnet/kb.h index a112e2dc9b6..b3d913c54c8 100644 --- a/src/devices/bus/adamnet/kb.h +++ b/src/devices/bus/adamnet/kb.h @@ -29,17 +29,6 @@ public: // construction/destruction adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); - DECLARE_READ8_MEMBER( p3_r ); - DECLARE_WRITE8_MEMBER( p3_w ); - DECLARE_READ8_MEMBER( p4_r ); - DECLARE_WRITE8_MEMBER( p4_w ); - - void adam_kb_io(address_map &map); - void adam_kb_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -52,10 +41,23 @@ protected: // device_adamnet_card_interface overrides virtual void adamnet_reset_w(int state) override; +private: required_device m_maincpu; required_ioport_array<13> m_y; uint16_t m_key_y; + + // not really public + DECLARE_READ8_MEMBER( p1_r ); + DECLARE_READ8_MEMBER( p2_r ); + DECLARE_WRITE8_MEMBER( p2_w ); + DECLARE_READ8_MEMBER( p3_r ); + DECLARE_WRITE8_MEMBER( p3_w ); + DECLARE_READ8_MEMBER( p4_r ); + DECLARE_WRITE8_MEMBER( p4_w ); + + void adam_kb_io(address_map &map); + void adam_kb_mem(address_map &map); }; diff --git a/src/devices/bus/adamnet/printer.h b/src/devices/bus/adamnet/printer.h index 5703c997fe0..1c13ff340ce 100644 --- a/src/devices/bus/adamnet/printer.h +++ b/src/devices/bus/adamnet/printer.h @@ -29,16 +29,6 @@ public: // construction/destruction adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_WRITE8_MEMBER( p1_w ); - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); - DECLARE_READ8_MEMBER( p3_r ); - DECLARE_READ8_MEMBER( p4_r ); - DECLARE_WRITE8_MEMBER( p4_w ); - - void adam_prn_io(address_map &map); - void adam_prn_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -50,7 +40,18 @@ protected: // device_adamnet_card_interface overrides virtual void adamnet_reset_w(int state) override; +private: required_device m_maincpu; + + DECLARE_WRITE8_MEMBER( p1_w ); + DECLARE_READ8_MEMBER( p2_r ); + DECLARE_WRITE8_MEMBER( p2_w ); + DECLARE_READ8_MEMBER( p3_r ); + DECLARE_READ8_MEMBER( p4_r ); + DECLARE_WRITE8_MEMBER( p4_w ); + + void adam_prn_io(address_map &map); + void adam_prn_mem(address_map &map); }; diff --git a/src/devices/bus/adamnet/spi.h b/src/devices/bus/adamnet/spi.h index f5595babf65..4004ebf90bd 100644 --- a/src/devices/bus/adamnet/spi.h +++ b/src/devices/bus/adamnet/spi.h @@ -32,12 +32,6 @@ public: // construction/destruction adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_READ8_MEMBER( p2_r ); - DECLARE_WRITE8_MEMBER( p2_w ); - - void adam_spi_io(address_map &map); - void adam_spi_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -49,7 +43,14 @@ protected: // device_adamnet_card_interface overrides virtual void adamnet_reset_w(int state) override; +private: required_device m_maincpu; + + DECLARE_READ8_MEMBER( p2_r ); + DECLARE_WRITE8_MEMBER( p2_w ); + + void adam_spi_io(address_map &map); + void adam_spi_mem(address_map &map); }; diff --git a/src/devices/bus/amiga/keyboard/a500.h b/src/devices/bus/amiga/keyboard/a500.h index 7edcc0142d2..f5ff92f9efb 100644 --- a/src/devices/bus/amiga/keyboard/a500.h +++ b/src/devices/bus/amiga/keyboard/a500.h @@ -47,26 +47,9 @@ namespace bus { namespace amiga { namespace keyboard { class a500_kbd_device : public device_t, public device_amiga_keyboard_interface { public: - // from host - virtual DECLARE_WRITE_LINE_MEMBER(kdat_w) override; - - // 6500/1 internal - DECLARE_READ8_MEMBER(port_a_r); - DECLARE_WRITE8_MEMBER(port_a_w); - DECLARE_WRITE8_MEMBER(port_b_w); - DECLARE_WRITE8_MEMBER(port_c_w); - DECLARE_WRITE8_MEMBER(port_d_w); - DECLARE_WRITE8_MEMBER(latch_w); - DECLARE_READ8_MEMBER(counter_r); - DECLARE_WRITE8_MEMBER(transfer_latch_w); - DECLARE_WRITE8_MEMBER(clear_pa0_detect); - DECLARE_WRITE8_MEMBER(clear_pa1_detect); - DECLARE_READ8_MEMBER(control_r); - DECLARE_WRITE8_MEMBER(control_w); DECLARE_INPUT_CHANGED_MEMBER(check_reset); - void mpu6500_map(address_map &map); protected: a500_kbd_device( const machine_config &mconfig, @@ -82,6 +65,9 @@ protected: virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + // from host + virtual DECLARE_WRITE_LINE_MEMBER(kdat_w) override; + private: enum { @@ -121,6 +107,22 @@ private: uint16_t m_latch; uint16_t m_counter; uint8_t m_control; + + // 6500/1 internal + DECLARE_READ8_MEMBER(port_a_r); + DECLARE_WRITE8_MEMBER(port_a_w); + DECLARE_WRITE8_MEMBER(port_b_w); + DECLARE_WRITE8_MEMBER(port_c_w); + DECLARE_WRITE8_MEMBER(port_d_w); + DECLARE_WRITE8_MEMBER(latch_w); + DECLARE_READ8_MEMBER(counter_r); + DECLARE_WRITE8_MEMBER(transfer_latch_w); + DECLARE_WRITE8_MEMBER(clear_pa0_detect); + DECLARE_WRITE8_MEMBER(clear_pa1_detect); + DECLARE_READ8_MEMBER(control_r); + DECLARE_WRITE8_MEMBER(control_w); + + void mpu6500_map(address_map &map); }; // ======================> a500_kbd_us_device diff --git a/src/devices/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h index 52bf187d70f..efa6199aebf 100644 --- a/src/devices/bus/amiga/zorro/a2232.h +++ b/src/devices/bus/amiga/zorro/a2232.h @@ -35,10 +35,6 @@ public: // construction/destruction a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // cpu - WRITE8_MEMBER( int2_w ); - WRITE8_MEMBER( irq_ack8_w ); - // zorro slot DECLARE_READ16_MEMBER( shared_ram_r ); DECLARE_WRITE16_MEMBER( shared_ram_w ); @@ -51,27 +47,8 @@ public: DECLARE_READ16_MEMBER( reset_high_r ); DECLARE_WRITE16_MEMBER( reset_high_w ); - // acia - DECLARE_READ8_MEMBER( acia_0_r ); - DECLARE_WRITE8_MEMBER( acia_0_w ); - DECLARE_READ8_MEMBER( acia_1_r ); - DECLARE_WRITE8_MEMBER( acia_1_w ); - DECLARE_READ8_MEMBER( acia_2_r ); - DECLARE_WRITE8_MEMBER( acia_2_w ); - DECLARE_READ8_MEMBER( acia_3_r ); - DECLARE_WRITE8_MEMBER( acia_3_w ); - DECLARE_READ8_MEMBER( acia_4_r ); - DECLARE_WRITE8_MEMBER( acia_4_w ); - DECLARE_READ8_MEMBER( acia_5_r ); - DECLARE_WRITE8_MEMBER( acia_5_w ); - DECLARE_READ8_MEMBER( acia_6_r ); - DECLARE_WRITE8_MEMBER( acia_6_w ); - - // cia - DECLARE_READ8_MEMBER( cia_r ); - DECLARE_WRITE8_MEMBER( cia_w ); - void iocpu_map(address_map &map); + protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; @@ -100,6 +77,10 @@ private: void update_irqs(); + // cpu + WRITE8_MEMBER( int2_w ); + WRITE8_MEMBER( irq_ack8_w ); + // acia DECLARE_WRITE_LINE_MEMBER( acia_0_irq_w ); DECLARE_WRITE_LINE_MEMBER( acia_1_irq_w ); @@ -108,12 +89,28 @@ private: DECLARE_WRITE_LINE_MEMBER( acia_4_irq_w ); DECLARE_WRITE_LINE_MEMBER( acia_5_irq_w ); DECLARE_WRITE_LINE_MEMBER( acia_6_irq_w ); + DECLARE_READ8_MEMBER( acia_0_r ); + DECLARE_WRITE8_MEMBER( acia_0_w ); + DECLARE_READ8_MEMBER( acia_1_r ); + DECLARE_WRITE8_MEMBER( acia_1_w ); + DECLARE_READ8_MEMBER( acia_2_r ); + DECLARE_WRITE8_MEMBER( acia_2_w ); + DECLARE_READ8_MEMBER( acia_3_r ); + DECLARE_WRITE8_MEMBER( acia_3_w ); + DECLARE_READ8_MEMBER( acia_4_r ); + DECLARE_WRITE8_MEMBER( acia_4_w ); + DECLARE_READ8_MEMBER( acia_5_r ); + DECLARE_WRITE8_MEMBER( acia_5_w ); + DECLARE_READ8_MEMBER( acia_6_r ); + DECLARE_WRITE8_MEMBER( acia_6_w ); // cia DECLARE_WRITE_LINE_MEMBER( cia_irq_w ); DECLARE_READ8_MEMBER( cia_port_a_r ); DECLARE_READ8_MEMBER( cia_port_b_r ); DECLARE_WRITE8_MEMBER( cia_port_b_w ); + DECLARE_READ8_MEMBER( cia_r ); + DECLARE_WRITE8_MEMBER( cia_w ); // rs232 DECLARE_WRITE_LINE_MEMBER( rs232_1_rxd_w ); diff --git a/src/devices/bus/amiga/zorro/buddha.h b/src/devices/bus/amiga/zorro/buddha.h index 4d2069cc6b3..bf671902cc0 100644 --- a/src/devices/bus/amiga/zorro/buddha.h +++ b/src/devices/bus/amiga/zorro/buddha.h @@ -30,8 +30,21 @@ public: // construction/destruction buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void mmio_map(address_map &map); +protected: + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_start() override; + virtual void device_reset() override; + + // device_zorro2_card_interface overrides + virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ) override; + + // amiga_autoconfig overrides + virtual void autoconfig_base_address(offs_t address) override; + +private: // speed register DECLARE_READ16_MEMBER( speed_r ); DECLARE_WRITE16_MEMBER( speed_w ); @@ -50,25 +63,11 @@ public: DECLARE_READ16_MEMBER( ide_0_interrupt_r ); DECLARE_READ16_MEMBER( ide_1_interrupt_r ); DECLARE_WRITE16_MEMBER( ide_interrupt_enable_w ); - -protected: - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual const tiny_rom_entry *device_rom_region() const override; - - virtual void device_start() override; - virtual void device_reset() override; - - // device_zorro2_card_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ) override; - - // amiga_autoconfig overrides - virtual void autoconfig_base_address(offs_t address) override; - -private: DECLARE_WRITE_LINE_MEMBER( ide_0_interrupt_w ); DECLARE_WRITE_LINE_MEMBER( ide_1_interrupt_w ); + void mmio_map(address_map &map); + required_device m_ata_0; required_device m_ata_1; diff --git a/src/devices/bus/bbc/tube/tube_6502.h b/src/devices/bus/bbc/tube/tube_6502.h index d9e59eb6089..67d14bd539f 100644 --- a/src/devices/bus/bbc/tube/tube_6502.h +++ b/src/devices/bus/bbc/tube/tube_6502.h @@ -31,10 +31,6 @@ public: // construction/destruction bbc_tube_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - - void tube_6502_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -54,6 +50,11 @@ private: required_memory_region m_rom; bool m_rom_enabled; + + DECLARE_READ8_MEMBER( read ); + DECLARE_WRITE8_MEMBER( write ); + + void tube_6502_mem(address_map &map); }; diff --git a/src/devices/bus/bbc/tube/tube_65c102.h b/src/devices/bus/bbc/tube/tube_65c102.h index d1892b8f13e..1ba891739d1 100644 --- a/src/devices/bus/bbc/tube/tube_65c102.h +++ b/src/devices/bus/bbc/tube/tube_65c102.h @@ -31,10 +31,6 @@ public: // construction/destruction bbc_tube_65c102_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - - void tube_6502_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -54,6 +50,11 @@ private: required_memory_region m_rom; bool m_rom_enabled; + + DECLARE_READ8_MEMBER( read ); + DECLARE_WRITE8_MEMBER( write ); + + void tube_6502_mem(address_map &map); }; diff --git a/src/devices/bus/bbc/tube/tube_80186.h b/src/devices/bus/bbc/tube/tube_80186.h index 79e43d11277..3081acbddac 100644 --- a/src/devices/bus/bbc/tube/tube_80186.h +++ b/src/devices/bus/bbc/tube/tube_80186.h @@ -31,8 +31,6 @@ public: // construction/destruction bbc_tube_80186_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void tube_80186_io(address_map &map); - void tube_80186_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -50,6 +48,9 @@ private: required_device m_ula; required_device m_ram; required_memory_region m_bootstrap; + + void tube_80186_io(address_map &map); + void tube_80186_mem(address_map &map); }; diff --git a/src/devices/bus/bbc/tube/tube_80286.h b/src/devices/bus/bbc/tube/tube_80286.h index ae3f750e379..da2d807477b 100644 --- a/src/devices/bus/bbc/tube/tube_80286.h +++ b/src/devices/bus/bbc/tube/tube_80286.h @@ -29,11 +29,6 @@ public: // construction/destruction bbc_tube_80286_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( disable_boot_rom ); - DECLARE_WRITE8_MEMBER( irq_latch_w ); - - void tube_80286_io(address_map &map); - void tube_80286_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -55,6 +50,12 @@ private: required_device m_ula; required_device m_ram; required_memory_region m_bootstrap; + + DECLARE_READ8_MEMBER( disable_boot_rom ); + DECLARE_WRITE8_MEMBER( irq_latch_w ); + + void tube_80286_io(address_map &map); + void tube_80286_mem(address_map &map); }; diff --git a/src/devices/bus/bbc/tube/tube_arm.h b/src/devices/bus/bbc/tube/tube_arm.h index 8904ab85d72..7b58d2b40bd 100644 --- a/src/devices/bus/bbc/tube/tube_arm.h +++ b/src/devices/bus/bbc/tube/tube_arm.h @@ -29,10 +29,6 @@ public: // construction/destruction bbc_tube_arm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( ram_r ); - DECLARE_WRITE8_MEMBER( ram_w ); - - void tube_arm_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -52,6 +48,11 @@ private: required_memory_region m_bootstrap; bool m_rom_select; + + DECLARE_READ8_MEMBER( ram_r ); + DECLARE_WRITE8_MEMBER( ram_w ); + + void tube_arm_mem(address_map &map); }; diff --git a/src/devices/bus/bbc/tube/tube_casper.h b/src/devices/bus/bbc/tube/tube_casper.h index c41476b01d5..1fc2578bb8b 100644 --- a/src/devices/bus/bbc/tube/tube_casper.h +++ b/src/devices/bus/bbc/tube/tube_casper.h @@ -28,7 +28,6 @@ public: // construction/destruction bbc_tube_casper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void tube_casper_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -47,6 +46,8 @@ private: required_device m_via6522_1; required_memory_region m_casper_rom; required_memory_region m_host_rom; + + void tube_casper_mem(address_map &map); }; diff --git a/src/devices/bus/bbc/tube/tube_z80.h b/src/devices/bus/bbc/tube/tube_z80.h index 53858ecbd38..e35dfa02ef4 100644 --- a/src/devices/bus/bbc/tube/tube_z80.h +++ b/src/devices/bus/bbc/tube/tube_z80.h @@ -31,13 +31,6 @@ public: // construction/destruction bbc_tube_z80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( mem_r ); - DECLARE_WRITE8_MEMBER( mem_w ); - DECLARE_READ8_MEMBER( opcode_r ); - - void tube_z80_fetch(address_map &map); - void tube_z80_io(address_map &map); - void tube_z80_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -60,6 +53,14 @@ private: required_memory_region m_rom; bool m_rom_enabled; + + DECLARE_READ8_MEMBER( mem_r ); + DECLARE_WRITE8_MEMBER( mem_w ); + DECLARE_READ8_MEMBER( opcode_r ); + + void tube_z80_fetch(address_map &map); + void tube_z80_io(address_map &map); + void tube_z80_mem(address_map &map); }; diff --git a/src/devices/bus/bbc/tube/tube_zep100.h b/src/devices/bus/bbc/tube/tube_zep100.h index 983f4c844ab..af6cae2d78d 100644 --- a/src/devices/bus/bbc/tube/tube_zep100.h +++ b/src/devices/bus/bbc/tube/tube_zep100.h @@ -32,17 +32,6 @@ public: // construction/destruction bbc_tube_zep100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( mem_r ); - DECLARE_WRITE8_MEMBER( mem_w ); - DECLARE_READ8_MEMBER( io_r ); - DECLARE_WRITE8_MEMBER( io_w ); - - DECLARE_WRITE8_MEMBER( via_pb_w ); - DECLARE_READ8_MEMBER( ppi_pb_r ); - DECLARE_WRITE8_MEMBER( ppi_pc_w ); - - void tube_zep100_io(address_map &map); - void tube_zep100_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -64,6 +53,18 @@ private: uint8_t m_port_b; bool m_rom_enabled; + + DECLARE_READ8_MEMBER( mem_r ); + DECLARE_WRITE8_MEMBER( mem_w ); + DECLARE_READ8_MEMBER( io_r ); + DECLARE_WRITE8_MEMBER( io_w ); + + DECLARE_WRITE8_MEMBER( via_pb_w ); + DECLARE_READ8_MEMBER( ppi_pb_r ); + DECLARE_WRITE8_MEMBER( ppi_pc_w ); + + void tube_zep100_io(address_map &map); + void tube_zep100_mem(address_map &map); }; diff --git a/src/devices/bus/c64/cpm.h b/src/devices/bus/c64/cpm.h index 2313007a58d..f0da4d6c0f7 100644 --- a/src/devices/bus/c64/cpm.h +++ b/src/devices/bus/c64/cpm.h @@ -29,12 +29,6 @@ public: // construction/destruction c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_READ8_MEMBER( dma_r ); - DECLARE_WRITE8_MEMBER( dma_w ); - - void z80_io(address_map &map); - void z80_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -56,6 +50,12 @@ private: int m_ba; int m_reset; + + DECLARE_READ8_MEMBER( dma_r ); + DECLARE_WRITE8_MEMBER( dma_w ); + + void z80_io(address_map &map); + void z80_mem(address_map &map); }; diff --git a/src/devices/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h index 92650f55dfa..4d548f38528 100644 --- a/src/devices/bus/c64/fcc.h +++ b/src/devices/bus/c64/fcc.h @@ -30,10 +30,6 @@ public: // construction/destruction c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( nvram_r ); - DECLARE_WRITE8_MEMBER( nvram_w ); - - void c64_fcc_map(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -58,6 +54,11 @@ private: uint8_t m_bank; int m_ramen; + + DECLARE_READ8_MEMBER( nvram_r ); + DECLARE_WRITE8_MEMBER( nvram_w ); + + void c64_fcc_map(address_map &map); }; diff --git a/src/devices/bus/c64/multiscreen.h b/src/devices/bus/c64/multiscreen.h index 810543887e3..9d26edb723a 100644 --- a/src/devices/bus/c64/multiscreen.h +++ b/src/devices/bus/c64/multiscreen.h @@ -31,7 +31,6 @@ public: // construction/destruction c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void multiscreen_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -47,6 +46,8 @@ protected: private: uint8_t m_bank; + + void multiscreen_mem(address_map &map); }; diff --git a/src/devices/bus/c64/supercpu.h b/src/devices/bus/c64/supercpu.h index 21b2464a9bf..006449400c1 100644 --- a/src/devices/bus/c64/supercpu.h +++ b/src/devices/bus/c64/supercpu.h @@ -29,7 +29,6 @@ public: // construction/destruction c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void c64_supercpu_map(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -52,6 +51,8 @@ private: required_shared_ptr m_sram; required_shared_ptr m_dimm; + + void c64_supercpu_map(address_map &map); }; diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h index 77209400042..ccd16dc1b05 100644 --- a/src/devices/bus/cbm2/hrg.h +++ b/src/devices/bus/cbm2/hrg.h @@ -55,10 +55,12 @@ public: // construction/destruction cbm2_hrg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void hrg_a_map(address_map &map); protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; + +private: + void hrg_a_map(address_map &map); }; @@ -70,10 +72,12 @@ public: // construction/destruction cbm2_hrg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void hrg_b_map(address_map &map); protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; + +private: + void hrg_b_map(address_map &map); }; diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h index 36b4dac257e..f9706441c4f 100644 --- a/src/devices/bus/cbmiec/c1541.h +++ b/src/devices/bus/cbmiec/c1541.h @@ -261,28 +261,25 @@ public: // construction/destruction c1541_prologic_dos_classic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - - void c1541pdc_mem(address_map &map); protected: // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; - DECLARE_READ8_MEMBER( pia_r ); - DECLARE_WRITE8_MEMBER( pia_w ); - -protected: +private: required_device m_pia; required_device m_cent_data_out; required_memory_region m_mmu_rom; -private: + DECLARE_READ8_MEMBER( pia_r ); + DECLARE_WRITE8_MEMBER( pia_w ); DECLARE_WRITE8_MEMBER( pia_pa_w ); DECLARE_READ8_MEMBER( pia_pb_r ); DECLARE_WRITE8_MEMBER( pia_pb_w ); + DECLARE_READ8_MEMBER( read ); + DECLARE_WRITE8_MEMBER( write ); + + void c1541pdc_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h index 272b5ffc123..0679dff686b 100644 --- a/src/devices/bus/cbmiec/c1571.h +++ b/src/devices/bus/cbmiec/c1571.h @@ -166,7 +166,6 @@ public: // construction/destruction mini_chief_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void mini_chief_mem(address_map &map); protected: // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -176,6 +175,8 @@ private: DECLARE_READ8_MEMBER( cia_pa_r ); DECLARE_WRITE8_MEMBER( cia_pa_w ); DECLARE_WRITE8_MEMBER( cia_pb_w ); + + void mini_chief_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h index 17332c6aab3..64c616bad45 100644 --- a/src/devices/bus/cbmiec/c1581.h +++ b/src/devices/bus/cbmiec/c1581.h @@ -39,7 +39,6 @@ public: // construction/destruction c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void c1581_mem(address_map &map); protected: c1581_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -74,6 +73,8 @@ private: DECLARE_READ8_MEMBER( cia_pb_r ); DECLARE_WRITE8_MEMBER( cia_pb_w ); + void c1581_mem(address_map &map); + DECLARE_FLOPPY_FORMATS( floppy_formats ); required_device m_maincpu; diff --git a/src/devices/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h index e2b1e99df84..9749f81f547 100644 --- a/src/devices/bus/cbmiec/cmdhd.h +++ b/src/devices/bus/cbmiec/cmdhd.h @@ -40,9 +40,6 @@ public: // construction/destruction cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( led_w ); - - void cmd_hd_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -58,8 +55,13 @@ protected: void cbm_iec_data(int state) override; void cbm_iec_reset(int state) override; +private: required_device m_maincpu; required_device m_scsibus; + + DECLARE_WRITE8_MEMBER( led_w ); + + void cmd_hd_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h index 29525a54490..740c1ce6441 100644 --- a/src/devices/bus/cbmiec/fd2000.h +++ b/src/devices/bus/cbmiec/fd2000.h @@ -47,7 +47,6 @@ public: //DECLARE_FLOPPY_FORMATS( floppy_formats ); - void fd2000_mem(address_map &map); protected: fd2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -68,6 +67,9 @@ protected: required_device m_maincpu; required_device m_fdc; required_device m_floppy0; + +private: + void fd2000_mem(address_map &map); }; @@ -79,10 +81,12 @@ public: // construction/destruction fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void fd4000_mem(address_map &map); protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; + +private: + void fd4000_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h index 18940128f03..cc6e07f7c7a 100644 --- a/src/devices/bus/cbmiec/interpod.h +++ b/src/devices/bus/cbmiec/interpod.h @@ -49,7 +49,6 @@ public: // construction/destruction interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void interpod_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -59,11 +58,14 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; +private: required_device m_maincpu; required_device m_via; required_device m_riot; required_device m_acia; required_device m_ieee; + + void interpod_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h index 6400fe92ff5..396f9a85927 100644 --- a/src/devices/bus/cbmiec/serialbox.h +++ b/src/devices/bus/cbmiec/serialbox.h @@ -36,7 +36,6 @@ public: // construction/destruction serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void serial_box_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -53,6 +52,8 @@ protected: private: required_device m_maincpu; + + void serial_box_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h index 94ed0d236a7..1b84636e6d3 100644 --- a/src/devices/bus/cbmiec/vic1515.h +++ b/src/devices/bus/cbmiec/vic1515.h @@ -28,8 +28,6 @@ public: // construction/destruction vic1515_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void vic1515_io(address_map &map); - void vic1515_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -44,6 +42,10 @@ protected: void cbm_iec_atn(int state) override; void cbm_iec_data(int state) override; void cbm_iec_reset(int state) override; + +private: + void vic1515_io(address_map &map); + void vic1515_mem(address_map &map); }; diff --git a/src/devices/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h index 19ec85de510..e31eec855dc 100644 --- a/src/devices/bus/cbmiec/vic1520.h +++ b/src/devices/bus/cbmiec/vic1520.h @@ -28,7 +28,6 @@ public: // construction/destruction vic1520_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void vic1520_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -43,6 +42,9 @@ protected: void cbm_iec_atn(int state) override; void cbm_iec_data(int state) override; void cbm_iec_reset(int state) override; + +private: + void vic1520_mem(address_map &map); }; diff --git a/src/devices/bus/cbus/mpu_pc98.h b/src/devices/bus/cbus/mpu_pc98.h index 9d0b8991ad5..798f8b8f11e 100644 --- a/src/devices/bus/cbus/mpu_pc98.h +++ b/src/devices/bus/cbus/mpu_pc98.h @@ -19,7 +19,7 @@ class mpu_pc98_device : public device_t public: // construction/destruction mpu_pc98_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void map(address_map &map); + protected: // device-level overrides virtual void device_start() override; @@ -32,6 +32,8 @@ private: // called back by the MPU401 core to set the IRQ line state DECLARE_WRITE_LINE_MEMBER(mpu_irq_out); + void map(address_map &map); + required_device m_bus; required_device m_mpu401; }; diff --git a/src/devices/bus/centronics/comxpl80.h b/src/devices/bus/centronics/comxpl80.h index 18c5f69998e..2e1d86dd1e4 100644 --- a/src/devices/bus/centronics/comxpl80.h +++ b/src/devices/bus/centronics/comxpl80.h @@ -29,14 +29,6 @@ public: // construction/destruction comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_WRITE8_MEMBER( pa_w ); - DECLARE_WRITE8_MEMBER( pb_w ); - DECLARE_WRITE8_MEMBER( pc_w ); - DECLARE_READ8_MEMBER( pd_r ); - - void comxpl80_io(address_map &map); - void comxpl80_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -71,6 +63,14 @@ private: int m_plotter_online; // online LED uint8_t m_data; + + DECLARE_WRITE8_MEMBER( pa_w ); + DECLARE_WRITE8_MEMBER( pb_w ); + DECLARE_WRITE8_MEMBER( pc_w ); + DECLARE_READ8_MEMBER( pd_r ); + + void comxpl80_io(address_map &map); + void comxpl80_mem(address_map &map); }; diff --git a/src/devices/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h index 94c1610d0b8..e637e7e28f3 100644 --- a/src/devices/bus/centronics/epson_ex800.h +++ b/src/devices/bus/centronics/epson_ex800.h @@ -30,18 +30,8 @@ public: // construction/destruction epson_ex800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(devsel_r); - DECLARE_WRITE8_MEMBER(devsel_w); - DECLARE_READ8_MEMBER(gate5a_r); - DECLARE_WRITE8_MEMBER(gate5a_w); - DECLARE_READ8_MEMBER(iosel_r); - DECLARE_WRITE8_MEMBER(iosel_w); - DECLARE_READ8_MEMBER(gate7a_r); - DECLARE_WRITE8_MEMBER(gate7a_w); - DECLARE_INPUT_CHANGED_MEMBER(online_switch); - void ex800_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -59,6 +49,16 @@ private: DECLARE_WRITE8_MEMBER(porta_w); DECLARE_WRITE8_MEMBER(portb_w); DECLARE_WRITE8_MEMBER(portc_w); + DECLARE_READ8_MEMBER(devsel_r); + DECLARE_WRITE8_MEMBER(devsel_w); + DECLARE_READ8_MEMBER(gate5a_r); + DECLARE_WRITE8_MEMBER(gate5a_w); + DECLARE_READ8_MEMBER(iosel_r); + DECLARE_WRITE8_MEMBER(iosel_w); + DECLARE_READ8_MEMBER(gate7a_r); + DECLARE_WRITE8_MEMBER(gate7a_w); + + void ex800_mem(address_map &map); required_device m_maincpu; required_device m_beeper; diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h index 1e7c75fe2cb..4f057565dd3 100644 --- a/src/devices/bus/centronics/epson_lx800.h +++ b/src/devices/bus/centronics/epson_lx800.h @@ -31,12 +31,6 @@ public: // construction/destruction epson_lx800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(centronics_data_r); - DECLARE_WRITE_LINE_MEMBER(centronics_pe_w); - DECLARE_WRITE_LINE_MEMBER(paperempty_led_w); - DECLARE_WRITE_LINE_MEMBER(reset_w); - - void lx800_mem(address_map &map); protected: epson_lx800_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -62,6 +56,13 @@ private: DECLARE_READ_LINE_MEMBER(an4_r); DECLARE_READ_LINE_MEMBER(an5_r); + DECLARE_READ8_MEMBER(centronics_data_r); + DECLARE_WRITE_LINE_MEMBER(centronics_pe_w); + DECLARE_WRITE_LINE_MEMBER(paperempty_led_w); + DECLARE_WRITE_LINE_MEMBER(reset_w); + + void lx800_mem(address_map &map); + required_device m_maincpu; required_device m_beep; }; diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h index 17fcedf9fdc..aac62c94141 100644 --- a/src/devices/bus/centronics/epson_lx810l.h +++ b/src/devices/bus/centronics/epson_lx810l.h @@ -41,10 +41,6 @@ public: // construction/destruction epson_lx810l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - /* fake memory I/O to get past memory reset check */ - DECLARE_READ8_MEMBER(fakemem_r); - DECLARE_WRITE8_MEMBER(fakemem_w); - /* Centronics stuff */ virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override { if (m_e05a30) m_e05a30->centronics_input_strobe(state); } virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (m_e05a30) m_e05a30->centronics_input_data0(state); } @@ -59,11 +55,6 @@ public: /* Panel buttons */ DECLARE_INPUT_CHANGED_MEMBER(online_sw); - /* Video hardware (simulates paper) */ -#define uabs(x) ((x) > 0 ? (x) : -(x)) - unsigned int bitmap_line(int i) { return ((uabs(m_pf_pos_abs) / 6) + i) % m_bitmap.height(); } - - void lx810l_mem(address_map &map); protected: epson_lx810l_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -85,6 +76,10 @@ private: DECLARE_READ8_MEMBER(portc_r); DECLARE_WRITE8_MEMBER(portc_w); + /* fake memory I/O to get past memory reset check */ + DECLARE_READ8_MEMBER(fakemem_r); + DECLARE_WRITE8_MEMBER(fakemem_w); + /* Extended Timer Output */ DECLARE_WRITE_LINE_MEMBER(co0_w); @@ -111,9 +106,14 @@ private: DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_fault) { output_fault(state); } DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_select) { output_select(state); } + void lx810l_mem(address_map &map); + /* Video hardware (simulates paper) */ uint32_t screen_update_lx810l(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); +#define uabs(x) ((x) > 0 ? (x) : -(x)) + unsigned int bitmap_line(int i) { return ((uabs(m_pf_pos_abs) / 6) + i) % m_bitmap.height(); } + required_device m_maincpu; required_device m_pf_stepper; required_device m_cr_stepper; diff --git a/src/devices/bus/centronics/nec_p72.h b/src/devices/bus/centronics/nec_p72.h index 959d670c945..f7ba6d59a73 100644 --- a/src/devices/bus/centronics/nec_p72.h +++ b/src/devices/bus/centronics/nec_p72.h @@ -22,7 +22,6 @@ public: // construction/destruction nec_p72_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void p72_mem(address_map &map); protected: nec_p72_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -35,6 +34,8 @@ protected: private: required_device m_maincpu; + + void p72_mem(address_map &map); }; // device type definition diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h index 81f303465b2..48892c3e994 100644 --- a/src/devices/bus/cgenie/expansion/floppy.h +++ b/src/devices/bus/cgenie/expansion/floppy.h @@ -29,14 +29,6 @@ public: // construction/destruction cgenie_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void mmio(address_map &map); - - TIMER_DEVICE_CALLBACK_MEMBER(timer_callback); - - DECLARE_READ8_MEMBER(irq_r); - DECLARE_WRITE8_MEMBER(select_w); - DECLARE_WRITE8_MEMBER(command_w); - protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; @@ -48,6 +40,14 @@ private: DECLARE_WRITE_LINE_MEMBER(intrq_w); + TIMER_DEVICE_CALLBACK_MEMBER(timer_callback); + + DECLARE_READ8_MEMBER(irq_r); + DECLARE_WRITE8_MEMBER(select_w); + DECLARE_WRITE8_MEMBER(command_w); + + void mmio(address_map &map); + DECLARE_FLOPPY_FORMATS(floppy_formats); required_device m_fdc; diff --git a/src/devices/bus/compis/hrg.h b/src/devices/bus/compis/hrg.h index eba335fd82c..6b42b6ae919 100644 --- a/src/devices/bus/compis/hrg.h +++ b/src/devices/bus/compis/hrg.h @@ -29,7 +29,6 @@ public: // construction/destruction compis_hrg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void hrg_map(address_map &map); protected: compis_hrg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -52,6 +51,8 @@ protected: private: UPD7220_DISPLAY_PIXELS_MEMBER( display_pixels ); + + void hrg_map(address_map &map); }; @@ -63,13 +64,14 @@ public: // construction/destruction compis_uhrg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void uhrg_map(address_map &map); protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; private: UPD7220_DISPLAY_PIXELS_MEMBER( display_pixels ); + + void uhrg_map(address_map &map); }; diff --git a/src/devices/bus/dmv/k230.h b/src/devices/bus/dmv/k230.h index 01c76d8a63b..0e7bd6b19f5 100644 --- a/src/devices/bus/dmv/k230.h +++ b/src/devices/bus/dmv/k230.h @@ -30,16 +30,6 @@ public: // construction/destruction dmv_k230_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(io_r); - DECLARE_READ8_MEMBER(program_r); - DECLARE_WRITE8_MEMBER(io_w); - DECLARE_WRITE8_MEMBER(program_w); - DECLARE_READ8_MEMBER(rom_r); - - void k230_io(address_map &map); - void k230_mem(address_map &map); - void k234_mem(address_map &map); - void k235_io(address_map &map); protected: dmv_k230_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -56,13 +46,24 @@ protected: virtual void switch16_w(int state) override; virtual bool av16bit() override; -protected: + void k230_io(address_map &map); + void k230_mem(address_map &map); + void k234_mem(address_map &map); + void k235_io(address_map &map); + required_device m_maincpu; optional_memory_region m_rom; dmvcart_slot_device * m_bus; address_space * m_io; int m_switch16; int m_hold; + +private: + DECLARE_READ8_MEMBER(io_r); + DECLARE_READ8_MEMBER(program_r); + DECLARE_WRITE8_MEMBER(io_w); + DECLARE_WRITE8_MEMBER(program_w); + DECLARE_READ8_MEMBER(rom_r); }; @@ -89,9 +90,6 @@ public: // construction/destruction dmv_k234_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(snr_r); - DECLARE_WRITE8_MEMBER(snr_w); - protected: // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -107,6 +105,9 @@ protected: private: int m_snr; + + DECLARE_READ8_MEMBER(snr_r); + DECLARE_WRITE8_MEMBER(snr_w); }; diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h index 3572ba9c1b6..476d97ca9b0 100644 --- a/src/devices/bus/ecbbus/grip.h +++ b/src/devices/bus/ecbbus/grip.h @@ -36,19 +36,6 @@ public: // construction/destruction ecb_grip21_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_WRITE8_MEMBER( vol0_w ); - DECLARE_WRITE8_MEMBER( vol1_w ); - DECLARE_WRITE8_MEMBER( flash_w ); - DECLARE_WRITE8_MEMBER( page_w ); - DECLARE_READ8_MEMBER( stat_r ); - DECLARE_READ8_MEMBER( lrs_r ); - DECLARE_WRITE8_MEMBER( lrs_w ); - DECLARE_READ8_MEMBER( cxstb_r ); - DECLARE_WRITE8_MEMBER( cxstb_w ); - - void grip_io(address_map &map); - void grip_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -115,6 +102,18 @@ private: // timers emu_timer *m_kb_timer; + DECLARE_WRITE8_MEMBER( vol0_w ); + DECLARE_WRITE8_MEMBER( vol1_w ); + DECLARE_WRITE8_MEMBER( flash_w ); + DECLARE_WRITE8_MEMBER( page_w ); + DECLARE_READ8_MEMBER( stat_r ); + DECLARE_READ8_MEMBER( lrs_r ); + DECLARE_WRITE8_MEMBER( lrs_w ); + DECLARE_READ8_MEMBER( cxstb_r ); + DECLARE_WRITE8_MEMBER( cxstb_w ); + + void grip_io(address_map &map); + void grip_mem(address_map &map); /* required_device m_crtc; diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h index 804fc2aba75..e5b2b512570 100644 --- a/src/devices/bus/econet/e01.h +++ b/src/devices/bus/econet/e01.h @@ -31,24 +31,6 @@ public: // construction/destruction econet_e01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( ram_select_r ); - DECLARE_WRITE8_MEMBER( floppy_w ); - DECLARE_READ8_MEMBER( network_irq_disable_r ); - DECLARE_WRITE8_MEMBER( network_irq_disable_w ); - DECLARE_READ8_MEMBER( network_irq_enable_r ); - DECLARE_WRITE8_MEMBER( network_irq_enable_w ); - DECLARE_READ8_MEMBER( hdc_data_r ); - DECLARE_WRITE8_MEMBER( hdc_data_w ); - DECLARE_WRITE8_MEMBER( hdc_select_w ); - DECLARE_WRITE8_MEMBER( hdc_irq_enable_w ); - DECLARE_READ8_MEMBER( rtc_address_r ); - DECLARE_WRITE8_MEMBER( rtc_address_w ); - DECLARE_READ8_MEMBER( rtc_data_r ); - DECLARE_WRITE8_MEMBER( rtc_data_w ); - - void e01_mem(address_map &map); protected: enum { @@ -82,6 +64,22 @@ private: DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); DECLARE_WRITE_LINE_MEMBER( scsi_bsy_w ); DECLARE_WRITE_LINE_MEMBER( scsi_req_w ); + DECLARE_READ8_MEMBER( read ); + DECLARE_WRITE8_MEMBER( write ); + DECLARE_READ8_MEMBER( ram_select_r ); + DECLARE_WRITE8_MEMBER( floppy_w ); + DECLARE_READ8_MEMBER( network_irq_disable_r ); + DECLARE_WRITE8_MEMBER( network_irq_disable_w ); + DECLARE_READ8_MEMBER( network_irq_enable_r ); + DECLARE_WRITE8_MEMBER( network_irq_enable_w ); + DECLARE_READ8_MEMBER( hdc_data_r ); + DECLARE_WRITE8_MEMBER( hdc_data_w ); + DECLARE_WRITE8_MEMBER( hdc_select_w ); + DECLARE_WRITE8_MEMBER( hdc_irq_enable_w ); + DECLARE_READ8_MEMBER( rtc_address_r ); + DECLARE_WRITE8_MEMBER( rtc_address_w ); + DECLARE_READ8_MEMBER( rtc_data_r ); + DECLARE_WRITE8_MEMBER( rtc_data_w ); DECLARE_FLOPPY_FORMATS(floppy_formats_afs); @@ -103,6 +101,8 @@ private: inline void network_irq_enable(int enabled); inline void hdc_irq_enable(int enabled); + void e01_mem(address_map &map); + // interrupt state int m_adlc_ie; int m_hdc_ie; diff --git a/src/devices/bus/einstein/pipe/silicon_disc.h b/src/devices/bus/einstein/pipe/silicon_disc.h index 8ada24327c2..dad8ad7c940 100644 --- a/src/devices/bus/einstein/pipe/silicon_disc.h +++ b/src/devices/bus/einstein/pipe/silicon_disc.h @@ -28,11 +28,6 @@ public: // construction/destruction einstein_silicon_disc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER(sector_low_w); - DECLARE_WRITE8_MEMBER(sector_high_w); - DECLARE_READ8_MEMBER(ram_r); - DECLARE_WRITE8_MEMBER(ram_w); - protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_start() override; @@ -46,6 +41,11 @@ private: std::unique_ptr m_ram; uint16_t m_sector; + + DECLARE_READ8_MEMBER(ram_r); + DECLARE_WRITE8_MEMBER(ram_w); + DECLARE_WRITE8_MEMBER(sector_low_w); + DECLARE_WRITE8_MEMBER(sector_high_w); }; // device type definition diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h index 5429ae8a50c..0938bb73ce1 100644 --- a/src/devices/bus/epson_sio/pf10.h +++ b/src/devices/bus/epson_sio/pf10.h @@ -29,19 +29,6 @@ public: // construction/destruction epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // floppy disk controller - DECLARE_READ8_MEMBER( fdc_r ); - DECLARE_WRITE8_MEMBER( fdc_w ); - DECLARE_WRITE8_MEMBER( fdc_tc_w ); - - // hd6303 i/o - DECLARE_READ8_MEMBER( port1_r ); - DECLARE_WRITE8_MEMBER( port1_w ); - DECLARE_READ8_MEMBER( port2_r ); - DECLARE_WRITE8_MEMBER( port2_w ); - - void cpu_io(address_map &map); - void cpu_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -64,6 +51,19 @@ private: DECLARE_WRITE_LINE_MEMBER( rxc_w ); DECLARE_WRITE_LINE_MEMBER( pinc_w ); + // floppy disk controller + DECLARE_READ8_MEMBER( fdc_r ); + DECLARE_WRITE8_MEMBER( fdc_w ); + DECLARE_WRITE8_MEMBER( fdc_tc_w ); + + // hd6303 i/o + DECLARE_READ8_MEMBER( port1_r ); + DECLARE_WRITE8_MEMBER( port1_w ); + DECLARE_READ8_MEMBER( port2_r ); + DECLARE_WRITE8_MEMBER( port2_w ); + + void cpu_io(address_map &map); + void cpu_mem(address_map &map); required_device m_cpu; required_device m_fdc; diff --git a/src/devices/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h index fa37c87012f..0a9023f51d5 100644 --- a/src/devices/bus/epson_sio/tf20.h +++ b/src/devices/bus/epson_sio/tf20.h @@ -31,13 +31,6 @@ public: // construction/destruction epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_READ8_MEMBER( rom_disable_r ); - DECLARE_READ8_MEMBER( upd765_tc_r ); - DECLARE_WRITE8_MEMBER( fdc_control_w ); - - void cpu_io(address_map &map); - void cpu_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -62,6 +55,13 @@ private: DECLARE_WRITE_LINE_MEMBER( rxc_w ); DECLARE_WRITE_LINE_MEMBER( pinc_w ); + DECLARE_READ8_MEMBER( rom_disable_r ); + DECLARE_READ8_MEMBER( upd765_tc_r ); + DECLARE_WRITE8_MEMBER( fdc_control_w ); + + void cpu_io(address_map &map); + void cpu_mem(address_map &map); + required_device m_cpu; required_device m_ram; required_device m_fdc; diff --git a/src/devices/bus/hp80_io/82937.h b/src/devices/bus/hp80_io/82937.h index ea63acdea24..dabafa22f6e 100644 --- a/src/devices/bus/hp80_io/82937.h +++ b/src/devices/bus/hp80_io/82937.h @@ -25,15 +25,6 @@ public: hp82937_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~hp82937_io_card_device(); - virtual void install_read_write_handlers(address_space& space , uint16_t base_addr) override; - - virtual void inten() override; - virtual void clear_service() override; - - DECLARE_READ8_MEMBER(switch_r); - DECLARE_WRITE8_MEMBER(latch_w); - - void cpu_io_map(address_map &map); protected: virtual void device_start() override; virtual void device_reset() override; @@ -43,6 +34,11 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; + virtual void install_read_write_handlers(address_space& space , uint16_t base_addr) override; + + virtual void inten() override; + virtual void clear_service() override; + private: required_device m_cpu; required_device m_translator; @@ -62,6 +58,10 @@ private: DECLARE_READ8_MEMBER(dio_r); DECLARE_WRITE8_MEMBER(dio_w); DECLARE_WRITE_LINE_MEMBER(ieee488_ctrl_w); + DECLARE_READ8_MEMBER(switch_r); + DECLARE_WRITE8_MEMBER(latch_w); + + void cpu_io_map(address_map &map); void update_data_out(); void update_signals(); diff --git a/src/devices/bus/hp9845_io/98034.h b/src/devices/bus/hp9845_io/98034.h index 822944262cf..45efc059a3a 100644 --- a/src/devices/bus/hp9845_io/98034.h +++ b/src/devices/bus/hp9845_io/98034.h @@ -24,9 +24,22 @@ public: hp98034_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~hp98034_io_card_device(); +protected: + virtual void device_start() override; + virtual void device_reset() override; + + // device-level overrides + virtual ioport_constructor device_input_ports() const override; + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual DECLARE_READ16_MEMBER(reg_r) override; virtual DECLARE_WRITE16_MEMBER(reg_w) override; +private: + DECLARE_WRITE8_MEMBER(dc_w); + DECLARE_READ8_MEMBER(dc_r); + DECLARE_WRITE8_MEMBER(hpib_data_w); DECLARE_WRITE8_MEMBER(hpib_ctrl_w); DECLARE_READ8_MEMBER(hpib_ctrl_r); @@ -39,18 +52,6 @@ public: void np_io_map(address_map &map); void np_program_map(address_map &map); -protected: - virtual void device_start() override; - virtual void device_reset() override; - - // device-level overrides - virtual ioport_constructor device_input_ports() const override; - virtual const tiny_rom_entry *device_rom_region() const override; - virtual void device_add_mconfig(machine_config &config) override; - -private: - DECLARE_WRITE8_MEMBER(dc_w); - DECLARE_READ8_MEMBER(dc_r); IRQ_CALLBACK_MEMBER(irq_callback); diff --git a/src/devices/bus/hp9845_io/98035.h b/src/devices/bus/hp9845_io/98035.h index d181b12d25b..40f91883406 100644 --- a/src/devices/bus/hp9845_io/98035.h +++ b/src/devices/bus/hp9845_io/98035.h @@ -24,9 +24,22 @@ public: hp98035_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~hp98035_io_card_device(); +protected: + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + + // device-level overrides + virtual ioport_constructor device_input_ports() const override; + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual DECLARE_READ16_MEMBER(reg_r) override; virtual DECLARE_WRITE16_MEMBER(reg_w) override; +private: + DECLARE_WRITE8_MEMBER(dc_w); + DECLARE_WRITE8_MEMBER(ram_addr_w); DECLARE_READ8_MEMBER(ram_data_r); DECLARE_WRITE8_MEMBER(ram_addr_data_w); @@ -46,18 +59,6 @@ public: void np_io_map(address_map &map); void np_program_map(address_map &map); -protected: - virtual void device_start() override; - virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - - // device-level overrides - virtual ioport_constructor device_input_ports() const override; - virtual const tiny_rom_entry *device_rom_region() const override; - virtual void device_add_mconfig(machine_config &config) override; - -private: - DECLARE_WRITE8_MEMBER(dc_w); required_device m_cpu; diff --git a/src/devices/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h index 2ae98540a0e..886db53db5e 100644 --- a/src/devices/bus/ieee488/c2031.h +++ b/src/devices/bus/ieee488/c2031.h @@ -31,7 +31,6 @@ public: // construction/destruction c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void c2031_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -59,6 +58,8 @@ private: DECLARE_WRITE8_MEMBER( via1_pb_w ); DECLARE_WRITE_LINE_MEMBER( byte_w ); + void c2031_mem(address_map &map); + DECLARE_FLOPPY_FORMATS( floppy_formats ); required_device m_maincpu; diff --git a/src/devices/bus/ieee488/c8280.h b/src/devices/bus/ieee488/c8280.h index 9062962bdf5..38309ea1089 100644 --- a/src/devices/bus/ieee488/c8280.h +++ b/src/devices/bus/ieee488/c8280.h @@ -31,11 +31,6 @@ public: // construction/destruction c8280_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( fk5_r ); - DECLARE_WRITE8_MEMBER( fk5_w ); - - void c8280_fdc_mem(address_map &map); - void c8280_main_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -59,6 +54,11 @@ private: DECLARE_WRITE8_MEMBER( riot1_pa_w ); DECLARE_READ8_MEMBER( riot1_pb_r ); DECLARE_WRITE8_MEMBER( riot1_pb_w ); + DECLARE_READ8_MEMBER( fk5_r ); + DECLARE_WRITE8_MEMBER( fk5_w ); + + void c8280_fdc_mem(address_map &map); + void c8280_main_mem(address_map &map); DECLARE_FLOPPY_FORMATS( floppy_formats ); diff --git a/src/devices/bus/ieee488/hardbox.h b/src/devices/bus/ieee488/hardbox.h index 889fa2684b5..80b1fc0df07 100644 --- a/src/devices/bus/ieee488/hardbox.h +++ b/src/devices/bus/ieee488/hardbox.h @@ -33,8 +33,6 @@ public: // construction/destruction hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void hardbox_io(address_map &map); - void hardbox_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -58,6 +56,9 @@ private: DECLARE_READ8_MEMBER( ppi1_pc_r ); DECLARE_WRITE8_MEMBER( ppi1_pc_w ); + void hardbox_io(address_map &map); + void hardbox_mem(address_map &map); + enum { LED_A, diff --git a/src/devices/bus/ieee488/hp9895.h b/src/devices/bus/ieee488/hp9895.h index b6ef102fedf..5d748878f87 100644 --- a/src/devices/bus/ieee488/hp9895.h +++ b/src/devices/bus/ieee488/hp9895.h @@ -26,6 +26,16 @@ public: // construction/destruction hp9895_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + + // device-level overrides + virtual ioport_constructor device_input_ports() const override; + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + // device_ieee488_interface overrides virtual void ieee488_eoi(int state) override; virtual void ieee488_dav(int state) override; @@ -36,6 +46,27 @@ public: virtual void ieee488_atn(int state) override; virtual void ieee488_ren(int state) override; +private: + // PHI write CBs + DECLARE_WRITE_LINE_MEMBER(phi_eoi_w); + DECLARE_WRITE_LINE_MEMBER(phi_dav_w); + DECLARE_WRITE_LINE_MEMBER(phi_nrfd_w); + DECLARE_WRITE_LINE_MEMBER(phi_ndac_w); + DECLARE_WRITE_LINE_MEMBER(phi_ifc_w); + DECLARE_WRITE_LINE_MEMBER(phi_srq_w); + DECLARE_WRITE_LINE_MEMBER(phi_atn_w); + DECLARE_WRITE_LINE_MEMBER(phi_ren_w); + + // PHI DIO r/w CBs + DECLARE_READ8_MEMBER(phi_dio_r); + DECLARE_WRITE8_MEMBER(phi_dio_w); + + // PHI IRQ/Z80 NMI + DECLARE_WRITE_LINE_MEMBER(phi_int_w); + + // Z80 IRQ + DECLARE_WRITE16_MEMBER(z80_m1_w); + // Floppy interface DECLARE_WRITE8_MEMBER(data_w); DECLARE_WRITE8_MEMBER(clock_w); @@ -58,36 +89,6 @@ public: void z80_io_map(address_map &map); void z80_program_map(address_map &map); -protected: - virtual void device_start() override; - virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - - // device-level overrides - virtual ioport_constructor device_input_ports() const override; - virtual const tiny_rom_entry *device_rom_region() const override; - virtual void device_add_mconfig(machine_config &config) override; - -private: - // PHI write CBs - DECLARE_WRITE_LINE_MEMBER(phi_eoi_w); - DECLARE_WRITE_LINE_MEMBER(phi_dav_w); - DECLARE_WRITE_LINE_MEMBER(phi_nrfd_w); - DECLARE_WRITE_LINE_MEMBER(phi_ndac_w); - DECLARE_WRITE_LINE_MEMBER(phi_ifc_w); - DECLARE_WRITE_LINE_MEMBER(phi_srq_w); - DECLARE_WRITE_LINE_MEMBER(phi_atn_w); - DECLARE_WRITE_LINE_MEMBER(phi_ren_w); - - // PHI DIO r/w CBs - DECLARE_READ8_MEMBER(phi_dio_r); - DECLARE_WRITE8_MEMBER(phi_dio_w); - - // PHI IRQ/Z80 NMI - DECLARE_WRITE_LINE_MEMBER(phi_int_w); - - // Z80 IRQ - DECLARE_WRITE16_MEMBER(z80_m1_w); required_device m_cpu; required_device m_phi; diff --git a/src/devices/bus/ieee488/shark.h b/src/devices/bus/ieee488/shark.h index 3681c7b4ac6..6ba13e138e8 100644 --- a/src/devices/bus/ieee488/shark.h +++ b/src/devices/bus/ieee488/shark.h @@ -30,8 +30,6 @@ public: // construction/destruction mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void mshark_io(address_map &map); - void mshark_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -43,6 +41,9 @@ protected: private: required_device m_maincpu; + + void mshark_io(address_map &map); + void mshark_mem(address_map &map); }; diff --git a/src/devices/bus/ieee488/softbox.h b/src/devices/bus/ieee488/softbox.h index d6eacc0c262..74c5f985ae3 100644 --- a/src/devices/bus/ieee488/softbox.h +++ b/src/devices/bus/ieee488/softbox.h @@ -35,10 +35,6 @@ public: // construction/destruction softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( dbrg_w ); - - void softbox_io(address_map &map); - void softbox_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -61,6 +57,11 @@ private: DECLARE_READ8_MEMBER( ppi1_pc_r ); DECLARE_WRITE8_MEMBER( ppi1_pc_w ); + DECLARE_WRITE8_MEMBER( dbrg_w ); + + void softbox_io(address_map &map); + void softbox_mem(address_map &map); + enum { LED_A, diff --git a/src/devices/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h index 18a7b26ecfb..6723401eb5d 100644 --- a/src/devices/bus/imi7000/imi5000h.h +++ b/src/devices/bus/imi7000/imi5000h.h @@ -34,8 +34,6 @@ public: // construction/destruction imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void imi5000h_io(address_map &map); - void imi5000h_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -66,6 +64,9 @@ private: DECLARE_READ8_MEMBER( pio3_pb_r ); DECLARE_WRITE8_MEMBER( pio3_pb_w ); + void imi5000h_io(address_map &map); + void imi5000h_mem(address_map &map); + enum { LED_FAULT, diff --git a/src/devices/bus/interpro/sr/gt.h b/src/devices/bus/interpro/sr/gt.h index 80825d40232..c7b0aa515eb 100644 --- a/src/devices/bus/interpro/sr/gt.h +++ b/src/devices/bus/interpro/sr/gt.h @@ -26,11 +26,6 @@ public: CONTROL_BUSY = 0x8000 }; - virtual DECLARE_READ16_MEMBER(control_r) = 0; - virtual DECLARE_WRITE16_MEMBER(control_w) = 0; - virtual DECLARE_READ32_MEMBER(vram_r) = 0; - virtual DECLARE_WRITE32_MEMBER(vram_w) = 0; - protected: typedef struct { @@ -39,6 +34,11 @@ protected: bool primary; } gt_screen_t; + + virtual DECLARE_READ16_MEMBER(control_r) = 0; + virtual DECLARE_WRITE16_MEMBER(control_w) = 0; + virtual DECLARE_READ32_MEMBER(vram_r) = 0; + virtual DECLARE_WRITE32_MEMBER(vram_w) = 0; }; class mpcb963_device : public gt_device_base @@ -48,6 +48,11 @@ public: static const int GT_SCREEN_COUNT = 1; +protected: + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + virtual void map(address_map &map) override; virtual DECLARE_READ16_MEMBER(control_r) override { return m_control; } @@ -55,11 +60,6 @@ public: virtual DECLARE_READ32_MEMBER(vram_r) override; virtual DECLARE_WRITE32_MEMBER(vram_w) override; -protected: - virtual const tiny_rom_entry *device_rom_region() const override; - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - u32 screen_update0(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); private: @@ -75,13 +75,6 @@ public: static const int GT_SCREEN_COUNT = 2; - virtual void map(address_map &map) override; - - virtual DECLARE_READ16_MEMBER(control_r) override { return m_control; } - virtual DECLARE_WRITE16_MEMBER(control_w) override; - virtual DECLARE_READ32_MEMBER(vram_r) override; - virtual DECLARE_WRITE32_MEMBER(vram_w) override; - protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; @@ -90,6 +83,13 @@ protected: u32 screen_update0(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); u32 screen_update1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + virtual void map(address_map &map) override; + + virtual DECLARE_READ16_MEMBER(control_r) override { return m_control; } + virtual DECLARE_WRITE16_MEMBER(control_w) override; + virtual DECLARE_READ32_MEMBER(vram_r) override; + virtual DECLARE_WRITE32_MEMBER(vram_w) override; + private: u16 m_control; gt_screen_t m_screen[GT_SCREEN_COUNT]; diff --git a/src/devices/bus/interpro/sr/sr.h b/src/devices/bus/interpro/sr/sr.h index ddd41938661..f53e6e031ad 100644 --- a/src/devices/bus/interpro/sr/sr.h +++ b/src/devices/bus/interpro/sr/sr.h @@ -116,8 +116,6 @@ public: // construction/destruction virtual ~device_sr_card_interface(); - virtual void map(address_map &map) = 0; - void set_sr_device(); // inline configuration @@ -126,6 +124,8 @@ public: protected: device_sr_card_interface(const machine_config &mconfig, device_t &device); + virtual void map(address_map &map) = 0; + sr_device *m_sr; const char *m_sr_tag; const char *m_sr_slot_tag; diff --git a/src/devices/bus/isa/aha1542.h b/src/devices/bus/isa/aha1542.h index 91bfeec77ee..cc84c2ea55b 100644 --- a/src/devices/bus/isa/aha1542.h +++ b/src/devices/bus/isa/aha1542.h @@ -35,7 +35,6 @@ public: DECLARE_READ8_MEMBER( aha1542_r ); DECLARE_WRITE8_MEMBER( aha1542_w ); - void z84c0010_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -45,6 +44,8 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_add_mconfig(machine_config &config) override; +private: + void z84c0010_mem(address_map &map); }; // device type definition diff --git a/src/devices/bus/isa/dectalk.h b/src/devices/bus/isa/dectalk.h index ff1442bc38e..e728b1a24d6 100644 --- a/src/devices/bus/isa/dectalk.h +++ b/src/devices/bus/isa/dectalk.h @@ -16,6 +16,19 @@ class dectalk_isa_device : public device_t, public: dectalk_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + +private: + DECLARE_READ_LINE_MEMBER(bio_line_r); + DECLARE_WRITE_LINE_MEMBER(clock_w); + DECLARE_WRITE8_MEMBER(write); DECLARE_READ8_MEMBER(read); @@ -36,18 +49,6 @@ public: void dectalk_cpu_map(address_map &map); void dectalk_dsp_io(address_map &map); void dectalk_dsp_map(address_map &map); -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual void device_add_mconfig(machine_config &config) override; - -private: - DECLARE_READ_LINE_MEMBER(bio_line_r); - DECLARE_WRITE_LINE_MEMBER(clock_w); uint16_t m_cmd, m_stat, m_data, m_dsp_dma, m_ctl; uint8_t m_dma, m_vol, m_bio; diff --git a/src/devices/bus/isa/finalchs.h b/src/devices/bus/isa/finalchs.h index fae3da43d8c..58c9a65e6d5 100644 --- a/src/devices/bus/isa/finalchs.h +++ b/src/devices/bus/isa/finalchs.h @@ -21,15 +21,6 @@ public: // construction/destruction isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(finalchs_r); - DECLARE_WRITE8_MEMBER(finalchs_w); - - DECLARE_WRITE8_MEMBER( io7ff8_write ); - DECLARE_READ8_MEMBER( io7ff8_read ); - DECLARE_READ8_MEMBER( io6000_read ); - DECLARE_WRITE8_MEMBER( io6000_write ); - - void finalchs_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -42,6 +33,16 @@ protected: private: // internal state uint8_t m_FCH_latch_data; + + DECLARE_READ8_MEMBER(finalchs_r); + DECLARE_WRITE8_MEMBER(finalchs_w); + + DECLARE_WRITE8_MEMBER( io7ff8_write ); + DECLARE_READ8_MEMBER( io7ff8_read ); + DECLARE_READ8_MEMBER( io6000_read ); + DECLARE_WRITE8_MEMBER( io6000_write ); + + void finalchs_mem(address_map &map); }; diff --git a/src/devices/bus/isa/ibm_mfc.h b/src/devices/bus/isa/ibm_mfc.h index 66110e20a0b..febb741c3b3 100644 --- a/src/devices/bus/isa/ibm_mfc.h +++ b/src/devices/bus/isa/ibm_mfc.h @@ -31,11 +31,6 @@ public: // Construction/destruction isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( ibm_mfc_r ); - DECLARE_WRITE8_MEMBER( ibm_mfc_w ); - - void io_map(address_map &map); - void prg_map(address_map &map); protected: // Device-level overrides virtual void device_start() override; @@ -64,6 +59,12 @@ private: DECLARE_WRITE_LINE_MEMBER( ibm_mfc_ym_irq ); + DECLARE_READ8_MEMBER( ibm_mfc_r ); + DECLARE_WRITE8_MEMBER( ibm_mfc_w ); + + void io_map(address_map &map); + void prg_map(address_map &map); + void set_z80_interrupt(int src, int state); void set_pc_interrupt(int src, int state); void update_pc_interrupts(void); diff --git a/src/devices/bus/isa/ide.h b/src/devices/bus/isa/ide.h index b6148793a08..e0e58661389 100644 --- a/src/devices/bus/isa/ide.h +++ b/src/devices/bus/isa/ide.h @@ -21,12 +21,6 @@ public: // construction/destruction isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - bool is_primary() { return m_is_primary; } - void map(address_map &map); - void alt_map(address_map &map); - READ8_MEMBER(ide16_alt_r); - WRITE8_MEMBER(ide16_alt_w); - static void cdrom_headphones(device_t *device); protected: @@ -40,6 +34,12 @@ protected: private: DECLARE_WRITE_LINE_MEMBER(ide_interrupt); + READ8_MEMBER(ide16_alt_r); + WRITE8_MEMBER(ide16_alt_w); + bool is_primary() { return m_is_primary; } + + void map(address_map &map); + void alt_map(address_map &map); // internal state bool m_is_primary; diff --git a/src/devices/bus/isa/mcd.h b/src/devices/bus/isa/mcd.h index 1d4a10a3cff..26f3a7a31d3 100644 --- a/src/devices/bus/isa/mcd.h +++ b/src/devices/bus/isa/mcd.h @@ -21,15 +21,10 @@ public: // construction/destruction mcd_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: // optional information overrides virtual ioport_constructor device_input_ports() const override; - void map(address_map &map); - - DECLARE_READ8_MEMBER(data_r); - DECLARE_READ8_MEMBER(flag_r); - DECLARE_WRITE8_MEMBER(cmd_w); - DECLARE_WRITE8_MEMBER(reset_w); virtual uint16_t dack16_r(int line) override; protected: @@ -38,6 +33,13 @@ protected: virtual void device_reset() override; private: + DECLARE_READ8_MEMBER(data_r); + DECLARE_READ8_MEMBER(flag_r); + DECLARE_WRITE8_MEMBER(cmd_w); + DECLARE_WRITE8_MEMBER(reset_w); + + void map(address_map &map); + bool read_sector(bool first = false); bool m_change; diff --git a/src/devices/bus/isa/num9rev.h b/src/devices/bus/isa/num9rev.h index 1a9f10d3fb6..dbfda9fa954 100644 --- a/src/devices/bus/isa/num9rev.h +++ b/src/devices/bus/isa/num9rev.h @@ -23,6 +23,19 @@ public: // construction/destruction isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + // optional information overrides + virtual void device_add_mconfig(machine_config &config) override; + +private: + UPD7220_DISPLAY_PIXELS_MEMBER(hgdc_display_pixels); + + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + DECLARE_READ8_MEMBER(pal8_r); DECLARE_WRITE8_MEMBER(pal8_w); DECLARE_READ8_MEMBER(pal12_r); @@ -37,18 +50,6 @@ public: DECLARE_WRITE8_MEMBER(write8); void upd7220_map(address_map &map); -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - // optional information overrides - virtual void device_add_mconfig(machine_config &config) override; - -private: - UPD7220_DISPLAY_PIXELS_MEMBER(hgdc_display_pixels); - - uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_upd7220; required_device m_palette; diff --git a/src/devices/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h index 0a619a7d980..91184a4ee8a 100644 --- a/src/devices/bus/isa/pgc.h +++ b/src/devices/bus/isa/pgc.h @@ -25,15 +25,6 @@ public: // construction/destruction isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( stateparam_w ); - DECLARE_READ8_MEMBER( stateparam_r ); - DECLARE_WRITE8_MEMBER( lut_w ); - DECLARE_READ8_MEMBER( init_r ); - - void reset_common(); - - void pgc_io(address_map &map); - void pgc_map(address_map &map); protected: isa8_pgc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -54,6 +45,16 @@ private: INTERRUPT_GEN_MEMBER(vblank_irq); IRQ_CALLBACK_MEMBER(irq_callback); + DECLARE_WRITE8_MEMBER( stateparam_w ); + DECLARE_READ8_MEMBER( stateparam_r ); + DECLARE_WRITE8_MEMBER( lut_w ); + DECLARE_READ8_MEMBER( init_r ); + + void reset_common(); + + void pgc_io(address_map &map); + void pgc_map(address_map &map); + required_device m_cpu; required_device m_screen; required_device m_palette; diff --git a/src/devices/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h index 1d0c64a0528..59bf99e7648 100644 --- a/src/devices/bus/isa/sb16.h +++ b/src/devices/bus/isa/sb16.h @@ -22,6 +22,23 @@ public: // construction/destruction sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + + uint8_t dack_r(int line) override; + void dack_w(int line, uint8_t data) override; + uint16_t dack16_r(int line) override; + void dack16_w(int line, uint16_t data) override; + +private: READ8_MEMBER( mpu401_r ); WRITE8_MEMBER( mpu401_w ); @@ -69,30 +86,14 @@ public: DECLARE_WRITE8_MEMBER( invalid_w ); void sb16_io(address_map &map); -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual void device_add_mconfig(machine_config &config) override; - uint8_t dack_r(int line) override; - void dack_w(int line, uint8_t data) override; - uint16_t dack16_r(int line) override; - void dack16_w(int line, uint16_t data) override; + void control_timer(bool start); required_device m_ldac; required_device m_rdac; required_device m_joy; required_device m_cpu; -private: - void control_timer(bool start); - // internal state bool m_data_in; uint8_t m_in_byte; diff --git a/src/devices/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h index 73363bc31a8..5242adcfbef 100644 --- a/src/devices/bus/isa/stereo_fx.h +++ b/src/devices/bus/isa/stereo_fx.h @@ -23,28 +23,6 @@ public: // construction/destruction stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // mcu ports - DECLARE_READ8_MEMBER( dev_dsp_data_r ); - DECLARE_WRITE8_MEMBER( dev_dsp_data_w ); - DECLARE_READ8_MEMBER( p1_r ); - DECLARE_READ8_MEMBER( p3_r ); - DECLARE_WRITE8_MEMBER( p3_w ); - DECLARE_WRITE8_MEMBER( dev_host_irq_w ); - DECLARE_WRITE8_MEMBER( raise_drq_w ); - DECLARE_WRITE8_MEMBER( port20_w ); - DECLARE_WRITE8_MEMBER( port00_w ); - - // host ports - DECLARE_READ8_MEMBER( dsp_data_r ); - DECLARE_WRITE8_MEMBER( dsp_cmd_w ); - DECLARE_WRITE8_MEMBER( dsp_reset_w ); - DECLARE_READ8_MEMBER( dsp_wbuf_status_r ); - DECLARE_READ8_MEMBER( dsp_rbuf_status_r ); - DECLARE_READ8_MEMBER( invalid_r ); - DECLARE_WRITE8_MEMBER( invalid_w ); - - void stereo_fx_io(address_map &map); - void stereo_fx_rom(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -74,6 +52,29 @@ private: emu_timer *m_timer; uint8_t m_t0; uint8_t m_t1; + + // mcu ports + DECLARE_READ8_MEMBER( dev_dsp_data_r ); + DECLARE_WRITE8_MEMBER( dev_dsp_data_w ); + DECLARE_READ8_MEMBER( p1_r ); + DECLARE_READ8_MEMBER( p3_r ); + DECLARE_WRITE8_MEMBER( p3_w ); + DECLARE_WRITE8_MEMBER( dev_host_irq_w ); + DECLARE_WRITE8_MEMBER( raise_drq_w ); + DECLARE_WRITE8_MEMBER( port20_w ); + DECLARE_WRITE8_MEMBER( port00_w ); + + // host ports + DECLARE_READ8_MEMBER( dsp_data_r ); + DECLARE_WRITE8_MEMBER( dsp_cmd_w ); + DECLARE_WRITE8_MEMBER( dsp_reset_w ); + DECLARE_READ8_MEMBER( dsp_wbuf_status_r ); + DECLARE_READ8_MEMBER( dsp_rbuf_status_r ); + DECLARE_READ8_MEMBER( invalid_r ); + DECLARE_WRITE8_MEMBER( invalid_w ); + + void stereo_fx_io(address_map &map); + void stereo_fx_rom(address_map &map); }; // device type definition diff --git a/src/devices/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h index e713fd5e804..89d3aa5774f 100644 --- a/src/devices/bus/isa/wdxt_gen.h +++ b/src/devices/bus/isa/wdxt_gen.h @@ -40,7 +40,6 @@ public: // construction/destruction wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void wd1015_io(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -67,6 +66,8 @@ private: DECLARE_READ8_MEMBER( wd1015_p2_r ); DECLARE_WRITE8_MEMBER( wd1015_p2_w ); + void wd1015_io(address_map &map); + required_device m_maincpu; required_device m_host; required_device m_hdc; diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h index 81810ce2bbb..e85d12c6aee 100644 --- a/src/devices/bus/kc/d004.h +++ b/src/devices/bus/kc/d004.h @@ -27,12 +27,6 @@ public: // construction/destruction kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(hw_input_gate_r); - DECLARE_WRITE8_MEMBER(fdd_select_w); - DECLARE_WRITE8_MEMBER(hw_terminal_count_w); - - void kc_d004_io(address_map &map); - void kc_d004_mem(address_map &map); protected: kc_d004_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -52,11 +46,18 @@ protected: virtual void io_read(offs_t offset, uint8_t &data) override; virtual void io_write(offs_t offset, uint8_t data) override; + DECLARE_READ8_MEMBER(hw_input_gate_r); + DECLARE_WRITE8_MEMBER(fdd_select_w); + DECLARE_WRITE8_MEMBER(hw_terminal_count_w); + private: DECLARE_FLOPPY_FORMATS( floppy_formats ); DECLARE_WRITE_LINE_MEMBER( fdc_irq ); + void kc_d004_io(address_map &map); + void kc_d004_mem(address_map &map); + static const device_timer_id TIMER_RESET = 0; required_device m_cpu; @@ -89,10 +90,6 @@ public: // construction/destruction kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(gide_r); - DECLARE_WRITE8_MEMBER(gide_w); - - void kc_d004_gide_io(address_map &map); protected: // device-level overrides virtual void device_reset() override; @@ -106,6 +103,11 @@ private: uint16_t m_ata_data; int m_lh; + + DECLARE_READ8_MEMBER(gide_r); + DECLARE_WRITE8_MEMBER(gide_w); + + void kc_d004_gide_io(address_map &map); }; // device type definition diff --git a/src/devices/bus/megadrive/svp.h b/src/devices/bus/megadrive/svp.h index a74c644e3a9..dd0cba5b07e 100644 --- a/src/devices/bus/megadrive/svp.h +++ b/src/devices/bus/megadrive/svp.h @@ -19,6 +19,16 @@ public: // construction/destruction md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + md_rom_svp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + virtual void device_start() override; + + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + virtual void set_bank_to_rom(const char *banktag, uint32_t offset) override; + // reading and writing virtual DECLARE_READ16_MEMBER(read) override; virtual DECLARE_WRITE16_MEMBER(write) override; @@ -44,19 +54,8 @@ public: virtual DECLARE_WRITE16_MEMBER(write_xst); virtual DECLARE_WRITE16_MEMBER(write_pmc); virtual DECLARE_WRITE16_MEMBER(write_al); - - void md_svp_ext_map(address_map &map); - void md_svp_ssp_map(address_map &map); -protected: - md_rom_svp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - virtual void device_start() override; - - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual ioport_constructor device_input_ports() const override; - virtual void set_bank_to_rom(const char *banktag, uint32_t offset) override; - + +private: required_device m_svp; required_ioport m_test_ipt; @@ -70,6 +69,9 @@ protected: uint16_t m_xst2; // status of XST (bit1 set when 68k writes to XST) uint8_t m_iram[0x800]; // IRAM (0-0x7ff) uint8_t m_dram[0x20000]; // [0x20000]; + + void md_svp_ext_map(address_map &map); + void md_svp_ssp_map(address_map &map); }; diff --git a/src/devices/bus/msx_cart/bm_012.h b/src/devices/bus/msx_cart/bm_012.h index b2855652648..e54213e8e75 100644 --- a/src/devices/bus/msx_cart/bm_012.h +++ b/src/devices/bus/msx_cart/bm_012.h @@ -18,7 +18,6 @@ class msx_cart_bm_012_device : public device_t, public msx_cart_interface public: msx_cart_bm_012_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void bm_012_memory_map(address_map &map); protected: virtual void device_start() override; @@ -29,6 +28,8 @@ protected: private: DECLARE_WRITE_LINE_MEMBER(midi_in); + void bm_012_memory_map(address_map &map); + required_device m_tmpz84c015af; required_device m_bm012_pio; required_device m_mdthru; diff --git a/src/devices/bus/msx_cart/konami.h b/src/devices/bus/msx_cart/konami.h index e278cb8313c..3985884f568 100644 --- a/src/devices/bus/msx_cart/konami.h +++ b/src/devices/bus/msx_cart/konami.h @@ -178,23 +178,24 @@ class msx_cart_keyboard_master_device : public device_t, public msx_cart_interfa public: msx_cart_keyboard_master_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + // device-level overrides + virtual void device_start() override; + + virtual void device_add_mconfig(machine_config &config) override; + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart) override; +private: + required_device m_vlm5030; + DECLARE_READ8_MEMBER(read_vlm); DECLARE_WRITE8_MEMBER(io_20_w); DECLARE_READ8_MEMBER(io_00_r); void vlm_map(address_map &map); -protected: - // device-level overrides - virtual void device_start() override; - - virtual void device_add_mconfig(machine_config &config) override; - -private: - required_device m_vlm5030; }; diff --git a/src/devices/bus/msx_cart/moonsound.h b/src/devices/bus/msx_cart/moonsound.h index dbdb0e99014..1e72706632d 100644 --- a/src/devices/bus/msx_cart/moonsound.h +++ b/src/devices/bus/msx_cart/moonsound.h @@ -17,13 +17,6 @@ class msx_cart_moonsound_device : public device_t, public msx_cart_interface public: msx_cart_moonsound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER(write_ymf278b_fm); - DECLARE_READ8_MEMBER(read_ymf278b_fm); - DECLARE_WRITE8_MEMBER(write_ymf278b_pcm); - DECLARE_READ8_MEMBER(read_ymf278b_pcm); - DECLARE_READ8_MEMBER(read_c0); - - void ymf278b_map(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -34,6 +27,13 @@ protected: private: DECLARE_WRITE_LINE_MEMBER(irq_w); + DECLARE_WRITE8_MEMBER(write_ymf278b_fm); + DECLARE_READ8_MEMBER(read_ymf278b_fm); + DECLARE_WRITE8_MEMBER(write_ymf278b_pcm); + DECLARE_READ8_MEMBER(read_ymf278b_pcm); + DECLARE_READ8_MEMBER(read_c0); + + void ymf278b_map(address_map &map); required_device m_ymf278b; }; diff --git a/src/devices/bus/newbrain/fdc.h b/src/devices/bus/newbrain/fdc.h index 4b69d607532..79140df472d 100644 --- a/src/devices/bus/newbrain/fdc.h +++ b/src/devices/bus/newbrain/fdc.h @@ -29,12 +29,6 @@ public: // construction/destruction newbrain_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( fdc_auxiliary_w ); - DECLARE_READ8_MEMBER( fdc_control_r ); - DECLARE_WRITE8_MEMBER( io_dec_w ); - - void newbrain_fdc_io(address_map &map); - void newbrain_fdc_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -53,6 +47,13 @@ protected: private: DECLARE_WRITE_LINE_MEMBER( fdc_int_w ); + DECLARE_WRITE8_MEMBER( fdc_auxiliary_w ); + DECLARE_READ8_MEMBER( fdc_control_r ); + DECLARE_WRITE8_MEMBER( io_dec_w ); + + void newbrain_fdc_io(address_map &map); + void newbrain_fdc_mem(address_map &map); + required_device m_maincpu; required_device m_fdc; required_device m_floppy0; diff --git a/src/devices/bus/odyssey2/chess.h b/src/devices/bus/odyssey2/chess.h index 95f5bdd3236..da8bee54b9d 100644 --- a/src/devices/bus/odyssey2/chess.h +++ b/src/devices/bus/odyssey2/chess.h @@ -18,14 +18,15 @@ public: // construction/destruction o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void chess_io(address_map &map); - void chess_mem(address_map &map); protected: virtual void device_add_mconfig(machine_config &config) override; // virtual const rom_entry *device_rom_region() const; private: required_device m_cpu; + + void chess_io(address_map &map); + void chess_mem(address_map &map); }; // device type definition diff --git a/src/devices/bus/oricext/jasmin.h b/src/devices/bus/oricext/jasmin.h index 7dd300bddc6..4daf1feff09 100644 --- a/src/devices/bus/oricext/jasmin.h +++ b/src/devices/bus/oricext/jasmin.h @@ -17,13 +17,7 @@ public: jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~jasmin_device(); - void map(address_map &map); DECLARE_INPUT_CHANGED_MEMBER(boot_pressed); - DECLARE_WRITE8_MEMBER(side_sel_w); - DECLARE_WRITE8_MEMBER(fdc_reset_w); - DECLARE_WRITE8_MEMBER(ram_access_w); - DECLARE_WRITE8_MEMBER(rom_access_w); - DECLARE_WRITE8_MEMBER(select_w); protected: virtual void device_start() override; @@ -32,8 +26,17 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; +private: void remap(); + DECLARE_WRITE8_MEMBER(side_sel_w); + DECLARE_WRITE8_MEMBER(fdc_reset_w); + DECLARE_WRITE8_MEMBER(ram_access_w); + DECLARE_WRITE8_MEMBER(rom_access_w); + DECLARE_WRITE8_MEMBER(select_w); + + void map(address_map &map); + DECLARE_FLOPPY_FORMATS(floppy_formats); required_device fdc; diff --git a/src/devices/bus/oricext/microdisc.h b/src/devices/bus/oricext/microdisc.h index 61870f31251..a5f97151f0d 100644 --- a/src/devices/bus/oricext/microdisc.h +++ b/src/devices/bus/oricext/microdisc.h @@ -15,10 +15,6 @@ public: microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~microdisc_device(); - void map(address_map &map); - DECLARE_WRITE8_MEMBER(port_314_w); - DECLARE_READ8_MEMBER(port_314_r); - DECLARE_READ8_MEMBER(port_318_r); protected: enum { @@ -50,6 +46,12 @@ private: DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); DECLARE_WRITE_LINE_MEMBER(fdc_hld_w); + DECLARE_WRITE8_MEMBER(port_314_w); + DECLARE_READ8_MEMBER(port_314_r); + DECLARE_READ8_MEMBER(port_318_r); + + void map(address_map &map); + DECLARE_FLOPPY_FORMATS(floppy_formats); }; diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h index 5515cbd2bad..a05fd4b3736 100644 --- a/src/devices/bus/pc_kbd/iskr1030.h +++ b/src/devices/bus/pc_kbd/iskr1030.h @@ -29,10 +29,6 @@ public: // construction/destruction iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( ram_r ); - DECLARE_WRITE8_MEMBER( ram_w ); - - void iskr_1030_keyboard_io(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -53,6 +49,11 @@ private: DECLARE_WRITE8_MEMBER( p2_w ); DECLARE_READ_LINE_MEMBER( t1_r ); + DECLARE_READ8_MEMBER( ram_r ); + DECLARE_WRITE8_MEMBER( ram_w ); + + void iskr_1030_keyboard_io(address_map &map); + required_device m_maincpu; required_ioport m_md00; required_ioport m_md01; diff --git a/src/devices/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h index cdae3623567..4bfc637e8f2 100644 --- a/src/devices/bus/pc_kbd/keytro.h +++ b/src/devices/bus/pc_kbd/keytro.h @@ -26,22 +26,6 @@ public: // construction/destruction pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - required_device m_cpu; - - virtual DECLARE_WRITE_LINE_MEMBER(clock_write) override; - virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; - - DECLARE_READ8_MEMBER( internal_data_read ); - DECLARE_WRITE8_MEMBER( internal_data_write ); - DECLARE_READ8_MEMBER( p1_read ); - DECLARE_WRITE8_MEMBER( p1_write ); - DECLARE_READ8_MEMBER( p2_read ); - DECLARE_WRITE8_MEMBER( p2_write ); - DECLARE_READ8_MEMBER( p3_read ); - DECLARE_WRITE8_MEMBER( p3_write ); - - void keytronic_pc3270_io(address_map &map); - void keytronic_pc3270_program(address_map &map); protected: pc_kbd_keytronic_pc3270_device( machine_config const &mconfig, @@ -59,6 +43,23 @@ protected: virtual ioport_constructor device_input_ports() const override; virtual const tiny_rom_entry *device_rom_region() const override; + virtual DECLARE_WRITE_LINE_MEMBER(clock_write) override; + virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; + + DECLARE_READ8_MEMBER( internal_data_read ); + DECLARE_WRITE8_MEMBER( internal_data_write ); + DECLARE_READ8_MEMBER( p1_read ); + DECLARE_WRITE8_MEMBER( p1_write ); + DECLARE_READ8_MEMBER( p2_read ); + DECLARE_WRITE8_MEMBER( p2_write ); + DECLARE_READ8_MEMBER( p3_read ); + DECLARE_WRITE8_MEMBER( p3_write ); + + void keytronic_pc3270_io(address_map &map); + void keytronic_pc3270_program(address_map &map); + + required_device m_cpu; + uint8_t m_p1; uint8_t m_p1_data; uint8_t m_p2; diff --git a/src/devices/bus/pc_kbd/msnat.h b/src/devices/bus/pc_kbd/msnat.h index 6ecf57ddc38..52e6cabae3f 100644 --- a/src/devices/bus/pc_kbd/msnat.h +++ b/src/devices/bus/pc_kbd/msnat.h @@ -24,17 +24,6 @@ public: // construction/destruction pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_WRITE_LINE_MEMBER(clock_write) override; - virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; - - DECLARE_READ8_MEMBER(p0_read); - DECLARE_WRITE8_MEMBER(p0_write); - DECLARE_WRITE8_MEMBER(p1_write); - DECLARE_WRITE8_MEMBER(p2_write); - DECLARE_READ8_MEMBER(p3_read); - DECLARE_WRITE8_MEMBER(p3_write); - - void microsoft_natural_io(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -45,6 +34,10 @@ protected: virtual ioport_constructor device_input_ports() const override; virtual const tiny_rom_entry *device_rom_region() const override; + virtual DECLARE_WRITE_LINE_MEMBER(clock_write) override; + virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; + +private: required_device m_cpu; required_ioport_array<8> m_p2_r; @@ -54,6 +47,15 @@ protected: uint8_t m_p1; uint8_t m_p2; uint8_t m_p3; + + DECLARE_READ8_MEMBER(p0_read); + DECLARE_WRITE8_MEMBER(p0_write); + DECLARE_WRITE8_MEMBER(p1_write); + DECLARE_WRITE8_MEMBER(p2_write); + DECLARE_READ8_MEMBER(p3_read); + DECLARE_WRITE8_MEMBER(p3_write); + + void microsoft_natural_io(address_map &map); }; diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h index 66080a8e565..44abebbf9ef 100644 --- a/src/devices/bus/pet/hsg.h +++ b/src/devices/bus/pet/hsg.h @@ -24,15 +24,6 @@ class cbm8000_hsg_device : public device_t, public device_pet_expansion_card_interface { -public: - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - - // device_pet_expansion_card_interface overrides - virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override; - virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) override; - virtual void pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) override; - protected: // construction/destruction cbm8000_hsg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -41,6 +32,14 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + + // device_pet_expansion_card_interface overrides + virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override; + virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) override; + virtual void pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) override; + private: required_device m_gdc; required_memory_region m_9000; @@ -56,10 +55,12 @@ public: // construction/destruction cbm8000_hsg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void hsg_a_map(address_map &map); protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; + +private: + void hsg_a_map(address_map &map); }; @@ -71,10 +72,12 @@ public: // construction/destruction cbm8000_hsg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void hsg_b_map(address_map &map); protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; + +private: + void hsg_b_map(address_map &map); }; diff --git a/src/devices/bus/pet/superpet.h b/src/devices/bus/pet/superpet.h index a9fba1213b3..35c74af8ab0 100644 --- a/src/devices/bus/pet/superpet.h +++ b/src/devices/bus/pet/superpet.h @@ -30,10 +30,6 @@ public: // construction/destruction superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - - void superpet_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -54,6 +50,11 @@ protected: private: DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); + DECLARE_READ8_MEMBER( read ); + DECLARE_WRITE8_MEMBER( write ); + + void superpet_mem(address_map &map); + required_device m_maincpu; required_device m_acia; required_device m_dongle; diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h index 4a1d0e28415..e8413337f46 100644 --- a/src/devices/bus/plus4/c1551.h +++ b/src/devices/bus/plus4/c1551.h @@ -31,10 +31,6 @@ public: // construction/destruction c1551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( tpi0_r ); - DECLARE_WRITE8_MEMBER( tpi0_w ); - - void c1551_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -63,6 +59,11 @@ private: DECLARE_READ8_MEMBER( tpi1_pc_r ); DECLARE_WRITE8_MEMBER( tpi1_pc_w ); + DECLARE_READ8_MEMBER( tpi0_r ); + DECLARE_WRITE8_MEMBER( tpi0_w ); + + void c1551_mem(address_map &map); + DECLARE_FLOPPY_FORMATS( floppy_formats ); enum diff --git a/src/devices/bus/psi_kbd/ergoline.h b/src/devices/bus/psi_kbd/ergoline.h index ec43412030b..3b3329d45cb 100644 --- a/src/devices/bus/psi_kbd/ergoline.h +++ b/src/devices/bus/psi_kbd/ergoline.h @@ -30,11 +30,6 @@ public: static constexpr feature_type unemulated_features() { return feature::KEYBOARD; } - // from host - virtual void tx_w(int state) override; - - void kbd_io(address_map &map); - void kbd_mem(address_map &map); protected: // device_t overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -43,7 +38,12 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // from host + virtual void tx_w(int state) override; + private: + void kbd_io(address_map &map); + void kbd_mem(address_map &map); }; diff --git a/src/devices/bus/s100/djdma.h b/src/devices/bus/s100/djdma.h index c612cf80188..013399e2fa5 100644 --- a/src/devices/bus/s100/djdma.h +++ b/src/devices/bus/s100/djdma.h @@ -29,8 +29,6 @@ public: // construction/destruction s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void djdma_io(address_map &map); - void djdma_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -39,6 +37,10 @@ protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; + +private: + void djdma_io(address_map &map); + void djdma_mem(address_map &map); }; diff --git a/src/devices/bus/scsi/s1410.h b/src/devices/bus/scsi/s1410.h index 02586c9bb32..03ec288b76a 100644 --- a/src/devices/bus/scsi/s1410.h +++ b/src/devices/bus/scsi/s1410.h @@ -19,16 +19,18 @@ public: // construction/destruction s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual void ExecCommand() override; virtual void WriteData( uint8_t *data, int dataLength ) override; virtual void ReadData( uint8_t *data, int dataLength ) override; +private: void s1410_io(address_map &map); void s1410_mem(address_map &map); -protected: - // optional information overrides - virtual const tiny_rom_entry *device_rom_region() const override; - virtual void device_add_mconfig(machine_config &config) override; }; diff --git a/src/devices/bus/snes/event.h b/src/devices/bus/snes/event.h index 50b88266170..812022b3799 100644 --- a/src/devices/bus/snes/event.h +++ b/src/devices/bus/snes/event.h @@ -18,19 +18,6 @@ public: // construction/destruction sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual void speedup_addon_bios_access() override; - - // reading and writing - virtual DECLARE_READ8_MEMBER(read_l) override; - virtual DECLARE_READ8_MEMBER(read_h) override; - virtual DECLARE_READ8_MEMBER(chip_read) override; - virtual DECLARE_WRITE8_MEMBER(chip_write) override; - - virtual DECLARE_READ32_MEMBER(necdsp_prg_r); - virtual DECLARE_READ16_MEMBER(necdsp_data_r); - - void dsp_data_map_lorom(address_map &map); - void dsp_prg_map_lorom(address_map &map); protected: static constexpr device_timer_id TIMER_EVENT = 0; @@ -42,10 +29,21 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual ioport_constructor device_input_ports() const override; + virtual void speedup_addon_bios_access() override; + + // reading and writing + virtual DECLARE_READ8_MEMBER(read_l) override; + virtual DECLARE_READ8_MEMBER(read_h) override; + virtual DECLARE_READ8_MEMBER(chip_read) override; + virtual DECLARE_WRITE8_MEMBER(chip_write) override; + + virtual DECLARE_READ32_MEMBER(necdsp_prg_r); + virtual DECLARE_READ16_MEMBER(necdsp_data_r); + +private: required_device m_upd7725; required_ioport m_dsw; -private: uint8_t m_base_bank; uint8_t m_mask; uint8_t m_status; @@ -55,6 +53,9 @@ private: std::vector m_dsp_data; emu_timer *pfest94_timer; + + void dsp_data_map_lorom(address_map &map); + void dsp_prg_map_lorom(address_map &map); }; diff --git a/src/devices/bus/snes/sa1.h b/src/devices/bus/snes/sa1.h index cb646d32364..6ea8ae9b15a 100644 --- a/src/devices/bus/snes/sa1.h +++ b/src/devices/bus/snes/sa1.h @@ -18,6 +18,13 @@ public: // construction/destruction sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + virtual void device_add_mconfig(machine_config &config) override; + // reading and writing virtual DECLARE_READ8_MEMBER(read_l) override; virtual DECLARE_READ8_MEMBER(read_h) override; @@ -28,19 +35,6 @@ public: virtual DECLARE_READ8_MEMBER(chip_read) override; virtual DECLARE_WRITE8_MEMBER(chip_write) override; - DECLARE_READ8_MEMBER(sa1_lo_r); - DECLARE_READ8_MEMBER(sa1_hi_r); - DECLARE_WRITE8_MEMBER(sa1_lo_w); - DECLARE_WRITE8_MEMBER(sa1_hi_w); - - void sa1_map(address_map &map); -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - virtual void device_add_mconfig(machine_config &config) override; - private: uint8_t var_length_read(address_space &space, uint32_t offset); void dma_transfer(address_space &space); @@ -108,6 +102,13 @@ private: uint8_t m_scpu_flags, m_sa1_flags; // $2302-$2305 uint16_t m_hcr, m_vcr; + + DECLARE_READ8_MEMBER(sa1_lo_r); + DECLARE_READ8_MEMBER(sa1_hi_r); + DECLARE_WRITE8_MEMBER(sa1_lo_w); + DECLARE_WRITE8_MEMBER(sa1_hi_w); + + void sa1_map(address_map &map); }; diff --git a/src/devices/bus/snes/sfx.h b/src/devices/bus/snes/sfx.h index f46bce710fb..253084be139 100644 --- a/src/devices/bus/snes/sfx.h +++ b/src/devices/bus/snes/sfx.h @@ -16,6 +16,15 @@ public: // construction/destruction sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + + virtual void device_add_mconfig(machine_config &config) override; + + virtual DECLARE_WRITE_LINE_MEMBER(snes_extern_irq_w); + // additional reading and writing virtual DECLARE_READ8_MEMBER(read_l) override; virtual DECLARE_READ8_MEMBER(read_h) override; @@ -31,19 +40,12 @@ public: virtual DECLARE_WRITE8_MEMBER(superfx_w_bank2); virtual DECLARE_WRITE8_MEMBER(superfx_w_bank3); - void sfx_map(address_map &map); -protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - virtual void device_add_mconfig(machine_config &config) override; - - virtual DECLARE_WRITE_LINE_MEMBER(snes_extern_irq_w); - +private: required_device m_superfx; uint8_t sfx_ram[0x200000]; + + void sfx_map(address_map &map); }; diff --git a/src/devices/bus/snes/sgb.h b/src/devices/bus/snes/sgb.h index 9815bce164d..4a15edd6b68 100644 --- a/src/devices/bus/snes/sgb.h +++ b/src/devices/bus/snes/sgb.h @@ -21,6 +21,17 @@ class sns_rom_sgb_device : public sns_rom_device { public: + + virtual DECLARE_WRITE8_MEMBER(gb_timer_callback); + +protected: + // construction/destruction + sns_rom_sgb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; + // reading and writing virtual DECLARE_READ8_MEMBER(read_l) override; virtual DECLARE_READ8_MEMBER(read_h) override; @@ -37,17 +48,10 @@ public: virtual DECLARE_WRITE8_MEMBER(gb_io_w); virtual DECLARE_READ8_MEMBER(gb_ie_r); virtual DECLARE_WRITE8_MEMBER(gb_ie_w); - virtual DECLARE_WRITE8_MEMBER(gb_timer_callback); void supergb_map(address_map &map); -protected: - // construction/destruction - sns_rom_sgb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; +private: required_device m_sgb_cpu; required_device m_sgb_apu; required_device m_sgb_ppu; diff --git a/src/devices/bus/snes/upd.h b/src/devices/bus/snes/upd.h index 904bcf48ad1..dfc55466225 100644 --- a/src/devices/bus/snes/upd.h +++ b/src/devices/bus/snes/upd.h @@ -18,6 +18,13 @@ public: // construction/destruction sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + // device-level overrides + virtual void device_start() override; + virtual void device_add_mconfig(machine_config &config) override; + virtual void speedup_addon_bios_access() override; // additional reading and writing @@ -29,13 +36,8 @@ public: void dsp_data_map_lorom(address_map &map); void dsp_prg_map_lorom(address_map &map); -protected: - sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - // device-level overrides - virtual void device_start() override; - virtual void device_add_mconfig(machine_config &config) override; +private: required_device m_upd7725; std::vector m_dsp_prg; @@ -50,6 +52,13 @@ public: // construction/destruction sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + // device-level overrides + virtual void device_start() override; + virtual void device_add_mconfig(machine_config &config) override; + virtual void speedup_addon_bios_access() override; // additional reading and writing @@ -61,13 +70,8 @@ public: void dsp_data_map_hirom(address_map &map); void dsp_prg_map_hirom(address_map &map); -protected: - sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - // device-level overrides - virtual void device_start() override; - virtual void device_add_mconfig(machine_config &config) override; +private: required_device m_upd7725; std::vector m_dsp_prg; @@ -81,6 +85,13 @@ class sns_rom_setadsp_device : public sns_rom_device public: virtual void speedup_addon_bios_access() override; +protected: + // construction/destruction + sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + // device-level overrides + virtual void device_start() override; + // additional reading and writing virtual DECLARE_READ8_MEMBER(chip_read) override; virtual DECLARE_WRITE8_MEMBER(chip_write) override; @@ -90,13 +101,8 @@ public: void st01x_data_map(address_map &map); void st01x_prg_map(address_map &map); -protected: - // construction/destruction - sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - // device-level overrides - virtual void device_start() override; +private: required_device m_upd96050; std::vector m_dsp_prg; diff --git a/src/devices/bus/spc1000/fdd.h b/src/devices/bus/spc1000/fdd.h index f748b853902..236ef9ba55e 100644 --- a/src/devices/bus/spc1000/fdd.h +++ b/src/devices/bus/spc1000/fdd.h @@ -22,12 +22,6 @@ public: // construction/destruction spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_READ8_MEMBER(tc_r); - DECLARE_WRITE8_MEMBER(control_w); - - void sd725_io(address_map &map); - void sd725_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -39,10 +33,6 @@ protected: virtual DECLARE_READ8_MEMBER(read) override; virtual DECLARE_WRITE8_MEMBER(write) override; - DECLARE_WRITE8_MEMBER(i8255_b_w); - DECLARE_READ8_MEMBER(i8255_c_r); - DECLARE_WRITE8_MEMBER(i8255_c_w); - private: static constexpr device_timer_id TIMER_TC = 0; @@ -59,6 +49,16 @@ private: uint8_t m_i8255_0_pc; uint8_t m_i8255_1_pc; uint8_t m_i8255_portb; + + DECLARE_WRITE8_MEMBER(i8255_b_w); + DECLARE_READ8_MEMBER(i8255_c_r); + DECLARE_WRITE8_MEMBER(i8255_c_w); + + DECLARE_READ8_MEMBER(tc_r); + DECLARE_WRITE8_MEMBER(control_w); + + void sd725_io(address_map &map); + void sd725_mem(address_map &map); }; diff --git a/src/devices/bus/tiki100/8088.h b/src/devices/bus/tiki100/8088.h index 8e3c99a761a..c9fcca86807 100644 --- a/src/devices/bus/tiki100/8088.h +++ b/src/devices/bus/tiki100/8088.h @@ -29,11 +29,6 @@ public: // construction/destruction tiki100_8088_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - - void i8088_io(address_map &map); - void i8088_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -49,6 +44,12 @@ private: required_device m_maincpu; uint8_t m_data; + + DECLARE_READ8_MEMBER( read ); + DECLARE_WRITE8_MEMBER( write ); + + void i8088_io(address_map &map); + void i8088_mem(address_map &map); }; diff --git a/src/devices/bus/vcs/harmony_melody.h b/src/devices/bus/vcs/harmony_melody.h index 487fe14191e..d765b40d11b 100644 --- a/src/devices/bus/vcs/harmony_melody.h +++ b/src/devices/bus/vcs/harmony_melody.h @@ -17,13 +17,6 @@ public: // construction/destruction a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; - virtual DECLARE_WRITE8_MEMBER(write_bank) override; - - DECLARE_READ8_MEMBER(read8_r); - - void harmony_arm7_map(address_map &map); private: // device-level overrides virtual void device_start() override; @@ -31,8 +24,17 @@ private: virtual void device_add_mconfig(machine_config &config) override; + // reading and writing + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + +private: void check_bankswitch(offs_t offset); + DECLARE_READ8_MEMBER(read8_r); + + void harmony_arm7_map(address_map &map); + required_device m_cpu; }; diff --git a/src/devices/bus/vme/vme_fccpu20.h b/src/devices/bus/vme/vme_fccpu20.h index 5013060d0fb..bab05fd987f 100644 --- a/src/devices/bus/vme/vme_fccpu20.h +++ b/src/devices/bus/vme/vme_fccpu20.h @@ -23,12 +23,6 @@ DECLARE_DEVICE_TYPE(VME_FCCPU21YB, vme_fccpu21yb_card_device) //************************************************************************** class vme_fccpu20_device : public device_t, public device_vme_card_interface { -public: - // Below are duplicated declarations from src/mame/drivers/fccpu20.cpp - DECLARE_READ32_MEMBER (bootvect_r); - DECLARE_WRITE32_MEMBER (bootvect_w); - - void cpu20_mem(address_map &map); protected: // PIT port C Board ID bits static constexpr unsigned CPU20 = 0x40; @@ -68,6 +62,12 @@ private: DECLARE_READ8_MEMBER (pitb_r); DECLARE_READ8_MEMBER (pitc_r); + // Below are duplicated declarations from src/mame/drivers/fccpu20.cpp + DECLARE_READ32_MEMBER (bootvect_r); + DECLARE_WRITE32_MEMBER (bootvect_w); + + void cpu20_mem(address_map &map); + required_device m_maincpu; required_device m_pit; required_device m_bim; diff --git a/src/devices/bus/vme/vme_fcisio.h b/src/devices/bus/vme/vme_fcisio.h index e0858bb4b36..9a0c8056617 100644 --- a/src/devices/bus/vme/vme_fcisio.h +++ b/src/devices/bus/vme/vme_fcisio.h @@ -17,13 +17,6 @@ class vme_fcisio1_card_device : public device_t, public device_vme_card_interfac public: vme_fcisio1_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ16_MEMBER (bootvect_r); - - /* Dummy driver routines */ - DECLARE_READ8_MEMBER (not_implemented_r); - DECLARE_WRITE8_MEMBER (not_implemented_w); - - void fcisio1_mem(address_map &map); protected: vme_fcisio1_card_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -37,6 +30,14 @@ protected: private: DECLARE_READ8_MEMBER (config_rd); + DECLARE_READ16_MEMBER (bootvect_r); + + /* Dummy driver routines */ + DECLARE_READ8_MEMBER (not_implemented_r); + DECLARE_WRITE8_MEMBER (not_implemented_w); + + void fcisio1_mem(address_map &map); + required_device m_maincpu; required_device m_duscc0; required_device m_duscc1; diff --git a/src/devices/bus/vme/vme_fcscsi.h b/src/devices/bus/vme/vme_fcscsi.h index 33bada06987..5c8115df853 100644 --- a/src/devices/bus/vme/vme_fcscsi.h +++ b/src/devices/bus/vme/vme_fcscsi.h @@ -19,19 +19,6 @@ class vme_fcscsi1_card_device : public: vme_fcscsi1_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ16_MEMBER (bootvect_r); - DECLARE_READ8_MEMBER (tcr_r); - DECLARE_WRITE8_MEMBER (tcr_w); - DECLARE_WRITE8_MEMBER (led_w); - - /* Dummy driver routines */ - DECLARE_READ8_MEMBER(not_implemented_r); - DECLARE_WRITE8_MEMBER(not_implemented_w); - - DECLARE_READ8_MEMBER(scsi_r); - DECLARE_WRITE8_MEMBER(scsi_w); - - void fcscsi1_mem(address_map &map); protected: vme_fcscsi1_card_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -61,6 +48,20 @@ private: DECLARE_WRITE8_MEMBER(fdc_write_byte); DECLARE_FLOPPY_FORMATS(floppy_formats); + DECLARE_READ16_MEMBER (bootvect_r); + DECLARE_READ8_MEMBER (tcr_r); + DECLARE_WRITE8_MEMBER (tcr_w); + DECLARE_WRITE8_MEMBER (led_w); + + /* Dummy driver routines */ + DECLARE_READ8_MEMBER(not_implemented_r); + DECLARE_WRITE8_MEMBER(not_implemented_w); + + DECLARE_READ8_MEMBER(scsi_r); + DECLARE_WRITE8_MEMBER(scsi_w); + + void fcscsi1_mem(address_map &map); + required_device m_maincpu; required_device m_fdc; required_device m_pit; diff --git a/src/devices/bus/vme/vme_hcpu30.h b/src/devices/bus/vme/vme_hcpu30.h index 1ca87f8b627..98e0691b6fe 100644 --- a/src/devices/bus/vme/vme_hcpu30.h +++ b/src/devices/bus/vme/vme_hcpu30.h @@ -20,10 +20,6 @@ class vme_hcpu30_card_device : public device_t, public device_vme_card_interface public: vme_hcpu30_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ32_MEMBER(bootvect_r); - DECLARE_WRITE32_MEMBER(bootvect_w); - - void hcpu30_mem(address_map &map); protected: vme_hcpu30_card_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -42,6 +38,11 @@ private: // Pointer to System ROMs needed by bootvect_r and masking RAM buffer for post reset accesses uint32_t *m_sysrom; uint32_t m_sysram[2]; + + DECLARE_READ32_MEMBER(bootvect_r); + DECLARE_WRITE32_MEMBER(bootvect_w); + + void hcpu30_mem(address_map &map); }; #endif // MAME_BUS_VME_VME_HCPU30_H diff --git a/src/devices/bus/vme/vme_mvme350.h b/src/devices/bus/vme/vme_mvme350.h index 24fba717cb0..c140a5b9fc3 100644 --- a/src/devices/bus/vme/vme_mvme350.h +++ b/src/devices/bus/vme/vme_mvme350.h @@ -18,7 +18,6 @@ public: // virtual DECLARE_READ16_MEMBER (read16) override; // virtual DECLARE_WRITE16_MEMBER (write16) override; - void mvme350_mem(address_map &map); protected: vme_mvme350_card_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -28,6 +27,9 @@ protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; + +private: + void mvme350_mem(address_map &map); }; #endif // MAME_BUS_VME_VME_MVME350_H diff --git a/src/devices/bus/wangpc/rtc.h b/src/devices/bus/wangpc/rtc.h index 48c299f2ee9..b1bc38d4570 100644 --- a/src/devices/bus/wangpc/rtc.h +++ b/src/devices/bus/wangpc/rtc.h @@ -32,8 +32,6 @@ public: // construction/destruction wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void wangpc_rtc_io(address_map &map); - void wangpc_rtc_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -55,6 +53,9 @@ private: required_device m_ctc1; required_device m_sio; optional_shared_ptr m_char_ram; + + void wangpc_rtc_io(address_map &map); + void wangpc_rtc_mem(address_map &map); }; diff --git a/src/devices/bus/wangpc/tig.h b/src/devices/bus/wangpc/tig.h index 1f48628da8e..d67424a850e 100644 --- a/src/devices/bus/wangpc/tig.h +++ b/src/devices/bus/wangpc/tig.h @@ -29,8 +29,6 @@ public: // construction/destruction wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void upd7220_0_map(address_map &map); - void upd7220_1_map(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -51,6 +49,9 @@ private: UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); + void upd7220_0_map(address_map &map); + void upd7220_1_map(address_map &map); + // internal state required_device m_hgdc0; required_device m_hgdc1; diff --git a/src/devices/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h index 095755d99f9..7f169db3898 100644 --- a/src/devices/bus/wangpc/wdc.h +++ b/src/devices/bus/wangpc/wdc.h @@ -31,20 +31,6 @@ public: // construction/destruction wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // not really public - DECLARE_READ8_MEMBER( port_r ); - DECLARE_WRITE8_MEMBER( status_w ); - DECLARE_READ8_MEMBER( ctc_ch0_r ); - DECLARE_WRITE8_MEMBER( ctc_ch0_w ); - DECLARE_READ8_MEMBER( ctc_ch1_r ); - DECLARE_WRITE8_MEMBER( ctc_ch1_w ); - DECLARE_READ8_MEMBER( ctc_ch2_r ); - DECLARE_WRITE8_MEMBER( ctc_ch2_w ); - DECLARE_READ8_MEMBER( ctc_ch3_r ); - DECLARE_WRITE8_MEMBER( ctc_ch3_w ); - - void wangpc_wdc_io(address_map &map); - void wangpc_wdc_mem(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -64,6 +50,20 @@ protected: private: inline void set_irq(int state); + DECLARE_READ8_MEMBER( port_r ); + DECLARE_WRITE8_MEMBER( status_w ); + DECLARE_READ8_MEMBER( ctc_ch0_r ); + DECLARE_WRITE8_MEMBER( ctc_ch0_w ); + DECLARE_READ8_MEMBER( ctc_ch1_r ); + DECLARE_WRITE8_MEMBER( ctc_ch1_w ); + DECLARE_READ8_MEMBER( ctc_ch2_r ); + DECLARE_WRITE8_MEMBER( ctc_ch2_w ); + DECLARE_READ8_MEMBER( ctc_ch3_r ); + DECLARE_WRITE8_MEMBER( ctc_ch3_w ); + + void wangpc_wdc_io(address_map &map); + void wangpc_wdc_mem(address_map &map); + required_device m_maincpu; required_device m_ctc; -- cgit v1.2.3