diff options
Diffstat (limited to 'src/devices/bus/pet/cass.h')
-rw-r--r-- | src/devices/bus/pet/cass.h | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/src/devices/bus/pet/cass.h b/src/devices/bus/pet/cass.h index 78eb8fd7332..d5c40c37181 100644 --- a/src/devices/bus/pet/cass.h +++ b/src/devices/bus/pet/cass.h @@ -15,10 +15,10 @@ **********************************************************************/ -#pragma once +#ifndef MAME_BUS_PET_CASS_H +#define MAME_BUS_PET_CASS_H -#ifndef __PET_DATASSETTE_PORT__ -#define __PET_DATASSETTE_PORT__ +#pragma once @@ -51,8 +51,7 @@ class device_pet_datassette_port_interface; -class pet_datassette_port_device : public device_t, - public device_slot_interface +class pet_datassette_port_device : public device_t, public device_slot_interface { public: // construction/destruction @@ -60,7 +59,7 @@ public: virtual ~pet_datassette_port_device(); // static configuration helpers - template<class _Object> static devcb_base &set_read_handler(device_t &device, _Object object) { return downcast<pet_datassette_port_device &>(device).m_read_handler.set_callback(object); } + template <class Object> static devcb_base &set_read_handler(device_t &device, Object &&cb) { return downcast<pet_datassette_port_device &>(device).m_read_handler.set_callback(std::forward<Object>(cb)); } // computer interface DECLARE_READ_LINE_MEMBER( read ); @@ -88,29 +87,24 @@ class device_pet_datassette_port_interface : public device_slot_card_interface { public: // construction/destruction - device_pet_datassette_port_interface(const machine_config &mconfig, device_t &device); virtual ~device_pet_datassette_port_interface(); - virtual int datassette_read() { return 1; }; - virtual void datassette_write(int state) { }; - virtual int datassette_sense() { return 1; }; - virtual void datassette_motor(int state) { }; + virtual int datassette_read() { return 1; } + virtual void datassette_write(int state) { } + virtual int datassette_sense() { return 1; } + virtual void datassette_motor(int state) { } protected: + device_pet_datassette_port_interface(const machine_config &mconfig, device_t &device); + pet_datassette_port_device *m_slot; }; // device type definition -extern const device_type PET_DATASSETTE_PORT; - +DECLARE_DEVICE_TYPE(PET_DATASSETTE_PORT, pet_datassette_port_device) -// slot devices -#include "c2n.h" -#include "diag264_lb_tape.h" SLOT_INTERFACE_EXTERN( cbm_datassette_devices ); - - -#endif +#endif // MAME_BUS_PET_CASS_H |