diff options
Diffstat (limited to 'src/devices')
60 files changed, 21 insertions, 157 deletions
diff --git a/src/devices/bus/a2bus/a2arcadebd.h b/src/devices/bus/a2bus/a2arcadebd.h index ae39c51eac6..060e1c82007 100644 --- a/src/devices/bus/a2bus/a2arcadebd.h +++ b/src/devices/bus/a2bus/a2arcadebd.h @@ -44,8 +44,6 @@ protected: required_device<tms9918a_device> m_tms; required_device<ay8910_device> m_ay; - -private: }; // device type definition diff --git a/src/devices/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h index bcd9f6fa3b6..9a0f998db84 100644 --- a/src/devices/bus/a2bus/a2vulcan.h +++ b/src/devices/bus/a2bus/a2vulcan.h @@ -69,8 +69,6 @@ class a2bus_vulcangold_device : public a2bus_vulcanbase_device public: a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual const rom_entry *device_rom_region() const; - -protected: }; // device type definition diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h index 195ad987f25..c645f8fe54a 100644 --- a/src/devices/bus/a2bus/a2zipdrive.h +++ b/src/devices/bus/a2bus/a2zipdrive.h @@ -55,8 +55,6 @@ class a2bus_zipdrive_device : public a2bus_zipdrivebase_device { public: a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - -protected: }; // device type definition diff --git a/src/devices/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h index ef1e6e397de..05192f97b5c 100644 --- a/src/devices/bus/a2bus/ezcgi.h +++ b/src/devices/bus/a2bus/ezcgi.h @@ -45,8 +45,6 @@ protected: virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); required_device<tms9918a_device> m_tms; - -private: }; class a2bus_ezcgi_9938_device: @@ -72,8 +70,6 @@ protected: virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); required_device<v9938_device> m_tms; - -private: }; class a2bus_ezcgi_9958_device: @@ -99,8 +95,6 @@ protected: virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); required_device<v9958_device> m_tms; - -private: }; // device type definition diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index b7d9a5247f3..ecf70d0864b 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -313,7 +313,7 @@ INPUT_PORTS_START( abc55 ) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED) PORT_START("SW1") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_NAME("Keyboard Reset") PORT_CHANGED_MEMBER(DEVICE_SELF, abc77_device, keyboard_reset, 0) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_NAME("Keyboard Reset") PORT_CHANGED_MEMBER(DEVICE_SELF, abc77_device, keyboard_reset, nullptr) INPUT_PORTS_END diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp index df8c2b2adce..01fd743d3eb 100644 --- a/src/devices/bus/abckb/abc99.cpp +++ b/src/devices/bus/abckb/abc99.cpp @@ -397,7 +397,7 @@ INPUT_PORTS_START( abc99 ) PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(1) PORT_START("J4") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_NAME("Keyboard Reset") PORT_CHANGED_MEMBER(DEVICE_SELF, abc99_device, keyboard_reset, 0) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_NAME("Keyboard Reset") PORT_CHANGED_MEMBER(DEVICE_SELF, abc99_device, keyboard_reset, nullptr) INPUT_PORTS_END diff --git a/src/devices/bus/amiga/zorro/action_replay.cpp b/src/devices/bus/amiga/zorro/action_replay.cpp index a5356114c2e..03711e56f1c 100644 --- a/src/devices/bus/amiga/zorro/action_replay.cpp +++ b/src/devices/bus/amiga/zorro/action_replay.cpp @@ -31,7 +31,7 @@ const device_type ACTION_REPLAY_MK3 = &device_creator<action_replay_mk3_device>; static INPUT_PORTS_START( ar_button ) PORT_START("freeze") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, action_replay_device, freeze, 0) + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, action_replay_device, freeze, nullptr) INPUT_PORTS_END ioport_constructor action_replay_device::device_input_ports() const diff --git a/src/devices/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h index e691a5b946a..022178bb242 100644 --- a/src/devices/bus/astrocde/exp.h +++ b/src/devices/bus/astrocde/exp.h @@ -15,8 +15,6 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read) { return 0xff; } virtual DECLARE_WRITE8_MEMBER(write) {} - -protected: }; diff --git a/src/devices/bus/c64/final.cpp b/src/devices/bus/c64/final.cpp index 8e29c886a16..4087201c5cb 100644 --- a/src/devices/bus/c64/final.cpp +++ b/src/devices/bus/c64/final.cpp @@ -39,7 +39,7 @@ INPUT_CHANGED_MEMBER( c64_final_cartridge_device::freeze ) static INPUT_PORTS_START( c64_final ) PORT_START("SW") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, c64_final_cartridge_device, freeze, 0) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, c64_final_cartridge_device, freeze, nullptr) INPUT_PORTS_END diff --git a/src/devices/bus/c64/final3.cpp b/src/devices/bus/c64/final3.cpp index b34cc4c17a1..a72963123ba 100644 --- a/src/devices/bus/c64/final3.cpp +++ b/src/devices/bus/c64/final3.cpp @@ -40,7 +40,7 @@ INPUT_CHANGED_MEMBER( c64_final3_cartridge_device::freeze ) static INPUT_PORTS_START( c64_final3 ) PORT_START("SW") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, c64_final3_cartridge_device, freeze, 0) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, c64_final3_cartridge_device, freeze, nullptr) INPUT_PORTS_END diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp index 22faa6cbc9b..b6f9605ee45 100644 --- a/src/devices/bus/c64/magic_formel.cpp +++ b/src/devices/bus/c64/magic_formel.cpp @@ -139,7 +139,7 @@ INPUT_CHANGED_MEMBER( c64_magic_formel_cartridge_device::freeze ) static INPUT_PORTS_START( c64_magic_formel ) PORT_START("FREEZE") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, c64_magic_formel_cartridge_device, freeze, 0) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F12) PORT_CHANGED_MEMBER(DEVICE_SELF, c64_magic_formel_cartridge_device, freeze, nullptr) INPUT_PORTS_END diff --git a/src/devices/bus/c64/warp_speed.h b/src/devices/bus/c64/warp_speed.h index e115c7be256..8c3b7a445ec 100644 --- a/src/devices/bus/c64/warp_speed.h +++ b/src/devices/bus/c64/warp_speed.h @@ -41,9 +41,6 @@ protected: // device_c64_expansion_card_interface overrides virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - -private: - //UINT8 m_bank; }; diff --git a/src/devices/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h index 4976e5caaf9..b8b3cb9c90f 100644 --- a/src/devices/bus/cgenie/parallel/parallel.h +++ b/src/devices/bus/cgenie/parallel/parallel.h @@ -63,8 +63,6 @@ protected: virtual void device_reset(); device_parallel_interface *m_cart; - -private: }; // class representing interface-specific live parallel device diff --git a/src/devices/bus/coco/coco_dwsock.cpp b/src/devices/bus/coco/coco_dwsock.cpp index 837675aa61a..e48b3e565d1 100644 --- a/src/devices/bus/coco/coco_dwsock.cpp +++ b/src/devices/bus/coco/coco_dwsock.cpp @@ -77,7 +77,7 @@ beckerport_device::beckerport_device(const machine_config &mconfig, const char * beckerport_device::~beckerport_device() { if (m_pSocket != nullptr) - device_stop(); + beckerport_device::device_stop(); } /*------------------------------------------------- diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h index 8773a48bea4..c5b9eac2f9e 100644 --- a/src/devices/bus/coco/coco_fdc.h +++ b/src/devices/bus/coco/coco_fdc.h @@ -153,7 +153,6 @@ protected: virtual void device_start(); virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); -private: }; diff --git a/src/devices/bus/coleco/hand.cpp b/src/devices/bus/coleco/hand.cpp index 058f06a3711..a00a1d89f4c 100644 --- a/src/devices/bus/coleco/hand.cpp +++ b/src/devices/bus/coleco/hand.cpp @@ -49,7 +49,7 @@ static INPUT_PORTS_START( coleco_hand_controller ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_START("COMMON1") - PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, coleco_hand_controller_t, keypad_r, 0) + PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, coleco_hand_controller_t, keypad_r, nullptr) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) diff --git a/src/devices/bus/coleco/sac.cpp b/src/devices/bus/coleco/sac.cpp index 42ef14ca909..01a62b49323 100644 --- a/src/devices/bus/coleco/sac.cpp +++ b/src/devices/bus/coleco/sac.cpp @@ -56,7 +56,7 @@ static INPUT_PORTS_START( coleco_super_action_controller ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_START("COMMON1") - PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, coleco_super_action_controller_t, keypad_r, 0) + PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, coleco_super_action_controller_t, keypad_r, nullptr) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) @@ -78,7 +78,7 @@ static INPUT_PORTS_START( coleco_super_action_controller ) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_START("SLIDER") - PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(25) PORT_REVERSE PORT_RESET PORT_CHANGED_MEMBER(DEVICE_SELF, coleco_super_action_controller_t, slider_w, 0) + PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(25) PORT_REVERSE PORT_RESET PORT_CHANGED_MEMBER(DEVICE_SELF, coleco_super_action_controller_t, slider_w, nullptr) INPUT_PORTS_END diff --git a/src/devices/bus/isa/aha1542.h b/src/devices/bus/isa/aha1542.h index 035a9ebdd46..d8e8320dca6 100644 --- a/src/devices/bus/isa/aha1542.h +++ b/src/devices/bus/isa/aha1542.h @@ -44,10 +44,6 @@ protected: virtual void device_start(); virtual void device_reset(); - // device_isa16_card_interface - -private: - // internal state }; // device type definition diff --git a/src/devices/bus/isa/mach32.h b/src/devices/bus/isa/mach32.h index 340ca31a8bb..7842f1b5a97 100644 --- a/src/devices/bus/isa/mach32.h +++ b/src/devices/bus/isa/mach32.h @@ -126,8 +126,6 @@ protected: virtual void device_start(); virtual void device_reset(); virtual machine_config_constructor device_mconfig_additions() const; - -private: }; /* diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h index 8c62520308b..d8e39f4bb8f 100644 --- a/src/devices/bus/isa/mda.h +++ b/src/devices/bus/isa/mda.h @@ -89,8 +89,6 @@ protected: virtual void device_start(); virtual void device_reset(); -private: - // internal state public: UINT8 m_configuration_switch; //hercules }; diff --git a/src/devices/bus/isa/mpu401.h b/src/devices/bus/isa/mpu401.h index b31bb3a2308..a7ba010757a 100644 --- a/src/devices/bus/isa/mpu401.h +++ b/src/devices/bus/isa/mpu401.h @@ -34,9 +34,6 @@ protected: virtual void device_start(); virtual void device_reset(); virtual machine_config_constructor device_mconfig_additions() const; - -private: - // internal state }; diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h index fc8be653fd1..d1b3be92bbc 100644 --- a/src/devices/bus/isa/sblaster.h +++ b/src/devices/bus/isa/sblaster.h @@ -205,8 +205,6 @@ public: protected: // device-level overrides virtual void device_start(); -private: - // internal state }; class sb16_device : public sb_device, @@ -246,8 +244,6 @@ public: protected: // device-level overrides virtual void device_start(); -private: - // internal state }; // device type definition diff --git a/src/devices/bus/lpci/cirrus.h b/src/devices/bus/lpci/cirrus.h index 4de5fc32d74..8e7bc0c41a9 100644 --- a/src/devices/bus/lpci/cirrus.h +++ b/src/devices/bus/lpci/cirrus.h @@ -31,7 +31,6 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); -private: }; diff --git a/src/devices/bus/lpci/pci.h b/src/devices/bus/lpci/pci.h index 87433ebdd6f..a85ea34b52c 100644 --- a/src/devices/bus/lpci/pci.h +++ b/src/devices/bus/lpci/pci.h @@ -27,7 +27,6 @@ public: virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) = 0; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) = 0; -private: }; class pci_connector: public device_t, diff --git a/src/devices/bus/msx_cart/disk.h b/src/devices/bus/msx_cart/disk.h index efe48e28255..5b5d6675131 100644 --- a/src/devices/bus/msx_cart/disk.h +++ b/src/devices/bus/msx_cart/disk.h @@ -136,9 +136,6 @@ public: virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); - -private: - }; diff --git a/src/devices/bus/msx_slot/slot.h b/src/devices/bus/msx_slot/slot.h index fe5a540a19e..5208e421a95 100644 --- a/src/devices/bus/msx_slot/slot.h +++ b/src/devices/bus/msx_slot/slot.h @@ -22,6 +22,7 @@ class msx_internal_slot_interface { public: msx_internal_slot_interface(); + virtual ~msx_internal_slot_interface() { } // static configuration helpers static void set_start_address(device_t &device, UINT32 start_address); diff --git a/src/devices/bus/neogeo/banked_cart.h b/src/devices/bus/neogeo/banked_cart.h index f81b8f5b9c9..337e37a37ef 100644 --- a/src/devices/bus/neogeo/banked_cart.h +++ b/src/devices/bus/neogeo/banked_cart.h @@ -35,12 +35,6 @@ protected: virtual void device_start(); virtual void device_reset(); void postload(); - - - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/bootleg_prot.h b/src/devices/bus/neogeo/bootleg_prot.h index 6ad1f257845..d6e23accbd0 100644 --- a/src/devices/bus/neogeo/bootleg_prot.h +++ b/src/devices/bus/neogeo/bootleg_prot.h @@ -87,12 +87,6 @@ public: protected: virtual void device_start(); virtual void device_reset(); - - - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/cmc_prot.h b/src/devices/bus/neogeo/cmc_prot.h index 8660c3bf3ed..676b7ab5cd4 100644 --- a/src/devices/bus/neogeo/cmc_prot.h +++ b/src/devices/bus/neogeo/cmc_prot.h @@ -78,10 +78,6 @@ protected: const UINT8 *address_16_23_xor1; const UINT8 *address_16_23_xor2; const UINT8 *address_0_7_xor; - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/fatfury2_prot.h b/src/devices/bus/neogeo/fatfury2_prot.h index 2abe9c92da6..400fee2d160 100644 --- a/src/devices/bus/neogeo/fatfury2_prot.h +++ b/src/devices/bus/neogeo/fatfury2_prot.h @@ -31,12 +31,6 @@ public: protected: virtual void device_start(); virtual void device_reset(); - - - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/kof2002_prot.h b/src/devices/bus/neogeo/kof2002_prot.h index b0abde55809..c3479ec9a21 100644 --- a/src/devices/bus/neogeo/kof2002_prot.h +++ b/src/devices/bus/neogeo/kof2002_prot.h @@ -27,12 +27,6 @@ public: protected: virtual void device_start(); virtual void device_reset(); - - - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/kof98_prot.h b/src/devices/bus/neogeo/kof98_prot.h index bdd634cbb04..83c9dd5f23a 100644 --- a/src/devices/bus/neogeo/kof98_prot.h +++ b/src/devices/bus/neogeo/kof98_prot.h @@ -29,12 +29,6 @@ public: protected: virtual void device_start(); virtual void device_reset(); - - - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/kog_prot.h b/src/devices/bus/neogeo/kog_prot.h index c14b6d919d0..b1ff5f6ee6d 100644 --- a/src/devices/bus/neogeo/kog_prot.h +++ b/src/devices/bus/neogeo/kog_prot.h @@ -29,12 +29,6 @@ protected: virtual void device_start(); virtual void device_reset(); virtual ioport_constructor device_input_ports() const; - - - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/mslugx_prot.h b/src/devices/bus/neogeo/mslugx_prot.h index dabd8425503..42d75263432 100644 --- a/src/devices/bus/neogeo/mslugx_prot.h +++ b/src/devices/bus/neogeo/mslugx_prot.h @@ -30,12 +30,6 @@ public: protected: virtual void device_start(); virtual void device_reset(); - - - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/pcm2_prot.h b/src/devices/bus/neogeo/pcm2_prot.h index 7920b745970..62193ee5901 100644 --- a/src/devices/bus/neogeo/pcm2_prot.h +++ b/src/devices/bus/neogeo/pcm2_prot.h @@ -25,12 +25,6 @@ public: protected: virtual void device_start(); virtual void device_reset(); - - - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/pvc_prot.h b/src/devices/bus/neogeo/pvc_prot.h index 794783cc4dd..87f6b24ecc5 100644 --- a/src/devices/bus/neogeo/pvc_prot.h +++ b/src/devices/bus/neogeo/pvc_prot.h @@ -39,12 +39,6 @@ public: protected: virtual void device_start(); virtual void device_reset(); - - - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/sbp_prot.h b/src/devices/bus/neogeo/sbp_prot.h index 7aa5ebb67da..d9c0884d36b 100644 --- a/src/devices/bus/neogeo/sbp_prot.h +++ b/src/devices/bus/neogeo/sbp_prot.h @@ -29,12 +29,6 @@ public: protected: virtual void device_start(); virtual void device_reset(); - - - -private: - - }; #endif diff --git a/src/devices/bus/neogeo/sma_prot.h b/src/devices/bus/neogeo/sma_prot.h index 271e1248f4d..8fbe4770076 100644 --- a/src/devices/bus/neogeo/sma_prot.h +++ b/src/devices/bus/neogeo/sma_prot.h @@ -47,12 +47,6 @@ public: protected: virtual void device_start(); virtual void device_reset(); - - - -private: - - }; #endif diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp index 9b4b0b35f0e..49034d22d16 100644 --- a/src/devices/bus/oricext/jasmin.cpp +++ b/src/devices/bus/oricext/jasmin.cpp @@ -30,7 +30,7 @@ MACHINE_CONFIG_END INPUT_PORTS_START( jasmin ) PORT_START("JASMIN") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Boot") PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CHANGED_MEMBER(DEVICE_SELF, jasmin_device, boot_pressed, 0) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Boot") PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CHANGED_MEMBER(DEVICE_SELF, jasmin_device, boot_pressed, nullptr) INPUT_PORTS_END DEVICE_ADDRESS_MAP_START(map, 8, jasmin_device) diff --git a/src/devices/bus/psx/analogue.cpp b/src/devices/bus/psx/analogue.cpp index a4d82de288f..69d980e5843 100644 --- a/src/devices/bus/psx/analogue.cpp +++ b/src/devices/bus/psx/analogue.cpp @@ -255,7 +255,7 @@ static INPUT_PORTS_START( psx_analog_controller ) PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_NAME("Left Analog Y") PORT_SENSITIVITY(100) PORT_START("PSXMISC") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON11 ) PORT_NAME("Analog") PORT_TOGGLE PORT_CHANGED_MEMBER(DEVICE_SELF, psx_analog_controller_device, change_mode, 0) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON11 ) PORT_NAME("Analog") PORT_TOGGLE PORT_CHANGED_MEMBER(DEVICE_SELF, psx_analog_controller_device, change_mode, nullptr) INPUT_PORTS_END ioport_constructor psx_analog_controller_device::device_input_ports() const diff --git a/src/devices/bus/ql/cst_qdisc.h b/src/devices/bus/ql/cst_qdisc.h index a4f50cb7ccb..a946767a87b 100644 --- a/src/devices/bus/ql/cst_qdisc.h +++ b/src/devices/bus/ql/cst_qdisc.h @@ -39,8 +39,6 @@ protected: // device_ql_expansion_card_interface overrides virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); virtual void write(address_space &space, offs_t offset, UINT8 data); - -private: }; diff --git a/src/devices/bus/ql/cumana_fdi.h b/src/devices/bus/ql/cumana_fdi.h index b3249e76cdf..7b7a9b2fa8f 100644 --- a/src/devices/bus/ql/cumana_fdi.h +++ b/src/devices/bus/ql/cumana_fdi.h @@ -39,8 +39,6 @@ protected: // device_ql_expansion_card_interface overrides virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); virtual void write(address_space &space, offs_t offset, UINT8 data); - -private: }; diff --git a/src/devices/bus/ql/kempston_di.h b/src/devices/bus/ql/kempston_di.h index 0920fe2430d..613df61c357 100644 --- a/src/devices/bus/ql/kempston_di.h +++ b/src/devices/bus/ql/kempston_di.h @@ -39,8 +39,6 @@ protected: // device_ql_expansion_card_interface overrides virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); virtual void write(address_space &space, offs_t offset, UINT8 data); - -private: }; diff --git a/src/devices/bus/ql/miracle_gold_card.h b/src/devices/bus/ql/miracle_gold_card.h index 36c358984a3..574dee19182 100644 --- a/src/devices/bus/ql/miracle_gold_card.h +++ b/src/devices/bus/ql/miracle_gold_card.h @@ -39,8 +39,6 @@ protected: // device_ql_expansion_card_interface overrides virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); virtual void write(address_space &space, offs_t offset, UINT8 data); - -private: }; diff --git a/src/devices/bus/ql/miracle_hd.h b/src/devices/bus/ql/miracle_hd.h index 43ef817475a..e72b7c483d4 100644 --- a/src/devices/bus/ql/miracle_hd.h +++ b/src/devices/bus/ql/miracle_hd.h @@ -39,8 +39,6 @@ protected: // device_ql_rom_cartridge_card_interface overrides virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); virtual void write(address_space &space, offs_t offset, UINT8 data); - -private: }; diff --git a/src/devices/bus/ql/mp_fdi.h b/src/devices/bus/ql/mp_fdi.h index 5f0d3e9fd0f..f8df3088269 100644 --- a/src/devices/bus/ql/mp_fdi.h +++ b/src/devices/bus/ql/mp_fdi.h @@ -39,8 +39,6 @@ protected: // device_ql_expansion_card_interface overrides virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); virtual void write(address_space &space, offs_t offset, UINT8 data); - -private: }; diff --git a/src/devices/bus/ql/opd_basic_master.h b/src/devices/bus/ql/opd_basic_master.h index 4a9b2b7e043..90ca72f612a 100644 --- a/src/devices/bus/ql/opd_basic_master.h +++ b/src/devices/bus/ql/opd_basic_master.h @@ -39,8 +39,6 @@ protected: // device_ql_expansion_card_interface overrides virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); virtual void write(address_space &space, offs_t offset, UINT8 data); - -private: }; diff --git a/src/devices/bus/ql/pcml_qdisk.h b/src/devices/bus/ql/pcml_qdisk.h index e59d101d9c4..1996683cbbb 100644 --- a/src/devices/bus/ql/pcml_qdisk.h +++ b/src/devices/bus/ql/pcml_qdisk.h @@ -39,8 +39,6 @@ protected: // device_ql_expansion_card_interface overrides virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); virtual void write(address_space &space, offs_t offset, UINT8 data); - -private: }; diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp index 37052242d08..0508b835982 100644 --- a/src/devices/bus/ql/sandy_superqboard.cpp +++ b/src/devices/bus/ql/sandy_superqboard.cpp @@ -171,10 +171,10 @@ INPUT_CHANGED_MEMBER( sandy_superqboard_t::mouse_y_changed ) INPUT_PORTS_START( sandy_superqmouse ) PORT_START("mouse_x") - PORT_BIT( 0xff, 0x00, IPT_MOUSE_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_CHANGED_MEMBER(DEVICE_SELF, sandy_superqboard_t, mouse_x_changed, 0) + PORT_BIT( 0xff, 0x00, IPT_MOUSE_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_CHANGED_MEMBER(DEVICE_SELF, sandy_superqboard_t, mouse_x_changed, nullptr) PORT_START("mouse_y") - PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_CHANGED_MEMBER(DEVICE_SELF, sandy_superqboard_t, mouse_y_changed, 0) + PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_CHANGED_MEMBER(DEVICE_SELF, sandy_superqboard_t, mouse_y_changed, nullptr) PORT_START("mouse_buttons") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Middle Mouse Button") PORT_CODE(MOUSECODE_BUTTON3) diff --git a/src/devices/bus/s100/djdma.h b/src/devices/bus/s100/djdma.h index b5b54c972c4..edbf8bb8a35 100644 --- a/src/devices/bus/s100/djdma.h +++ b/src/devices/bus/s100/djdma.h @@ -38,9 +38,6 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); - -private: - // internal state }; diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp index d5b0a6513ae..9c1a2d30b9a 100644 --- a/src/devices/bus/sms_ctrl/lphaser.cpp +++ b/src/devices/bus/sms_ctrl/lphaser.cpp @@ -42,7 +42,7 @@ static INPUT_PORTS_START( sms_light_phaser ) PORT_BIT( 0x9f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("LPHASER_X") - PORT_BIT( 0xff, 0x00, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_CHANGED_MEMBER(DEVICE_SELF, sms_light_phaser_device, position_changed, 0) + PORT_BIT( 0xff, 0x00, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_CHANGED_MEMBER(DEVICE_SELF, sms_light_phaser_device, position_changed, nullptr) PORT_START("LPHASER_Y") PORT_BIT( 0xff, 0x00, IPT_LIGHTGUN_Y) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_CHANGED_MEMBER(DEVICE_SELF, sms_light_phaser_device, position_changed, 0) diff --git a/src/devices/bus/spc1000/exp.h b/src/devices/bus/spc1000/exp.h index 3607f021a0e..c2a398401d5 100644 --- a/src/devices/bus/spc1000/exp.h +++ b/src/devices/bus/spc1000/exp.h @@ -15,8 +15,6 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read) { return 0xff; } virtual DECLARE_WRITE8_MEMBER(write) {} - -protected: }; diff --git a/src/devices/bus/ti99_peb/pcode.cpp b/src/devices/bus/ti99_peb/pcode.cpp index e16baa7145c..57ee6462874 100644 --- a/src/devices/bus/ti99_peb/pcode.cpp +++ b/src/devices/bus/ti99_peb/pcode.cpp @@ -300,7 +300,7 @@ MACHINE_CONFIG_END INPUT_PORTS_START( ti99_pcode ) PORT_START( ACTIVE_TAG ) - PORT_DIPNAME( 0x01, 0x00, "P-Code activation switch" ) PORT_CHANGED_MEMBER(DEVICE_SELF, ti_pcode_card_device, switch_changed, 0) + PORT_DIPNAME( 0x01, 0x00, "P-Code activation switch" ) PORT_CHANGED_MEMBER(DEVICE_SELF, ti_pcode_card_device, switch_changed, nullptr) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) INPUT_PORTS_END diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp index 3104260b94d..2368c375e9b 100644 --- a/src/devices/bus/ti99x/gromport.cpp +++ b/src/devices/bus/ti99x/gromport.cpp @@ -2502,7 +2502,7 @@ rpk* rpk_reader::open(emu_options &options, const char *filename, const char *sy if (zipfile != nullptr) zip_file_close(zipfile); // rethrow the exception - throw exp; + throw; } if (layout_xml != nullptr) xml_file_free(layout_xml); diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h index b4d3b9c27c5..880f5d95d64 100644 --- a/src/devices/bus/ti99x/gromport.h +++ b/src/devices/bus/ti99x/gromport.h @@ -298,7 +298,6 @@ protected: int m_grom_address; // for gromemu int m_ram_page; // for super const char* m_tag; -private: }; /******************** Standard cartridge ******************************/ diff --git a/src/devices/bus/ti99x/ti99defs.h b/src/devices/bus/ti99x/ti99defs.h index 543b5ad04ba..130c0cfbc40 100644 --- a/src/devices/bus/ti99x/ti99defs.h +++ b/src/devices/bus/ti99x/ti99defs.h @@ -90,6 +90,8 @@ public: class bus16z_device : device_t { public: + bus16z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) + : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } virtual DECLARE_READ16Z_MEMBER(read16z) =0; virtual DECLARE_WRITE16_MEMBER(write16) =0; virtual DECLARE_SETADDRESS_DBIN_MEMBER( setaddress_dbin ) { }; diff --git a/src/devices/bus/vcs/compumat.h b/src/devices/bus/vcs/compumat.h index 80f1df069fd..3db7f5fa0e6 100644 --- a/src/devices/bus/vcs/compumat.h +++ b/src/devices/bus/vcs/compumat.h @@ -24,8 +24,6 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); - -private: }; diff --git a/src/devices/bus/vcs/dpc.h b/src/devices/bus/vcs/dpc.h index 9e04ddb2e67..9d79553fbb8 100644 --- a/src/devices/bus/vcs/dpc.h +++ b/src/devices/bus/vcs/dpc.h @@ -83,9 +83,6 @@ public: virtual DECLARE_DIRECT_UPDATE_MEMBER(cart_opbase); virtual void setup_addon_ptr(UINT8 *ptr); - -protected: -// int m_reset_bank; }; diff --git a/src/devices/bus/vcs/harmony_melody.h b/src/devices/bus/vcs/harmony_melody.h index 4d704b39c75..3bc520c10b9 100644 --- a/src/devices/bus/vcs/harmony_melody.h +++ b/src/devices/bus/vcs/harmony_melody.h @@ -29,8 +29,6 @@ public: void check_bankswitch(offs_t offset); -protected: - private: required_device<lpc210x_device> m_cpu; }; diff --git a/src/devices/bus/vcs_ctrl/lightpen.cpp b/src/devices/bus/vcs_ctrl/lightpen.cpp index 8531930b2a1..446e57cd6a0 100644 --- a/src/devices/bus/vcs_ctrl/lightpen.cpp +++ b/src/devices/bus/vcs_ctrl/lightpen.cpp @@ -26,7 +26,7 @@ INPUT_CHANGED_MEMBER( vcs_lightpen_device::trigger ) static INPUT_PORTS_START( vcs_lightpen ) PORT_START("JOY") - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, vcs_lightpen_device, trigger, 0) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, vcs_lightpen_device, trigger, nullptr) PORT_BIT( 0xdf, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("LIGHTX") |