summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/eepromser.h
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-05-07 23:18:47 +1000
committer Vas Crabb <vas@vastheman.com>2017-05-14 21:44:11 +1000
commit0f0d39ef81562c75e79176dd3bebb1e491ca39d5 (patch)
tree201cee7fdf55ee800f83859a92efd2cfe66cf2b3 /src/devices/machine/eepromser.h
parente6c4be2b4d71c7a6c95be0bae111eb416ff0f9e7 (diff)
Move static data out of devices into the device types. This is a significant change, so please pay attention.
The core changes are: * Short name, full name and source file are no longer members of device_t, they are part of the device type * MACHINE_COFIG_START no longer needs a driver class * MACHINE_CONFIG_DERIVED_CLASS is no longer necessary * Specify the state class you want in the GAME/COMP/CONS line * The compiler will work out the base class where the driver init member is declared * There is one static device type object per driver rather than one per machine configuration Use DECLARE_DEVICE_TYPE or DECLARE_DEVICE_TYPE_NS to declare device type. * DECLARE_DEVICE_TYPE forward-declares teh device type and class, and declares extern object finders. * DECLARE_DEVICE_TYPE_NS is for devices classes in namespaces - it doesn't forward-declare the device type. Use DEFINE_DEVICE_TYPE or DEFINE_DEVICE_TYPE_NS to define device types. * These macros declare storage for the static data, and instantiate the device type and device finder templates. The rest of the changes are mostly just moving stuff out of headers that shouldn't be there, renaming stuff for consistency, and scoping stuff down where appropriate. Things I've actually messed with substantially: * More descriptive names for a lot of devices * Untangled the fantasy sound from the driver state, which necessitates breaking up sound/flip writes * Changed DECO BSMT2000 ready callback into a device delegate * Untangled Microprose 3D noise from driver state * Used object finders for CoCo multipak, KC85 D002, and Irem sound subdevices * Started to get TI-99 stuff out of the TI-990 directory and arrange bus devices properly * Started to break out common parts of Samsung ARM SoC devices * Turned some of FM, SID, SCSP DSP, EPIC12 and Voodoo cores into something resmbling C++ * Tried to make Z180 table allocation/setup a bit safer * Converted generic keyboard/terminal to not use WRITE8 - space/offset aren't relevant * Dynamically allocate generic terminal buffer so derived devices (e.g. teleprinter) can specify size * Imporved encapsulation of Z80DART channels * Refactored the SPC7110 bit table generator loop to make it more readable * Added wrappers for SNES PPU operations so members can be made protected * Factored out some boilerplate for YM chips with PSG * toaplan2 gfx * stic/intv resolution * Video System video * Out Run/Y-board sprite alignment * GIC video hookup * Amstrad CPC ROM box members * IQ151 ROM cart region * MSX cart IRQ callback resolution time * SMS passthrough control devices starting subslots I've smoke-tested several drivers, but I've probably missed something. Things I've missed will likely blow up spectacularly with failure to bind errors and the like. Let me know if there's more subtle breakage (could have happened in FM or Voodoo). And can everyone please, please try to keep stuff clean. In particular, please stop polluting the global namespace. Keep things out of headers that don't need to be there, and use things that can be scoped down rather than macros. It feels like an uphill battle trying to get this stuff under control while more of it's added.
Diffstat (limited to 'src/devices/machine/eepromser.h')
-rw-r--r--src/devices/machine/eepromser.h40
1 files changed, 19 insertions, 21 deletions
diff --git a/src/devices/machine/eepromser.h b/src/devices/machine/eepromser.h
index 04b1d5e35c7..c82e36729a7 100644
--- a/src/devices/machine/eepromser.h
+++ b/src/devices/machine/eepromser.h
@@ -8,10 +8,10 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_EEPROMSER_H
+#define MAME_MACHINE_EEPROMSER_H
-#ifndef __EEPROMSER_H__
-#define __EEPROMSER_H__
+#pragma once
#include "eeprom.h"
@@ -102,10 +102,6 @@
class eeprom_serial_base_device : public eeprom_base_device
{
-protected:
- // construction/destruction
- eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
-
public:
// inline configuration helpers
static void static_set_address_bits(device_t &device, int addrbits);
@@ -113,6 +109,9 @@ public:
static void static_enable_output_on_falling_clock(device_t &device);
protected:
+ // construction/destruction
+ eeprom_serial_base_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -197,10 +196,6 @@ protected:
class eeprom_serial_93cxx_device : public eeprom_serial_base_device
{
-protected:
- // construction/destruction
- eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
-
public:
// read handlers
DECLARE_READ_LINE_MEMBER(do_read); // combined DO+READY/BUSY
@@ -211,6 +206,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(di_write); // DI
protected:
+ // construction/destruction
+ eeprom_serial_93cxx_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner);
+
// subclass overrides
virtual void parse_command_and_address() override;
};
@@ -220,10 +218,6 @@ protected:
class eeprom_serial_er5911_device : public eeprom_serial_base_device
{
-protected:
- // construction/destruction
- eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
-
public:
// read handlers
DECLARE_READ_LINE_MEMBER(do_read); // DO
@@ -235,6 +229,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(di_write); // DI
protected:
+ // construction/destruction
+ eeprom_serial_er5911_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner);
+
// subclass overrides
virtual void parse_command_and_address() override;
};
@@ -246,10 +243,6 @@ class eeprom_serial_x24c44_device : public eeprom_serial_base_device
{
//async recall not implemented
//async store not implemented
-protected:
- // construction/destruction
- eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
-
public:
// read handlers
DECLARE_READ_LINE_MEMBER(do_read); // DO
@@ -260,6 +253,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(di_write); // DI
protected:
+ // construction/destruction
+ eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner);
+
// subclass overrides
virtual void parse_command_and_address() override;
void handle_event(eeprom_event event) override;
@@ -287,7 +283,8 @@ class eeprom_serial_##_lowercase##_##_bits##bit_device : public eeprom_serial_##
public: \
eeprom_serial_##_lowercase##_##_bits##bit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); \
}; \
-extern const device_type EEPROM_SERIAL_##_uppercase##_##_bits##BIT;
+DECLARE_DEVICE_TYPE(EEPROM_SERIAL_##_uppercase##_##_bits##BIT, eeprom_serial_##_lowercase##_##_bits##bit_device)
+
// standard 93CX6 class of 16-bit EEPROMs
DECLARE_SERIAL_EEPROM_DEVICE(93cxx, 93c06, 93C06, 16)
DECLARE_SERIAL_EEPROM_DEVICE(93cxx, 93c46, 93C46, 16)
@@ -319,4 +316,5 @@ DECLARE_SERIAL_EEPROM_DEVICE(93cxx, s29390, S29390, 16)
// X24c44 8 bit 32byte ram/eeprom combo
DECLARE_SERIAL_EEPROM_DEVICE(x24c44, x24c44, X24C44, 16)
-#endif
+
+#endif // MAME_MACHINE_EEPROMSER_H