Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

bus/nes_ctrl: Clean up access specifiers in all headers. (#9515)

Browse Source
This commit is contained in:
0kmg 2022-04-05 15:29:03 -08:00 committed by GitHub
parent 8b6f2314cf
commit ecec3922ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 87 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/devices/bus/nes_ctrl/4score.h
View File

@ -23,6 +23,9 @@
class nes_4score_device : public device_t,
public device_nes_control_port_interface
{
public:
virtual uint8_t read_bit0() override;
protected:
// construction/destruction
nes_4score_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@ -31,8 +34,6 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
virtual uint8_t read_bit0() override;
uint32_t m_latch;
};
@ -44,10 +45,11 @@ public:
// construction/destruction
nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
virtual void write(uint8_t data) override;
protected:
virtual void write(uint8_t data) override;
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
private:
required_ioport m_joypad1;
@ -62,10 +64,11 @@ public:
// construction/destruction
nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
virtual void write(uint8_t data) override;
protected:
virtual void write(uint8_t data) override;
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
private:
required_ioport m_joypad2;
@ -77,5 +80,4 @@ private:
DECLARE_DEVICE_TYPE(NES_4SCORE_P1P3, nes_4score_p1p3_device)
DECLARE_DEVICE_TYPE(NES_4SCORE_P2P4, nes_4score_p2p4_device)
#endif // MAME_BUS_NES_CTRL_4SCORE_H

3
src/devices/bus/nes_ctrl/bcbattle.h
View File

@ -28,6 +28,8 @@ public:
// construction/destruction
nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual uint8_t read_exp(offs_t offset) override;
protected:
static constexpr device_timer_id TIMER_BATTLER = 1;
@ -38,7 +40,6 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
virtual uint8_t read_exp(offs_t offset) override;
int read_current_bit();
required_device<barcode_reader_device> m_reader;

1
src/devices/bus/nes_ctrl/ctrl.h
View File

@ -101,5 +101,4 @@ void fc_expansion_devices(device_slot_interface &device);
void famibox_control_port12_devices(device_slot_interface &device);
void famibox_control_port3_devices(device_slot_interface &device);
#endif // MAME_BUS_NES_CTRL_CTRL_H

8
src/devices/bus/nes_ctrl/dorepiano.h
View File

@ -28,14 +28,13 @@ public:
// construction/destruction
nes_dorepiano_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
virtual ioport_constructor device_input_ports() const override;
private:
required_ioport_array<8> m_port;
@ -48,5 +47,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(NES_DOREPIANO, nes_dorepiano_device)
#endif // MAME_BUS_NES_CTRL_DOREPIANO_H

7
src/devices/bus/nes_ctrl/fckeybrd.h
View File

@ -28,6 +28,9 @@ public:
// construction/destruction
nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual uint8_t read_exp(offs_t offset) override;
virtual void write(uint8_t data) override;
protected:
// device-level overrides
virtual void device_start() override;
@ -36,9 +39,6 @@ protected:
virtual ioport_constructor device_input_ports() const override;
virtual void device_add_mconfig(machine_config &config) override;
virtual uint8_t read_exp(offs_t offset) override;
virtual void write(uint8_t data) override;
private:
required_device<cassette_image_device> m_cassette;
required_ioport_array<9> m_kbd;
@ -49,5 +49,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(NES_FCKEYBOARD, nes_fckeybrd_device)
#endif // MAME_BUS_NES_CTRL_FCKEYBOARD_H

10
src/devices/bus/nes_ctrl/fcmat.h
View File

@ -25,6 +25,10 @@ class nes_fcmat_device :
public device_t,
public device_nes_control_port_interface
{
public:
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
protected:
// construction/destruction
nes_fcmat_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
@ -32,9 +36,6 @@ protected:
// device-level overrides
virtual void device_start() override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
private:
required_ioport_array<4> m_mat;
u8 m_row_scan;
@ -50,6 +51,7 @@ public:
nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
protected:
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
};
@ -63,6 +65,7 @@ public:
nes_taptapmat_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
protected:
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
};
@ -71,5 +74,4 @@ protected:
DECLARE_DEVICE_TYPE(NES_FTRAINER, nes_ftrainer_device)
DECLARE_DEVICE_TYPE(NES_TAPTAPMAT, nes_taptapmat_device)
#endif // MAME_BUS_NES_CTRL_FCMAT_H

12
src/devices/bus/nes_ctrl/hori.h
View File

@ -27,14 +27,14 @@ public:
// construction/destruction
nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual void device_start() override { }
virtual void device_add_mconfig(machine_config &config) override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
private:
required_device_array<nes_control_port_device, 2> m_subexp;
};
@ -49,15 +49,15 @@ public:
// construction/destruction
nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_add_mconfig(machine_config &config) override;
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
private:
void reset_regs();

32
src/devices/bus/nes_ctrl/joypad.h
View File

@ -28,16 +28,16 @@ public:
// construction/destruction
nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_bit0() override;
virtual void write(u8 data) override;
protected:
nes_joypad_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u32 latch_fill = 0x80);
// device-level overrides
virtual void device_start() override;
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_bit0() override;
virtual void write(u8 data) override;
virtual void set_latch() { m_latch = m_joypad->read(); }
required_ioport m_joypad;
@ -54,11 +54,11 @@ public:
// construction/destruction
nes_fcpadexp_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
protected:
nes_fcpadexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u32 latch_fill = 0x80);
virtual u8 read_bit0() override { return 0; }
virtual u8 read_exp(offs_t offset) override;
protected:
nes_fcpadexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u32 latch_fill = 0x80);
};
@ -70,10 +70,11 @@ public:
// construction/destruction
nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_bit2() override;
protected:
virtual u8 read_bit2() override;
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
private:
required_ioport m_mic;
@ -88,6 +89,8 @@ public:
// construction/destruction
nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
protected:
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
};
@ -100,6 +103,8 @@ public:
// construction/destruction
nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
protected:
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
};
@ -112,13 +117,15 @@ public:
// construction/destruction
nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
protected:
virtual ioport_constructor device_input_ports() const override;
virtual void device_add_mconfig(machine_config &config) override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
virtual void device_add_mconfig(machine_config &config) override;
private:
required_device<nes_control_port_device> m_daisychain;
required_ioport m_cfg;
};
@ -133,6 +140,7 @@ public:
nes_vboyctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
protected:
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
};

8
src/devices/bus/nes_ctrl/konamibag.h
View File

@ -30,14 +30,13 @@ public:
// construction/destruction
nes_konamibag_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
virtual ioport_constructor device_input_ports() const override;
private:
required_ioport_array<2> m_sensor;
@ -48,5 +47,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(NES_KONAMIBAG, nes_konamibag_device)
#endif // MAME_BUS_NES_CTRL_KONAMIBAG_H

8
src/devices/bus/nes_ctrl/konamihs.h
View File

@ -27,15 +27,15 @@ public:
// construction/destruction
nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
private:
required_ioport_array<2> m_ipt;
u8 m_latch;
};

6
src/devices/bus/nes_ctrl/miracle.h
View File

@ -30,6 +30,9 @@ public:
// construction/destruction
nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual uint8_t read_bit0() override;
virtual void write(uint8_t data) override;
required_device<midi_port_device> m_midiin, m_midiout;
protected:
@ -52,9 +55,6 @@ private:
void xmit_char(uint8_t data);
virtual uint8_t read_bit0() override;
virtual void write(uint8_t data) override;
emu_timer *strobe_timer;
int m_strobe_on, m_midi_mode, m_sent_bits;

7
src/devices/bus/nes_ctrl/mjpanel.h
View File

@ -27,14 +27,13 @@ public:
// construction/destruction
nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
virtual ioport_constructor device_input_ports() const override;
private:
void set_latch();

3
src/devices/bus/nes_ctrl/pachinko.h
View File

@ -26,9 +26,10 @@ public:
// construction/destruction
nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
protected:
// device-level overrides
virtual ioport_constructor device_input_ports() const override;
protected:
virtual void set_latch() override;
private:

8
src/devices/bus/nes_ctrl/partytap.h
View File

@ -27,15 +27,15 @@ public:
// construction/destruction
nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
private:
required_ioport m_inputs;
u8 m_latch;
};

7
src/devices/bus/nes_ctrl/powerpad.h
View File

@ -27,14 +27,13 @@ public:
// construction/destruction
nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_bit34() override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual u8 read_bit34() override;
virtual void write(u8 data) override;
virtual ioport_constructor device_input_ports() const override;
private:
required_ioport_array<2> m_ipt;

3
src/devices/bus/nes_ctrl/rob.h
View File

@ -29,13 +29,12 @@ public:
// construction/destruction
nes_rob_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual ioport_constructor device_input_ports() const override;
private:
required_device<sm590_device> m_maincpu;

6
src/devices/bus/nes_ctrl/snesadapter.h
View File

@ -27,14 +27,14 @@ public:
// construction/destruction
nes_snesadapter_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual u8 read_bit0() override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual void device_start() override { }
virtual void device_add_mconfig(machine_config &config) override;
virtual u8 read_bit0() override;
virtual void write(u8 data) override;
private:
required_device<snes_control_port_device> m_snesctrl;
};

7
src/devices/bus/nes_ctrl/suborkey.h
View File

@ -27,15 +27,14 @@ public:
// construction/destruction
nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
virtual uint8_t read_exp(offs_t offset) override;
virtual void write(uint8_t data) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
virtual uint8_t read_exp(offs_t offset) override;
virtual void write(uint8_t data) override;
virtual ioport_constructor device_input_ports() const override;
private:
required_ioport_array<13> m_kbd;

6
src/devices/bus/nes_ctrl/turbofile.h
View File

@ -28,6 +28,9 @@ public:
// construction/destruction
nes_turbofile_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
DECLARE_INPUT_CHANGED_MEMBER(lock_changed);
protected:
@ -38,9 +41,6 @@ protected:
virtual ioport_constructor device_input_ports() const override;
virtual void device_add_mconfig(machine_config &config) override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
private:
required_device<nvram_device> m_nvram;
required_ioport m_lock;

14
src/devices/bus/nes_ctrl/zapper.h
View File

@ -29,7 +29,8 @@ public:
// construction/destruction
nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_bit34() override;
virtual u8 read_exp(offs_t offset) override;
protected:
// construction/destruction
@ -38,9 +39,7 @@ protected:
// device-level overrides
virtual void device_start() override;
virtual void device_add_mconfig(machine_config &config) override;
virtual u8 read_bit34() override;
virtual u8 read_exp(offs_t offset) override;
virtual ioport_constructor device_input_ports() const override;
private:
required_device<nes_zapper_sensor_device> m_sensor;
@ -58,14 +57,13 @@ public:
// construction/destruction
nes_bandaihs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual ioport_constructor device_input_ports() const override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual u8 read_exp(offs_t offset) override;
virtual void write(u8 data) override;
virtual ioport_constructor device_input_ports() const override;
private:
required_ioport m_joypad;