diff options
Diffstat (limited to 'src/devices/bus/nubus/nubus_image.h')
-rw-r--r-- | src/devices/bus/nubus/nubus_image.h | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/src/devices/bus/nubus/nubus_image.h b/src/devices/bus/nubus/nubus_image.h index 543ae8d3781..b12da43dc36 100644 --- a/src/devices/bus/nubus/nubus_image.h +++ b/src/devices/bus/nubus/nubus_image.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont -#pragma once +#ifndef MAME_BUS_NUBUS_NUBUS_IMAGE_H +#define MAME_BUS_NUBUS_NUBUS_IMAGE_H -#ifndef __NUBUS_IMAGE_H__ -#define __NUBUS_IMAGE_H__ +#pragma once #include "nubus.h" #include "osdcore.h" @@ -11,17 +11,6 @@ //************************************************************************** // TYPE DEFINITIONS //************************************************************************** -class messimg_disk_image_device; - -struct nbfilectx { - uint32_t curcmd; - uint8_t filename[128]; - uint8_t curdir[1024]; - osd::directory::ptr dirp; - osd_file::ptr fd; - uint64_t filelen; - uint32_t bytecount; -}; // ======================> nubus_image_device @@ -30,15 +19,39 @@ class nubus_image_device : public device_nubus_card_interface { public: + class messimg_disk_image_device; + // construction/destruction nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; virtual const tiny_rom_entry *device_rom_region() const override; protected: + enum + { + kFileCmdGetDir = 1, + kFileCmdSetDir, + kFileCmdGetFirstListing, + kFileCmdGetNextListing, + kFileCmdGetFile, + kFileCmdPutFile + }; + + struct nbfilectx + { + uint32_t curcmd; + uint8_t filename[128]; + uint8_t curdir[1024]; + osd::directory::ptr dirp; + osd_file::ptr fd; + uint64_t filelen; + uint32_t bytecount; + }; + + nubus_image_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; @@ -58,22 +71,12 @@ protected: DECLARE_READ32_MEMBER(file_name_r); DECLARE_WRITE32_MEMBER(file_name_w); -public: messimg_disk_image_device *m_image; - struct nbfilectx filectx; + nbfilectx filectx; }; // device type definition -extern const device_type NUBUS_IMAGE; - -enum { - kFileCmdGetDir = 1, - kFileCmdSetDir, - kFileCmdGetFirstListing, - kFileCmdGetNextListing, - kFileCmdGetFile, - kFileCmdPutFile -}; +DECLARE_DEVICE_TYPE(NUBUS_IMAGE, nubus_image_device) -#endif /* __NUBUS_IMAGE_H__ */ +#endif // MAME_BUS_NUBUS_NUBUS_IMAGE_H |