diff options
author | Aaron Giles <aaron@aarongiles.com> | 2013-07-26 09:44:37 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2013-07-26 09:44:37 +0000 |
commit | ba158e3675e85a21c67a489eaf99eb3533dc65c9 (patch) | |
tree | ec64ffd3d3d56f13d485a4b393510ff663933c6e | |
parent | a5689467f5cfeccb2fbac4a51fc7eb4463c28fe0 (diff) |
Rename eeprom_device to serial_eeprom_device in anticipation of adding
a parallel eeprom device.
Also attempted to fix Visual Studio warnings.
143 files changed, 682 insertions, 681 deletions
diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c index 18481ace058..1ef1cbb87a3 100644 --- a/src/emu/machine/eeprom.c +++ b/src/emu/machine/eeprom.c @@ -25,9 +25,9 @@ //************************************************************************** // device type definition -const device_type EEPROM = &device_creator<eeprom_device>; +const device_type SERIAL_EEPROM = &device_creator<serial_eeprom_device>; -const eeprom_interface eeprom_interface_93C46 = +const serial_eeprom_interface eeprom_interface_93C46 = { 6, // address bits 6 16, // data bits 16 @@ -42,7 +42,7 @@ const eeprom_interface eeprom_interface_93C46 = // "*10010xxxx" // erase all 1 00 10xxxx }; -const eeprom_interface eeprom_interface_93C46_8bit = +const serial_eeprom_interface eeprom_interface_93C46_8bit = { 7, // address bits 7 8, // data bits 8 @@ -57,7 +57,7 @@ const eeprom_interface eeprom_interface_93C46_8bit = // "*10010xxxx" // erase all 1 00 10xxxx }; -const eeprom_interface eeprom_interface_93C66B = +const serial_eeprom_interface eeprom_interface_93C66B = { 8, // address bits 16, // data bits @@ -73,12 +73,12 @@ const eeprom_interface eeprom_interface_93C66B = }; -static ADDRESS_MAP_START( eeprom_map8, AS_PROGRAM, 8, eeprom_device ) +static ADDRESS_MAP_START( eeprom_map8, AS_PROGRAM, 8, serial_eeprom_device ) AM_RANGE(0x0000, 0x0fff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( eeprom_map16, AS_PROGRAM, 16, eeprom_device ) +static ADDRESS_MAP_START( eeprom_map16, AS_PROGRAM, 16, serial_eeprom_device ) AM_RANGE(0x0000, 0x07ff) AM_RAM ADDRESS_MAP_END @@ -89,11 +89,11 @@ ADDRESS_MAP_END //************************************************************************** //------------------------------------------------- -// eeprom_device - constructor +// serial_eeprom_device - constructor //------------------------------------------------- -eeprom_device::eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, EEPROM, "EEPROM", tag, owner, clock, "eeprom", __FILE__), +serial_eeprom_device::serial_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : device_t(mconfig, SERIAL_EEPROM, "Serial EEPROM", tag, owner, clock, "seeprom", __FILE__), device_memory_interface(mconfig, *this), device_nvram_interface(mconfig, *this), m_default_data_size(0), @@ -110,7 +110,7 @@ eeprom_device::eeprom_device(const machine_config &mconfig, const char *tag, dev m_reset_counter(0) { m_default_data.u8 = NULL; - memset(downcast<eeprom_interface *>(this), 0, sizeof(eeprom_interface)); + memset(downcast<serial_eeprom_interface *>(this), 0, sizeof(serial_eeprom_interface)); } @@ -119,10 +119,10 @@ eeprom_device::eeprom_device(const machine_config &mconfig, const char *tag, dev // to set the interface //------------------------------------------------- -void eeprom_device::static_set_interface(device_t &device, const eeprom_interface &interface) +void serial_eeprom_device::static_set_interface(device_t &device, const serial_eeprom_interface &interface) { - eeprom_device &eeprom = downcast<eeprom_device &>(device); - static_cast<eeprom_interface &>(eeprom) = interface; + serial_eeprom_device &eeprom = downcast<serial_eeprom_device &>(device); + static_cast<serial_eeprom_interface &>(eeprom) = interface; // describe our address space if (eeprom.m_data_bits == 8) @@ -137,17 +137,17 @@ void eeprom_device::static_set_interface(device_t &device, const eeprom_interfac // to set the default data //------------------------------------------------- -void eeprom_device::static_set_default_data(device_t &device, const UINT8 *data, UINT32 size) +void serial_eeprom_device::static_set_default_data(device_t &device, const UINT8 *data, UINT32 size) { - eeprom_device &eeprom = downcast<eeprom_device &>(device); + serial_eeprom_device &eeprom = downcast<serial_eeprom_device &>(device); assert(eeprom.m_data_bits == 8); eeprom.m_default_data.u8 = const_cast<UINT8 *>(data); eeprom.m_default_data_size = size; } -void eeprom_device::static_set_default_data(device_t &device, const UINT16 *data, UINT32 size) +void serial_eeprom_device::static_set_default_data(device_t &device, const UINT16 *data, UINT32 size) { - eeprom_device &eeprom = downcast<eeprom_device &>(device); + serial_eeprom_device &eeprom = downcast<serial_eeprom_device &>(device); assert(eeprom.m_data_bits == 16); eeprom.m_default_data.u16 = const_cast<UINT16 *>(data); eeprom.m_default_data_size = size / 2; @@ -159,9 +159,9 @@ void eeprom_device::static_set_default_data(device_t &device, const UINT16 *data // to set the default value //------------------------------------------------- -void eeprom_device::static_set_default_value(device_t &device, UINT16 value) +void serial_eeprom_device::static_set_default_value(device_t &device, UINT16 value) { - downcast<eeprom_device &>(device).m_default_value = 0x10000 | value; + downcast<serial_eeprom_device &>(device).m_default_value = 0x10000 | value; } @@ -170,7 +170,7 @@ void eeprom_device::static_set_default_value(device_t &device, UINT16 value) // on this device //------------------------------------------------- -void eeprom_device::device_validity_check(validity_checker &valid) const +void serial_eeprom_device::device_validity_check(validity_checker &valid) const { if (m_data_bits != 8 && m_data_bits != 16) mame_printf_error("Invalid data width %d specified\n", m_data_bits); @@ -181,7 +181,7 @@ void eeprom_device::device_validity_check(validity_checker &valid) const // device_start - device-specific startup //------------------------------------------------- -void eeprom_device::device_start() +void serial_eeprom_device::device_start() { m_locked = (m_cmd_unlock != NULL); @@ -202,7 +202,7 @@ void eeprom_device::device_start() // device_reset - device-specific reset //------------------------------------------------- -void eeprom_device::device_reset() +void serial_eeprom_device::device_reset() { } @@ -212,7 +212,7 @@ void eeprom_device::device_reset() // any address spaces owned by this device //------------------------------------------------- -const address_space_config *eeprom_device::memory_space_config(address_spacenum spacenum) const +const address_space_config *serial_eeprom_device::memory_space_config(address_spacenum spacenum) const { return (spacenum == 0) ? &m_space_config : NULL; } @@ -223,7 +223,7 @@ const address_space_config *eeprom_device::memory_space_config(address_spacenum // its default state //------------------------------------------------- -void eeprom_device::nvram_default() +void serial_eeprom_device::nvram_default() { UINT32 eeprom_length = 1 << m_address_bits; UINT32 eeprom_bytes = eeprom_length * m_data_bits / 8; @@ -271,7 +271,7 @@ void eeprom_device::nvram_default() // .nv file //------------------------------------------------- -void eeprom_device::nvram_read(emu_file &file) +void serial_eeprom_device::nvram_read(emu_file &file) { UINT32 eeprom_length = 1 << m_address_bits; UINT32 eeprom_bytes = eeprom_length * m_data_bits / 8; @@ -289,7 +289,7 @@ void eeprom_device::nvram_read(emu_file &file) // .nv file //------------------------------------------------- -void eeprom_device::nvram_write(emu_file &file) +void serial_eeprom_device::nvram_write(emu_file &file) { UINT32 eeprom_length = 1 << m_address_bits; UINT32 eeprom_bytes = eeprom_length * m_data_bits / 8; @@ -307,7 +307,7 @@ void eeprom_device::nvram_write(emu_file &file) // READ/WRITE HANDLERS //************************************************************************** -WRITE_LINE_MEMBER( eeprom_device::write_bit ) +WRITE_LINE_MEMBER( serial_eeprom_device::write_bit ) { LOG(("write bit %d\n",state)); m_latch = state; @@ -316,10 +316,10 @@ WRITE_LINE_MEMBER( eeprom_device::write_bit ) READ_LINE_DEVICE_HANDLER( eeprom_read_bit ) { - return downcast<eeprom_device *>(device)->read_bit(); + return downcast<serial_eeprom_device *>(device)->read_bit(); } -READ_LINE_MEMBER( eeprom_device::read_bit ) +READ_LINE_MEMBER( serial_eeprom_device::read_bit ) { int res; @@ -344,7 +344,7 @@ READ_LINE_MEMBER( eeprom_device::read_bit ) -WRITE_LINE_MEMBER( eeprom_device::set_cs_line ) +WRITE_LINE_MEMBER( serial_eeprom_device::set_cs_line ) { LOG(("set reset line %d\n",state)); m_reset_line = state; @@ -362,7 +362,7 @@ WRITE_LINE_MEMBER( eeprom_device::set_cs_line ) -WRITE_LINE_MEMBER( eeprom_device::set_clock_line ) +WRITE_LINE_MEMBER( serial_eeprom_device::set_clock_line ) { LOG(("set clock line %d\n",state)); if (state == PULSE_LINE || (m_clock_line == CLEAR_LINE && state != CLEAR_LINE)) @@ -398,7 +398,7 @@ WRITE_LINE_MEMBER( eeprom_device::set_clock_line ) // INTERNAL HELPERS //************************************************************************** -void eeprom_device::write(int bit) +void serial_eeprom_device::write(int bit) { LOG(("EEPROM %s write bit %d\n", tag(), bit)); @@ -515,7 +515,7 @@ void eeprom_device::write(int bit) Note: (cmd) may be NULL. Return 0 (no match) in this case. */ -bool eeprom_device::command_match(const char *buf, const char *cmd, int len) +bool serial_eeprom_device::command_match(const char *buf, const char *cmd, int len) { if ( cmd == 0 ) return false; if ( len == 0 ) return false; diff --git a/src/emu/machine/eeprom.h b/src/emu/machine/eeprom.h index da7f381d728..76ae0c9aceb 100644 --- a/src/emu/machine/eeprom.h +++ b/src/emu/machine/eeprom.h @@ -17,22 +17,24 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_EEPROM_ADD(_tag, _interface) \ - MCFG_DEVICE_ADD(_tag, EEPROM, 0) \ - eeprom_device::static_set_interface(*device, _interface); +#define MCFG_SERIAL_EEPROM_ADD(_tag, _interface) \ + MCFG_DEVICE_ADD(_tag, SERIAL_EEPROM, 0) \ + serial_eeprom_device::static_set_interface(*device, _interface); + +#define MCFG_SERIAL_EEPROM_DATA(_data, _size) \ + serial_eeprom_device::static_set_default_data(*device, _data, _size); +#define MCFG_SERIAL_EEPROM_DEFAULT_VALUE(_value) \ + serial_eeprom_device::static_set_default_value(*device, _value); + #define MCFG_EEPROM_93C46_ADD(_tag) \ - MCFG_EEPROM_ADD(_tag, eeprom_interface_93C46) + MCFG_SERIAL_EEPROM_ADD(_tag, eeprom_interface_93C46) #define MCFG_EEPROM_93C46_8BIT_ADD(_tag) \ - MCFG_EEPROM_ADD(_tag, eeprom_interface_93C46_8bit) + MCFG_SERIAL_EEPROM_ADD(_tag, eeprom_interface_93C46_8bit) #define MCFG_EEPROM_93C66B_ADD(_tag) \ - MCFG_EEPROM_ADD(_tag, eeprom_interface_93C66B) + MCFG_SERIAL_EEPROM_ADD(_tag, eeprom_interface_93C66B) -#define MCFG_EEPROM_DATA(_data, _size) \ - eeprom_device::static_set_default_data(*device, _data, _size); -#define MCFG_EEPROM_DEFAULT_VALUE(_value) \ - eeprom_device::static_set_default_value(*device, _value); //************************************************************************** @@ -40,9 +42,9 @@ //************************************************************************** -// ======================> eeprom_interface +// ======================> serial_eeprom_interface -struct eeprom_interface +struct serial_eeprom_interface { UINT8 m_address_bits; // EEPROM has 2^address_bits cells UINT8 m_data_bits; // every cell has this many bits (8 or 16) @@ -58,19 +60,19 @@ struct eeprom_interface -// ======================> eeprom_device +// ======================> serial_eeprom_device -class eeprom_device : public device_t, - public device_memory_interface, - public device_nvram_interface, - public eeprom_interface +class serial_eeprom_device : public device_t, + public device_memory_interface, + public device_nvram_interface, + public serial_eeprom_interface { public: // construction/destruction - eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + serial_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers - static void static_set_interface(device_t &device, const eeprom_interface &interface); + static void static_set_interface(device_t &device, const serial_eeprom_interface &interface); static void static_set_default_data(device_t &device, const UINT8 *data, UINT32 size); static void static_set_default_data(device_t &device, const UINT16 *data, UINT32 size); static void static_set_default_value(device_t &device, UINT16 value); @@ -123,7 +125,7 @@ protected: // device type definition -extern const device_type EEPROM; +extern const device_type SERIAL_EEPROM; @@ -131,9 +133,9 @@ extern const device_type EEPROM; // GLOBAL VARIABLES //************************************************************************** -extern const eeprom_interface eeprom_interface_93C46; -extern const eeprom_interface eeprom_interface_93C46_8bit; -extern const eeprom_interface eeprom_interface_93C66B; +extern const serial_eeprom_interface eeprom_interface_93C46; +extern const serial_eeprom_interface eeprom_interface_93C46_8bit; +extern const serial_eeprom_interface eeprom_interface_93C66B; #endif diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index 0d21fd7a534..4bef19c1e62 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -2105,7 +2105,7 @@ WRITE8_MEMBER(vga_device::mem_linear_w) } -static struct eeprom_interface ati_eeprom_interface = +static struct serial_eeprom_interface ati_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -2164,7 +2164,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( ati_vga ) MCFG_MACH8_ADD_OWNER("8514a") - MCFG_EEPROM_ADD("ati_eeprom",ati_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("ati_eeprom",ati_eeprom_interface) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( s3_764 ) @@ -5255,7 +5255,7 @@ READ8_MEMBER(ati_vga_device::ati_port_ext_r) break; case 0x37: { - eeprom_device* eep = subdevice<eeprom_device>("ati_eeprom"); + serial_eeprom_device* eep = subdevice<serial_eeprom_device>("ati_eeprom"); ret = 0x00; ret |= eep->read_bit() << 3; } @@ -5315,7 +5315,7 @@ WRITE8_MEMBER(ati_vga_device::ati_port_ext_w) if(data & 0x04) { - eeprom_device* eep = subdevice<eeprom_device>("ati_eeprom"); + serial_eeprom_device* eep = subdevice<serial_eeprom_device>("ati_eeprom"); if(eep != NULL) { eep->write_bit((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index 8c1c944ddd4..f9ac43f89ae 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -139,7 +139,7 @@ static const namco_interface namco_config = * *************************************/ -static const eeprom_interface _20pacgal_eeprom_intf = +static const serial_eeprom_interface _20pacgal_eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -306,12 +306,12 @@ static INPUT_PORTS_START( 20pacgal ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) PORT_START( "EEPROMIN" ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* bit 7 is EEPROM data */ + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* bit 7 is EEPROM data */ PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) /* bit 5 is cs (active low) */ - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) /* bit 6 is clock (active high) */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) /* bit 7 is data */ + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) /* bit 5 is cs (active low) */ + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) /* bit 6 is clock (active high) */ + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) /* bit 7 is data */ INPUT_PORTS_END @@ -368,7 +368,7 @@ static MACHINE_CONFIG_START( 20pacgal, _20pacgal_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", _20pacgal_state, vblank_irq) - MCFG_EEPROM_ADD("eeprom", _20pacgal_eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", _20pacgal_eeprom_intf) /* video hardware */ MCFG_FRAGMENT_ADD(20pacgal_video) diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index 399cf0e7be7..952ac31ffde 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -50,7 +50,7 @@ public: PXA255_LCD_Regs m_lcd_regs; dmadac_sound_device *m_dmadac[2]; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; UINT32 m_pxa255_lcd_palette[0x100]; UINT8 m_pxa255_lcd_framebuffer[0x100000]; diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index d5a7c32d943..a48da7de988 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -268,7 +268,7 @@ static INPUT_PORTS_START( yumefuda ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Coin Out") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Pay Out") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Init SW") - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("IN0") @@ -322,9 +322,9 @@ static INPUT_PORTS_START( yumefuda ) PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) /* Unused, on the PCB there's just one bank */ PORT_START("DSW1") diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index 79dfd6383c0..a42794225f2 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -18,7 +18,7 @@ colour, including the word "Konami" #include "includes/konamipt.h" #include "includes/asterix.h" -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -213,15 +213,15 @@ static INPUT_PORTS_START( asterix ) PORT_START("IN1") KONAMI16_LSB(2, IPT_UNKNOWN, IPT_START2) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED ) // EEPROM ready (always 1) PORT_SERVICE_NO_TOGGLE(0x0400, IP_ACTIVE_LOW ) PORT_BIT( 0xf800, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END @@ -289,7 +289,7 @@ static MACHINE_CONFIG_START( asterix, asterix_state ) MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) diff --git a/src/mame/drivers/astrcorp.c b/src/mame/drivers/astrcorp.c index bcea5df05be..ae937404d5a 100644 --- a/src/mame/drivers/astrcorp.c +++ b/src/mame/drivers/astrcorp.c @@ -380,12 +380,12 @@ static INPUT_PORTS_START( showhand ) PORT_START( "EEPROMIN" ) PORT_BIT( 0xfff7, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static INPUT_PORTS_START( showhanc ) @@ -409,12 +409,12 @@ static INPUT_PORTS_START( showhanc ) PORT_START( "EEPROMIN" ) PORT_BIT( 0xfff7, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static INPUT_PORTS_START( skilldrp ) @@ -438,12 +438,12 @@ static INPUT_PORTS_START( skilldrp ) PORT_START( "EEPROMIN" ) PORT_BIT( 0xfff7, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END /*************************************************************************** @@ -481,7 +481,7 @@ static MACHINE_CONFIG_START( showhand, astrocorp_state ) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_EEPROM_93C46_ADD("eeprom") - MCFG_EEPROM_DATA(showhand_default_eeprom, sizeof(showhand_default_eeprom)) + MCFG_SERIAL_EEPROM_DATA(showhand_default_eeprom, sizeof(showhand_default_eeprom)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c index 5fb6ecce6f6..2ff413bf79f 100644 --- a/src/mame/drivers/ataxx.c +++ b/src/mame/drivers/ataxx.c @@ -119,7 +119,7 @@ static INPUT_PORTS_START( ataxx ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("IN2") /* 0x20 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("AN0") /* 0x00 - analog X */ @@ -150,7 +150,7 @@ static INPUT_PORTS_START( wsf ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("IN2") /* 0x20 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -202,7 +202,7 @@ static INPUT_PORTS_START( indyheat ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("IN2") /* 0x20 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("AN0") /* Analog wheel 1 */ @@ -248,7 +248,7 @@ static INPUT_PORTS_START( brutforc ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("IN2") /* 0x20 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("P1") /* 0x0E */ @@ -290,7 +290,7 @@ INPUT_PORTS_END * *************************************/ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, 16, @@ -328,7 +328,7 @@ static MACHINE_CONFIG_START( ataxx, leland_state ) MCFG_MACHINE_START_OVERRIDE(leland_state,ataxx) MCFG_MACHINE_RESET_OVERRIDE(leland_state,ataxx) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_NVRAM_ADD_0FILL("battery") /* video hardware */ diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index 42d51609529..749016634c4 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -60,7 +60,7 @@ public: required_device<deco16ic_device> m_deco_tilegen1; required_device<deco16ic_device> m_deco_tilegen2; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; /* memory */ UINT16 m_pf1_rowscroll[0x0800/2]; diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index b9aedd2d053..7523224df85 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -387,7 +387,7 @@ WRITE16_MEMBER(cave_state::metmqstr_eeprom_msb_w) } } -static const eeprom_interface eeprom_interface_93C46_pacslot = +static const serial_eeprom_interface eeprom_interface_93C46_pacslot = { 6, // address bits 6 16, // data bits 16 @@ -1280,7 +1280,7 @@ static INPUT_PORTS_START( cave ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(6) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1433,7 +1433,7 @@ static INPUT_PORTS_START( guwange ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1477,7 +1477,7 @@ static INPUT_PORTS_START( korokoro ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1489,7 +1489,7 @@ static INPUT_PORTS_START( tjumpman ) PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( DEF_STR( Yes ) ) PORT_CODE(KEYCODE_Y) // suru ("do") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME( "1 Bet" ) @@ -1514,7 +1514,7 @@ static INPUT_PORTS_START( pacslot ) PORT_SERVICE( 0x01, IP_ACTIVE_LOW ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // credits PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "Pac-Man" ) PORT_CODE(KEYCODE_Y) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME( "Bet" ) @@ -2301,7 +2301,7 @@ static MACHINE_CONFIG_START( pacslot, cave_state ) MCFG_MACHINE_START_OVERRIDE(cave_state,cave) MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C46_pacslot) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_93C46_pacslot) MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start) diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index fab955b26e5..29e00518f76 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -89,7 +89,7 @@ WRITE8_MEMBER(cbasebal_state::cbasebal_coinctrl_w) * *************************************/ -static const eeprom_interface cbasebal_eeprom_intf = +static const serial_eeprom_interface cbasebal_eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -166,16 +166,16 @@ static INPUT_PORTS_START( cbasebal ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") /* ? */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "IO_01" ) - PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) PORT_START( "IO_02" ) - PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) PORT_START( "IO_03" ) - PORT_BIT( 0x00000040, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x00000040, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END @@ -275,7 +275,7 @@ static MACHINE_CONFIG_START( cbasebal, cbasebal_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", cbasebal_state, irq0_line_hold) /* ??? */ - MCFG_EEPROM_ADD("eeprom", cbasebal_eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", cbasebal_eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index baea5637657..b3e0b920c3a 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -432,7 +432,7 @@ WRITE8_MEMBER(cps_state::qsound_banksw_w) * ********************************************************************/ -static const eeprom_interface qsound_eeprom_interface = +static const serial_eeprom_interface qsound_eeprom_interface = { 7, /* address bits */ 8, /* data bits */ @@ -441,7 +441,7 @@ static const eeprom_interface qsound_eeprom_interface = "0111" /* erase command */ }; -static const eeprom_interface pang3_eeprom_interface = +static const serial_eeprom_interface pang3_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -2275,12 +2275,12 @@ static INPUT_PORTS_START( wof ) PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMIN" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END INPUT_PORTS_START( dino ) @@ -2305,12 +2305,12 @@ INPUT_PORTS_START( dino ) PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMIN" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END @@ -2433,12 +2433,12 @@ INPUT_PORTS_START( punisher ) PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMIN" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END @@ -2533,12 +2533,12 @@ INPUT_PORTS_START( slammast ) PORT_BIT( 0xf7, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMIN" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END /* Needs further checking */ @@ -2775,12 +2775,12 @@ static INPUT_PORTS_START( pang3 ) PORT_DIPUNUSED( 0x80, 0x80 ) /* doubles up as an extra service switch */ PORT_START( "EEPROMIN" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END /* Needs further checking */ @@ -3074,12 +3074,12 @@ static INPUT_PORTS_START( wofch ) PORT_INCLUDE( sfzch ) PORT_START( "EEPROMIN" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END /* @@ -3217,7 +3217,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( pang3, cps1_12MHz ) /* basic machine hardware */ - MCFG_EEPROM_ADD("eeprom", pang3_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", pang3_eeprom_interface) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( ganbare, cps1_10MHz ) @@ -3242,7 +3242,7 @@ static MACHINE_CONFIG_DERIVED( qsound, cps1_12MHz ) MCFG_MACHINE_START_OVERRIDE(cps_state,qsound) - MCFG_EEPROM_ADD("eeprom", qsound_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", qsound_eeprom_interface) /* sound hardware */ MCFG_DEVICE_REMOVE("mono") @@ -3259,7 +3259,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( wofhfh, cps1_12MHz ) /* basic machine hardware */ - MCFG_EEPROM_ADD("eeprom", qsound_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", qsound_eeprom_interface) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( sf2m3, cps1_12MHz) diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index c5c7ce669ed..182b64ca18a 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -679,7 +679,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cps_state::cps2_interrupt) * *************************************/ -static const eeprom_interface cps2_eeprom_interface = +static const serial_eeprom_interface cps2_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -936,7 +936,7 @@ static INPUT_PORTS_START( cps2_4p4b ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4) PORT_START("IN2") /* (0x20) */ - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_LOW ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x00f8, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -950,9 +950,9 @@ static INPUT_PORTS_START( cps2_4p4b ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) /* fake inputs for digital volume buttons */ PORT_START( "DIGITALVOL" ) @@ -1258,7 +1258,7 @@ static MACHINE_CONFIG_START( cps2, cps_state ) MCFG_MACHINE_START_OVERRIDE(cps_state,cps2) - MCFG_EEPROM_ADD("eeprom", cps2_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", cps2_eeprom_interface) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c index bf8c9d3ca7e..011202f63c5 100644 --- a/src/mame/drivers/dcheese.c +++ b/src/mame/drivers/dcheese.c @@ -244,7 +244,7 @@ static INPUT_PORTS_START( dcheese ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE ) /* says tilt */ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_TILT ) /* says test */ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* bump left */ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON4 ) /* bump right */ @@ -282,9 +282,9 @@ static INPUT_PORTS_START( dcheese ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END @@ -296,7 +296,7 @@ static INPUT_PORTS_START( lottof2 ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x1f00, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* button */ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* ticket */ @@ -330,9 +330,9 @@ static INPUT_PORTS_START( lottof2 ) PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END @@ -344,7 +344,7 @@ static INPUT_PORTS_START( fredmem ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x1f00, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_CODE(KEYCODE_5_PAD) PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -380,9 +380,9 @@ static INPUT_PORTS_START( fredmem ) PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index 33e675c954b..b99674e3126 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -203,7 +203,7 @@ static INPUT_PORTS_START( hvysmsh ) PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x01000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -213,9 +213,9 @@ static INPUT_PORTS_START( hvysmsh ) PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x00000010, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x00000020, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x00000010, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x00000020, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static INPUT_PORTS_START( wcvol95 ) @@ -245,7 +245,7 @@ static INPUT_PORTS_START( wcvol95 ) PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_UNUSED ) /* 'soundmask' */ PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x01000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -255,9 +255,9 @@ static INPUT_PORTS_START( wcvol95 ) PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x00000002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x00000002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index b68a2acc43d..baf6a4d668e 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -1669,7 +1669,7 @@ WRITE8_MEMBER(deco32_state::sound_bankswitch_w) m_oki2->set_bank_base(((data >> 1)& 1) * 0x40000); } -static const eeprom_interface eeprom_interface_tattass = +static const serial_eeprom_interface eeprom_interface_tattass = { 10, // address bits 10 ==> } 1024 byte eprom 8, // data bits 8 @@ -1801,7 +1801,7 @@ UINT16 deco32_state::port_a_fghthist(int unused) UINT16 deco32_state::port_b_fghthist(int unused) { - return machine().device<eeprom_device>(":eeprom")->read_bit(); + return machine().device<serial_eeprom_device>(":eeprom")->read_bit(); } UINT16 deco32_state::port_c_fghthist(int unused) @@ -2161,7 +2161,7 @@ static MACHINE_CONFIG_START( tattass, deco32_state ) MCFG_CPU_PROGRAM_MAP(tattass_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", deco32_state, deco32_vbl_interrupt) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_tattass) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_tattass) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c index 0ce0320bace..6dcaa79521c 100644 --- a/src/mame/drivers/deco_mlc.c +++ b/src/mame/drivers/deco_mlc.c @@ -344,7 +344,7 @@ static INPUT_PORTS_START( mlc ) PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/dreambal.c b/src/mame/drivers/dreambal.c index c5b6c68e82f..54a9740d191 100644 --- a/src/mame/drivers/dreambal.c +++ b/src/mame/drivers/dreambal.c @@ -39,7 +39,7 @@ public: m_deco_tilegen1(*this, "tilegen1") { } - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; /* devices */ required_device<cpu_device> m_maincpu; @@ -191,7 +191,7 @@ static INPUT_PORTS_START( dreambal ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_START("DSW") - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c index 310df998faf..b7619ade851 100644 --- a/src/mame/drivers/eolith.c +++ b/src/mame/drivers/eolith.c @@ -280,7 +280,7 @@ static INPUT_PORTS_START( common ) PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x00000008, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00000008, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, eolith_state, eolith_speedup_getvblank, NULL) @@ -316,9 +316,9 @@ static INPUT_PORTS_START( common ) PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x00000004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x00000008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x00000004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x00000008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END static INPUT_PORTS_START( linkypip ) @@ -544,7 +544,7 @@ INPUT_PORTS_END *************************************/ // It's configured for 512 bytes -static const eeprom_interface eeprom_interface_93C66 = +static const serial_eeprom_interface eeprom_interface_93C66 = { 9, // address bits 9 8, // data bits 8 @@ -597,7 +597,7 @@ static MACHINE_CONFIG_START( eolith45, eolith_state ) MCFG_MACHINE_RESET_OVERRIDE(eolith_state,eolith) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C66) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_93C66) // for testing sound sync // MCFG_QUANTUM_PERFECT_CPU("maincpu") diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c index 835e0f7a7dd..2226aa2b2e2 100644 --- a/src/mame/drivers/eolith16.c +++ b/src/mame/drivers/eolith16.c @@ -39,7 +39,7 @@ public: // It's configured for 512 bytes -static const eeprom_interface eeprom_interface_93C66 = +static const serial_eeprom_interface eeprom_interface_93C66 = { 9, // address bits 9 8, // data bits 8 @@ -94,7 +94,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( eolith16 ) PORT_START("SPECIAL") - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, eolith16_state, eolith_speedup_getvblank, NULL) PORT_BIT( 0xff6f, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -117,9 +117,9 @@ static INPUT_PORTS_START( eolith16 ) PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x00000020, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x00000040, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x00000020, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x00000040, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END VIDEO_START_MEMBER(eolith16_state,eolith16) @@ -181,7 +181,7 @@ static MACHINE_CONFIG_START( eolith16, eolith16_state ) MCFG_CPU_PROGRAM_MAP(eolith16_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", eolith16_state, eolith_speedup, "screen", 0, 1) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C66) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_93C66) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 2508bf5fd13..882433268de 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -455,9 +455,9 @@ static INPUT_PORTS_START( hedpanic ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END @@ -492,9 +492,9 @@ static INPUT_PORTS_START( swatpolc ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END /*************************************************************************** diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index f95403c9109..6cb2bfcdb06 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -119,16 +119,16 @@ static INPUT_PORTS_START( mosaicf2 ) PORT_BIT( 0xff000000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMIN" ) - PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) PORT_START( "EEPROMCLK" ) - PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) PORT_START( "EEPROMCS" ) - PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static MACHINE_CONFIG_START( mosaicf2, mosaicf2_state ) diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index da89b3e3f26..51205c299ff 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -94,7 +94,7 @@ slampic: no sound. In the wrestling ring, a layer flashes on and off. #include "sound/okim6295.h" #include "machine/eeprom.h" -static const eeprom_interface qsound_eeprom_interface = +static const serial_eeprom_interface qsound_eeprom_interface = { 7, /* address bits */ 8, /* data bits */ @@ -1322,12 +1322,12 @@ static INPUT_PORTS_START( sgyxz ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) PORT_START( "EEPROMIN" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END @@ -1976,7 +1976,7 @@ static MACHINE_CONFIG_START( dinopic, cps_state ) MCFG_MACHINE_START_OVERRIDE(cps_state, dinopic) - MCFG_EEPROM_ADD("eeprom", qsound_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", qsound_eeprom_interface) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2143,7 +2143,7 @@ static MACHINE_CONFIG_START( sgyxz, cps_state ) MCFG_PALETTE_LENGTH(0xc00) MCFG_VIDEO_START_OVERRIDE(cps_state,cps1) - MCFG_EEPROM_ADD("eeprom", qsound_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", qsound_eeprom_interface) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2221,7 +2221,7 @@ static MACHINE_CONFIG_START( punipic, cps_state ) MCFG_MACHINE_START_OVERRIDE(cps_state, punipic) - MCFG_EEPROM_ADD("eeprom", qsound_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", qsound_eeprom_interface) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2611,7 +2611,7 @@ static MACHINE_CONFIG_START( slampic, cps_state ) MCFG_MACHINE_START_OVERRIDE(cps_state, slampic) - MCFG_EEPROM_ADD("eeprom", qsound_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", qsound_eeprom_interface) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index 175ce332f49..245b55b75cd 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -345,7 +345,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_fortecar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; @@ -548,7 +548,7 @@ static MC6845_INTERFACE( mc6845_intf ) }; -static const eeprom_interface forte_eeprom_intf = +static const serial_eeprom_interface forte_eeprom_intf = {/* Preliminary interface for NM93CS56N Serial EEPROM. Correct address & data. Using 93C46 similar protocol. @@ -702,8 +702,8 @@ static MACHINE_CONFIG_START( fortecar, fortecar_state ) MCFG_SCREEN_UPDATE_DRIVER(fortecar_state, screen_update_fortecar) - MCFG_EEPROM_ADD("eeprom", forte_eeprom_intf) - MCFG_EEPROM_DEFAULT_VALUE(0) + MCFG_SERIAL_EEPROM_ADD("eeprom", forte_eeprom_intf) + MCFG_SERIAL_EEPROM_DEFAULT_VALUE(0) MCFG_I8255A_ADD( "fcppi0", ppi8255_intf ) MCFG_V3021_ADD("rtc") diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index ac8647b461e..9a1532c4cfe 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -313,7 +313,7 @@ static INPUT_PORTS_START( fromanc2 ) PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, fromanc2_state,subcpu_int_r, NULL) // SUBCPU INT FLAG PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, fromanc2_state,sndcpu_nmi_r, NULL) // SNDCPU NMI FLAG PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, fromanc2_state,subcpu_nmi_r, NULL) // SUBCPU NMI FLAG - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME( "Service Mode (1P)" ) PORT_CODE(KEYCODE_F2) // TEST (1P) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME( "Service Mode (2P)" ) PORT_CODE(KEYCODE_F2) // TEST (2P) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -396,9 +396,9 @@ static INPUT_PORTS_START( fromanc2 ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static INPUT_PORTS_START( fromanc4 ) @@ -412,14 +412,14 @@ static INPUT_PORTS_START( fromanc4 ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, fromanc2_state,sndcpu_nmi_r, NULL) // SNDCPU NMI FLAG PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_MODIFY("EEPROMOUT") - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c index 31048d4bdb6..49f381632dd 100644 --- a/src/mame/drivers/gaelco2.c +++ b/src/mame/drivers/gaelco2.c @@ -249,7 +249,7 @@ static INPUT_PORTS_START( bang ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* bit 6 is EEPROM data (DOUT) */ + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* bit 6 is EEPROM data (DOUT) */ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* bit 7 is EEPROM ready */ PORT_START("LIGHT0_X") @@ -271,7 +271,7 @@ static const gaelcosnd_interface bang_snd_interface = { 0*0x0200000, 1*0x0200000, 2*0x0200000, 3*0x0200000 } /* start of each ROM bank */ }; -static const eeprom_interface gaelco2_eeprom_interface = +static const serial_eeprom_interface gaelco2_eeprom_interface = { 8, /* address bits */ 16, /* data bits */ @@ -290,7 +290,7 @@ static MACHINE_CONFIG_START( bang, gaelco2_state ) MCFG_CPU_PROGRAM_MAP(bang_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gaelco2_state, bang_irq, "screen", 0, 1) - MCFG_EEPROM_ADD("eeprom", gaelco2_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", gaelco2_eeprom_interface) /* video hardware */ MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") @@ -951,7 +951,7 @@ static INPUT_PORTS_START( snowboar ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* bit 6 is EEPROM data (DOUT) */ + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* bit 6 is EEPROM data (DOUT) */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* bit 7 is EEPROM ready */ INPUT_PORTS_END @@ -967,7 +967,7 @@ static MACHINE_CONFIG_START( snowboar, gaelco2_state ) MCFG_CPU_PROGRAM_MAP(snowboar_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold) - MCFG_EEPROM_ADD("eeprom", gaelco2_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", gaelco2_eeprom_interface) /* video hardware */ MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") @@ -1208,7 +1208,7 @@ static MACHINE_CONFIG_START( wrally2, gaelco2_state ) MCFG_CPU_PROGRAM_MAP(wrally2_map) MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gaelco2_state, irq6_line_hold) - MCFG_EEPROM_ADD("eeprom", gaelco2_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", gaelco2_eeprom_interface) /* video hardware */ MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c index c5070f03dfd..741c9f4e2bd 100644 --- a/src/mame/drivers/galastrm.c +++ b/src/mame/drivers/galastrm.c @@ -200,7 +200,7 @@ static INPUT_PORTS_START( galastrm ) PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x00000200, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, galastrm_state,frame_counter_r, NULL) PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -275,7 +275,7 @@ GFXDECODE_END MACHINE DRIVERS ***********************************************************/ -static const eeprom_interface galastrm_eeprom_interface = +static const serial_eeprom_interface galastrm_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -313,7 +313,7 @@ static MACHINE_CONFIG_START( galastrm, galastrm_state ) MCFG_CPU_PROGRAM_MAP(galastrm_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", galastrm_state, galastrm_interrupt) /* VBL */ - MCFG_EEPROM_ADD("eeprom", galastrm_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", galastrm_eeprom_interface) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index d8bdd5f8dec..90fddad9f9a 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -45,7 +45,7 @@ Known Issues #define JOE_DMADELAY (attotime::from_nsec(42700 + 341300)) -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -200,14 +200,14 @@ static INPUT_PORTS_START( gijoe ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START4 ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL ) // EEPROM ready (always 1) PORT_SERVICE_NO_TOGGLE( 0x0800, IP_ACTIVE_LOW ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) PORT_START("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -286,7 +286,7 @@ static MACHINE_CONFIG_START( gijoe, gijoe_state ) MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c index e651afc59d6..8d31aee62d5 100644 --- a/src/mame/drivers/groundfx.c +++ b/src/mame/drivers/groundfx.c @@ -114,7 +114,7 @@ void groundfx_state::device_timer(emu_timer &timer, device_timer_id id, int para EPROM **********************************************************/ -static const eeprom_interface groundfx_eeprom_interface = +static const serial_eeprom_interface groundfx_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -251,7 +251,7 @@ static INPUT_PORTS_START( groundfx ) PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* shift hi */ PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* brake */ PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -263,9 +263,9 @@ static INPUT_PORTS_START( groundfx ) PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x00000020, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x00000040, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x00000020, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x00000040, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) PORT_START("SYSTEM") PORT_SERVICE_NO_TOGGLE( 0x00000001, IP_ACTIVE_LOW ) @@ -372,7 +372,7 @@ static MACHINE_CONFIG_START( groundfx, groundfx_state ) MCFG_CPU_PROGRAM_MAP(groundfx_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", groundfx_state, groundfx_interrupt) - MCFG_EEPROM_ADD("eeprom", groundfx_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", groundfx_eeprom_interface) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index bf03e536e56..adee32f879f 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -262,7 +262,7 @@ public: required_device<cpu_device> m_dsp; optional_device<cpu_device> m_dsp2; required_device<adc1038_device> m_adc1038; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; UINT32 *m_sharc_dataram_0; UINT32 *m_sharc_dataram_1; DECLARE_WRITE32_MEMBER(paletteram32_w); @@ -360,7 +360,7 @@ WRITE32_MEMBER(gticlub_state::gticlub_k001604_reg_w) /******************************************************************/ /* 93C56 EEPROM */ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 8, /* address bits */ 16, /* data bits */ @@ -978,7 +978,7 @@ static MACHINE_CONFIG_START( gticlub, gticlub_state ) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_MACHINE_START_OVERRIDE(gticlub_state,gticlub) MCFG_MACHINE_RESET_OVERRIDE(gticlub_state,gticlub) @@ -1085,7 +1085,7 @@ static MACHINE_CONFIG_START( hangplt, gticlub_state ) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_MACHINE_START_OVERRIDE(gticlub_state,gticlub) MCFG_MACHINE_RESET_OVERRIDE(gticlub_state,hangplt) diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c index 6e76080bb1f..058b952dbdb 100644 --- a/src/mame/drivers/gunbustr.c +++ b/src/mame/drivers/gunbustr.c @@ -185,7 +185,7 @@ static INPUT_PORTS_START( gunbustr ) PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -284,7 +284,7 @@ GFXDECODE_END MACHINE DRIVERS ***********************************************************/ -static const eeprom_interface gunbustr_eeprom_interface = +static const serial_eeprom_interface gunbustr_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -312,7 +312,7 @@ static MACHINE_CONFIG_START( gunbustr, gunbustr_state ) MCFG_CPU_PROGRAM_MAP(gunbustr_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gunbustr_state, gunbustr_interrupt) /* VBL */ - MCFG_EEPROM_ADD("eeprom", gunbustr_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", gunbustr_eeprom_interface) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 0cc79348827..a875ba3314a 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -354,7 +354,7 @@ public: optional_device<cpu_device> m_gn680; required_device<cpu_device> m_dsp; optional_device<cpu_device> m_dsp2; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; optional_device<k037122_device> m_k037122_1; optional_device<k037122_device> m_k037122_2; required_device<adc12138_device> m_adc12138; @@ -821,9 +821,9 @@ static INPUT_PORTS_START( hornet ) PORT_DIPSETTING( 0x00, "15KHz" ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static INPUT_PORTS_START( sscope ) @@ -873,9 +873,9 @@ static INPUT_PORTS_START( sscope ) PORT_DIPSETTING( 0x00, "15KHz" ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) PORT_START("ANALOG1") // Gun Yaw PORT_BIT( 0x7ff, 0x400, IPT_AD_STICK_X ) PORT_MINMAX(0x000, 0x7ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 96e90eb1012..45590116f00 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -235,14 +235,14 @@ static INPUT_PORTS_START( inufuku ) PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, inufuku_state,soundflag_r, NULL) // pending sound command PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 3on3dunk cares about something in here, possibly a vblank flag PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) PORT_START("P3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3) diff --git a/src/mame/drivers/invqix.c b/src/mame/drivers/invqix.c index 73173caa3ad..3203e62fce5 100644 --- a/src/mame/drivers/invqix.c +++ b/src/mame/drivers/invqix.c @@ -147,7 +147,7 @@ public: protected: // devices required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; required_shared_ptr<UINT16> m_vram; // driver_device overrides @@ -345,7 +345,7 @@ static MACHINE_CONFIG_START( invqix, invqix_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MCFG_EEPROM_93C46_ADD("eeprom") - MCFG_EEPROM_DEFAULT_VALUE(0) + MCFG_SERIAL_EEPROM_DEFAULT_VALUE(0) MACHINE_CONFIG_END ROM_START( invqix ) diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index ff5e7e8cc0b..e909aa16150 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -42,7 +42,7 @@ public: UINT32 screen_update_jackpool(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jackpool_interrupt); required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c index f8f5893a38b..b2c165f43ea 100644 --- a/src/mame/drivers/jclub2.c +++ b/src/mame/drivers/jclub2.c @@ -131,7 +131,7 @@ public: optional_shared_ptr<UINT32> m_spriteram; optional_device<st0020_device> m_gdfs_st0020; required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; DECLARE_WRITE32_MEMBER(darkhors_tmapram_w); DECLARE_WRITE32_MEMBER(darkhors_tmapram2_w); DECLARE_WRITE32_MEMBER(paletteram32_xBBBBBGGGGGRRRRR_dword_w); @@ -474,7 +474,7 @@ static INPUT_PORTS_START( darkhors ) PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // test PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // door 1 PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // door 2 - PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 ) // start PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Payout") PORT_CODE(KEYCODE_LCONTROL) // payout PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Cancel") PORT_CODE(KEYCODE_LALT) // cancel @@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( darkhors, darkhors_state ) MCFG_CPU_PROGRAM_MAP(darkhors_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", darkhors_state, darkhors_irq, "screen", 0, 1) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C46_8bit) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_93C46_8bit) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -733,7 +733,7 @@ static MACHINE_CONFIG_START( jclub2, darkhors_state ) MCFG_CPU_PROGRAM_MAP(jclub2_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", darkhors_state, darkhors_irq, "screen", 0, 1) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C46_8bit) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_93C46_8bit) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -799,7 +799,7 @@ static MACHINE_CONFIG_START( jclub2o, darkhors_state ) MCFG_CPU_IO_MAP(st0016_io) MCFG_CPU_VBLANK_INT_DRIVER("screen", darkhors_state, irq0_line_hold) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C46_8bit) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_93C46_8bit) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index 2bc98b9e85e..ba6cf40c598 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -768,8 +768,8 @@ static INPUT_PORTS_START( bakubrkr ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END @@ -1343,8 +1343,8 @@ static INPUT_PORTS_START( mgcrystl ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END @@ -1419,8 +1419,8 @@ static INPUT_PORTS_START( shogwarr ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END @@ -1495,8 +1495,8 @@ Difficulty Lives Bonus Players Play Level ******************************************************/ PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END @@ -1603,7 +1603,7 @@ static const ay8910_interface ay8910_intf_eeprom = { AY8910_LEGACY_OUTPUT, AY8910_DEFAULT_LOADS, - DEVCB_DEVICE_LINE_MEMBER("eeprom", eeprom_device, read_bit), /* inputs A: 0,EEPROM bit read */ + DEVCB_DEVICE_LINE_MEMBER("eeprom", serial_eeprom_device, read_bit), /* inputs A: 0,EEPROM bit read */ DEVCB_NULL, /* inputs B */ DEVCB_NULL, /* outputs A */ DEVCB_DRIVER_MEMBER(kaneko16_state,kaneko16_eeprom_reset_w) /* outputs B: 0,EEPROM reset */ @@ -2054,7 +2054,7 @@ static MACHINE_CONFIG_START( shogwarr, kaneko16_shogwarr_state ) MCFG_MACHINE_RESET_OVERRIDE(kaneko16_shogwarr_state,mgcrystl) MCFG_EEPROM_93C46_ADD("eeprom") - MCFG_EEPROM_DATA(shogwarr_default_eeprom, 128) + MCFG_SERIAL_EEPROM_DATA(shogwarr_default_eeprom, 128) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2124,7 +2124,7 @@ static MACHINE_CONFIG_DERIVED( brapboys, shogwarr ) MCFG_DEVICE_REMOVE("eeprom") MCFG_EEPROM_93C46_ADD("eeprom") - MCFG_EEPROM_DATA(brapboys_default_eeprom, 128) + MCFG_SERIAL_EEPROM_DATA(brapboys_default_eeprom, 128) MACHINE_CONFIG_END /*************************************************************************** diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index a5b554a2afd..0203a1ae3a6 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -650,7 +650,7 @@ static MACHINE_CONFIG_START( kickgoal, kickgoal_state ) MCFG_EEPROM_93C46_ADD("eeprom") - MCFG_EEPROM_DATA(kickgoal_default_eeprom_type1, 128) + MCFG_SERIAL_EEPROM_DATA(kickgoal_default_eeprom_type1, 128) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -685,7 +685,7 @@ static MACHINE_CONFIG_START( actionhw, kickgoal_state ) MCFG_EEPROM_93C46_ADD("eeprom") - MCFG_EEPROM_DATA(kickgoal_default_eeprom_type1, 128) + MCFG_SERIAL_EEPROM_DATA(kickgoal_default_eeprom_type1, 128) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index 011e0c1ab98..2aeaf7c60b8 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -297,7 +297,7 @@ static MACHINE_CONFIG_START( konamigq, konamigq_state ) MCFG_DEVICE_ADD("mb89371", MB89371, 0) MCFG_EEPROM_93C46_ADD("eeprom") - MCFG_EEPROM_DATA(konamigq_def_eeprom, 128) + MCFG_SERIAL_EEPROM_DATA(konamigq_def_eeprom, 128) MCFG_SCSIBUS_ADD("scsi") MCFG_SCSIDEV_ADD("scsi:disk", SCSIHD, SCSI_ID_0) @@ -395,12 +395,12 @@ static INPUT_PORTS_START( konamigq ) PORT_DIPSETTING( 0x00, "Independent" ) PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00010000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00010000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END ROM_START( cryptklr ) diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index 3d2972e4643..0eac05587c2 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -359,7 +359,7 @@ static INPUT_PORTS_START( konamigv ) PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x00001000, IP_ACTIVE_LOW ) - PORT_BIT( 0x00002000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER( "eeprom", eeprom_device, read_bit ) + PORT_BIT( 0x00002000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER( "eeprom", serial_eeprom_device, read_bit ) PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -403,9 +403,9 @@ static INPUT_PORTS_START( konamigv ) PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("EEPROMOUT") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END /* Simpsons Bowling */ diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 3d0e284f585..12720c915d1 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1361,7 +1361,7 @@ static INPUT_PORTS_START( common ) // excpuint stat, objdma stat, eeprom do // note: racin' force expects bit 1 of the eeprom port to toggle - PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x000000fe, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, konamigx_state,gx_rdport1_3_r, NULL) PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -1374,9 +1374,9 @@ static INPUT_PORTS_START( common ) PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNUSED ) /* DIP#1 & DIP#2 */ PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c index d511ea08871..8261d956193 100644 --- a/src/mame/drivers/leland.c +++ b/src/mame/drivers/leland.c @@ -145,7 +145,7 @@ static INPUT_PORTS_START( cerberus ) /* complete, verified from code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_START("IN3") /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -191,7 +191,7 @@ static INPUT_PORTS_START( mayhem ) /* complete, verified from code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_START("IN3") /* 0xD1 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -224,7 +224,7 @@ static INPUT_PORTS_START( wseries ) /* complete, verified from code */ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Aim") PORT_PLAYER(1) PORT_START("IN3") /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -263,7 +263,7 @@ static INPUT_PORTS_START( alleymas ) /* complete, verified from code */ // PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* redundant inputs */ PORT_START("IN3") /* 0xD1 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -299,7 +299,7 @@ static INPUT_PORTS_START( upyoural ) /* complete, verified from code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_START("IN3") /* 0xD1 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -334,7 +334,7 @@ static INPUT_PORTS_START( dangerz ) /* complete, verified from code */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("IN3") /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -369,7 +369,7 @@ static INPUT_PORTS_START( basebal2 ) /* complete, verified from code */ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Run/Cutoff") PORT_PLAYER(1) PORT_START("IN3") /* 0x51/D1 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -406,7 +406,7 @@ static INPUT_PORTS_START( redline ) /* complete, verified in code */ PORT_BIT( 0xe0, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(64) PORT_PLAYER(2) PORT_START("IN3") /* 0xD1 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -444,7 +444,7 @@ static INPUT_PORTS_START( quarterb ) /* complete, verified in code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_START("IN3") /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -486,7 +486,7 @@ static INPUT_PORTS_START( teamqb ) /* complete, verified in code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_START("IN3") /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -544,7 +544,7 @@ static INPUT_PORTS_START( aafb2p ) /* complete, verified in code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_START("IN3") /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -599,7 +599,7 @@ static INPUT_PORTS_START( offroad ) /* complete, verified from code */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("IN3") /* 0xD1 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) @@ -673,7 +673,7 @@ static INPUT_PORTS_START( pigout ) /* complete, verified from code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_START("IN3") /* 0x51 */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -728,7 +728,7 @@ static const ay8910_interface ay8910_config = * *************************************/ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 6, 16, @@ -760,7 +760,7 @@ static MACHINE_CONFIG_START( leland, leland_state ) MCFG_MACHINE_START_OVERRIDE(leland_state,leland) MCFG_MACHINE_RESET_OVERRIDE(leland_state,leland) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_NVRAM_ADD_0FILL("battery") /* video hardware */ diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index 45df14781fc..bf903ecbbaa 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -176,7 +176,7 @@ static const char *const gunnames[] = { "LIGHT0_X", "LIGHT0_Y", "LIGHT1_X", "LIG #define GUNX( a ) (( ( ioport(gunnames[2 * (a - 1)])->read() * 287 ) / 0xff ) + 16) #define GUNY( a ) (( ( ioport(gunnames[2 * (a - 1) + 1])->read() * 223 ) / 0xff ) + 10) -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -491,7 +491,7 @@ static INPUT_PORTS_START( lethalen ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) PORT_START("DSW") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* it must be 1 ? */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -509,9 +509,9 @@ static INPUT_PORTS_START( lethalen ) PORT_DIPSETTING( 0x0080, DEF_STR( Stereo ) ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) PORT_START("LIGHT0_X") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) @@ -639,7 +639,7 @@ static MACHINE_CONFIG_START( lethalen, lethal_state ) MCFG_CPU_PROGRAM_MAP(le_sound) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_GFXDECODE(lethal) diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index 83481fb4165..d4ad7445c98 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -594,7 +594,7 @@ static INPUT_PORTS_START( legendoh ) PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x00200000, IP_ACTIVE_LOW ) PORT_BIT( 0x00400000, IP_ACTIVE_HIGH, IPT_SPECIAL ) //security bit - PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_START4 ) PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -607,9 +607,9 @@ static INPUT_PORTS_START( legendoh ) PORT_BIT( 0x4000ffff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x00020000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x00040000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x00020000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x00040000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) // PORT_BIT( 0x00080000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // 0x80000 -> video disabled? INPUT_PORTS_END @@ -643,7 +643,7 @@ static INPUT_PORTS_START( sb2003 ) PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_SERVICE_NO_TOGGLE( 0x00200000, IP_ACTIVE_LOW ) PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_SPECIAL ) //security bit - PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_DIPNAME( 0x20000000, 0x00000000, "Sound Enable" ) PORT_DIPSETTING( 0x20000000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00000000, DEF_STR( On ) ) @@ -652,9 +652,9 @@ static INPUT_PORTS_START( sb2003 ) PORT_BIT( 0x5f00ffff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x00020000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x00040000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x00020000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x00040000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) // PORT_BIT( 0x00080000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // 0x80000 -> video disabled? INPUT_PORTS_END @@ -688,7 +688,7 @@ static INPUT_PORTS_START( spotty ) PORT_BIT( 0x00080000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, limenko_state,spriteram_bit_r, NULL) //changes spriteram location PORT_SERVICE_NO_TOGGLE( 0x00200000, IP_ACTIVE_LOW ) PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_SPECIAL ) //security bit - PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_DIPNAME( 0x20000000, 0x20000000, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00000000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x20000000, DEF_STR( On ) ) @@ -696,9 +696,9 @@ static INPUT_PORTS_START( spotty ) PORT_BIT( 0x5f10ffff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x00020000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x00040000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x00020000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x00040000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) // PORT_BIT( 0x00080000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // 0x80000 -> video disabled? INPUT_PORTS_END diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index 5fd4d5c757b..fee5a5d1b2a 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -451,7 +451,7 @@ static INPUT_PORTS_START( lordgun ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("START1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) @@ -572,7 +572,7 @@ static INPUT_PORTS_START( aliencha ) PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "SW3:8" ) /* Listed as "Unused" */ PORT_START("SERVICE") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 44de0ffe897..196eb8c6fdb 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -84,7 +84,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(livequiz_irqhandler); required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; @@ -456,7 +456,7 @@ static INPUT_PORTS_START( livequiz ) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) // EEPROM + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) // EEPROM PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x0040, IP_ACTIVE_LOW ) @@ -589,7 +589,7 @@ static INPUT_PORTS_START( hammer ) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x0040, IP_ACTIVE_LOW ) diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 4885e4c9958..815f3c7689b 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -83,7 +83,7 @@ mw-9.rom = ST M27C1001 / GFX * *************************************/ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -397,7 +397,7 @@ static INPUT_PORTS_START( mj_common ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -647,7 +647,7 @@ static INPUT_PORTS_START( pang ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -814,7 +814,7 @@ static INPUT_PORTS_START( qtono1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) /* same as the service mode farther down */ @@ -854,7 +854,7 @@ static INPUT_PORTS_START( block ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -896,7 +896,7 @@ static INPUT_PORTS_START( blockjoy ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1090,7 +1090,7 @@ static MACHINE_CONFIG_START( mgakuen, mitchell_state ) MCFG_MACHINE_START_OVERRIDE(mitchell_state,mitchell) MCFG_MACHINE_RESET_OVERRIDE(mitchell_state,mitchell) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1127,7 +1127,7 @@ static MACHINE_CONFIG_START( pang, mitchell_state ) MCFG_MACHINE_START_OVERRIDE(mitchell_state,mitchell) MCFG_MACHINE_RESET_OVERRIDE(mitchell_state,mitchell) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1262,7 +1262,7 @@ static MACHINE_CONFIG_START( marukin, mitchell_state ) MCFG_CPU_IO_MAP(mitchell_io_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mitchell_state, mitchell_irq, "screen", 0, 1) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1313,7 +1313,7 @@ static MACHINE_CONFIG_START( pkladiesbl, mitchell_state ) MCFG_CPU_IO_MAP(mitchell_io_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mitchell_state, mitchell_irq, "screen", 0, 1) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index cdc5c7614f9..1c8d36f5759 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -1193,7 +1193,7 @@ static void real3d_dma_callback(running_machine &machine, UINT32 src, UINT32 dst /*****************************************************************************/ /* this is a 93C46 but with reset delay that is needed by Lost World */ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -1874,7 +1874,7 @@ static INPUT_PORTS_START( common ) PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("IN1") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button B") PORT_CODE(KEYCODE_8) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test Button B") PORT_CODE(KEYCODE_7) PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2109,7 +2109,7 @@ static INPUT_PORTS_START( skichamp ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) /* Select 2 */ PORT_START("IN1") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button B") PORT_CODE(KEYCODE_8) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test Button B") PORT_CODE(KEYCODE_7) PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -5371,7 +5371,7 @@ static MACHINE_CONFIG_START( model3_10, model3_state ) MCFG_MACHINE_START_OVERRIDE(model3_state,model3_10) MCFG_MACHINE_RESET_OVERRIDE(model3_state,model3_10) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_NVRAM_ADD_1FILL("backup") @@ -5412,7 +5412,7 @@ static MACHINE_CONFIG_START( model3_15, model3_state ) MCFG_MACHINE_START_OVERRIDE(model3_state,model3_15) MCFG_MACHINE_RESET_OVERRIDE(model3_state,model3_15) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_NVRAM_ADD_1FILL("backup") @@ -5459,7 +5459,7 @@ static MACHINE_CONFIG_START( model3_20, model3_state ) MCFG_MACHINE_START_OVERRIDE(model3_state,model3_20) MCFG_MACHINE_RESET_OVERRIDE(model3_state,model3_20) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_NVRAM_ADD_1FILL("backup") @@ -5497,7 +5497,7 @@ static MACHINE_CONFIG_START( model3_21, model3_state ) MCFG_MACHINE_START_OVERRIDE(model3_state,model3_21) MCFG_MACHINE_RESET_OVERRIDE(model3_state,model3_21) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_NVRAM_ADD_1FILL("backup") diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 3b94074dd1c..7dc399bf4a3 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -52,7 +52,7 @@ Bucky: #define MOO_DMADELAY (100) -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -378,7 +378,7 @@ static INPUT_PORTS_START( moo ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 ) PORT_START("IN1") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE(0x08, IP_ACTIVE_LOW) @@ -394,9 +394,9 @@ static INPUT_PORTS_START( moo ) PORT_DIPSETTING( 0x80, "4") PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) PORT_START("P1_P3") KONAMI16_LSB( 1, IPT_UNKNOWN, IPT_START1 ) @@ -508,7 +508,7 @@ static MACHINE_CONFIG_START( moo, moo_state ) MCFG_MACHINE_START_OVERRIDE(moo_state,moo) MCFG_MACHINE_RESET_OVERRIDE(moo_state,moo) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_K053252_ADD("k053252", 16000000/2, moo_k053252_intf) @@ -553,7 +553,7 @@ static MACHINE_CONFIG_START( moobl, moo_state ) MCFG_MACHINE_START_OVERRIDE(moo_state,moo) MCFG_MACHINE_RESET_OVERRIDE(moo_state,moo) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK) diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index d5bc20afb8e..0f52bd2ed93 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -33,7 +33,7 @@ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -46,7 +46,7 @@ static const eeprom_interface eeprom_intf = /* Gaiapolis and Polygonet Commanders use the ER5911, but the command formats are slightly different. Why? */ -static const eeprom_interface gaia_eeprom_intf = +static const serial_eeprom_interface gaia_eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -604,7 +604,7 @@ static INPUT_PORTS_START( mystwarr ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("IN1") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* game loops if this is set */ @@ -628,9 +628,9 @@ static INPUT_PORTS_START( mystwarr ) KONAMI16_MSB(4, IPT_BUTTON3, IPT_START4 ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END static INPUT_PORTS_START( metamrph ) @@ -645,7 +645,7 @@ static INPUT_PORTS_START( metamrph ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("IN1") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) @@ -671,9 +671,9 @@ static INPUT_PORTS_START( metamrph ) KONAMI16_MSB(4, IPT_BUTTON3, IPT_START4 ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END static INPUT_PORTS_START( viostorm ) @@ -688,7 +688,7 @@ static INPUT_PORTS_START( viostorm ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("IN1") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) @@ -714,9 +714,9 @@ static INPUT_PORTS_START( viostorm ) KONAMI16_MSB(4, IPT_BUTTON3, IPT_START4 ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END static INPUT_PORTS_START( dadandrn ) @@ -732,7 +732,7 @@ static INPUT_PORTS_START( dadandrn ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("IN1") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) @@ -755,9 +755,9 @@ static INPUT_PORTS_START( dadandrn ) KONAMI8_B123_START(4) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END static INPUT_PORTS_START( martchmp ) @@ -772,7 +772,7 @@ static INPUT_PORTS_START( martchmp ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("IN1") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* game loops if this is set */ @@ -794,9 +794,9 @@ static INPUT_PORTS_START( martchmp ) KONAMI16_MSB(4, IPT_BUTTON3, IPT_START4 ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END /**********************************************************************************/ @@ -974,7 +974,7 @@ static MACHINE_CONFIG_START( mystwarr, mystwarr_state ) MCFG_QUANTUM_TIME(attotime::from_hz(1920)) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_K053252_ADD("k053252", 6000000, mystwarr_k053252_intf) // 6 MHz? MCFG_MACHINE_START_OVERRIDE(mystwarr_state,mystwarr) @@ -1101,7 +1101,7 @@ static MACHINE_CONFIG_DERIVED( gaiapols, mystwarr ) MCFG_GFXDECODE(gaiapols) MCFG_DEVICE_REMOVE("eeprom") - MCFG_EEPROM_ADD("eeprom", gaia_eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", gaia_eeprom_intf) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(mystwarr_state,gaiapols) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 79342f7ab0d..68c445f03b6 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -1828,9 +1828,9 @@ INPUT_PORTS_END static INPUT_PORTS_START( naomi_mie ) PORT_START("MIE.3") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("mie_eeprom", eeprom_device, write_bit) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("mie_eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("mie_eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("mie_eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("mie_eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("mie_eeprom", serial_eeprom_device, set_clock_line) PORT_START("MIE.5") PORT_DIPNAME( 0x01, 0x00, "Monitor" ) PORT_DIPLOCATION("SW1:1") @@ -1848,7 +1848,7 @@ static INPUT_PORTS_START( naomi_mie ) PORT_SERVICE_NO_TOGGLE( 0x10, IP_ACTIVE_LOW ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("mie_eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("mie_eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END /* 2 players with 1 joystick and 6 buttons each */ @@ -2494,7 +2494,7 @@ static MACHINE_CONFIG_START( naomi_aw_base, naomi_state ) MCFG_MACHINE_RESET_OVERRIDE(naomi_state,naomi) MCFG_EEPROM_93C46_ADD("main_eeprom") - MCFG_EEPROM_DEFAULT_VALUE(0) + MCFG_SERIAL_EEPROM_DEFAULT_VALUE(0) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index 77e9dd62fcf..c9c7c90f642 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -297,7 +297,7 @@ The eeprom unlock command is different, and the write/clock/reset bits are different. ******************************************************************/ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -688,7 +688,7 @@ static MACHINE_CONFIG_START( othunder, othunder_state ) MCFG_CPU_ADD("audiocpu", Z80,16000000/4 ) /* 4 MHz */ MCFG_CPU_PROGRAM_MAP(z80_sound_map) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_TC0220IOC_ADD("tc0220ioc", othunder_io_intf) diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index ffb10daa269..8e1e1d0d61c 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -54,7 +54,7 @@ static const UINT16 overdriv_default_eeprom[64] = }; -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -248,7 +248,7 @@ static INPUT_PORTS_START( overdriv ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("SYSTEM") @@ -265,9 +265,9 @@ static INPUT_PORTS_START( overdriv ) PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(100) PORT_KEYDELTA(50) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END @@ -353,8 +353,8 @@ static MACHINE_CONFIG_START( overdriv, overdriv_state ) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) - MCFG_EEPROM_DATA(overdriv_default_eeprom, 128) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_DATA(overdriv_default_eeprom, 128) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c index 4d33d7352ae..820780fd2fb 100644 --- a/src/mame/drivers/pirates.c +++ b/src/mame/drivers/pirates.c @@ -94,7 +94,7 @@ Notes: #include "includes/pirates.h" -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -206,7 +206,7 @@ static INPUT_PORTS_START( pirates ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x0008, IP_ACTIVE_LOW ) - PORT_BIT( 0x0010, IP_ACTIVE_HIGH,IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) // EEPROM data + PORT_BIT( 0x0010, IP_ACTIVE_HIGH,IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) // EEPROM data PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // seems checked in "test mode" PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // seems checked in "test mode" PORT_BIT( 0x0080, IP_ACTIVE_HIGH,IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, pirates_state,prot_r, NULL) // protection @@ -262,7 +262,7 @@ static MACHINE_CONFIG_START( pirates, pirates_state ) MCFG_CPU_PROGRAM_MAP(pirates_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", pirates_state, irq1_line_hold) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_GFXDECODE(pirates) diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index 208102917e9..62275c36824 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -61,7 +61,7 @@ WRITE16_MEMBER(playmark_state::coinctrl_w) ***************************************************************************/ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -550,7 +550,7 @@ static INPUT_PORTS_START( wbeachvl ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE(0x20, IP_ACTIVE_LOW) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* ?? see code at 746a. sound status? */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* EEPROM data */ + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* EEPROM data */ PORT_START("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -716,7 +716,7 @@ static INPUT_PORTS_START( hotmind ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* EEPROM data */ + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* EEPROM data */ PORT_START("DSW1") PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) @@ -1128,8 +1128,8 @@ static MACHINE_CONFIG_START( wbeachvl, playmark_state ) /* Program and Data Maps are internal to the MCU */ // MCFG_CPU_IO_MAP(playmark_sound_io_map) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) - MCFG_EEPROM_DEFAULT_VALUE(0) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_DEFAULT_VALUE(0) MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark) MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark) @@ -1199,8 +1199,8 @@ static MACHINE_CONFIG_START( hotmind, playmark_state ) /* Program and Data Maps are internal to the MCU */ MCFG_CPU_IO_MAP(playmark_sound_io_map) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) - MCFG_EEPROM_DEFAULT_VALUE(0) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_DEFAULT_VALUE(0) MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark) MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark) diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index 96b592996b9..0f50da897f6 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -72,7 +72,7 @@ enum { BANK_GROUP_A, BANK_GROUP_B, INVALID_BANK_GROUP }; -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 9, // address bits 8, // data bits @@ -671,7 +671,7 @@ static MACHINE_CONFIG_START( plygonet, polygonet_state ) MCFG_QUANTUM_PERFECT_CPU("maincpu") /* TODO: TEMPORARY! UNTIL A MORE LOCALIZED SYNC CAN BE MADE */ - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_GFXDECODE(plygonet) @@ -726,7 +726,7 @@ static INPUT_PORTS_START( polygonet ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("IN2") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) // Start 2, unused diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index 71b394922a9..5f48c1902df 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -154,11 +154,11 @@ public: DECLARE_READ16_MEMBER(pntnpuzl_eeprom_r); DECLARE_WRITE16_MEMBER(pntnpuzl_eeprom_w); DECLARE_DRIVER_INIT(pip); - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -359,7 +359,7 @@ static MACHINE_CONFIG_START( pntnpuzl, pntnpuzl_state ) MCFG_CPU_ADD("maincpu", M68000, 12000000)//?? MCFG_CPU_PROGRAM_MAP(pntnpuzl_map) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_vga ) diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c index 41e696d7dd6..561938c4ebd 100644 --- a/src/mame/drivers/policetr.c +++ b/src/mame/drivers/policetr.c @@ -237,7 +237,7 @@ WRITE32_MEMBER(policetr_state::speedup_w) * *************************************/ -static const eeprom_interface eeprom_interface_policetr = +static const serial_eeprom_interface eeprom_interface_policetr = { 8, // address bits 8 16, // data bits 16 @@ -334,7 +334,7 @@ static INPUT_PORTS_START( policetr ) PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x20000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* EEPROM read */ + PORT_BIT( 0x20000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* EEPROM read */ PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -416,7 +416,7 @@ static MACHINE_CONFIG_START( policetr, policetr_state ) MCFG_CPU_PROGRAM_MAP(policetr_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", policetr_state, irq4_gen) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_policetr) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_policetr) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 30c2db3fb06..ec0e253d0bb 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -30,7 +30,7 @@ public: int m_tilebank; int m_bg_yoffset; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; DECLARE_DRIVER_INIT(powerbal); DECLARE_DRIVER_INIT(magicstk); @@ -47,7 +47,7 @@ public: }; -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -244,7 +244,7 @@ static INPUT_PORTS_START( magicstk ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("IN2") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* EEPROM data */ + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* EEPROM data */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -341,7 +341,7 @@ static INPUT_PORTS_START( hotminda ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("IN2") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* EEPROM data */ + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* EEPROM data */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -534,8 +534,8 @@ static MACHINE_CONFIG_START( magicstk, powerbal_state ) MCFG_CPU_PROGRAM_MAP(magicstk_main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", powerbal_state, irq2_line_hold) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) - MCFG_EEPROM_DEFAULT_VALUE(0) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_DEFAULT_VALUE(0) MCFG_MACHINE_START_OVERRIDE(powerbal_state,powerbal) MCFG_MACHINE_RESET_OVERRIDE(powerbal_state,powerbal) diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index c38916c8b79..a8818645eb4 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -150,7 +150,7 @@ static GFXDECODE_START( ps4 ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0x000, 0x80 ) // 8bpp tiles GFXDECODE_END -static const eeprom_interface eeprom_interface_93C56 = +static const serial_eeprom_interface eeprom_interface_93C56 = { 8, // address bits 8 8, // data bits 8 @@ -385,7 +385,7 @@ static INPUT_PORTS_START( hotgmck ) PORT_START("JP4")/* jumper pads 'JP4' on the PCB */ /* EEPROM is read here */ - PORT_BIT( 0x00100000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00100000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("SYSTEM") /* system inputs */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // Screen 1 @@ -560,7 +560,7 @@ static INPUT_PORTS_START( loderndf ) PORT_DIPSETTING( 0x00000000, "Japan (Shows Version Number)" ) PORT_DIPSETTING( 0x00010000, "World (Does Not Show Version Number)" ) /* EEPROM is read here */ - PORT_BIT( 0x00100000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00100000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END /* unused inputs also act as duplicate buttons */ @@ -639,7 +639,7 @@ static INPUT_PORTS_START( hotdebut ) PORT_START("JP4")/* jumper pads 'JP4' on the PCB */ /* EEPROM is read here */ - PORT_BIT( 0x00100000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00100000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END @@ -669,8 +669,8 @@ static MACHINE_CONFIG_START( ps4big, psikyo4_state ) MCFG_CPU_VBLANK_INT_DRIVER("lscreen", psikyo4_state, psikyosh_interrupt) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C56) - MCFG_EEPROM_DEFAULT_VALUE(0) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_93C56) + MCFG_SERIAL_EEPROM_DEFAULT_VALUE(0) /* video hardware */ MCFG_GFXDECODE(ps4) diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index a03818cd23a..6c7a5818fe9 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -306,7 +306,7 @@ static GFXDECODE_START( psikyosh ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0x000, 0x100 ) // 8bpp tiles GFXDECODE_END -static const eeprom_interface eeprom_interface_93C56 = +static const serial_eeprom_interface eeprom_interface_93C56 = { 8, // address bits 8 8, // data bits 8 @@ -606,7 +606,7 @@ static INPUT_PORTS_START( s1945ii ) PORT_DIPNAME( 0x01000000, 0x01000000, DEF_STR( Region ) ) PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x01000000, DEF_STR( World ) ) - PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END static INPUT_PORTS_START( soldivid ) @@ -616,7 +616,7 @@ static INPUT_PORTS_START( soldivid ) PORT_DIPNAME( 0x01000000, 0x01000000, DEF_STR( Region ) ) PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x01000000, DEF_STR( World ) ) - PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END static INPUT_PORTS_START( daraku ) @@ -634,7 +634,7 @@ static INPUT_PORTS_START( daraku ) PORT_DIPNAME( 0x01000000, 0x01000000, DEF_STR( Region ) ) PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x01000000, DEF_STR( World ) ) /* Title screen is different, English is default now */ - PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END static INPUT_PORTS_START( sbomberb ) @@ -649,7 +649,7 @@ static INPUT_PORTS_START( sbomberb ) PORT_DIPNAME( 0x01000000, 0x01000000, DEF_STR( Region ) ) PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x01000000, DEF_STR( World ) ) - PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END static INPUT_PORTS_START( gunbird2 ) /* Different Region */ @@ -661,7 +661,7 @@ static INPUT_PORTS_START( gunbird2 ) /* Different Region */ PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x01000000, "International Ver A." ) PORT_DIPSETTING( 0x02000000, "International Ver B." ) - PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END static INPUT_PORTS_START( s1945iii ) /* Different Region again */ @@ -673,7 +673,7 @@ static INPUT_PORTS_START( s1945iii ) /* Different Region again */ PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x02000000, "International Ver A." ) PORT_DIPSETTING( 0x01000000, "International Ver B." ) - PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END static INPUT_PORTS_START( dragnblz ) /* Security requires bit high */ @@ -689,7 +689,7 @@ static INPUT_PORTS_START( dragnblz ) /* Security requires bit high */ PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x02000000, "International Ver A." ) PORT_DIPSETTING( 0x01000000, "International Ver B." ) - PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END static INPUT_PORTS_START( gnbarich ) /* Same as S1945iii except only one button */ @@ -701,7 +701,7 @@ static INPUT_PORTS_START( gnbarich ) /* Same as S1945iii except only one button PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x02000000, "International Ver A." ) PORT_DIPSETTING( 0x01000000, "International Ver B." ) - PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END static INPUT_PORTS_START( tgm2 ) @@ -722,7 +722,7 @@ static INPUT_PORTS_START( tgm2 ) // PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) // PORT_DIPSETTING( 0x02000000, "International Ver A." ) // PORT_DIPSETTING( 0x01000000, "International Ver B." ) - PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END static INPUT_PORTS_START( mjgtaste ) @@ -776,7 +776,7 @@ static INPUT_PORTS_START( mjgtaste ) // PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) // PORT_DIPSETTING( 0x02000000, "International Ver A." ) // PORT_DIPSETTING( 0x01000000, "International Ver B." ) - PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END @@ -800,8 +800,8 @@ static MACHINE_CONFIG_START( psikyo3v1, psikyosh_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", psikyosh_state, psikyosh_interrupt) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C56) - MCFG_EEPROM_DEFAULT_VALUE(0) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_93C56) + MCFG_SERIAL_EEPROM_DEFAULT_VALUE(0) /* video hardware */ MCFG_BUFFERED_SPRITERAM32_ADD("spriteram") /* If using alpha */ diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index b8b000602cf..534f85a8193 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -65,7 +65,7 @@ public: UINT32 screen_update_pzletime(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; @@ -246,7 +246,7 @@ static INPUT_PORTS_START( pzletime ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* eeprom */ + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* eeprom */ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, pzletime_state,ticket_status_r, NULL) /* ticket dispenser */ PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index 2e599e815b4..6922d66e0fd 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -73,7 +73,7 @@ public: INTERRUPT_GEN_MEMBER(rdx_v33_interrupt); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri); required_device<cpu_device> m_maincpu; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; }; @@ -568,7 +568,7 @@ static INPUT_PORTS_START( rdx_v33 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x0040, 0x0040, "Test Mode" ) PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) @@ -606,7 +606,7 @@ static INPUT_PORTS_START( nzerotea ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNUSED ) - //PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + //PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x0040, 0x0040, "Test Mode" ) PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 91c5998bda1..25b2b544165 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -152,7 +152,7 @@ public: void rabbit_drawtilemap( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int whichtilemap ); void rabbit_do_blit(); required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); @@ -740,7 +740,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( rabbit ) PORT_START("INPUTS") - PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) // as per code at 4d932 + PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) // as per code at 4d932 PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unlabeled in input test PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_START2 ) diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index 2a673c6bac9..c49e5d996db 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -85,7 +85,7 @@ public: INTERRUPT_GEN_MEMBER(mcu_irq); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mcu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; @@ -366,7 +366,7 @@ static INPUT_PORTS_START( rbmk ) PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("IN4") /* 16bit */ PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 92246635a0a..bc848a45213 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -53,7 +53,7 @@ #define RNG_DEBUG 0 -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -263,7 +263,7 @@ static INPUT_PORTS_START( rng ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("DSW") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) PORT_DIPNAME( 0x10, 0x00, "Monitors" ) @@ -283,9 +283,9 @@ static INPUT_PORTS_START( rng ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) PORT_START("P1") KONAMI8_B123_START(1) @@ -390,7 +390,7 @@ static MACHINE_CONFIG_START( rng, rungun_state ) MCFG_GFXDECODE(rungun) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index 6f7611defd5..0bace3e4ee2 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -1321,7 +1321,7 @@ static INPUT_PORTS_START( system32_generic ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE3 ) /* sometimes mirrors SERVICE1 */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE4 ) /* tends to also work as a test switch */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("PORTG_A") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -1356,7 +1356,7 @@ static INPUT_PORTS_START( multi32_generic ) PORT_START("SERVICE34_B") PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("PORTG_B") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 3f759d59bc4..990f664f275 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -1247,7 +1247,7 @@ static INPUT_PORTS_START( sxx2f ) PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_MODIFY("SYSTEM") - PORT_BIT( 0x00000040, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00000040, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END @@ -1365,7 +1365,7 @@ static INPUT_PORTS_START( sys386f ) PORT_START("SYSTEM") PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x00004000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x00004000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0xffffbf3f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("INPUTS") @@ -1751,7 +1751,7 @@ GFXDECODE_END /*****************************************************************************/ /* this is a 93C46 but with reset delay */ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -1917,7 +1917,7 @@ static MACHINE_CONFIG_DERIVED( sxx2f, sxx2e ) MCFG_DEVICE_REMOVE("ds2404") - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) // Z80 is Z84C0006PCS instead of Z84C0008PEC // clock is unknown, possibly slower than 7.159MHz @@ -1950,7 +1950,7 @@ static MACHINE_CONFIG_START( sys386i, seibuspi_state ) MCFG_CPU_PROGRAM_MAP(sys386i_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -2000,7 +2000,7 @@ static MACHINE_CONFIG_START( sys386f, seibuspi_state ) MCFG_CPU_PROGRAM_MAP(sys386f_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c index b05a5f798b6..3ec5a1167bd 100644 --- a/src/mame/drivers/sigmab98.c +++ b/src/mame/drivers/sigmab98.c @@ -109,7 +109,7 @@ public: required_device<cpu_device> m_maincpu; optional_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_nvram; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; UINT8 m_reg; UINT8 m_rombank; @@ -1516,7 +1516,7 @@ static INPUT_PORTS_START( gegege ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) // ? (coin error, pulses mask 4 of port c6) @@ -1554,7 +1554,7 @@ static INPUT_PORTS_START( pepsiman ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) // ? (coin error, pulses mask 4 of port c6) @@ -1592,7 +1592,7 @@ static INPUT_PORTS_START( ucytokyu ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10) // ? (coin error, pulses mask 4 of port c6) @@ -1675,7 +1675,7 @@ INPUT_PORTS_END GeGeGe no Kitarou Youkai Slot ***************************************************************************/ -const eeprom_interface eeprom_intf = +const serial_eeprom_interface eeprom_intf = { 6, // address bits 6 16, // data bits 16 @@ -1700,7 +1700,7 @@ static MACHINE_CONFIG_START( gegege, sigmab98_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", sigmab98_state, gegege_vblank_interrupt) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ) @@ -1726,7 +1726,7 @@ MACHINE_CONFIG_END Sammy Medal Games ***************************************************************************/ -static const eeprom_interface eeprom_interface_93C46_8bit_delay = +static const serial_eeprom_interface eeprom_interface_93C46_8bit_delay = { 7, // address bits 6 8, // data bits 8 @@ -1754,7 +1754,7 @@ static MACHINE_CONFIG_START( sammymdl, sigmab98_state ) MCFG_MACHINE_RESET_OVERRIDE(sigmab98_state, sammymdl ) MCFG_NVRAM_ADD_0FILL("nvram") // battery - MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C46_8bit_delay) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_93C46_8bit_delay) MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ) diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index 8d5bbb4d9b8..438c626d909 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -184,14 +184,14 @@ static INPUT_PORTS_START( simpsons ) PORT_START("TEST") PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // eeprom ack PORT_BIT( 0xce, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END static INPUT_PORTS_START( simpsn2p ) @@ -219,14 +219,14 @@ static INPUT_PORTS_START( simpsn2p ) PORT_START("TEST") PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // eeprom ack PORT_BIT( 0xce, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END @@ -291,7 +291,7 @@ static const k053247_interface simpsons_k053246_intf = simpsons_sprite_callback }; -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -314,7 +314,7 @@ static MACHINE_CONFIG_START( simpsons, simpsons_state ) /* NMIs are generated by the 053260 */ - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK) diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index e15d939176c..6e4a85975dd 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -122,7 +122,7 @@ public: virtual void video_start(); UINT32 screen_update_spool99(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; required_device<okim6295_device> m_oki; }; diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c index 5ced05a6b02..75b0c9a2bb5 100644 --- a/src/mame/drivers/stlforce.c +++ b/src/mame/drivers/stlforce.c @@ -138,7 +138,7 @@ static INPUT_PORTS_START( stlforce ) PORT_SERVICE_NO_TOGGLE( 0x0008, IP_ACTIVE_LOW ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* eeprom */ + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* eeprom */ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c index 8d292297e6b..eb97d17f398 100644 --- a/src/mame/drivers/superchs.c +++ b/src/mame/drivers/superchs.c @@ -223,7 +223,7 @@ static INPUT_PORTS_START( superchs ) PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* reserved for EEROM */ + PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* reserved for EEROM */ PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Seat Center") /* seat center (cockpit only) */ PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -303,7 +303,7 @@ GFXDECODE_END MACHINE DRIVERS ***********************************************************/ -static const eeprom_interface superchs_eeprom_interface = +static const serial_eeprom_interface superchs_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -337,7 +337,7 @@ static MACHINE_CONFIG_START( superchs, superchs_state ) MCFG_QUANTUM_TIME(attotime::from_hz(480)) /* Need to interleave CPU 1 & 3 */ - MCFG_EEPROM_ADD("eeprom", superchs_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", superchs_eeprom_interface) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 15a4b0d6358..56531802b40 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -373,7 +373,7 @@ INPUT_CHANGED_MEMBER(taitob_state::realpunc_sensor) ***************************************************************************/ -static const eeprom_interface taitob_eeprom_intf = +static const serial_eeprom_interface taitob_eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -1166,7 +1166,7 @@ static INPUT_PORTS_START( pbobble ) /* Missing P3&4 controls ! */ PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) /*ok*/ PORT_START("COIN") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1226,9 +1226,9 @@ static INPUT_PORTS_START( pbobble ) /* Missing P3&4 controls ! */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static INPUT_PORTS_START( spacedxo ) @@ -1328,7 +1328,7 @@ static INPUT_PORTS_START( qzshowby ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) /*ok*/ PORT_START("COIN") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1388,9 +1388,9 @@ static INPUT_PORTS_START( qzshowby ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static INPUT_PORTS_START( viofight ) @@ -2356,7 +2356,7 @@ static MACHINE_CONFIG_START( pbobble, taitob_state ) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_EEPROM_ADD("eeprom", taitob_eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", taitob_eeprom_intf) MCFG_TC0640FIO_ADD("tc0640fio", pbobble_io_intf) @@ -2404,7 +2404,7 @@ static MACHINE_CONFIG_START( spacedx, taitob_state ) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_EEPROM_ADD("eeprom", taitob_eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", taitob_eeprom_intf) MCFG_TC0640FIO_ADD("tc0640fio", pbobble_io_intf) @@ -2496,7 +2496,7 @@ static MACHINE_CONFIG_START( qzshowby, taitob_state ) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_EEPROM_ADD("eeprom", taitob_eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", taitob_eeprom_intf) MCFG_TC0640FIO_ADD("tc0640fio", pbobble_io_intf) diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index 88be110010a..a86135e885e 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -284,7 +284,7 @@ static INPUT_PORTS_START( f3 ) /* These are not read directly, but through PORT_CUSTOMs above */ PORT_START("EEPROMIN") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) /* Another service mode */ @@ -300,9 +300,9 @@ static INPUT_PORTS_START( f3 ) PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static INPUT_PORTS_START( kn ) @@ -488,14 +488,14 @@ static MACHINE_CONFIG_DERIVED( f3_eeprom, f3 ) MCFG_DEVICE_REMOVE("eeprom") MCFG_EEPROM_93C46_ADD("eeprom") - MCFG_EEPROM_DATA(recalh_eeprom, 128) //TODO: convert this into ROM + MCFG_SERIAL_EEPROM_DATA(recalh_eeprom, 128) //TODO: convert this into ROM MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( f3_224b_eeprom, f3 ) MCFG_DEVICE_REMOVE("eeprom") MCFG_EEPROM_93C46_ADD("eeprom") - MCFG_EEPROM_DATA(recalh_eeprom, 128) //TODO: convert this into ROM + MCFG_SERIAL_EEPROM_DATA(recalh_eeprom, 128) //TODO: convert this into ROM MACHINE_CONFIG_END static const gfx_layout bubsympb_sprite_layout = diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index f643e4c8743..0a1d374589f 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -1064,7 +1064,7 @@ static const UINT16 spacegun_default_eeprom[64]= 0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff }; -static const eeprom_interface spacegun_eeprom_intf = +static const serial_eeprom_interface spacegun_eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -2669,9 +2669,9 @@ static INPUT_PORTS_START( spacegun ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) PORT_START("STICKX1") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(13) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(1) @@ -3504,8 +3504,8 @@ static MACHINE_CONFIG_START( spacegun, taitoz_state ) MCFG_MACHINE_START_OVERRIDE(taitoz_state,bshark) MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz) - MCFG_EEPROM_ADD("eeprom", spacegun_eeprom_intf) - MCFG_EEPROM_DATA(spacegun_default_eeprom, 128) + MCFG_SERIAL_EEPROM_ADD("eeprom", spacegun_eeprom_intf) + MCFG_SERIAL_EEPROM_DATA(spacegun_default_eeprom, 128) MCFG_TC0220IOC_ADD("tc0220ioc", taitoz_io220_intf) diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index 1d38ecbaaa3..8bbdb489dfe 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -1074,7 +1074,7 @@ static INPUT_PORTS_START( common ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("COINS") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_DIPNAME( 0x02, 0x02, "Dev Skip RAM Test" ) // skips mainram test on page 1 of POST PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1118,9 +1118,9 @@ static INPUT_PORTS_START( common ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("EEPROMOUT") - PORT_BIT( 0x04000000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x08000000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x04000000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x08000000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END // Mascon must always be in a defined state, Densha de Go 2 in particular returns black screen if the Mascon input is undefined diff --git a/src/mame/drivers/tasman.c b/src/mame/drivers/tasman.c index 67d3368973b..b81c92c186e 100644 --- a/src/mame/drivers/tasman.c +++ b/src/mame/drivers/tasman.c @@ -237,7 +237,7 @@ static INPUT_PORTS_START( kongambl ) PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x04, DEF_STR( On ) ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x10, DEF_STR( On ) ) @@ -526,9 +526,9 @@ static INPUT_PORTS_START( kongambl ) PORT_DIPSETTING( 0x80000000, DEF_STR( On ) ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static void kongambl_sprite_callback( running_machine &machine, int *code, int *color, int *priority_mask ) diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 2ae89ce0d44..d861af2e40f 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -571,7 +571,7 @@ ADDRESS_MAP_END // NVRAM (5 x EEPROM) -static const eeprom_interface galgames_eeprom_interface = +static const serial_eeprom_interface galgames_eeprom_interface = { 10, // address bits 10 8, // data bits 8 @@ -594,7 +594,7 @@ static const char *const galgames_eeprom_names[5] = { GALGAMES_EEPROM_BIOS, GALG READ16_MEMBER(tmaster_state::galgames_eeprom_r) { - eeprom_device *eeprom = machine().device<eeprom_device>(galgames_eeprom_names[m_galgames_cart]); + serial_eeprom_device *eeprom = machine().device<serial_eeprom_device>(galgames_eeprom_names[m_galgames_cart]); return eeprom->read_bit() ? 0x80 : 0x00; } @@ -606,7 +606,7 @@ WRITE16_MEMBER(tmaster_state::galgames_eeprom_w) if ( ACCESSING_BITS_0_7 ) { - eeprom_device *eeprom = machine().device<eeprom_device>(galgames_eeprom_names[m_galgames_cart]); + serial_eeprom_device *eeprom = machine().device<serial_eeprom_device>(galgames_eeprom_names[m_galgames_cart]); // latch the bit eeprom->write_bit(data & 0x0001); @@ -679,7 +679,7 @@ WRITE16_MEMBER(tmaster_state::galgames_cart_sel_w) { case 0x07: // 7 resets the eeprom for (i = 0; i < 5; i++) - machine().device<eeprom_device>(galgames_eeprom_names[i])->set_cs_line(ASSERT_LINE); + machine().device<serial_eeprom_device>(galgames_eeprom_names[i])->set_cs_line(ASSERT_LINE); break; case 0x00: @@ -687,12 +687,12 @@ WRITE16_MEMBER(tmaster_state::galgames_cart_sel_w) case 0x02: case 0x03: case 0x04: - machine().device<eeprom_device>(galgames_eeprom_names[data & 0xff])->set_cs_line(CLEAR_LINE); + machine().device<serial_eeprom_device>(galgames_eeprom_names[data & 0xff])->set_cs_line(CLEAR_LINE); galgames_update_rombank(data & 0xff); break; default: - machine().device<eeprom_device>(galgames_eeprom_names[0])->set_cs_line(CLEAR_LINE); + machine().device<serial_eeprom_device>(galgames_eeprom_names[0])->set_cs_line(CLEAR_LINE); galgames_update_rombank(0); logerror("%06x: unknown cart sel = %04x\n", space.device().safe_pc(), data); break; @@ -968,11 +968,11 @@ static MACHINE_CONFIG_START( galgames, tmaster_state ) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tmaster_state, tm3k_interrupt, "screen", 0, 1) // 5 EEPROMs on the motherboard (for BIOS + 4 Carts) - MCFG_EEPROM_ADD(GALGAMES_EEPROM_BIOS, galgames_eeprom_interface) - MCFG_EEPROM_ADD(GALGAMES_EEPROM_CART1, galgames_eeprom_interface) - MCFG_EEPROM_ADD(GALGAMES_EEPROM_CART2, galgames_eeprom_interface) - MCFG_EEPROM_ADD(GALGAMES_EEPROM_CART3, galgames_eeprom_interface) - MCFG_EEPROM_ADD(GALGAMES_EEPROM_CART4, galgames_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD(GALGAMES_EEPROM_BIOS, galgames_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD(GALGAMES_EEPROM_CART1, galgames_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD(GALGAMES_EEPROM_CART2, galgames_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD(GALGAMES_EEPROM_CART3, galgames_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD(GALGAMES_EEPROM_CART4, galgames_eeprom_interface) MCFG_MACHINE_RESET_OVERRIDE(tmaster_state, galgames ) diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c index 7ff3d0a3859..0d604aea4fb 100644 --- a/src/mame/drivers/tmmjprd.c +++ b/src/mame/drivers/tmmjprd.c @@ -78,7 +78,7 @@ public: void ttmjprd_draw_tilemap(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32*tileram, UINT32*tileregs, UINT8*rom ); void tmmjprd_do_blit(); required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; @@ -544,7 +544,7 @@ static INPUT_PORTS_START( tmmjprd ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_NAME("Right Screen Coin B") // might actually be service 1 PORT_SERVICE( 0x20, IP_ACTIVE_LOW ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) // CHECK! + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) // CHECK! PORT_START("PL1_1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(1) diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index ab29cf25cdd..a0e0ab89cee 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -403,7 +403,7 @@ WRITE16_MEMBER(tmnt_state::ssriders_protection_w) ***************************************************************************/ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -466,7 +466,7 @@ WRITE16_MEMBER(tmnt_state::blswhstl_eeprom_w) } } -static const eeprom_interface thndrx2_eeprom_intf = +static const serial_eeprom_interface thndrx2_eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -1624,14 +1624,14 @@ static INPUT_PORTS_START( blswhstl ) KONAMI16_LSB( 2, IPT_UNKNOWN, IPT_UNKNOWN ) PORT_START("EEPROM") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END static INPUT_PORTS_START( glfgreat ) @@ -1768,7 +1768,7 @@ static INPUT_PORTS_START( ssriders ) PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("EEPROM") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* ?? TMNT2: NVBLK */ @@ -1777,9 +1777,9 @@ static INPUT_PORTS_START( ssriders ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END static INPUT_PORTS_START( ssridr4p ) @@ -1806,7 +1806,7 @@ static INPUT_PORTS_START( ssridr4p ) KONAMI16_LSB( 4, IPT_UNKNOWN, IPT_UNKNOWN ) PORT_START("EEPROM") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* ?? TMNT2: NVBLK */ @@ -1815,9 +1815,9 @@ static INPUT_PORTS_START( ssridr4p ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END /* Same as 'ssridr4p', but additional Start button for each player. @@ -1846,7 +1846,7 @@ static INPUT_PORTS_START( ssrid4ps ) KONAMI16_LSB( 4, IPT_UNKNOWN, IPT_START4 ) PORT_START("EEPROM") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* ?? TMNT2: NVBLK */ @@ -1855,9 +1855,9 @@ static INPUT_PORTS_START( ssrid4ps ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END /* Version for the bootleg, which has the service switch a little different */ @@ -1885,16 +1885,16 @@ static INPUT_PORTS_START( sunsetbl ) KONAMI16_LSB( 4, IPT_UNKNOWN, IPT_START4 ) PORT_START("EEPROM") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END static INPUT_PORTS_START( qgakumon ) @@ -1935,7 +1935,7 @@ static INPUT_PORTS_START( qgakumon ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("EEPROM") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* ?? TMNT2: NVBLK (needs to be ACTIVE_HIGH to avoid problems) */ @@ -1944,9 +1944,9 @@ static INPUT_PORTS_START( qgakumon ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END static INPUT_PORTS_START( thndrx2 ) @@ -1963,7 +1963,7 @@ static INPUT_PORTS_START( thndrx2 ) PORT_START("P2/EEPROM") KONAMI16_LSB( 2, IPT_UNKNOWN, IPT_START2 ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* VBLK?? */ @@ -1973,9 +1973,9 @@ static INPUT_PORTS_START( thndrx2 ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END static INPUT_PORTS_START( prmrsocr ) @@ -1994,7 +1994,7 @@ static INPUT_PORTS_START( prmrsocr ) PORT_START("P2/EEPROM") KONAMI16_LSB( 2, IPT_UNKNOWN, IPT_START2 ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2004,9 +2004,9 @@ static INPUT_PORTS_START( prmrsocr ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END @@ -2440,7 +2440,7 @@ static MACHINE_CONFIG_START( blswhstl, tmnt_state ) MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK) @@ -2569,7 +2569,7 @@ static MACHINE_CONFIG_START( prmrsocr, tmnt_state ) MCFG_MACHINE_START_OVERRIDE(tmnt_state,prmrsocr) MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) - MCFG_EEPROM_ADD("eeprom", thndrx2_eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", thndrx2_eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK) @@ -2618,7 +2618,7 @@ static MACHINE_CONFIG_START( tmnt2, tmnt_state ) MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK) @@ -2665,7 +2665,7 @@ static MACHINE_CONFIG_START( ssriders, tmnt_state ) MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK) @@ -2708,7 +2708,7 @@ static MACHINE_CONFIG_START( sunsetbl, tmnt_state ) MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK) @@ -2748,7 +2748,7 @@ static MACHINE_CONFIG_START( thndrx2, tmnt_state ) MCFG_MACHINE_START_OVERRIDE(tmnt_state,common) MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common) - MCFG_EEPROM_ADD("eeprom", thndrx2_eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", thndrx2_eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS) diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index f29a20d2cb1..2f753b6a270 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -946,7 +946,7 @@ WRITE8_MEMBER(toaplan2_state::batrider_clear_nmi_w) } -static const eeprom_interface bbakraid_93C66_intf = +static const serial_eeprom_interface bbakraid_93C66_intf = { // Pin 6 of the 93C66 is connected to Gnd! // So it's configured for 512 bytes @@ -2087,10 +2087,10 @@ static INPUT_PORTS_START( fixeight ) PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // Unknown/Unused PORT_START("EEPROM") - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) INPUT_PORTS_END @@ -2766,9 +2766,9 @@ static INPUT_PORTS_START( bbakraid ) PORT_DIPSETTING( 0x8000, DEF_STR( On ) ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END @@ -3727,7 +3727,7 @@ static MACHINE_CONFIG_START( bbakraid, toaplan2_state ) MCFG_MACHINE_START_OVERRIDE(toaplan2_state,toaplan2) MCFG_MACHINE_RESET_OVERRIDE(toaplan2_state,toaplan2) - MCFG_EEPROM_ADD("eeprom", bbakraid_93C66_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", bbakraid_93C66_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index a022b5819aa..60b6dccd841 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -185,13 +185,13 @@ static INPUT_PORTS_START( ultrsprt ) PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_START2 ) PORT_START("SERVICE") - PORT_BIT( 0x02000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x02000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_SERVICE_NO_TOGGLE( 0x08000000, IP_ACTIVE_LOW ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01000000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x01000000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) PORT_START("STICKX1") PORT_BIT( 0xfff, 0x800, IPT_AD_STICK_X ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(1) diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c index 1ef0be17bf6..137ba2b7646 100644 --- a/src/mame/drivers/undrfire.c +++ b/src/mame/drivers/undrfire.c @@ -241,7 +241,7 @@ void undrfire_state::device_timer(emu_timer &timer, device_timer_id id, int para EPROM **********************************************************/ -static const eeprom_interface undrfire_eeprom_interface = +static const serial_eeprom_interface undrfire_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -538,7 +538,7 @@ static INPUT_PORTS_START( undrfire ) PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* reserved for EEROM */ + PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* reserved for EEROM */ PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -606,7 +606,7 @@ static INPUT_PORTS_START( cbombers ) PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* reserved for EEROM */ + PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* reserved for EEROM */ PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -734,7 +734,7 @@ static MACHINE_CONFIG_START( undrfire, undrfire_state ) MCFG_CPU_PROGRAM_MAP(undrfire_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", undrfire_state, undrfire_interrupt) - MCFG_EEPROM_ADD("eeprom", undrfire_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", undrfire_eeprom_interface) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -769,7 +769,7 @@ static MACHINE_CONFIG_START( cbombers, undrfire_state ) MCFG_QUANTUM_TIME(attotime::from_hz(480)) /* CPU slices - Need to interleave Cpu's 1 & 3 */ - MCFG_EEPROM_ADD("eeprom", undrfire_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", undrfire_eeprom_interface) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index 11a8e502e8c..1875f85198d 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -507,7 +507,7 @@ static INPUT_PORTS_START( zeropnt2 ) PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) // EEPROM + PORT_BIT( 0x80000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) // EEPROM PORT_START("Y0") /* $800140.b */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2) @@ -567,7 +567,7 @@ MACHINE_RESET_MEMBER(unico_state,unico) } -static const eeprom_interface zeropnt2_eeprom_interface = +static const serial_eeprom_interface zeropnt2_eeprom_interface = { 7, // address bits 7 8, // data bits 8 @@ -679,7 +679,7 @@ static MACHINE_CONFIG_START( zeropnt2, unico_state ) MCFG_MACHINE_RESET_OVERRIDE(unico_state,zeropt) - MCFG_EEPROM_ADD("eeprom", zeropnt2_eeprom_interface) + MCFG_SERIAL_EEPROM_ADD("eeprom", zeropnt2_eeprom_interface) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 28877815659..16488fd3725 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -173,7 +173,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; optional_device<okim6295_device> m_oki2; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; READ16_MEMBER(vamphalf_state::eeprom_r) @@ -885,7 +885,7 @@ static INPUT_PORTS_START( aoh ) PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x00000010, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) // eeprom bit + PORT_BIT( 0x00000010, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) // eeprom bit PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index 4295666c885..3c703d3ede5 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -105,7 +105,7 @@ static KONAMI_SETLINES_CALLBACK( vendetta_banking ); ***************************************************************************/ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -320,16 +320,16 @@ static INPUT_PORTS_START( vendet4p ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("EEPROM") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM ready */ PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* not really vblank, object related. Its timed, otherwise sprites flicker */ PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END static INPUT_PORTS_START( vendetta ) @@ -376,16 +376,16 @@ static INPUT_PORTS_START( esckids ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("EEPROM") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM ready */ PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* not really vblank, object related. Its timed, otherwise sprites flicker */ PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) INPUT_PORTS_END static INPUT_PORTS_START( esckidsj ) @@ -499,7 +499,7 @@ static MACHINE_CONFIG_START( vendetta, vendetta_state ) /* interrupts are triggered by the main CPU */ - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 12d1351a6ff..0a418f6c81d 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -72,7 +72,7 @@ Unresolved Issues: #define XE_SKIPIDLE 1 #define XE_DMADELAY attotime::from_usec(256) -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -379,16 +379,16 @@ static INPUT_PORTS_START( xexex ) KONAMI16_LSB(2, IPT_UNKNOWN, IPT_START2 ) PORT_START("EEPROM") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) INPUT_PORTS_END @@ -495,7 +495,7 @@ static MACHINE_CONFIG_START( xexex, xexex_state ) MCFG_QUANTUM_TIME(attotime::from_hz(1920)) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index ceebc3a74f1..a48d747548d 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -30,7 +30,7 @@ likewise be a 2 screen game ***************************************************************************/ -static const eeprom_interface eeprom_intf = +static const serial_eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -206,7 +206,7 @@ static INPUT_PORTS_START( xmen ) PORT_START("EEPROM") PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM status - always 1 */ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) @@ -217,9 +217,9 @@ static INPUT_PORTS_START( xmen ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END static INPUT_PORTS_START( xmen2p ) @@ -235,7 +235,7 @@ static INPUT_PORTS_START( xmen2p ) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_BIT( 0x003c, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM status - always 1 */ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) @@ -246,9 +246,9 @@ static INPUT_PORTS_START( xmen2p ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END CUSTOM_INPUT_MEMBER(xmen_state::xmen_frame_r) @@ -271,7 +271,7 @@ static INPUT_PORTS_START( xmen6p ) PORT_START("EEPROM") PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM status - always 1 */ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) @@ -283,9 +283,9 @@ static INPUT_PORTS_START( xmen6p ) PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, xmen_state,xmen_frame_r, NULL) /* screen indicator? */ PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) INPUT_PORTS_END @@ -361,7 +361,7 @@ static MACHINE_CONFIG_START( xmen, xmen_state ) MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) @@ -410,7 +410,7 @@ static MACHINE_CONFIG_START( xmen6p, xmen_state ) MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_EEPROM_ADD("eeprom", eeprom_intf) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c index 54eb1f239db..cc3d5c5e33f 100644 --- a/src/mame/drivers/xorworld.c +++ b/src/mame/drivers/xorworld.c @@ -104,7 +104,7 @@ static INPUT_PORTS_START( xorworld ) PORT_DIPNAME( 0x08, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) /* used for accessing the NVRAM */ + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) /* used for accessing the NVRAM */ PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x40, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x60, DEF_STR( Normal ) ) diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 4ee4fedff78..3e48106226c 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -548,12 +548,12 @@ static INPUT_PORTS_START( zr107 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* PARAACK */ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("adc0838", adc083x_device, sars_read) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_device, read_bit) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, read_bit) PORT_START("EEPROMOUT") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, write_bit) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_clock_line) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_device, set_cs_line) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, write_bit) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_clock_line) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", serial_eeprom_device, set_cs_line) PORT_START("OUT4") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("adc0838", adc083x_device, cs_write) diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h index 6e685f7f7bf..34efa12dd5a 100644 --- a/src/mame/includes/20pacgal.h +++ b/src/mame/includes/20pacgal.h @@ -33,7 +33,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; /* memory */ UINT8 m_sprite_gfx_ram[0x2000]; diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index cc4c5b22dee..e4428e2b7c4 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -28,7 +28,7 @@ public: optional_device<timer_device> m_claybust_gun_on; optional_device<discrete_device> m_discrete; optional_device<speaker_sound_device> m_speaker; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; /* misc game specific */ diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 1b202b9f34b..c658092f4dd 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -215,7 +215,7 @@ public: void sailormn_tilebank_w(int bank); DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(sound_irq_gen); - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; private: inline void get_tile_info( tile_data &tileinfo, int tile_index, int GFX ); diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index d1b607df724..25b0711d381 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -87,5 +87,5 @@ public: void milliped_set_color(offs_t offset, UINT8 data); inline int read_trackball(int idx, int switch_port); required_device<cpu_device> m_maincpu; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; }; diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index af8e9295b66..6fd7449563a 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -52,7 +52,7 @@ public: optional_device<decospr_device> m_sprgen1; optional_device<decospr_device> m_sprgen2; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; optional_device<okim6295_device> m_oki1; optional_device<okim6295_device> m_oki2; diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index f35a8e8173f..e63f0cba4c1 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -64,7 +64,7 @@ public: void draw_sprites( const rectangle &cliprect, int scanline, UINT32* dest); void descramble_sound( ); required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; DECLARE_READ16_MEMBER( sh96_protection_region_0_146_r ); DECLARE_WRITE16_MEMBER( sh96_protection_region_0_146_w ); diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index c5e73c7a67a..66b39c2e9f0 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -97,7 +97,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_soundcpu; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; optional_device<cpu_device> m_dev_n2a03a; optional_device<cpu_device> m_dev_n2a03b; optional_device<m58819_device> m_m58819; diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index d60320892d2..0485f98ca16 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -49,7 +49,7 @@ public: int m_tilemap1_color; /* devices */ - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; DECLARE_WRITE16_MEMBER(esd16_sound_command_w); DECLARE_WRITE16_MEMBER(hedpanic_platform_w); DECLARE_READ16_MEMBER(esd_eeprom_r); diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 8f4ede95b70..b3a16b319c7 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -33,7 +33,7 @@ public: /* devices */ required_device<cpu_device> m_audiocpu; optional_device<cpu_device> m_subcpu; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; DECLARE_WRITE16_MEMBER(fromanc2_sndcmd_w); DECLARE_WRITE16_MEMBER(fromanc2_portselect_w); DECLARE_READ16_MEMBER(fromanc2_keymatrix_r); diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 720cd38ddf1..286e3620cd8 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -17,7 +17,7 @@ public: required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_vregs; optional_shared_ptr<UINT16> m_snowboar_protection; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; int m_clr_gun_int; UINT8 m_analog_ports[2]; diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index 7eeac025f25..0a2703a19d9 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -72,7 +72,7 @@ public: required_shared_ptr<UINT16> m_adsp_fastram_base; required_device<cpu_device> m_maincpu; required_device<cpu_device> m_adsp; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; required_device<cpu_device> m_tms; required_device<gaelco_serial_device> m_serial; UINT16 m_sound_data; diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index 680f95b023d..f7ee4e40ef1 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -34,7 +34,7 @@ public: required_shared_ptr<UINT32> m_spriteram; required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; required_device<tc0100scn_device> m_tc0100scn; required_device<tc0480scp_device> m_tc0480scp; UINT16 m_coin_word; diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h index bf53af2a4e3..429981e6342 100644 --- a/src/mame/includes/galpani2.h +++ b/src/mame/includes/galpani2.h @@ -71,5 +71,5 @@ public: DECLARE_WRITE16_MEMBER( galpani2_bg15_w ); required_device<okim6295_device> m_oki2; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index a29431751d6..10372269d7a 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -34,7 +34,7 @@ public: required_device<tc0480scp_device> m_tc0480scp; required_shared_ptr<UINT32> m_ram; required_shared_ptr<UINT32> m_spriteram; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; bool m_coin_lockout; UINT16 m_coin_word; diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index f4c8af75097..9a7cd004176 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -322,6 +322,6 @@ protected: emu_file *jaguar_nvram_fopen( UINT32 openflags); void jaguar_nvram_load(); void jaguar_nvram_save(); - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; optional_device<vt83c461_device> m_ide; }; diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index bde045f1b40..ab074df13ce 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -41,7 +41,7 @@ public: optional_device<okim6295_device> m_oki; optional_device<okim6295_device> m_oki1; optional_device<okim6295_device> m_oki2; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; optional_shared_ptr<UINT16> m_spriteram; optional_shared_ptr<UINT16> m_mainram; optional_device<kaneko_view2_tilemap_device> m_view2_0; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 8939e9b4f57..3b920dd26c4 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -56,7 +56,7 @@ public: /* devices */ required_device<okim6295_device> m_adpcm; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; DECLARE_READ16_MEMBER(kickgoal_eeprom_r); DECLARE_WRITE16_MEMBER(kickgoal_eeprom_w); DECLARE_WRITE16_MEMBER(kickgoal_fgram_w); diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index c12540fdfb0..c8f548f6fb0 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -29,7 +29,7 @@ public: required_device<cpu_device> m_master; required_device<cpu_device> m_slave; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; UINT8 m_dac_control; UINT8 *m_alleymas_kludge_mem; diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 79f95b665c7..91ccdca1a57 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -83,7 +83,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<okim6295_device> m_oki; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; /*----------- defined in video/lordgun.c -----------*/ diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index fcd2cf285db..06302a139c6 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -70,7 +70,7 @@ public: optional_shared_ptr<UINT16> m_input_sel; optional_shared_ptr<UINT16> m_k053936_ram; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; int m_flip_screen; diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index 9439fc41617..0276f0aefdf 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -32,7 +32,7 @@ public: required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_videoram; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; optional_device<msm5205_device> m_msm; /* video-related */ diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 89a0a449704..87013b704b6 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -180,7 +180,7 @@ public: optional_device<cpu_device> m_tgp; optional_device<cpu_device> m_dsp; optional_device<cpu_device> m_drivecpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; /*----------- defined in video/model2.c -----------*/ diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index 34b5fd6764e..b81613ea38c 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -209,7 +209,7 @@ public: void model3_exit(); DECLARE_WRITE_LINE_MEMBER(scsp_irq); required_device<cpu_device> m_audiocpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h index 6389699e95f..ad60dbc8670 100644 --- a/src/mame/includes/naomi.h +++ b/src/mame/includes/naomi.h @@ -29,7 +29,7 @@ class naomi_state : public dc_state optional_shared_ptr<UINT64> pvr2_framebuffer_ram; optional_shared_ptr<UINT64> elan_ram; optional_device<macronix_29l001mc_device> m_awflash; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; DECLARE_WRITE_LINE_MEMBER(aica_irq); DECLARE_MACHINE_RESET(naomi); diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 958fa3c9648..dc6421bc44d 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -63,7 +63,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; required_device<tc0220ioc_device> m_tc0220ioc; required_device<tc0100scn_device> m_tc0100scn; required_device<tc0110pcr_device> m_tc0110pcr; diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index b2c4ab45b20..777fbf360af 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -42,6 +42,6 @@ public: void pirates_decrypt_s(); void pirates_decrypt_oki(); required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; required_device<okim6295_device> m_oki; }; diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 6b9d3cca5eb..a91ac19f6d6 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -53,7 +53,7 @@ public: /* devices */ required_device<okim6295_device> m_oki; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; DECLARE_WRITE16_MEMBER(coinctrl_w); DECLARE_WRITE16_MEMBER(wbeachvl_coin_eeprom_w); DECLARE_WRITE16_MEMBER(hotmind_coin_eeprom_w); diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 0d810007fad..5cd2ccf42ea 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -26,7 +26,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_dsp; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; required_device<k053936_device> m_k053936; /* 68k-side shared ram */ diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index d97cee18f3b..4ccd3d59597 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -57,7 +57,7 @@ public: INTERRUPT_GEN_MEMBER(irq4_gen); void render_display_list(offs_t offset); required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 637f90b4f3d..557d1caf567 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -37,7 +37,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; DECLARE_WRITE32_MEMBER(ps4_paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w); DECLARE_WRITE32_MEMBER(ps4_bgpen_1_dword_w); diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index f01c1cc5bb9..ac796d47738 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -49,7 +49,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; DECLARE_WRITE32_MEMBER(psikyosh_irqctrl_w); DECLARE_WRITE32_MEMBER(paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w); diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index 97e11558b2d..a8263c1f6df 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -254,7 +254,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ym3438_irq_handler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; /*----------- defined in machine/segas32.c -----------*/ diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index a6588db6a2e..2b04ede5dc8 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -33,7 +33,7 @@ public: required_shared_ptr<UINT32> m_mainram; optional_shared_ptr<UINT32> m_scrollram; optional_memory_region m_z80_rom; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; optional_device<intel_e28f008sa_device> m_soundflash1; optional_device<intel_e28f008sa_device> m_soundflash2; optional_device<fifo7200_device> m_soundfifo1; diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 3e70f2ec826..26ff2b75034 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -31,7 +31,7 @@ public: optional_device<x1_010_device> m_x1; optional_device<okim9810_device> m_oki; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; int m_xoffset; int m_yoffset; diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index f272b5ff22a..e9b789a6d51 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -26,7 +26,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; required_device<deco16ic_device> m_deco_tilegen1; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; required_device<okim6295_device> m_okimusic; /* memory pointers */ UINT16 * m_pf1_rowscroll; diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 856b29f570c..299dd3eb45d 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -38,7 +38,7 @@ public: required_device<cpu_device> m_maincpu; required_device<device_t> m_ensoniq; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; optional_device<upd96050_device> m_dsp; required_shared_ptr<UINT16> m_mainram; diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index 253f0e18522..c1bcd8efacc 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -53,5 +53,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index a0e0f51e56c..8ca1a04d1ac 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -144,7 +144,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_slave; required_device<m68000_base_device> m_audiocpu; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; bitmap_rgb32 m_tmpbitmap; DECLARE_VIDEO_START(stv_vdp2); diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 285c49d0e88..78e34d44381 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -50,5 +50,5 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<tc0480scp_device> m_tc0480scp; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 2743f0ab54e..2d50510a363 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -56,7 +56,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; required_device<cpu_device> m_subcpu; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; optional_device<tc0480scp_device> m_tc0480scp; optional_device<tc0150rod_device> m_tc0150rod; optional_device<tc0100scn_device> m_tc0100scn; diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index 4f204b22800..f06c0873523 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -94,5 +94,5 @@ public: DECLARE_WRITE_LINE_MEMBER(sound_irq); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index 741b787563d..36d52b9065d 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -154,7 +154,7 @@ public: optional_device<nmk112_device> m_nmk112; optional_device<okim6295_device> m_oki; optional_device<okim6295_device> m_oki1; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index 861bdefdcb8..4452bda8932 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -35,7 +35,7 @@ public: optional_device<cpu_device> m_subcpu; required_device<tc0100scn_device> m_tc0100scn; required_device<tc0480scp_device> m_tc0480scp; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; optional_shared_ptr<UINT32> m_ram; optional_shared_ptr<UINT32> m_shared_ram; UINT16 m_coin_word; diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index 5abb4a73199..e194297013d 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -52,5 +52,5 @@ public: void zeropnt2_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; - optional_device<eeprom_device> m_eeprom; + optional_device<serial_eeprom_device> m_eeprom; }; diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index 8308250740b..c569cd8d255 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -26,5 +26,5 @@ public: UINT32 screen_update_xorworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); required_device<cpu_device> m_maincpu; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; }; diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index f10e6ce2de1..4d4123ded0a 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -42,6 +42,7 @@ #include "machine/nvram.h" #include "machine/er2055.h" +#include "video/atarimo.h" #include "cpu/m6502/m6502.h" #include "sound/okim6295.h" @@ -186,8 +187,6 @@ private: // ======================> atari_vad_device -class atari_motion_objects_device; - // device type definition extern const device_type ATARI_VAD; diff --git a/src/mame/machine/kaneko_calc3.c b/src/mame/machine/kaneko_calc3.c index 6d418d13b90..c2c7dbf1dd8 100644 --- a/src/mame/machine/kaneko_calc3.c +++ b/src/mame/machine/kaneko_calc3.c @@ -1330,7 +1330,7 @@ int kaneko_calc3_device::calc3_decompress_table(running_machine& machine, int ta //printf("save to eeprom\n"); { - address_space &eeprom_space = space.machine().device<eeprom_device>(":eeprom")->space(); + address_space &eeprom_space = space.machine().device<serial_eeprom_device>(":eeprom")->space(); for (i=0;i<0x80;i++) { @@ -1673,7 +1673,7 @@ void kaneko_calc3_device::calc3_mcu_run(running_machine &machine) } #endif { - address_space &eeprom_space = space.machine().device<eeprom_device>(":eeprom")->space(); + address_space &eeprom_space = space.machine().device<serial_eeprom_device>(":eeprom")->space(); for (i=0;i<0x80;i++) { diff --git a/src/mame/machine/kaneko_toybox.c b/src/mame/machine/kaneko_toybox.c index 00101652a8a..b68214ca114 100644 --- a/src/mame/machine/kaneko_toybox.c +++ b/src/mame/machine/kaneko_toybox.c @@ -199,7 +199,7 @@ void kaneko_toybox_device::toybox_mcu_run(running_machine &machine) { UINT8* nvdat = (UINT8*)&kaneko16_mcu_ram[mcu_offset]; - address_space &eeprom_space = machine.device<eeprom_device>(":eeprom")->space(); + address_space &eeprom_space = machine.device<serial_eeprom_device>(":eeprom")->space(); for (int i=0;i<0x80;i++) { @@ -213,7 +213,7 @@ void kaneko_toybox_device::toybox_mcu_run(running_machine &machine) case 0x42: // Write to NVRAM { - address_space &eeprom_space = machine.device<eeprom_device>(":eeprom")->space(); + address_space &eeprom_space = machine.device<serial_eeprom_device>(":eeprom")->space(); UINT8* nvdat = (UINT8*)&kaneko16_mcu_ram[mcu_offset]; for (int i=0;i<0x80;i++) { @@ -232,7 +232,7 @@ void kaneko_toybox_device::toybox_mcu_run(running_machine &machine) //memcpy(m_nvram_save, bonkadv_mcu_43, sizeof(bonkadv_mcu_43)); - address_space &eeprom_space = machine.device<eeprom_device>(":eeprom")->space(); + address_space &eeprom_space = machine.device<serial_eeprom_device>(":eeprom")->space(); UINT8* nvdat = (UINT8*)&bonkadv_mcu_43[0]; for (int i=0;i<0x80;i++) { diff --git a/src/mame/video/atarimo.c b/src/mame/video/atarimo.c index cd21b2f9cd5..9b0f7973a4d 100644 --- a/src/mame/video/atarimo.c +++ b/src/mame/video/atarimo.c @@ -425,10 +425,10 @@ void atari_motion_objects_device::build_active_list(int link) else { UINT16 *srcdata = &bankbase[link]; - *current++ = srcdata[0 << m_entrybits]; - *current++ = srcdata[1 << m_entrybits]; - *current++ = srcdata[2 << m_entrybits]; - *current++ = srcdata[3 << m_entrybits]; + *current++ = srcdata[UINT32(0) << m_entrybits]; + *current++ = srcdata[UINT32(1) << m_entrybits]; + *current++ = srcdata[UINT32(2) << m_entrybits]; + *current++ = srcdata[UINT32(3) << m_entrybits]; } // link to the next object diff --git a/src/mess/drivers/ip20.c b/src/mess/drivers/ip20.c index f57fc8c217b..fc4e3980aea 100644 --- a/src/mess/drivers/ip20.c +++ b/src/mess/drivers/ip20.c @@ -73,7 +73,7 @@ public: TIMER_CALLBACK_MEMBER(ip20_timer_rtc); required_device<wd33c93_device> m_wd33c93; required_device<scc8530_t> m_scc; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; inline void ATTR_PRINTF(3,4) verboselog(int n_level, const char *s_fmt, ... ); required_device<cpu_device> m_maincpu; @@ -106,7 +106,7 @@ UINT32 ip20_state::screen_update_ip204415(screen_device &screen, bitmap_ind16 &b return 0; } -static const eeprom_interface eeprom_interface_93C56 = +static const serial_eeprom_interface eeprom_interface_93C56 = { 7, // address bits 7 16, // data bits 16 @@ -627,7 +627,7 @@ static MACHINE_CONFIG_START( ip204415, ip20_state ) MCFG_SOUND_MODIFY( "scsi:cdrom:cdda" ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "^^^mono", 1.0) - MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C56) + MCFG_SERIAL_EEPROM_ADD("eeprom", eeprom_interface_93C56) MACHINE_CONFIG_END ROM_START( ip204415 ) diff --git a/src/mess/machine/sega8_rom.h b/src/mess/machine/sega8_rom.h index 98403c2f0ec..0d6a7078c81 100644 --- a/src/mess/machine/sega8_rom.h +++ b/src/mess/machine/sega8_rom.h @@ -213,7 +213,7 @@ public: protected: UINT8 m_rom_bank_base[3]; - required_device<eeprom_device> m_eeprom; + required_device<serial_eeprom_device> m_eeprom; int m_93c46_enabled; UINT8 m_93c46_lines; }; |