diff options
author | Aaron Giles <aaron@aarongiles.com> | 2008-05-25 05:38:24 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2008-05-25 05:38:24 +0000 |
commit | 7cb132645956b1157a6f53b2a8bdb58b90565c95 (patch) | |
tree | bd4dcb1976bcbc642af39b5cbf5cd11bb127144e | |
parent | f36dece89818707aec3f1476531658d5ef651453 (diff) |
Renamed EEPROM_* to eeprom_*
Typedef'ed a real eeprom_interface structure.
Added a PORT_CUSTOM for the eeprom bit reading. Updated several
drivers to use that by specifying it in their input ports instead
of having a custom read handler that inserted the bit forcefully.
Added a PORT_CUSTOM for the ticket dispenser callback as well.
Updated the dcheese driver to use it.
Many more drivers can be updated to use these new PORT_CUSTOMs
in the future, eliminating hacky input port read handlers.
99 files changed, 862 insertions, 907 deletions
diff --git a/src/emu/cheat.c b/src/emu/cheat.c index 633c46b5ae8..7d212dccb8b 100644 --- a/src/emu/cheat.c +++ b/src/emu/cheat.c @@ -10874,7 +10874,7 @@ static UINT32 ReadData(CheatAction * action) int length; UINT8 * buf; - buf = EEPROM_get_data_pointer(&length); + buf = eeprom_get_data_pointer(&length); if(IsAddressInRange(action, length)) return DoMemoryRead(buf, action->address, bytes, swapBytes, &rawCPUInfo); @@ -10988,7 +10988,7 @@ static void WriteData(CheatAction * action, UINT32 data) int length; UINT8 * buf; - buf = EEPROM_get_data_pointer(&length); + buf = eeprom_get_data_pointer(&length); if(IsAddressInRange(action, length)) DoMemoryWrite(data, buf, action->address, bytes, swapBytes, &rawCPUInfo); diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c index a7f1756ead3..eb1147bed8c 100644 --- a/src/emu/machine/eeprom.c +++ b/src/emu/machine/eeprom.c @@ -7,7 +7,7 @@ #define SERIAL_BUFFER_LENGTH 40 #define MEMORY_SIZE 1024 -static const struct EEPROM_interface *intf; +static const eeprom_interface *intf; static int serial_count; static UINT8 serial_buffer[SERIAL_BUFFER_LENGTH]; @@ -20,7 +20,7 @@ static int locked; static int reset_delay; /* - EEPROM_command_match: + eeprom_command_match: Try to match the first (len) digits in the EEPROM serial buffer string (*buf) with an EEPROM command string (*cmd). @@ -35,7 +35,7 @@ static int reset_delay; Note: (cmd) may be NULL. Return 0 (no match) in this case. */ -static int EEPROM_command_match(const char *buf, const char *cmd, int len) +static int eeprom_command_match(const char *buf, const char *cmd, int len) { if ( cmd == 0 ) return 0; if ( len == 0 ) return 0; @@ -77,7 +77,7 @@ static int EEPROM_command_match(const char *buf, const char *cmd, int len) } -const struct EEPROM_interface eeprom_interface_93C46 = +const eeprom_interface eeprom_interface_93C46 = { 6, // address bits 6 16, // data bits 16 @@ -91,7 +91,7 @@ const struct EEPROM_interface eeprom_interface_93C46 = // "*10010xxxx" // erase all 1 00 10xxxx }; -const struct EEPROM_interface eeprom_interface_93C66B = +const eeprom_interface eeprom_interface_93C66B = { 8, /* address bits */ 16, /* data bits */ @@ -108,26 +108,26 @@ const struct EEPROM_interface eeprom_interface_93C66B = NVRAM_HANDLER( 93C46 ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); - if (file) EEPROM_load(file); + eeprom_init(&eeprom_interface_93C46); + if (file) eeprom_load(file); } } NVRAM_HANDLER( 93C66B ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C66B); - if (file) EEPROM_load(file); + eeprom_init(&eeprom_interface_93C66B); + if (file) eeprom_load(file); } } -void EEPROM_init(const struct EEPROM_interface *interface) +void eeprom_init(const eeprom_interface *interface) { intf = interface; @@ -159,7 +159,7 @@ void EEPROM_init(const struct EEPROM_interface *interface) state_save_register_global(eeprom_read_address); } -static void EEPROM_write(int bit) +static void eeprom_write(int bit) { LOG(("EEPROM write bit %d\n",bit)); @@ -173,7 +173,7 @@ static void EEPROM_write(int bit) serial_buffer[serial_count] = 0; /* nul terminate so we can treat it as a string */ if ( (serial_count > intf->address_bits) && - EEPROM_command_match((char*)serial_buffer,intf->cmd_read,strlen((char*)serial_buffer)-intf->address_bits) ) + eeprom_command_match((char*)serial_buffer,intf->cmd_read,strlen((char*)serial_buffer)-intf->address_bits) ) { int i,address; @@ -194,7 +194,7 @@ static void EEPROM_write(int bit) logerror("EEPROM read %04x from address %02x\n",eeprom_data_bits,address); } else if ( (serial_count > intf->address_bits) && - EEPROM_command_match((char*)serial_buffer,intf->cmd_erase,strlen((char*)serial_buffer)-intf->address_bits) ) + eeprom_command_match((char*)serial_buffer,intf->cmd_erase,strlen((char*)serial_buffer)-intf->address_bits) ) { int i,address; @@ -220,7 +220,7 @@ logerror("Error: EEPROM is locked\n"); serial_count = 0; } else if ( (serial_count > (intf->address_bits + intf->data_bits)) && - EEPROM_command_match((char*)serial_buffer,intf->cmd_write,strlen((char*)serial_buffer)-(intf->address_bits + intf->data_bits)) ) + eeprom_command_match((char*)serial_buffer,intf->cmd_write,strlen((char*)serial_buffer)-(intf->address_bits + intf->data_bits)) ) { int i,address,data; @@ -251,13 +251,13 @@ logerror("EEPROM write %04x to address %02x\n",data,address); logerror("Error: EEPROM is locked\n"); serial_count = 0; } - else if ( EEPROM_command_match((char*)serial_buffer,intf->cmd_lock,strlen((char*)serial_buffer)) ) + else if ( eeprom_command_match((char*)serial_buffer,intf->cmd_lock,strlen((char*)serial_buffer)) ) { logerror("EEPROM lock\n"); locked = 1; serial_count = 0; } - else if ( EEPROM_command_match((char*)serial_buffer,intf->cmd_unlock,strlen((char*)serial_buffer)) ) + else if ( eeprom_command_match((char*)serial_buffer,intf->cmd_unlock,strlen((char*)serial_buffer)) ) { logerror("EEPROM unlock\n"); locked = 0; @@ -265,7 +265,7 @@ logerror("EEPROM unlock\n"); } } -static void EEPROM_reset(void) +static void eeprom_reset(void) { if (serial_count) logerror("EEPROM reset, buffer = %s\n",serial_buffer); @@ -276,13 +276,13 @@ if (serial_count) } -void EEPROM_write_bit(int bit) +void eeprom_write_bit(int bit) { LOG(("write bit %d\n",bit)); latch = bit; } -int EEPROM_read_bit(void) +int eeprom_read_bit(void) { int res; @@ -305,16 +305,21 @@ int EEPROM_read_bit(void) return res; } -void EEPROM_set_cs_line(int state) +CUSTOM_INPUT( eeprom_bit_r ) +{ + return eeprom_read_bit(); +} + +void eeprom_set_cs_line(int state) { LOG(("set reset line %d\n",state)); reset_line = state; if (reset_line != CLEAR_LINE) - EEPROM_reset(); + eeprom_reset(); } -void EEPROM_set_clock_line(int state) +void eeprom_set_clock_line(int state) { LOG(("set clock line %d\n",state)); if (state == PULSE_LINE || (clock_line == CLEAR_LINE && state != CLEAR_LINE)) @@ -337,7 +342,7 @@ logerror("EEPROM read %04x from address %02x\n",eeprom_data_bits,eeprom_read_add eeprom_clock_count++; } else - EEPROM_write(latch); + eeprom_write(latch); } } @@ -345,22 +350,22 @@ logerror("EEPROM read %04x from address %02x\n",eeprom_data_bits,eeprom_read_add } -void EEPROM_load(mame_file *f) +void eeprom_load(mame_file *f) { mame_fread(f,eeprom_data,(1 << intf->address_bits) * intf->data_bits / 8); } -void EEPROM_save(mame_file *f) +void eeprom_save(mame_file *f) { mame_fwrite(f,eeprom_data,(1 << intf->address_bits) * intf->data_bits / 8); } -void EEPROM_set_data(const UINT8 *data, int length) +void eeprom_set_data(const UINT8 *data, int length) { memcpy(eeprom_data, data, length); } -UINT8 * EEPROM_get_data_pointer(int * length) +UINT8 * eeprom_get_data_pointer(int * length) { if(length) *length = MEMORY_SIZE; diff --git a/src/emu/machine/eeprom.h b/src/emu/machine/eeprom.h index bef23dc5bef..2dab30ceb1a 100644 --- a/src/emu/machine/eeprom.h +++ b/src/emu/machine/eeprom.h @@ -1,7 +1,8 @@ -#ifndef EEPROM_H -#define EEPROM_H +#ifndef eeprom_H +#define eeprom_H -struct EEPROM_interface +typedef struct _eeprom_interface eeprom_interface; +struct _eeprom_interface { int address_bits; /* EEPROM has 2^address_bits cells */ int data_bits; /* every cell has this many bits (8 or 16) */ @@ -11,30 +12,31 @@ struct EEPROM_interface const char *cmd_lock; /* lock command string, or 0 if n/a */ const char *cmd_unlock; /* unlock command string, or 0 if n/a */ int enable_multi_read;/* set to 1 to enable multiple values to be read from one read command */ - int reset_delay; /* number of times EEPROM_read_bit() should return 0 after a reset, */ + int reset_delay; /* number of times eeprom_read_bit() should return 0 after a reset, */ /* before starting to return 1. */ }; -void EEPROM_init(const struct EEPROM_interface *interface); +void eeprom_init(const eeprom_interface *interface); -void EEPROM_write_bit(int bit); -int EEPROM_read_bit(void); -void EEPROM_set_cs_line(int state); -void EEPROM_set_clock_line(int state); +void eeprom_write_bit(int bit); +int eeprom_read_bit(void); +CUSTOM_INPUT( eeprom_bit_r ); +void eeprom_set_cs_line(int state); +void eeprom_set_clock_line(int state); -void EEPROM_load(mame_file *file); -void EEPROM_save(mame_file *file); +void eeprom_load(mame_file *file); +void eeprom_save(mame_file *file); -void EEPROM_set_data(const UINT8 *data, int length); -UINT8 * EEPROM_get_data_pointer(int * length); +void eeprom_set_data(const UINT8 *data, int length); +UINT8 * eeprom_get_data_pointer(int * length); /* 93C46 */ -extern const struct EEPROM_interface eeprom_interface_93C46; +extern const eeprom_interface eeprom_interface_93C46; NVRAM_HANDLER( 93C46 ); /* 93C66B */ -extern const struct EEPROM_interface eeprom_interface_93C66B; +extern const eeprom_interface eeprom_interface_93C66B; NVRAM_HANDLER( 93C66B ); #endif diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index 9cd008a6acc..6549747a7bc 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -94,7 +94,7 @@ static WRITE8_HANDLER( _20pacgal_dac_w ) * *************************************/ -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -109,13 +109,13 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( eeprom ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) - EEPROM_load(file); + eeprom_load(file); } } @@ -123,7 +123,7 @@ static NVRAM_HANDLER( eeprom ) static READ8_HANDLER( eeprom_r ) { /* bit 7 is EEPROM data */ - return EEPROM_read_bit() << 7; + return eeprom_read_bit() << 7; } @@ -132,9 +132,9 @@ static WRITE8_HANDLER( eeprom_w ) /* bit 7 is data */ /* bit 6 is clock (active high) */ /* bit 5 is cs (active low) */ - EEPROM_write_bit(data & 0x80); - EEPROM_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x80); + eeprom_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index 82361165327..baa47cffe05 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -23,7 +23,7 @@ WRITE16_HANDLER( asterix_spritebank_w ); static UINT8 cur_control2; static int init_eeprom_count; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -37,7 +37,7 @@ static const struct EEPROM_interface eeprom_interface = #if 0 static void eeprom_init(void) { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); init_eeprom_count = 0; } #endif @@ -45,15 +45,15 @@ static void eeprom_init(void) static NVRAM_HANDLER( asterix ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -67,7 +67,7 @@ static READ16_HANDLER( control1_r ) /* bit 8 is EEPROM data */ /* bit 9 is EEPROM ready */ /* bit 10 is service button */ - res = (EEPROM_read_bit()<<8) | input_port_read_indexed(machine,1); + res = (eeprom_read_bit()<<8) | input_port_read_indexed(machine,1); if (init_eeprom_count) { @@ -96,9 +96,9 @@ static WRITE16_HANDLER( control2_w ) /* bit 1 is cs (active low) */ /* bit 2 is clock (active high) */ - EEPROM_write_bit(data & 0x01); - EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x01); + eeprom_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); /* bit 5 is select tile bank */ K056832_set_tile_bank((data & 0x20) >> 5); diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c index cbdd2216f50..8cc3fde6c59 100644 --- a/src/mame/drivers/astrocorp.c +++ b/src/mame/drivers/astrocorp.c @@ -95,7 +95,7 @@ static VIDEO_UPDATE(astrocorp) static READ16_HANDLER( astrocorp_eeprom_r ) { - return 0xfff7 | (EEPROM_read_bit() << 3); + return 0xfff7 | (eeprom_read_bit() << 3); } static WRITE16_HANDLER( astrocorp_eeprom_w ) @@ -103,13 +103,13 @@ static WRITE16_HANDLER( astrocorp_eeprom_w ) if (ACCESSING_BITS_0_7) { // latch the bit - EEPROM_write_bit(data & 0x01); + eeprom_write_bit(data & 0x01); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); } } @@ -236,16 +236,16 @@ static const UINT16 showhand_default_eeprom[] = {0x0001,0x0007,0x000a,0x0003,0x0 static NVRAM_HANDLER( showhand ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); - if (file) EEPROM_load(file); + if (file) eeprom_load(file); else { /* Set the EEPROM to Factory Defaults */ - EEPROM_set_data((UINT8*)showhand_default_eeprom,sizeof(showhand_default_eeprom)); + eeprom_set_data((UINT8*)showhand_default_eeprom,sizeof(showhand_default_eeprom)); } } } diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c index d0f9da13cb8..4a20cc2b8c9 100644 --- a/src/mame/drivers/ataxx.c +++ b/src/mame/drivers/ataxx.c @@ -100,7 +100,7 @@ ADDRESS_MAP_END /* Helps document the input ports. */ #define IPT_SLAVEHALT IPT_SPECIAL -#define IPT_EEPROM_DATA IPT_SPECIAL +#define IPT_eeprom_DATA IPT_SPECIAL static INPUT_PORTS_START( ataxx ) @@ -120,7 +120,7 @@ static INPUT_PORTS_START( ataxx ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START /* 0x20 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START /* 0x00 - analog X */ @@ -151,7 +151,7 @@ static INPUT_PORTS_START( wsf ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START /* 0x20 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -203,7 +203,7 @@ static INPUT_PORTS_START( indyheat ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START /* 0x20 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START /* Analog wheel 1 */ @@ -249,7 +249,7 @@ static INPUT_PORTS_START( brutforc ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START /* 0x20 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START /* 0x0D */ diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index b7be1625d74..ba3abe648fc 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -230,20 +230,20 @@ static READ32_HANDLER(backfire_eeprom_r) { /* some kind of screen indicator? checked by backfira set before it will boot */ int backfire_screen = mame_rand(machine)&1; - return ((EEPROM_read_bit()<<24) | input_port_read_indexed(machine, 0) | (input_port_read_indexed(machine, 3)<<16)) ^ (backfire_screen << 26) ; + return ((eeprom_read_bit()<<24) | input_port_read_indexed(machine, 0) | (input_port_read_indexed(machine, 3)<<16)) ^ (backfire_screen << 26) ; } static READ32_HANDLER(backfire_control2_r) { // logerror("%08x:Read eprom %08x (%08x)\n",activecpu_get_pc(),offset<<1,mem_mask); - return (EEPROM_read_bit()<<24) | input_port_read_indexed(machine, 1) | (input_port_read_indexed(machine, 1)<<16); + return (eeprom_read_bit()<<24) | input_port_read_indexed(machine, 1) | (input_port_read_indexed(machine, 1)<<16); } #ifdef UNUSED_FUNCTION static READ32_HANDLER(backfire_control3_r) { // logerror("%08x:Read eprom %08x (%08x)\n",activecpu_get_pc(),offset<<1,mem_mask); - return (EEPROM_read_bit()<<24) | input_port_read_indexed(machine, 2) | (input_port_read_indexed(machine, 2)<<16); + return (eeprom_read_bit()<<24) | input_port_read_indexed(machine, 2) | (input_port_read_indexed(machine, 2)<<16); } #endif @@ -252,9 +252,9 @@ static WRITE32_HANDLER(backfire_eeprom_w) { logerror("%08x:write eprom %08x (%08x) %08x\n",activecpu_get_pc(),offset<<1,mem_mask,data); if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x1); - EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x1); + eeprom_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); } } diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index e823e02e9be..86b511ecb5c 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -308,16 +308,6 @@ static const UINT8 *cave_default_eeprom; static int cave_default_eeprom_length; static int cave_region_byte; -static READ16_HANDLER( cave_input1_r ) -{ - return input_port_read_indexed(machine, 1) | ((EEPROM_read_bit() & 0x01) << 11); -} - -static READ16_HANDLER( guwange_input1_r ) -{ - return input_port_read_indexed(machine, 1) | ((EEPROM_read_bit() & 0x01) << 7); -} - static READ16_HANDLER( gaia_dsw_r ) { return input_port_read_indexed(machine, 2) | (input_port_read_indexed(machine, 3) << 8); @@ -336,13 +326,13 @@ static WRITE16_HANDLER( cave_eeprom_msb_w ) coin_counter_w(0, data & 0x1000); // latch the bit - EEPROM_write_bit(data & 0x0800); + eeprom_write_bit(data & 0x0800); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x0400) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x0400) ? ASSERT_LINE : CLEAR_LINE ); } } @@ -357,13 +347,13 @@ static WRITE16_HANDLER( hotdogst_eeprom_msb_w ) if ( ACCESSING_BITS_8_15 ) // even address { // latch the bit - EEPROM_write_bit(data & 0x0800); + eeprom_write_bit(data & 0x0800); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x0400) ? CLEAR_LINE: ASSERT_LINE ); + eeprom_set_clock_line((data & 0x0400) ? CLEAR_LINE: ASSERT_LINE ); } } @@ -380,13 +370,13 @@ static WRITE16_HANDLER( cave_eeprom_lsb_w ) coin_counter_w(0, data & 0x0001); // latch the bit - EEPROM_write_bit(data & 0x80); + eeprom_write_bit(data & 0x80); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE ); } } @@ -415,13 +405,13 @@ static WRITE16_HANDLER( metmqstr_eeprom_msb_w ) if (~data & 0x0100) { // latch the bit - EEPROM_write_bit(data & 0x0800); + eeprom_write_bit(data & 0x0800); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x0400) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x0400) ? ASSERT_LINE : CLEAR_LINE ); } } } @@ -429,21 +419,21 @@ static WRITE16_HANDLER( metmqstr_eeprom_msb_w ) static NVRAM_HANDLER( cave ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); - if (file) EEPROM_load(file); + if (file) eeprom_load(file); else { if (cave_default_eeprom) /* Set the EEPROM to Factory Defaults */ - EEPROM_set_data(cave_default_eeprom,cave_default_eeprom_length); + eeprom_set_data(cave_default_eeprom,cave_default_eeprom_length); } } } -static const struct EEPROM_interface eeprom_interface_93C46_8bit = +static const eeprom_interface eeprom_interface_93C46_8bit = { 7, // address bits 7 8, // data bits 8 @@ -460,16 +450,16 @@ static const struct EEPROM_interface eeprom_interface_93C46_8bit = static NVRAM_HANDLER( korokoro ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46_8bit); + eeprom_init(&eeprom_interface_93C46_8bit); - if (file) EEPROM_load(file); + if (file) eeprom_load(file); else { if (cave_default_eeprom) /* Set the EEPROM to Factory Defaults */ - EEPROM_set_data(cave_default_eeprom,cave_default_eeprom_length); + eeprom_set_data(cave_default_eeprom,cave_default_eeprom_length); } } } @@ -506,7 +496,7 @@ static ADDRESS_MAP_START( dfeveron_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // Layer 0 Control /**/AM_RANGE(0xa00000, 0xa00005) AM_READ(SMH_RAM ) // Layer 1 Control AM_RANGE(0xb00000, 0xb00001) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0xb00002, 0xb00003) AM_READ(cave_input1_r ) // Inputs + EEPROM + AM_RANGE(0xb00002, 0xb00003) AM_READ(input_port_1_word_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( dfeveron_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -545,7 +535,7 @@ static ADDRESS_MAP_START( ddonpach_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 2 Control /**/AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xd00000, 0xd00001) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0xd00002, 0xd00003) AM_READ(cave_input1_r ) // Inputs + EEPROM + AM_RANGE(0xd00002, 0xd00003) AM_READ(input_port_1_word_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( ddonpach_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -611,7 +601,7 @@ static ADDRESS_MAP_START( donpachi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xb00000, 0xb00001) AM_READ(OKIM6295_status_0_lsb_r ) // M6295 AM_RANGE(0xb00010, 0xb00011) AM_READ(OKIM6295_status_1_lsb_r ) // AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0xc00002, 0xc00003) AM_READ(cave_input1_r ) // Inputs + EEPROM + AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( donpachi_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -653,7 +643,7 @@ static ADDRESS_MAP_START( esprade_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 2 Control /**/AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xd00000, 0xd00001) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0xd00002, 0xd00003) AM_READ(cave_input1_r ) // Inputs + EEPROM + AM_RANGE(0xd00002, 0xd00003) AM_READ(input_port_1_word_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( esprade_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -741,7 +731,7 @@ static ADDRESS_MAP_START( guwange_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 2 Control /**/AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xd00010, 0xd00011) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0xd00012, 0xd00013) AM_READ(guwange_input1_r ) // Inputs + EEPROM + AM_RANGE(0xd00012, 0xd00013) AM_READ(input_port_1_word_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( guwange_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -781,7 +771,7 @@ static ADDRESS_MAP_START( hotdogst_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0xb80000, 0xb80005) AM_READ(SMH_RAM ) // Layer 1 Control /**/AM_RANGE(0xc00000, 0xc00005) AM_READ(SMH_RAM ) // Layer 2 Control AM_RANGE(0xc80000, 0xc80001) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0xc80002, 0xc80003) AM_READ(cave_input1_r ) // Inputs + EEPROM + AM_RANGE(0xc80002, 0xc80003) AM_READ(input_port_1_word_r ) // Inputs + EEPROM /**/AM_RANGE(0xf00000, 0xf07fff) AM_READ(SMH_RAM ) // Sprites /**/AM_RANGE(0xf08000, 0xf0ffff) AM_READ(SMH_RAM ) // Sprites? ADDRESS_MAP_END @@ -857,24 +847,19 @@ static WRITE16_HANDLER( korokoro_eeprom_msb_w ) hopper = data & 0x0100; // ??? // latch the bit - EEPROM_write_bit(data & 0x4000); + eeprom_write_bit(data & 0x4000); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x1000) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x1000) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x2000) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x2000) ? ASSERT_LINE : CLEAR_LINE ); } } -static READ16_HANDLER( korokoro_input0_r ) -{ - return input_port_read_indexed(machine, 0) | (hopper ? 0 : 0x8000); -} - -static READ16_HANDLER( korokoro_input1_r ) +static CUSTOM_INPUT( korokoro_hopper_r ) { - return input_port_read_indexed(machine, 1) | ((EEPROM_read_bit() & 0x01) << 12); + return hopper ? 1 : 0; } static ADDRESS_MAP_START( korokoro_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -885,8 +870,8 @@ static ADDRESS_MAP_START( korokoro_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1c0000, 0x1c0007) AM_READ( cave_irq_cause_r ) // IRQ Cause // AM_RANGE(0x200000, 0x207fff) AM_READ( SMH_RAM ) // Palette // AM_RANGE(0x240000, 0x240003) AM_READ( cave_sound_r ) // YMZ280 - AM_RANGE(0x280000, 0x280001) AM_READ( korokoro_input0_r ) // Inputs + ??? - AM_RANGE(0x280002, 0x280003) AM_READ( korokoro_input1_r ) // Inputs + EEPROM + AM_RANGE(0x280000, 0x280001) AM_READ( input_port_0_word_r ) // Inputs + ??? + AM_RANGE(0x280002, 0x280003) AM_READ( input_port_1_word_r ) // Inputs + EEPROM AM_RANGE(0x300000, 0x30ffff) AM_READ( SMH_RAM ) // RAM ADDRESS_MAP_END @@ -921,7 +906,7 @@ static ADDRESS_MAP_START( mazinger_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0x600000, 0x600005) AM_READ(SMH_RAM ) // Layer 1 Control /**/AM_RANGE(0x700000, 0x700005) AM_READ(SMH_RAM ) // Layer 0 Control AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0x800002, 0x800003) AM_READ(cave_input1_r ) // Inputs + EEPROM + AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r ) // Inputs + EEPROM /**/AM_RANGE(0xc08000, 0xc0ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xd00000, 0xd7ffff) AM_READ(SMH_BANK1 ) // ROM ADDRESS_MAP_END @@ -967,7 +952,7 @@ static ADDRESS_MAP_START( metmqstr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0xb80000, 0xb80005) AM_READ(SMH_RAM ) // Layer 1 Control /**/AM_RANGE(0xc00000, 0xc00005) AM_READ(SMH_RAM ) // Layer 2 Control AM_RANGE(0xc80000, 0xc80001) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0xc80002, 0xc80003) AM_READ(cave_input1_r ) // Inputs + EEPROM + AM_RANGE(0xc80002, 0xc80003) AM_READ(input_port_1_word_r ) // Inputs + EEPROM AM_RANGE(0xf00000, 0xf07fff) AM_READ(SMH_RAM ) // Sprites AM_RANGE(0xf08000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -1002,7 +987,7 @@ ADDRESS_MAP_END static READ16_HANDLER( pwrinst2_eeprom_r ) { - return ~8 + ((EEPROM_read_bit() & 1) ? 8 : 0); + return ~8 + ((eeprom_read_bit() & 1) ? 8 : 0); } INLINE void vctrl_w(UINT16 *VCTRL, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask) @@ -1106,7 +1091,7 @@ static ADDRESS_MAP_START( sailormn_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x508000, 0x50ffff) AM_READ(SMH_RAM ) // Sprites? AM_RANGE(0x510000, 0x510001) AM_READ(SMH_RAM ) // (agallet) AM_RANGE(0x600000, 0x600001) AM_READ(sailormn_input0_r ) // Inputs + Watchdog! - AM_RANGE(0x600002, 0x600003) AM_READ(cave_input1_r ) // Inputs + EEPROM + AM_RANGE(0x600002, 0x600003) AM_READ(input_port_1_word_r ) // Inputs + EEPROM AM_RANGE(0x800000, 0x887fff) AM_READ(SMH_RAM ) // Layer 0 AM_RANGE(0x880000, 0x887fff) AM_READ(SMH_RAM ) // Layer 1 AM_RANGE(0x900000, 0x907fff) AM_READ(SMH_RAM ) // Layer 2 @@ -1159,7 +1144,7 @@ static ADDRESS_MAP_START( uopoko_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0x700000, 0x700005) AM_READ(SMH_RAM ) // Layer 0 Control /**/AM_RANGE(0x800000, 0x80ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x900000, 0x900001) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0x900002, 0x900003) AM_READ(cave_input1_r ) // Inputs + EEPROM + AM_RANGE(0x900002, 0x900003) AM_READ(input_port_1_word_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( uopoko_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -1497,7 +1482,6 @@ static INPUT_PORTS_START( cave ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(6) PORT_SERVICE_NO_TOGGLE(0x0200, IP_ACTIVE_LOW ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) // sw? exit service mode @@ -1516,11 +1500,10 @@ static INPUT_PORTS_START( cave ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) - 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 ) // eeprom bit + PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1533,7 +1516,6 @@ static INPUT_PORTS_START( gaia ) PORT_MODIFY("IN0") // IN0 - Player 1 + 2 PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) @@ -1552,7 +1534,6 @@ static INPUT_PORTS_START( gaia ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1686,7 +1667,6 @@ static INPUT_PORTS_START( guwange ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) @@ -1704,8 +1684,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 ) // eeprom bit - + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1727,7 +1706,6 @@ static INPUT_PORTS_START( korokoro ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1735,7 +1713,7 @@ static INPUT_PORTS_START( korokoro ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_SERVICE2) // service medal out? PORT_SERVICE( 0x2000, IP_ACTIVE_LOW ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1) // service coin - PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL) // motor / hopper status ??? + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL) PORT_CUSTOM(korokoro_hopper_r, NULL) // motor / hopper status ??? PORT_START_TAG("IN1") // IN1 PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1746,12 +1724,11 @@ static INPUT_PORTS_START( korokoro ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) 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 ) // eeprom bit + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1983,7 +1960,7 @@ static MACHINE_RESET( cave ) /* modify the eeprom on a reset with the desired region for the games that have the region factory set in eeprom */ if (cave_region_byte >= 0) - EEPROM_get_data_pointer(0)[cave_region_byte] = input_port_read_indexed(machine, 2); + eeprom_get_data_pointer(0)[cave_region_byte] = input_port_read_indexed(machine, 2); } static const struct YMZ280Binterface ymz280b_intf = diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index 2e39269ada8..b1fd3a204b5 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -93,7 +93,7 @@ static WRITE8_HANDLER( cbasebal_coinctrl_w ) ***************************************************************************/ -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -106,38 +106,29 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( cbasebal ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) - EEPROM_load(file); + eeprom_load(file); } } -static READ8_HANDLER( eeprom_r ) -{ - int bit; - - bit = EEPROM_read_bit() << 7; - - return (input_port_read_indexed(machine, 2) & 0x7f) | bit; -} - static WRITE8_HANDLER( eeprom_cs_w ) { - EEPROM_set_cs_line(data ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line(data ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_HANDLER( eeprom_clock_w ) { - EEPROM_set_clock_line(data ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line(data ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_HANDLER( eeprom_serial_w ) { - EEPROM_write_bit(data); + eeprom_write_bit(data); } @@ -163,7 +154,7 @@ static ADDRESS_MAP_START( cbasebal_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0a, 0x0b) AM_WRITE(cbasebal_scrolly_w) AM_RANGE(0x10, 0x10) AM_READ(input_port_0_r) AM_RANGE(0x11, 0x11) AM_READ(input_port_1_r) - AM_RANGE(0x12, 0x12) AM_READ(eeprom_r) + AM_RANGE(0x12, 0x12) AM_READ(input_port_2_r) AM_RANGE(0x13, 0x13) AM_WRITE(cbasebal_gfxctrl_w) AM_RANGE(0x14, 0x14) AM_WRITE(cbasebal_coinctrl_w) ADDRESS_MAP_END @@ -198,7 +189,7 @@ 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_VBLANK ) /* ? */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* EEPROM data */ + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL) INPUT_PORTS_END diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index a3a3dfa2a9d..9d30ae0de7e 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -352,7 +352,7 @@ static WRITE8_HANDLER( qsound_banksw_w ) ********************************************************************/ #ifndef MESS -static const struct EEPROM_interface qsound_eeprom_interface = +static const eeprom_interface qsound_eeprom_interface = { 7, /* address bits */ 8, /* data bits */ @@ -361,7 +361,7 @@ static const struct EEPROM_interface qsound_eeprom_interface = "0111" /* erase command */ }; -static const struct EEPROM_interface pang3_eeprom_interface = +static const eeprom_interface pang3_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -373,33 +373,33 @@ static const struct EEPROM_interface pang3_eeprom_interface = static NVRAM_HANDLER( qsound ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&qsound_eeprom_interface); + eeprom_init(&qsound_eeprom_interface); if (file) - EEPROM_load(file); + eeprom_load(file); } } static NVRAM_HANDLER( pang3 ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&pang3_eeprom_interface); + eeprom_init(&pang3_eeprom_interface); if (file) - EEPROM_load(file); + eeprom_load(file); } } #endif READ16_HANDLER( cps1_eeprom_port_r ) { - return EEPROM_read_bit(); + return eeprom_read_bit(); } WRITE16_HANDLER( cps1_eeprom_port_w ) @@ -411,9 +411,9 @@ WRITE16_HANDLER( cps1_eeprom_port_w ) bit 6 = clock bit 7 = cs */ - EEPROM_write_bit(data & 0x01); - EEPROM_set_cs_line((data & 0x80) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x01); + eeprom_set_cs_line((data & 0x80) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE); } } diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index 62a7bd1a502..5dbd66abe72 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -698,7 +698,7 @@ static INTERRUPT_GEN( cps2_interrupt ) * *************************************/ -static const struct EEPROM_interface cps2_eeprom_interface = +static const eeprom_interface cps2_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -710,21 +710,16 @@ static const struct EEPROM_interface cps2_eeprom_interface = static NVRAM_HANDLER( cps2 ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&cps2_eeprom_interface); + eeprom_init(&cps2_eeprom_interface); if (file) - EEPROM_load(file); + eeprom_load(file); } } -static CUSTOM_INPUT( cps2_eeprom_port_r ) -{ - return EEPROM_read_bit(); -} - static WRITE16_HANDLER( cps2_eeprom_port_w ) { if (ACCESSING_BITS_8_15) @@ -739,9 +734,9 @@ static WRITE16_HANDLER( cps2_eeprom_port_w ) /* bit 7 - */ /* EEPROM */ - EEPROM_write_bit(data & 0x1000); - EEPROM_set_clock_line((data & 0x2000) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data & 0x4000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit(data & 0x1000); + eeprom_set_clock_line((data & 0x2000) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data & 0x4000) ? CLEAR_LINE : ASSERT_LINE); } if (ACCESSING_BITS_0_7) @@ -955,7 +950,7 @@ static INPUT_PORTS_START( cps2 ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4) PORT_START_TAG("IN2") /* IN2 (0x20) */ - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(cps2_eeprom_port_r, NULL) + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL) PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_LOW ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x00f8, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 2a1cfef4167..2db9c96a3f7 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -200,7 +200,7 @@ static VIDEO_UPDATE( darkhors ) ***************************************************************************/ -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, // address bits 7 8, // data bits 8 @@ -217,26 +217,20 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( darkhors ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); - if (file) EEPROM_load(file); + if (file) eeprom_load(file); else { // Set the EEPROM to Factory Defaults - EEPROM_set_data(memory_region(REGION_USER1),(1<<7)); + eeprom_set_data(memory_region(REGION_USER1),(1<<7)); } } } -static READ32_HANDLER( darkhors_eeprom_r ) -{ - // bit 31? - return input_port_read_indexed(machine, 4) | ((EEPROM_read_bit() & 1) << (7+16)); -} - static WRITE32_HANDLER( darkhors_eeprom_w ) { if (data & ~0xff000000) @@ -245,13 +239,13 @@ static WRITE32_HANDLER( darkhors_eeprom_w ) if ( ACCESSING_BITS_24_31 ) { // latch the bit - EEPROM_write_bit(data & 0x04000000); + eeprom_write_bit(data & 0x04000000); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x01000000) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x01000000) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x02000000) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x02000000) ? ASSERT_LINE : CLEAR_LINE ); } } @@ -315,7 +309,7 @@ static WRITE32_HANDLER( darkhors_unk1_w ) static ADDRESS_MAP_START( darkhors_readmem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x0fffff) AM_READ( SMH_ROM ) AM_RANGE(0x400000, 0x41ffff) AM_READ( SMH_RAM ) - AM_RANGE(0x4e0080, 0x4e0083) AM_READ( darkhors_eeprom_r ) + AM_RANGE(0x4e0080, 0x4e0083) AM_READ( input_port_4_dword_r ) AM_RANGE(0x580000, 0x580003) AM_READ( input_port_0_dword_r ) AM_RANGE(0x580004, 0x580007) AM_READ( input_port_1_dword_r ) AM_RANGE(0x580008, 0x58000b) AM_READ( darkhors_input_sel_r ) @@ -390,7 +384,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 ) // eeprom + PORT_BIT( 0x00800000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL) 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 diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c index 78ba011597b..239ae594439 100644 --- a/src/mame/drivers/dcheese.c +++ b/src/mame/drivers/dcheese.c @@ -126,15 +126,9 @@ static MACHINE_START( dcheese ) * *************************************/ -static READ16_HANDLER( port_0_r ) +static CUSTOM_INPUT( sound_latch_state_r ) { - return (input_port_read_indexed(machine, 0) & 0xff7f) | (EEPROM_read_bit() << 7); -} - - -static READ16_HANDLER( port_2_r ) -{ - return (input_port_read_indexed(machine, 2) & 0xff1f) | (!soundlatch_full << 7) | (ticket_dispenser_r(machine, 0) >> 2); + return soundlatch_full; } @@ -144,9 +138,9 @@ static WRITE16_HANDLER( eeprom_control_w ) /* bits $0080-$0010 are probably lamps */ if (ACCESSING_BITS_0_7) { - EEPROM_set_cs_line(~data & 8); - EEPROM_write_bit(data & 2); - EEPROM_set_clock_line(data & 4); + eeprom_set_cs_line(~data & 8); + eeprom_write_bit(data & 2); + eeprom_set_clock_line(data & 4); ticket_dispenser_w(machine, 0, (data & 1) << 7); } } @@ -222,9 +216,9 @@ static ADDRESS_MAP_START( main_cpu_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM - AM_RANGE(0x200000, 0x200001) AM_READWRITE(port_0_r, watchdog_reset16_w) + AM_RANGE(0x200000, 0x200001) AM_READWRITE(input_port_0_word_r, watchdog_reset16_w) AM_RANGE(0x220000, 0x220001) AM_READWRITE(input_port_1_word_r, madmax_blitter_color_w) - AM_RANGE(0x240000, 0x240001) AM_READWRITE(port_2_r, eeprom_control_w) + AM_RANGE(0x240000, 0x240001) AM_READWRITE(input_port_2_word_r, eeprom_control_w) AM_RANGE(0x260000, 0x26001f) AM_WRITE(madmax_blitter_xparam_w) AM_RANGE(0x280000, 0x28001f) AM_WRITE(madmax_blitter_yparam_w) AM_RANGE(0x2a0000, 0x2a003f) AM_READWRITE(madmax_blitter_vidparam_r, madmax_blitter_vidparam_w) @@ -265,7 +259,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_LOW, IPT_SPECIAL ) /* EEPROM data */ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL) 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 */ @@ -279,9 +273,9 @@ static INPUT_PORTS_START( dcheese ) PORT_START /* 240000 */ PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* low 5 bits read as a unit */ - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* ticket status */ + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(ticket_dispenser_0_port_r, NULL) PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* sound->main buffer status (0=empty) */ - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* main->sound buffer status (1=empty) */ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(sound_latch_state_r, NULL) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_VOLUME_DOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -312,7 +306,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_LOW, IPT_SPECIAL ) /* EEPROM data */ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL) 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 */ @@ -325,7 +319,7 @@ static INPUT_PORTS_START( lottof2 ) PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* low 5 bits read as a unit */ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* ticket status */ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* sound->main buffer status (0=empty) */ - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* main->sound buffer status (1=empty) */ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(sound_latch_state_r, NULL) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_VOLUME_DOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -355,7 +349,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_LOW, IPT_SPECIAL ) /* EEPROM data */ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL) 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 ) @@ -367,7 +361,7 @@ static INPUT_PORTS_START( fredmem ) PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* low 5 bits read as a unit */ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* ticket status */ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* sound->main buffer status (0=empty) */ - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* main->sound buffer status (1=empty) */ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(sound_latch_state_r, NULL) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_VOLUME_DOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED ) diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index b21136bd8ec..d45cd5360ef 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -152,7 +152,7 @@ static VIDEO_UPDATE( wcvol95 ) static READ32_HANDLER(hvysmsh_eeprom_r) { - return (EEPROM_read_bit()<<24) | input_port_read_indexed(machine, 0) | (input_port_read_indexed(machine, 1)<<16); + return (eeprom_read_bit()<<24) | input_port_read_indexed(machine, 0) | (input_port_read_indexed(machine, 1)<<16); } static WRITE32_HANDLER(hvysmsh_eeprom_w) @@ -161,9 +161,9 @@ static WRITE32_HANDLER(hvysmsh_eeprom_w) OKIM6295_set_bank_base(1, 0x40000 * (data & 0x7) ); - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x10); - EEPROM_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x10); + eeprom_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); } } @@ -195,15 +195,15 @@ static WRITE32_HANDLER(hvysmsh_oki_1_w) static READ32_HANDLER(wcvol95_eeprom_r) { - return (EEPROM_read_bit()<<24) | input_port_read_indexed(machine, 0) | ((input_port_read_indexed(machine, 1)&0xff)<<16); + return (eeprom_read_bit()<<24) | input_port_read_indexed(machine, 0) | ((input_port_read_indexed(machine, 1)&0xff)<<16); } static WRITE32_HANDLER(wcvol95_eeprom_w) { if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x1); - EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x1); + eeprom_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); } } diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index a1ff069fde2..d527c1e38b8 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -351,7 +351,7 @@ static READ32_HANDLER( fghthist_control_r ) switch (offset) { case 0: return 0xffff0000 | input_port_read_indexed(machine, 0); case 1: return 0xffff0000 | input_port_read_indexed(machine, 1); //check top bits?? - case 2: return 0xfffffffe | EEPROM_read_bit(); + case 2: return 0xfffffffe | eeprom_read_bit(); } return 0xffffffff; @@ -360,9 +360,9 @@ static READ32_HANDLER( fghthist_control_r ) static WRITE32_HANDLER( fghthist_eeprom_w ) { if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x10); - EEPROM_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x10); + eeprom_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); } else if (!ACCESSING_BITS_8_15) { @@ -429,15 +429,15 @@ static WRITE32_HANDLER( dragngun_lightgun_w ) static READ32_HANDLER( dragngun_eeprom_r ) { - return 0xfffffffe | EEPROM_read_bit(); + return 0xfffffffe | eeprom_read_bit(); } static WRITE32_HANDLER( dragngun_eeprom_w ) { if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x1); - EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x1); + eeprom_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); return; } logerror("%08x:Write control 1 %08x %08x\n",activecpu_get_pc(),offset,data); @@ -489,7 +489,7 @@ static WRITE32_HANDLER( tattass_control_w ) static int pendingCommand=0; /* 1 = read, 2 = write */ static int readBitCount=0; static int byteAddr=0; - UINT8 *eeprom=EEPROM_get_data_pointer(0); + UINT8 *eeprom=eeprom_get_data_pointer(0); /* Eprom in low byte */ if (mem_mask==0x000000ff) { /* Byte write to low byte only (different from word writing including low byte) */ @@ -625,7 +625,7 @@ static READ32_HANDLER( nslasher_prot_r ) switch (offset<<1) { case 0x280: return input_port_read_indexed(machine, 0) << 16| 0xffff; /* IN0 */ case 0x4c4: return input_port_read_indexed(machine, 1) << 16| 0xffff; /* IN1 */ - case 0x35a: return (EEPROM_read_bit()<< 16) | 0xffff; // Debug switch in low word?? + case 0x35a: return (eeprom_read_bit()<< 16) | 0xffff; // Debug switch in low word?? } //logerror("%08x: Read unmapped prot %08x (%08x)\n",activecpu_get_pc(),offset<<1,mem_mask); @@ -637,9 +637,9 @@ static WRITE32_HANDLER( nslasher_eeprom_w ) { if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x10); - EEPROM_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x10); + eeprom_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); deco32_pri_w(machine,0,data&0x3,0xffffffff); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */ } @@ -1836,7 +1836,7 @@ static const UINT8 tattass_default_eprom[0x160] = 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; -static const struct EEPROM_interface eeprom_interface_tattass = +static const eeprom_interface eeprom_interface_tattass = { 10, // address bits 10 ==> } 1024 byte eprom 8, // data bits 8 @@ -1845,13 +1845,13 @@ static const struct EEPROM_interface eeprom_interface_tattass = static NVRAM_HANDLER(tattass) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { int len; - EEPROM_init(&eeprom_interface_tattass); - if (file) EEPROM_load(file); - else memcpy(EEPROM_get_data_pointer(&len),tattass_default_eprom,0x160); + eeprom_init(&eeprom_interface_tattass); + if (file) eeprom_load(file); + else memcpy(eeprom_get_data_pointer(&len),tattass_default_eprom,0x160); } } diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c index c1d675130de..cc62ca9d8db 100644 --- a/src/mame/drivers/deco_mlc.c +++ b/src/mame/drivers/deco_mlc.c @@ -117,7 +117,7 @@ static int mlc_raster_table[9][256]; static READ32_HANDLER( avengrs_control_r ) { - return (input_port_read_indexed(machine, 1)<<16) | (EEPROM_read_bit()<<23) | input_port_read_indexed(machine, 0); + return (input_port_read_indexed(machine, 1)<<16) | (eeprom_read_bit()<<23) | input_port_read_indexed(machine, 0); } static READ32_HANDLER(test2_r) @@ -145,9 +145,9 @@ static WRITE32_HANDLER( avengrs_eprom_w ) if (ACCESSING_BITS_8_15) { UINT8 ebyte=(data>>8)&0xff; // if (ebyte&0x80) { - EEPROM_set_clock_line((ebyte & 0x2) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(ebyte & 0x1); - EEPROM_set_cs_line((ebyte & 0x4) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((ebyte & 0x2) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(ebyte & 0x1); + eeprom_set_cs_line((ebyte & 0x4) ? CLEAR_LINE : ASSERT_LINE); // } } else if (ACCESSING_BITS_0_7) { diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c index 2032dd5e227..84136fe2747 100644 --- a/src/mame/drivers/eolith.c +++ b/src/mame/drivers/eolith.c @@ -67,7 +67,7 @@ static int coin_counter_bit = 0; #include "eolithsp.h" // It's configured for 512 bytes -static const struct EEPROM_interface eeprom_interface_93C66 = +static const eeprom_interface eeprom_interface_93C66 = { 9, // address bits 9 8, // data bits 8 @@ -83,11 +83,11 @@ static const struct EEPROM_interface eeprom_interface_93C66 = static NVRAM_HANDLER( eolith ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C66); - if (file) EEPROM_load(file); + eeprom_init(&eeprom_interface_93C66); + if (file) eeprom_load(file); } } @@ -104,7 +104,7 @@ static READ32_HANDLER( eolith_custom_r ) */ eolith_speedup_read(); - return (input_port_read_indexed(machine, 0) & ~0x308) | (EEPROM_read_bit() << 3) | (mame_rand(machine) & 0x300); + return (input_port_read_indexed(machine, 0) & ~0x308) | (eeprom_read_bit() << 3) | (mame_rand(machine) & 0x300); } static WRITE32_HANDLER( systemcontrol_w ) @@ -113,9 +113,9 @@ static WRITE32_HANDLER( systemcontrol_w ) coin_counter_w(0, data & coin_counter_bit); set_led_status(0, data & 1); - EEPROM_write_bit(data & 0x08); - EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x08); + eeprom_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); // bit 0x100 and 0x040 ? } diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c index 6548e073749..ba1cc8b0fbd 100644 --- a/src/mame/drivers/eolith16.c +++ b/src/mame/drivers/eolith16.c @@ -19,7 +19,7 @@ static UINT16 *vram; static int vbuffer = 0; // It's configured for 512 bytes -static const struct EEPROM_interface eeprom_interface_93C66 = +static const eeprom_interface eeprom_interface_93C66 = { 9, // address bits 9 8, // data bits 8 @@ -35,9 +35,9 @@ static WRITE16_HANDLER( eeprom_w ) vbuffer = (data & 0x80) >> 7; coin_counter_w(0, data & 1); - EEPROM_write_bit(data & 0x40); - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x40); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); //data & 0x100 and data & 0x004 always set } @@ -45,7 +45,7 @@ static WRITE16_HANDLER( eeprom_w ) static READ16_HANDLER( eolith16_custom_r ) { eolith_speedup_read(); - return (input_port_read_indexed(machine, 0) & ~0x10) | (EEPROM_read_bit() << 4); + return (input_port_read_indexed(machine, 0) & ~0x10) | (eeprom_read_bit() << 4); } @@ -129,11 +129,11 @@ static VIDEO_UPDATE( eolith16 ) static NVRAM_HANDLER( eolith16_eeprom ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C66); - if (file) EEPROM_load(file); + eeprom_init(&eeprom_interface_93C66); + if (file) eeprom_load(file); } } diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 3e00dd99751..91370c7cf6f 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -131,7 +131,7 @@ static READ16_HANDLER( esd_eeprom_r ) { if (ACCESSING_BITS_8_15) { - return ((EEPROM_read_bit() & 0x01) << 15); + return ((eeprom_read_bit() & 0x01) << 15); } // logerror("(0x%06x) unk EEPROM read: %04x\n", activecpu_get_pc(), mem_mask); @@ -143,13 +143,13 @@ static WRITE16_HANDLER( esd_eeprom_w ) if (ACCESSING_BITS_8_15) { // data line - EEPROM_write_bit((data & 0x0400) >> 6); + eeprom_write_bit((data & 0x0400) >> 6); // clock line asserted. - EEPROM_set_clock_line((data & 0x0200) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x0200) ? ASSERT_LINE : CLEAR_LINE ); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x0100) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x0100) ? CLEAR_LINE : ASSERT_LINE ); } // logerror("(0x%06x) Unk EEPROM write: %04x %04x\n", activecpu_get_pc(), data, mem_mask); diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index 20ef690f7ad..f84602b95d3 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -45,22 +45,22 @@ static WRITE32_HANDLER( ym2151_register_32bit_w ) static READ32_HANDLER( eeprom_r ) { - return EEPROM_read_bit(); + return eeprom_read_bit(); } static WRITE32_HANDLER( eeprom_bit_w ) { - EEPROM_write_bit(data & 0x01); + eeprom_write_bit(data & 0x01); } static WRITE32_HANDLER( eeprom_cs_line_w ) { - EEPROM_set_cs_line( (data & 0x01) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line( (data & 0x01) ? CLEAR_LINE : ASSERT_LINE ); } static WRITE32_HANDLER( eeprom_clock_line_w ) { - EEPROM_set_clock_line( (~data & 0x01) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line( (~data & 0x01) ? ASSERT_LINE : CLEAR_LINE ); } diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index 53cd013ed45..dfb3a1ec361 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -174,7 +174,7 @@ static READ16_HANDLER( fromanc2_input_r ) cflag = (((fromanc2_subcpu_int_flag & 1) << 4) | ((fromanc2_subcpu_nmi_flag & 1) << 6) | ((fromanc2_sndcpu_nmi_flag & 1) << 5)); - eeprom = (EEPROM_read_bit() & 1) << 7; // EEPROM DATA + eeprom = (eeprom_read_bit() & 1) << 7; // EEPROM DATA coinsw = input_port_read_indexed(machine, 0) & 0x030f; // COIN, TEST return (cflag | eeprom | coinsw); @@ -185,7 +185,7 @@ static READ16_HANDLER( fromanc4_input_r ) UINT16 cflag, coinsw, eeprom; cflag = (fromanc2_sndcpu_nmi_flag & 1) << 5; - eeprom = (EEPROM_read_bit() & 1) << 7; // EEPROM DATA + eeprom = (eeprom_read_bit() & 1) << 7; // EEPROM DATA coinsw = input_port_read_indexed(machine, 0) & 0x001f; // COIN, TEST return (cflag | eeprom | coinsw); @@ -195,13 +195,13 @@ static WRITE16_HANDLER( fromanc2_eeprom_w ) { if (ACCESSING_BITS_8_15) { // latch the bit - EEPROM_write_bit(data & 0x0100); + eeprom_write_bit(data & 0x0100); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x0400) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x0400) ? CLEAR_LINE : ASSERT_LINE); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x0200) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_clock_line((data & 0x0200) ? ASSERT_LINE : CLEAR_LINE); } } @@ -211,13 +211,13 @@ static WRITE16_HANDLER( fromancr_eeprom_w ) fromancr_gfxbank_w(data & 0xfff8); // latch the bit - EEPROM_write_bit(data & 0x0001); + eeprom_write_bit(data & 0x0001); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x0004) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x0004) ? CLEAR_LINE : ASSERT_LINE); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x0002) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_clock_line((data & 0x0002) ? ASSERT_LINE : CLEAR_LINE); } } @@ -225,13 +225,13 @@ static WRITE16_HANDLER( fromanc4_eeprom_w ) { if (ACCESSING_BITS_0_7) { // latch the bit - EEPROM_write_bit(data & 0x0004); + eeprom_write_bit(data & 0x0004); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x0001) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x0001) ? CLEAR_LINE : ASSERT_LINE); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x0002) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_clock_line((data & 0x0002) ? ASSERT_LINE : CLEAR_LINE); } } diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index ed31c980be8..6c886b51657 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -264,7 +264,7 @@ static WRITE16_HANDLER( irq_ack_w ) static READ16_HANDLER( eeprom_data_r ) { UINT16 result = 0xffff; - if (EEPROM_read_bit()) + if (eeprom_read_bit()) result ^= 0x0004; logerror("eeprom_data_r(%02X)\n", result); return result; @@ -274,21 +274,21 @@ static READ16_HANDLER( eeprom_data_r ) static WRITE16_HANDLER( eeprom_data_w ) { if (ACCESSING_BITS_0_7) - EEPROM_write_bit(data & 0x01); + eeprom_write_bit(data & 0x01); } static WRITE16_HANDLER( eeprom_clock_w ) { if (ACCESSING_BITS_0_7) - EEPROM_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); } static WRITE16_HANDLER( eeprom_cs_w ) { if (ACCESSING_BITS_0_7) - EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index 0ad02aa85b2..f20130943d2 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -38,7 +38,7 @@ To Do: static UINT16 eeprom_word; static READ16_HANDLER(galpani2_eeprom_r) { - return (eeprom_word & ~1) | (EEPROM_read_bit() & 1); + return (eeprom_word & ~1) | (eeprom_read_bit() & 1); } static WRITE16_HANDLER(galpani2_eeprom_w) @@ -47,13 +47,13 @@ static WRITE16_HANDLER(galpani2_eeprom_w) if ( ACCESSING_BITS_0_7 ) { // latch the bit - EEPROM_write_bit(data & 0x02); + eeprom_write_bit(data & 0x02); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x08) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x08) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE ); } } diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index 3cb4807dd96..0e723ac5dec 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -52,7 +52,7 @@ static UINT16 cur_control2; static int init_eeprom_count; static emu_timer *dmadelay_timer; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -66,7 +66,7 @@ static const struct EEPROM_interface eeprom_interface = #if 0 static void eeprom_init(void) { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); init_eeprom_count = 0; } #endif @@ -74,15 +74,15 @@ static void eeprom_init(void) static NVRAM_HANDLER( gijoe ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 2720; @@ -96,7 +96,7 @@ static READ16_HANDLER( control1_r ) /* bit 8 is EEPROM data */ /* bit 9 is EEPROM ready */ /* bit 11 is service button */ - res = (EEPROM_read_bit()<<8) | input_port_read_indexed(machine,0); + res = (eeprom_read_bit()<<8) | input_port_read_indexed(machine,0); if (init_eeprom_count) { @@ -122,9 +122,9 @@ static WRITE16_HANDLER( control2_w ) /* bit 5 is enable irq 6 */ /* bit 7 (unknown: enable irq 5?) */ - EEPROM_write_bit(data & 0x01); - EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x01); + eeprom_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); cur_control2 = data; /* bit 6 = enable sprite ROM reading */ diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c index dcbbc9b1de8..6dffaa1f808 100644 --- a/src/mame/drivers/groundfx.c +++ b/src/mame/drivers/groundfx.c @@ -127,7 +127,7 @@ static const UINT8 default_eeprom[128]= 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff }; -static const struct EEPROM_interface groundfx_eeprom_interface = +static const eeprom_interface groundfx_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -141,13 +141,13 @@ static const struct EEPROM_interface groundfx_eeprom_interface = static NVRAM_HANDLER( groundfx ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&groundfx_eeprom_interface); + eeprom_init(&groundfx_eeprom_interface); if (file) - EEPROM_load(file); + eeprom_load(file); else - EEPROM_set_data(default_eeprom,128); /* Default the gun setup values */ + eeprom_set_data(default_eeprom,128); /* Default the gun setup values */ } } @@ -164,7 +164,7 @@ static READ32_HANDLER( groundfx_input_r ) case 0x00: { return (input_port_read_indexed(machine,0) << 16) | input_port_read_indexed(machine,1) | - (EEPROM_read_bit() << 7) | frame_counter; + (eeprom_read_bit() << 7) | frame_counter; } case 0x01: @@ -189,9 +189,9 @@ static WRITE32_HANDLER( groundfx_input_w ) if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x40); - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x40); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); return; } diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 2174bc3dfb9..b7c9b5c27cc 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -138,7 +138,7 @@ static VIDEO_UPDATE( hangplt ) /******************************************************************/ /* 93C56 EEPROM */ -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 8, /* address bits */ 16, /* data bits */ @@ -157,15 +157,15 @@ static void eeprom_handler(mame_file *file, int read_or_write) { if (file) { - EEPROM_save(file); + eeprom_save(file); } } else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { - EEPROM_load(file); + eeprom_load(file); } else { @@ -180,7 +180,7 @@ static void eeprom_handler(mame_file *file, int read_or_write) eepdata[0x5] = 0x72; } - EEPROM_set_data(eepdata, 0x200); + eeprom_set_data(eepdata, 0x200); } } } @@ -311,7 +311,7 @@ static READ32_HANDLER( sysreg_r ) // a = ADC readout // e = EEPROM data out - UINT32 eeprom_bit = (EEPROM_read_bit() << 1); + UINT32 eeprom_bit = (eeprom_read_bit() << 1); UINT32 adc_bit = (adc1038_do_r() << 2); r |= (eeprom_bit | adc_bit) << 24; } @@ -338,9 +338,9 @@ static WRITE32_HANDLER( sysreg_w ) } if( ACCESSING_BITS_0_7 ) { - EEPROM_write_bit((data & 0x01) ? 1 : 0); - EEPROM_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit((data & 0x01) ? 1 : 0); + eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE); } } if( offset == 1 ) diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c index db14c3dc634..9f6b0608462 100644 --- a/src/mame/drivers/gunbustr.c +++ b/src/mame/drivers/gunbustr.c @@ -92,7 +92,7 @@ static READ32_HANDLER( gunbustr_input_r ) case 0x00: { return (input_port_read_indexed(machine,0) << 16) | input_port_read_indexed(machine,1) | - (EEPROM_read_bit() << 7); + (eeprom_read_bit() << 7); } case 0x01: @@ -130,9 +130,9 @@ popmessage(t); if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x40); - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x40); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); return; } return; @@ -347,7 +347,7 @@ static const UINT8 default_eeprom[128]={ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff }; -static const struct EEPROM_interface gunbustr_eeprom_interface = +static const eeprom_interface gunbustr_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -361,13 +361,13 @@ static const struct EEPROM_interface gunbustr_eeprom_interface = static NVRAM_HANDLER( gunbustr ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&gunbustr_eeprom_interface); + eeprom_init(&gunbustr_eeprom_interface); if (file) - EEPROM_load(file); + eeprom_load(file); else - EEPROM_set_data(default_eeprom,128); /* Default the gun setup values */ + eeprom_set_data(default_eeprom,128); /* Default the gun setup values */ } } diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 77afdd43ae1..5d0b94f77c4 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -157,7 +157,7 @@ static READ16_HANDLER( inufuku_eeprom_r ) UINT16 inputport; soundflag = pending_command ? 0x0000 : 0x0080; // bit7 - eeprom = (EEPROM_read_bit() & 1) << 6; // bit6 + eeprom = (eeprom_read_bit() & 1) << 6; // bit6 inputport = input_port_read_indexed(machine, 4) & 0xff3f; // bit5-0 return (soundflag | eeprom | inputport); @@ -166,13 +166,13 @@ static READ16_HANDLER( inufuku_eeprom_r ) static WRITE16_HANDLER( inufuku_eeprom_w ) { // latch the bit - EEPROM_write_bit(data & 0x0800); + eeprom_write_bit(data & 0x0800); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x2000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x2000) ? CLEAR_LINE : ASSERT_LINE); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x1000) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_clock_line((data & 0x1000) ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index ee1b1c4d141..4280a88b07c 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -320,13 +320,13 @@ static WRITE16_HANDLER( kaneko16_YM2149_1_w ) static READ8_HANDLER( kaneko16_eeprom_r ) { - return EEPROM_read_bit() & 1; + return eeprom_read_bit() & 1; } static WRITE8_HANDLER( kaneko16_eeprom_reset_w ) { // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE ); } static WRITE16_HANDLER( kaneko16_eeprom_w ) @@ -334,13 +334,13 @@ static WRITE16_HANDLER( kaneko16_eeprom_w ) if (ACCESSING_BITS_0_7) { // latch the bit - EEPROM_write_bit(data & 0x02); + eeprom_write_bit(data & 0x02); // reset line asserted: reset. -// EEPROM_set_cs_line((data & 0x00) ? CLEAR_LINE : ASSERT_LINE ); +// eeprom_set_cs_line((data & 0x00) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE ); } if (ACCESSING_BITS_8_15) diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index 1d9140a3955..a555032a9d7 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -447,16 +447,16 @@ static const UINT8 kickgoal_default_eeprom_type1[128] = { static NVRAM_HANDLER( kickgoal ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); - if (file) EEPROM_load(file); + if (file) eeprom_load(file); else { if (kickgoal_default_eeprom) /* Sane Defaults */ - EEPROM_set_data(kickgoal_default_eeprom,kickgoal_default_eeprom_length); + eeprom_set_data(kickgoal_default_eeprom,kickgoal_default_eeprom_length); } } } @@ -467,7 +467,7 @@ static READ16_HANDLER( kickgoal_eeprom_r ) { if (ACCESSING_BITS_0_7) { - return EEPROM_read_bit(); + return eeprom_read_bit(); } return 0; } @@ -480,13 +480,13 @@ static WRITE16_HANDLER( kickgoal_eeprom_w ) switch (offset) { case 0: - EEPROM_set_cs_line((data & 0x0001) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x0001) ? CLEAR_LINE : ASSERT_LINE); break; case 1: - EEPROM_set_clock_line((data & 0x0001) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_clock_line((data & 0x0001) ? ASSERT_LINE : CLEAR_LINE); break; case 2: - EEPROM_write_bit(data & 0x0001); + eeprom_write_bit(data & 0x0001); break; } } diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index 97dc02f40cc..634dd8f4062 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -107,14 +107,14 @@ static NVRAM_HANDLER( konamigq_93C46 ) { if( read_or_write ) { - EEPROM_save( file ); + eeprom_save( file ); } else { - EEPROM_init( &eeprom_interface_93C46 ); + eeprom_init( &eeprom_interface_93C46 ); if( file ) { - EEPROM_load( file ); + eeprom_load( file ); } else { @@ -130,24 +130,19 @@ static NVRAM_HANDLER( konamigq_93C46 ) 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, }; - EEPROM_set_data( def_eeprom, 128 ); + eeprom_set_data( def_eeprom, 128 ); } } } static WRITE32_HANDLER( eeprom_w ) { - EEPROM_write_bit( ( data & 0x01 ) ? 1 : 0 ); - EEPROM_set_clock_line( ( data & 0x04 ) ? ASSERT_LINE : CLEAR_LINE ); - EEPROM_set_cs_line( ( data & 0x02 ) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_write_bit( ( data & 0x01 ) ? 1 : 0 ); + eeprom_set_clock_line( ( data & 0x04 ) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_cs_line( ( data & 0x02 ) ? CLEAR_LINE : ASSERT_LINE ); cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ( data & 0x40 ) ? CLEAR_LINE : ASSERT_LINE ); } -static CUSTOM_INPUT( eeprom_bit_r ) -{ - return EEPROM_read_bit(); -} - /* PCM RAM */ static UINT8 *m_p_n_pcmram; diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index 1af43d8d4b6..6d046fd15b5 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -138,33 +138,28 @@ static NVRAM_HANDLER( konamigv_93C46 ) { if( read_or_write ) { - EEPROM_save( file ); + eeprom_save( file ); } else { - EEPROM_init( &eeprom_interface_93C46 ); + eeprom_init( &eeprom_interface_93C46 ); if( file ) { - EEPROM_load( file ); + eeprom_load( file ); } else { - EEPROM_set_data( memory_region( REGION_USER2 ), memory_region_length( REGION_USER2 ) ); + eeprom_set_data( memory_region( REGION_USER2 ), memory_region_length( REGION_USER2 ) ); } } } -static CUSTOM_INPUT( eeprom_bit_r ) -{ - return EEPROM_read_bit(); -} - static WRITE32_HANDLER( eeprom_w ) { - EEPROM_write_bit((data&0x01) ? 1 : 0); - EEPROM_set_clock_line((data&0x04) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data&0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit((data&0x01) ? 1 : 0); + eeprom_set_clock_line((data&0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data&0x02) ? CLEAR_LINE : ASSERT_LINE); } static WRITE32_HANDLER( mb89371_w ) diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 4563eeaf10c..2682ba89dfa 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -465,15 +465,15 @@ static int init_eeprom_count; static NVRAM_HANDLER(konamigx_93C46) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -489,7 +489,7 @@ static READ32_HANDLER( eeprom_r ) // excpuint stat, objdma stat, eeprom do // note: racin' force expects bit 1 of the eeprom port to toggle - return(input_port_read_indexed(machine, 6)<<24 | input_port_read_indexed(machine, 7)<<16 | input_port_read_indexed(machine, 0)<<8 | EEPROM_read_bit() | gx_rdport1_3); + return(input_port_read_indexed(machine, 6)<<24 | input_port_read_indexed(machine, 7)<<16 | input_port_read_indexed(machine, 0)<<8 | eeprom_read_bit() | gx_rdport1_3); } static WRITE32_HANDLER( eeprom_w ) @@ -510,9 +510,9 @@ static WRITE32_HANDLER( eeprom_w ) bit 0: eeprom data */ - EEPROM_write_bit((odata&0x01) ? 1 : 0); - EEPROM_set_cs_line((odata&0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((odata&0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit((odata&0x01) ? 1 : 0); + eeprom_set_cs_line((odata&0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((odata&0x04) ? ASSERT_LINE : CLEAR_LINE); konamigx_wrport1_0 = odata; } diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c index 76be1245ff1..4ac931bbdab 100644 --- a/src/mame/drivers/leland.c +++ b/src/mame/drivers/leland.c @@ -122,7 +122,7 @@ ADDRESS_MAP_END /* Helps document the input ports. */ #define IPT_SLAVEHALT IPT_SPECIAL -#define IPT_EEPROM_DATA IPT_SPECIAL +#define IPT_eeprom_DATA IPT_SPECIAL static INPUT_PORTS_START( cerberus ) /* complete, verified from code */ @@ -144,7 +144,7 @@ static INPUT_PORTS_START( cerberus ) /* complete, verified from code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_START /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1) @@ -190,7 +190,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 /* 0xD1 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -223,7 +223,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 /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1) @@ -261,7 +261,7 @@ static INPUT_PORTS_START( alleymas ) /* complete, verified from code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* redundant inputs */ PORT_START /* 0xD1 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1) @@ -297,7 +297,7 @@ static INPUT_PORTS_START( upyoural ) /* complete, verified from code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_START /* 0xD1 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1) @@ -332,7 +332,7 @@ static INPUT_PORTS_START( dangerz ) /* complete, verified from code */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -367,7 +367,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 /* 0x51/D1 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1) @@ -404,7 +404,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 /* 0xD1 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -442,7 +442,7 @@ static INPUT_PORTS_START( quarterb ) /* complete, verified in code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_START /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -484,7 +484,7 @@ static INPUT_PORTS_START( teamqb ) /* complete, verified in code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_START /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -542,7 +542,7 @@ static INPUT_PORTS_START( aafb2p ) /* complete, verified in code */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_START /* 0x91 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) @@ -597,7 +597,7 @@ static INPUT_PORTS_START( offroad ) /* complete, verified from code */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START /* 0xD1 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW ) @@ -647,7 +647,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 /* 0x51 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index 9dafb05f2b0..24f73e99a46 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -194,7 +194,7 @@ static const UINT8 lethalen_default_eeprom[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -208,20 +208,20 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( lethalen ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else { init_eeprom_count = 10; - EEPROM_set_data(lethalen_default_eeprom,48); + eeprom_set_data(lethalen_default_eeprom,48); } } @@ -229,7 +229,7 @@ static NVRAM_HANDLER( lethalen ) static READ8_HANDLER( control2_r ) { - return 0x02 | EEPROM_read_bit() | (input_port_read_indexed(machine, 1) & 0xf0); + return 0x02 | eeprom_read_bit() | (input_port_read_indexed(machine, 1) & 0xf0); } static WRITE8_HANDLER( control2_w ) @@ -244,9 +244,9 @@ static WRITE8_HANDLER( control2_w ) cur_control2 = data; - EEPROM_write_bit(cur_control2 & 0x01); - EEPROM_set_cs_line((cur_control2 & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((cur_control2 & 0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(cur_control2 & 0x01); + eeprom_set_cs_line((cur_control2 & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((cur_control2 & 0x04) ? ASSERT_LINE : CLEAR_LINE); } static INTERRUPT_GEN(lethalen_interrupt) diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index 0d9c0d72815..10be08a707e 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -38,16 +38,16 @@ static UINT32 *mainram; static READ32_HANDLER( port2_r ) { - return (EEPROM_read_bit() << 23) | (input_port_read_indexed(machine, 2) & ~(1<<23)); + return (eeprom_read_bit() << 23) | (input_port_read_indexed(machine, 2) & ~(1<<23)); } static WRITE32_HANDLER( eeprom_w ) { // data & 0x80000 -> video disabled? - EEPROM_write_bit(data & 0x40000); - EEPROM_set_cs_line((data & 0x10000) ? CLEAR_LINE : ASSERT_LINE ); - EEPROM_set_clock_line((data & 0x20000) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_write_bit(data & 0x40000); + eeprom_set_cs_line((data & 0x10000) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_clock_line((data & 0x20000) ? ASSERT_LINE : CLEAR_LINE ); } static WRITE32_HANDLER( limenko_coincounter_w ) diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index cb42824017a..a53c076a3d5 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -110,7 +110,7 @@ static WRITE8_HANDLER(fake2_w) static READ8_HANDLER( lordgun_eeprom_r ) { - return input_port_read_indexed(machine, 0) | ((EEPROM_read_bit() & 1) << 7); + return input_port_read_indexed(machine, 0) | ((eeprom_read_bit() & 1) << 7); } static WRITE8_HANDLER( lordgun_eeprom_w ) @@ -132,13 +132,13 @@ static WRITE8_HANDLER( lordgun_eeprom_w ) lordgun_update_gun(machine, i); // latch the bit - EEPROM_write_bit(data & 0x40); + eeprom_write_bit(data & 0x40); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE ); lordgun_whitescreen = data & 0x80; diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 21a966ea552..5cb5980bc2e 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -1423,7 +1423,7 @@ static READ16_HANDLER( gakusai_input_r ) static READ16_HANDLER( gakusai_eeprom_r ) { - return EEPROM_read_bit() & 1; + return eeprom_read_bit() & 1; } static WRITE16_HANDLER( gakusai_eeprom_w ) @@ -1431,13 +1431,13 @@ static WRITE16_HANDLER( gakusai_eeprom_w ) if (ACCESSING_BITS_0_7) { // latch the bit - EEPROM_write_bit(data & 0x01); + eeprom_write_bit(data & 0x01); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); } } @@ -1552,10 +1552,10 @@ ADDRESS_MAP_END static READ16_HANDLER( dokyusp_eeprom_r ) { // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line(CLEAR_LINE); - EEPROM_set_clock_line(ASSERT_LINE); + eeprom_set_clock_line(CLEAR_LINE); + eeprom_set_clock_line(ASSERT_LINE); - return EEPROM_read_bit() & 1; + return eeprom_read_bit() & 1; } static WRITE16_HANDLER( dokyusp_eeprom_bit_w ) @@ -1563,11 +1563,11 @@ static WRITE16_HANDLER( dokyusp_eeprom_bit_w ) if (ACCESSING_BITS_0_7) { // latch the bit - EEPROM_write_bit(data & 0x01); + eeprom_write_bit(data & 0x01); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line(CLEAR_LINE); - EEPROM_set_clock_line(ASSERT_LINE); + eeprom_set_clock_line(CLEAR_LINE); + eeprom_set_clock_line(ASSERT_LINE); } } @@ -1576,7 +1576,7 @@ static WRITE16_HANDLER( dokyusp_eeprom_reset_w ) if (ACCESSING_BITS_0_7) { // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE); } } @@ -4192,12 +4192,12 @@ static NVRAM_HANDLER( dokyusp ) static const UINT8 def_data[] = {0x00,0xe0}; if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); - if (file) EEPROM_load(file); - else EEPROM_set_data(def_data,sizeof(def_data)/sizeof(def_data[0])); + eeprom_init(&eeprom_interface_93C46); + if (file) eeprom_load(file); + else eeprom_set_data(def_data,sizeof(def_data)/sizeof(def_data[0])); } } diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index e1a1522ae05..73f6b7cb33c 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -180,7 +180,7 @@ static VIDEO_UPDATE( livequiz ) static READ16_HANDLER( livequiz_eeprom_r ) { - return input_port_read_indexed(machine, 2) | (EEPROM_read_bit() << 3); + return input_port_read_indexed(machine, 2) | (eeprom_read_bit() << 3); } static WRITE16_HANDLER( livequiz_eeprom_w ) @@ -188,13 +188,13 @@ static WRITE16_HANDLER( livequiz_eeprom_w ) if (ACCESSING_BITS_0_7) { // latch the bit - EEPROM_write_bit(data & 0x04); + eeprom_write_bit(data & 0x04); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); } } diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 4fd17770827..5cacd296589 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -139,7 +139,7 @@ static WRITE8_HANDLER( pang_bankswitch_w ) ***************************************************************************/ -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -156,18 +156,18 @@ static NVRAM_HANDLER( mitchell ) { if (read_or_write) { - EEPROM_save(file); /* EEPROM */ + eeprom_save(file); /* EEPROM */ if (nvram_size) /* Super Pang, Block Block */ mame_fwrite(file,nvram,nvram_size); /* NVRAM */ } else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); /* EEPROM */ + eeprom_load(file); /* EEPROM */ if (nvram_size) /* Super Pang, Block Block */ mame_fread(file,nvram,nvram_size); /* NVRAM */ } @@ -180,7 +180,7 @@ static READ8_HANDLER( pang_port5_r ) { int bit; - bit = EEPROM_read_bit() << 7; + bit = eeprom_read_bit() << 7; /* bits 0 and (sometimes) 3 are checked in the interrupt handler. */ /* Maybe they are vblank related, but I'm not sure. */ @@ -198,17 +198,17 @@ static READ8_HANDLER( pang_port5_r ) static WRITE8_HANDLER( eeprom_cs_w ) { - EEPROM_set_cs_line(data ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line(data ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_HANDLER( eeprom_clock_w ) { - EEPROM_set_clock_line(data ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line(data ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_HANDLER( eeprom_serial_w ) { - EEPROM_write_bit(data); + eeprom_write_bit(data); } diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 72fe1a4c26f..3811562e17b 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -425,9 +425,9 @@ static WRITE32_HANDLER(ctrl0_w) { if(ACCESSING_BITS_0_7) { model2_ctrlmode = data & 0x01; - EEPROM_write_bit(data & 0x20); - EEPROM_set_clock_line((data & 0x80) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit(data & 0x20); + eeprom_set_clock_line((data & 0x80) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); } } @@ -442,7 +442,7 @@ static READ32_HANDLER(ctrl0_r) else { ret &= ~0x00300000; - return ret | 0x00100000 | (EEPROM_read_bit() << 21); + return ret | 0x00100000 | (eeprom_read_bit() << 21); } } static READ32_HANDLER(ctrl1_r) diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 6780a58a17b..84b6066f722 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -917,7 +917,7 @@ static void real3d_dma_callback(UINT32 src, UINT32 dst, int length, int byteswap /*****************************************************************************/ /* this is a 93C46 but with reset delay that is needed by Lost World */ -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -933,11 +933,11 @@ static const struct EEPROM_interface eeprom_interface = static void eeprom_handler(mame_file *file,int read_or_write) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); - if (file) EEPROM_load(file); + eeprom_init(&eeprom_intf); + if (file) eeprom_load(file); } } @@ -1057,7 +1057,7 @@ static READ64_HANDLER( model3_ctrl_r ) else if (ACCESSING_BITS_24_31) { if(model3_controls_bank & 0x1) { - eeprom_bit = EEPROM_read_bit() << 5; + eeprom_bit = eeprom_read_bit() << 5; return ((input_port_read_indexed(machine, 1) & ~0x20) | eeprom_bit) << 24; } else { @@ -1127,9 +1127,9 @@ static WRITE64_HANDLER( model3_ctrl_w ) if (ACCESSING_BITS_56_63) { int reg = (data >> 56) & 0xff; - EEPROM_write_bit((reg & 0x20) ? 1 : 0); - EEPROM_set_clock_line((reg & 0x80) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((reg & 0x40) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit((reg & 0x20) ? 1 : 0); + eeprom_set_clock_line((reg & 0x80) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((reg & 0x40) ? CLEAR_LINE : ASSERT_LINE); model3_controls_bank = reg & 0xff; } return; diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index cb832158480..619d6c5ef91 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -60,7 +60,7 @@ static UINT16 protram[16]; static UINT16 cur_control2; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -74,15 +74,15 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( moo ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -97,7 +97,7 @@ static READ16_HANDLER( control1_r ) /* bit 1 is EEPROM ready */ /* bit 3 is service button */ /* bits 4-7 are DIP switches */ - res = EEPROM_read_bit() | input_port_read_indexed(machine, 1); + res = eeprom_read_bit() | input_port_read_indexed(machine, 1); if (init_eeprom_count) { @@ -125,9 +125,9 @@ static WRITE16_HANDLER( control2_w ) COMBINE_DATA(&cur_control2); - EEPROM_write_bit(cur_control2 & 0x01); - EEPROM_set_cs_line((cur_control2 & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((cur_control2 & 0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(cur_control2 & 0x01); + eeprom_set_cs_line((cur_control2 & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((cur_control2 & 0x04) ? ASSERT_LINE : CLEAR_LINE); if (data & 0x100) { diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index bd18c9227ad..7c6896103ad 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -55,7 +55,7 @@ static UINT16 *gx_workram; static INT32 init_eeprom_count; static UINT8 mw_irq_control; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -68,7 +68,7 @@ static const struct EEPROM_interface eeprom_interface = /* Gaiapolis and Polygonet Commanders use the ER5911, but the command formats are slightly different. Why? */ -static const struct EEPROM_interface eeprom_interface_gaia = +static const eeprom_interface eeprom_intf_gaia = { 7, /* address bits */ 8, /* data bits */ @@ -82,15 +82,15 @@ static const struct EEPROM_interface eeprom_interface_gaia = static NVRAM_HANDLER(mystwarr) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -100,15 +100,15 @@ static NVRAM_HANDLER(mystwarr) static NVRAM_HANDLER(gaiapols) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_gaia); + eeprom_init(&eeprom_intf_gaia); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -119,7 +119,7 @@ static READ16_HANDLER( mweeprom_r ) { if (ACCESSING_BITS_0_7) { - int res = input_port_read_indexed(machine, 1) | EEPROM_read_bit(); + int res = input_port_read_indexed(machine, 1) | eeprom_read_bit(); if (init_eeprom_count) { @@ -139,7 +139,7 @@ static READ16_HANDLER( vseeprom_r ) { if (ACCESSING_BITS_0_7) { - int res = input_port_read_indexed(machine, 1) | EEPROM_read_bit(); + int res = input_port_read_indexed(machine, 1) | eeprom_read_bit(); if (init_eeprom_count) { @@ -159,9 +159,9 @@ static WRITE16_HANDLER( mweeprom_w ) { if (ACCESSING_BITS_8_15) { - EEPROM_write_bit((data&0x0100) ? 1 : 0); - EEPROM_set_cs_line((data&0x0200) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data&0x0400) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit((data&0x0100) ? 1 : 0); + eeprom_set_cs_line((data&0x0200) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data&0x0400) ? ASSERT_LINE : CLEAR_LINE); return; } @@ -173,7 +173,7 @@ static READ16_HANDLER( dddeeprom_r ) { if (ACCESSING_BITS_8_15) { - return (input_port_read_indexed(machine, 1) | EEPROM_read_bit())<<8; + return (input_port_read_indexed(machine, 1) | eeprom_read_bit())<<8; } return input_port_read_indexed(machine, 3); @@ -183,9 +183,9 @@ static WRITE16_HANDLER( mmeeprom_w ) { if (ACCESSING_BITS_0_7) { - EEPROM_write_bit((data&0x01) ? 1 : 0); - EEPROM_set_cs_line((data&0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data&0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit((data&0x01) ? 1 : 0); + eeprom_set_cs_line((data&0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data&0x04) ? ASSERT_LINE : CLEAR_LINE); return; } } diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 651058ccf39..f76d3061752 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -601,7 +601,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_default_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(NAMCOS2_68K_MASTER_RAM_R) AM_WRITE(NAMCOS2_68K_MASTER_RAM_W) - AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W) + AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_eeprom_R) AM_WRITE(NAMCOS2_68K_eeprom_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END @@ -619,7 +619,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_finallap_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(NAMCOS2_68K_MASTER_RAM_R) AM_WRITE(NAMCOS2_68K_MASTER_RAM_W) - AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W) + AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_eeprom_R) AM_WRITE(NAMCOS2_68K_eeprom_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END @@ -641,7 +641,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_sgunner_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(NAMCOS2_68K_MASTER_RAM_R) AM_WRITE(NAMCOS2_68K_MASTER_RAM_W) - AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W) + AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_eeprom_R) AM_WRITE(NAMCOS2_68K_eeprom_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END @@ -664,7 +664,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(NAMCOS2_68K_MASTER_RAM_R) AM_WRITE(NAMCOS2_68K_MASTER_RAM_W) - AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W) + AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_eeprom_R) AM_WRITE(NAMCOS2_68K_eeprom_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END @@ -692,7 +692,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(NAMCOS2_68K_MASTER_RAM_R) AM_WRITE(NAMCOS2_68K_MASTER_RAM_W) - AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W) + AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_eeprom_R) AM_WRITE(NAMCOS2_68K_eeprom_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index dff93e39a76..268611f3ed9 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1087,7 +1087,7 @@ static READ16_HANDLER( NAMCO_C139_SCI_register_r ){ return 0; } static ADDRESS_MAP_START( namcos21_68k_master, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* private work RAM */ - AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size) + AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_eeprom_R) AM_WRITE(NAMCOS2_68K_eeprom_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END @@ -1333,7 +1333,7 @@ static WRITE16_HANDLER( winrun_dspcomram_control_w ) static ADDRESS_MAP_START( am_master_winrun, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* work RAM */ - AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size) + AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_eeprom_R) AM_WRITE(NAMCOS2_68K_eeprom_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) AM_RANGE(0x250000, 0x25ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE( &winrun_polydata ) AM_RANGE(0x260000, 0x26ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* unused? */ @@ -1448,7 +1448,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( driveyes_68k_master, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* private work RAM */ - AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size) + AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_eeprom_R) AM_WRITE(NAMCOS2_68K_eeprom_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index f50803a3a0b..6b75d150067 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -649,14 +649,14 @@ static NVRAM_HANDLER( naomi_eeproms ) static UINT8 eeprom_romboard[20+48] = {0x19,0x00,0xaa,0x55,0,0,0,0,0,0,0,0,0x69,0x79,0x68,0x6b,0x74,0x6d,0x68,0x6d}; if (read_or_write) - /*EEPROM_save(file)*/; + /*eeprom_save(file)*/; else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); /*if (file) - EEPROM_load(file); + eeprom_load(file); else*/ - EEPROM_set_data((UINT8 *)"\011\241 0000000000000000", 48); // 2*checksum 30*unknown 16*serial + eeprom_set_data((UINT8 *)"\011\241 0000000000000000", 48); // 2*checksum 30*unknown 16*serial x76f100_init( 0, eeprom_romboard ); memcpy(eeprom_romboard+20,"\241\011 0000000000000000",48); } @@ -667,7 +667,7 @@ static READ64_HANDLER( eeprom_93c46a_r ) int res; /* bit 3 is EEPROM data */ - res = EEPROM_read_bit() << 4; + res = eeprom_read_bit() << 4; return res; } @@ -676,9 +676,9 @@ static WRITE64_HANDLER( eeprom_93c46a_w ) /* bit 4 is data */ /* bit 2 is clock */ /* bit 5 is cs */ - EEPROM_write_bit(data & 0x8); - EEPROM_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x4) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x8); + eeprom_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x4) ? ASSERT_LINE : CLEAR_LINE); } static ADDRESS_MAP_START( naomi_map, ADDRESS_SPACE_PROGRAM, 64 ) diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index 7dd113f5038..44da9d868b7 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -323,7 +323,7 @@ static const UINT8 default_eeprom[128]= 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff }; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -337,21 +337,21 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( othunder ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) - EEPROM_load(file); + eeprom_load(file); else - EEPROM_set_data(default_eeprom,128); /* Default the gun setup values */ + eeprom_set_data(default_eeprom,128); /* Default the gun setup values */ } } static int eeprom_r(void) { - return (EEPROM_read_bit() & 0x01)<<7; + return (eeprom_read_bit() & 0x01)<<7; } @@ -378,9 +378,9 @@ static WRITE16_HANDLER( othunder_TC0220IOC_w ) if (data & 4) popmessage("OBPRI SET!"); - EEPROM_write_bit(data & 0x40); - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit(data & 0x40); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); break; default: diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index 3890dd194ce..155ace7eaea 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -97,7 +97,7 @@ static const UINT8 default_eeprom[128] = }; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -111,15 +111,15 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( overdriv ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) - EEPROM_load(file); + eeprom_load(file); else - EEPROM_set_data(default_eeprom,sizeof(default_eeprom)); + eeprom_set_data(default_eeprom,sizeof(default_eeprom)); } } @@ -129,7 +129,7 @@ static READ16_HANDLER( eeprom_r ) //logerror("%06x eeprom_r\n",activecpu_get_pc()); /* bit 6 is EEPROM data */ - res = (EEPROM_read_bit() << 6) | input_port_read_indexed(machine,0); + res = (eeprom_read_bit() << 6) | input_port_read_indexed(machine,0); return res; } @@ -142,9 +142,9 @@ static WRITE16_HANDLER( eeprom_w ) /* bit 0 is data */ /* bit 1 is clock (active high) */ /* bit 2 is cs (active low) */ - EEPROM_write_bit(data & 0x01); - EEPROM_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x01); + eeprom_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE); } } diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index a7af030f66c..97cfce2be35 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -200,7 +200,7 @@ static int sda_dir = 0; /* Static Variables */ #define CMOS_NVRAM_SIZE 0x2000 -#define EEPROM_NVRAM_SIZE 0x200 // 4k Bit +#define eeprom_NVRAM_SIZE 0x200 // 4k Bit /***************** @@ -1045,7 +1045,7 @@ static void peplus_init(void) i8051_set_eram_iaddr_callback(peplus_external_ram_iaddr); /* EEPROM is a X2404P 4K-bit Serial I2C Bus */ - i2cmem_init(0, I2CMEM_SLAVE_ADDRESS, 8, EEPROM_NVRAM_SIZE, NULL); + i2cmem_init(0, I2CMEM_SLAVE_ADDRESS, 8, eeprom_NVRAM_SIZE, NULL); /* default : no address to patch in program RAM to enable autohold feature */ autohold_addr = 0; diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c index 917444b68c3..7f082c0e4d3 100644 --- a/src/mame/drivers/pirates.c +++ b/src/mame/drivers/pirates.c @@ -103,7 +103,7 @@ VIDEO_UPDATE(pirates); -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -116,11 +116,11 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( pirates ) { - if (read_or_write) EEPROM_save(file); + if (read_or_write) eeprom_save(file); else { - EEPROM_init(&eeprom_interface); - if (file) EEPROM_load(file); + eeprom_init(&eeprom_intf); + if (file) eeprom_load(file); } } @@ -129,9 +129,9 @@ static WRITE16_HANDLER( pirates_out_w ) if (ACCESSING_BITS_0_7) { /* bits 0-2 control EEPROM */ - EEPROM_write_bit(data & 0x04); - EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x04); + eeprom_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE); /* bit 6 selects oki bank */ OKIM6295_set_bank_base(0, (data & 0x40) ? 0x40000 : 0x00000); @@ -170,7 +170,7 @@ static READ16_HANDLER( pirates_in1_r ) bit = 1; /* bit 4 is EEPROM data, bit 7 is protection */ - return input_port_read_indexed(machine,1) | (EEPROM_read_bit() << 4) | (bit << 7); + return input_port_read_indexed(machine,1) | (eeprom_read_bit() << 4) | (bit << 7); } diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index 1c78c5f5c9f..2f5e5dc2b69 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -97,7 +97,7 @@ static WRITE16_HANDLER( coinctrl_w ) ***************************************************************************/ -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -114,19 +114,19 @@ static NVRAM_HANDLER( wbeachvl ) { if (read_or_write) { - EEPROM_save(file); + eeprom_save(file); } else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) - EEPROM_load(file); + eeprom_load(file); else { UINT8 init[128]; memset(init,0,128); - EEPROM_set_data(init,128); + eeprom_set_data(init,128); } } } @@ -135,7 +135,7 @@ static READ16_HANDLER( wbeachvl_port0_r ) { int bit; - bit = EEPROM_read_bit() << 7; + bit = eeprom_read_bit() << 7; return (input_port_read_indexed(machine, 0) & 0x7f) | bit; } @@ -144,7 +144,7 @@ static READ16_HANDLER( hotmind_port2_r ) { int bit; - bit = EEPROM_read_bit() << 7; + bit = eeprom_read_bit() << 7; return (input_port_read_indexed(machine, 2) & 0x7f) | bit; } @@ -160,9 +160,9 @@ static WRITE16_HANDLER( wbeachvl_coin_eeprom_w ) coin_counter_w(3,data & 0x08); /* bits 5-7 control EEPROM */ - EEPROM_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_write_bit(data & 0x80); - EEPROM_set_clock_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit(data & 0x80); + eeprom_set_clock_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); } } @@ -172,9 +172,9 @@ static WRITE16_HANDLER( hotmind_coin_eeprom_w ) { coin_counter_w(0,data & 0x20); - EEPROM_set_cs_line((data & 1) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_write_bit(data & 4); - EEPROM_set_clock_line((data & 2) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_cs_line((data & 1) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit(data & 4); + eeprom_set_clock_line((data & 2) ? ASSERT_LINE : CLEAR_LINE ); } } diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index f2bf8705925..08ee6e184cd 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -70,7 +70,7 @@ static UINT16 *dsp56k_bank01_ram ; static UINT16 *dsp56k_bank02_ram ; static UINT16 *dsp56k_bank04_ram ; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -84,15 +84,15 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( polygonet ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -103,7 +103,7 @@ static READ32_HANDLER( polygonet_eeprom_r ) { if (ACCESSING_BITS_0_15) { - return 0x0200 | (EEPROM_read_bit()<<8); + return 0x0200 | (eeprom_read_bit()<<8); } else { @@ -122,9 +122,9 @@ static WRITE32_HANDLER( polygonet_eeprom_w ) { if (ACCESSING_BITS_24_31) { - EEPROM_write_bit((data & 0x01000000) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data & 0x02000000) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x04000000) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit((data & 0x01000000) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data & 0x02000000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x04000000) ? ASSERT_LINE : CLEAR_LINE); return; } diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index 7001d47e20e..e4b837350b4 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -124,7 +124,7 @@ CN1 standard DB15 VGA connector (15KHz) #include "machine/eeprom.h" -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -138,19 +138,19 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( pntnpuzl ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) - EEPROM_load(file); + eeprom_load(file); else { int length; UINT8 *dat; - dat = EEPROM_get_data_pointer(&length); + dat = eeprom_get_data_pointer(&length); memset(dat, 0, length); } } @@ -161,7 +161,7 @@ static UINT16 pntnpuzl_eeprom; static READ16_HANDLER( pntnpuzl_eeprom_r ) { /* bit 11 is EEPROM data */ - return (pntnpuzl_eeprom & 0xf4ff) | (EEPROM_read_bit()<<11) | (input_port_read_indexed(machine, 3) & 0x0300); + return (pntnpuzl_eeprom & 0xf4ff) | (eeprom_read_bit()<<11) | (input_port_read_indexed(machine, 3) & 0x0300); } static WRITE16_HANDLER( pntnpuzl_eeprom_w ) @@ -172,9 +172,9 @@ static WRITE16_HANDLER( pntnpuzl_eeprom_w ) /* bit 13 is clock (active high) */ /* bit 14 is cs (active high) */ - EEPROM_write_bit(data & 0x1000); - EEPROM_set_cs_line((data & 0x4000) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x2000) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x1000); + eeprom_set_cs_line((data & 0x4000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x2000) ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c index 94b4a7b2017..d4e062f6e00 100644 --- a/src/mame/drivers/policetr.c +++ b/src/mame/drivers/policetr.c @@ -147,7 +147,7 @@ static READ32_HANDLER( port0_r ) static READ32_HANDLER( port1_r ) { - return (input_port_read_indexed(machine, 1) << 16) | (EEPROM_read_bit() << 29); + return (input_port_read_indexed(machine, 1) << 16) | (eeprom_read_bit() << 29); } @@ -180,9 +180,9 @@ static WRITE32_HANDLER( control_w ) /* handle EEPROM I/O */ if (ACCESSING_BITS_16_23) { - EEPROM_write_bit(data & 0x00800000); - EEPROM_set_cs_line((data & 0x00200000) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x00400000) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x00800000); + eeprom_set_cs_line((data & 0x00200000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x00400000) ? ASSERT_LINE : CLEAR_LINE); } /* toggling BSMT off then on causes a reset */ @@ -269,7 +269,7 @@ static WRITE32_HANDLER( speedup_w ) * *************************************/ -static const struct EEPROM_interface eeprom_interface_policetr = +static const eeprom_interface eeprom_interface_policetr = { 8, // address bits 8 16, // data bits 16 @@ -284,11 +284,11 @@ static const struct EEPROM_interface eeprom_interface_policetr = static NVRAM_HANDLER( policetr ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_policetr); - if (file) EEPROM_load(file); + eeprom_init(&eeprom_interface_policetr); + if (file) eeprom_load(file); } } diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index df0e9933a89..45bf764c923 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -27,7 +27,7 @@ static int bg_yoffset; static int xoffset; static int yoffset; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -44,26 +44,26 @@ static NVRAM_HANDLER( magicstk ) { if (read_or_write) { - EEPROM_save(file); + eeprom_save(file); } else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) - EEPROM_load(file); + eeprom_load(file); else { UINT8 init[128]; memset(init,0,128); - EEPROM_set_data(init,128); + eeprom_set_data(init,128); } } } static READ16_HANDLER( magicstk_port2_r ) { - return (input_port_read_indexed(machine, 2) & 0xfe) | EEPROM_read_bit(); + return (input_port_read_indexed(machine, 2) & 0xfe) | eeprom_read_bit(); } static WRITE16_HANDLER( magicstk_coin_eeprom_w ) @@ -72,9 +72,9 @@ static WRITE16_HANDLER( magicstk_coin_eeprom_w ) { coin_counter_w(0,data & 0x20); - EEPROM_set_cs_line((data & 8) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_write_bit(data & 2); - EEPROM_set_clock_line((data & 4) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 8) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit(data & 2); + eeprom_set_clock_line((data & 4) ? CLEAR_LINE : ASSERT_LINE); } } diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 60f29e09e6f..b92be25257e 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -160,7 +160,7 @@ static GFXDECODE_START( ps4 ) GFXDECODE_ENTRY( REGION_GFX1, 0, layout_16x16x8, 0x000, 0x80 ) // 8bpp tiles GFXDECODE_END -static const struct EEPROM_interface eeprom_interface_93C56 = +static const eeprom_interface eeprom_interface_93C56 = { 8, // address bits 8 8, // data bits 8 @@ -177,21 +177,21 @@ static NVRAM_HANDLER(93C56) { if (read_or_write) { - EEPROM_save(file); + eeprom_save(file); } else { - EEPROM_init(&eeprom_interface_93C56); + eeprom_init(&eeprom_interface_93C56); if (file) { - EEPROM_load(file); + eeprom_load(file); } else // these games want the eeprom all zeros by default { int length; UINT8 *dat; - dat = EEPROM_get_data_pointer(&length); + dat = eeprom_get_data_pointer(&length); memset(dat, 0, length); } } @@ -201,9 +201,9 @@ static WRITE32_HANDLER( ps4_eeprom_w ) { if (ACCESSING_BITS_16_31) { - EEPROM_write_bit((data & 0x00200000) ? 1 : 0); - EEPROM_set_cs_line((data & 0x00800000) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x00400000) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit((data & 0x00200000) ? 1 : 0); + eeprom_set_cs_line((data & 0x00800000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x00400000) ? ASSERT_LINE : CLEAR_LINE); return; } @@ -215,7 +215,7 @@ static READ32_HANDLER( ps4_eeprom_r ) { if (ACCESSING_BITS_16_31) { - return ((EEPROM_read_bit() << 20)); /* EEPROM */ + return ((eeprom_read_bit() << 20)); /* EEPROM */ } // logerror("Unk EEPROM read mask %x\n", mem_mask); diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index e4dc8c12c19..2c5bb32622f 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -318,7 +318,7 @@ static GFXDECODE_START( psikyosh ) GFXDECODE_ENTRY( REGION_GFX1, 0, layout_16x16x8, 0x000, 0x100 ) // 8bpp tiles GFXDECODE_END -static const struct EEPROM_interface eeprom_interface_93C56 = +static const eeprom_interface eeprom_interface_93C56 = { 8, // address bits 8 8, // data bits 8 @@ -335,24 +335,24 @@ static NVRAM_HANDLER(93C56) { if (read_or_write) { - EEPROM_save(file); + eeprom_save(file); } else { - EEPROM_init(&eeprom_interface_93C56); + eeprom_init(&eeprom_interface_93C56); if (file) { - EEPROM_load(file); + eeprom_load(file); } else // these games want the eeprom all zeros by default { int length; UINT8 *dat; - dat = EEPROM_get_data_pointer(&length); + dat = eeprom_get_data_pointer(&length); memset(dat, 0, length); - if (use_factory_eeprom!=EEPROM_0) /* Set the EEPROM to Factory Defaults for games needing them*/ + if (use_factory_eeprom!=eeprom_0) /* Set the EEPROM to Factory Defaults for games needing them*/ { UINT8 eeprom_data[0x100]; int i; @@ -361,25 +361,25 @@ static NVRAM_HANDLER(93C56) memcpy(eeprom_data, factory_eeprom, 0x10); - if (use_factory_eeprom==EEPROM_DARAKU) /* Daraku, replace top 10 bytes with defaults (different to other games) */ + if (use_factory_eeprom==eeprom_DARAKU) /* Daraku, replace top 10 bytes with defaults (different to other games) */ memcpy(eeprom_data, daraku_eeprom, 0x10); - if (use_factory_eeprom==EEPROM_S1945III) /* S1945iii suffers from corruption on highscore unless properly initialised at the end of the eeprom */ + if (use_factory_eeprom==eeprom_S1945III) /* S1945iii suffers from corruption on highscore unless properly initialised at the end of the eeprom */ memcpy(eeprom_data+0xf0, s1945iii_eeprom, 0x10); - if (use_factory_eeprom==EEPROM_DRAGNBLZ) /* Dragnblz too */ + if (use_factory_eeprom==eeprom_DRAGNBLZ) /* Dragnblz too */ memcpy(eeprom_data+0xf0, dragnblz_eeprom, 0x10); - if (use_factory_eeprom==EEPROM_GNBARICH) /* Might as well do Gnbarich as well, otherwise the highscore is incorrect */ + if (use_factory_eeprom==eeprom_GNBARICH) /* Might as well do Gnbarich as well, otherwise the highscore is incorrect */ memcpy(eeprom_data+0xf0, gnbarich_eeprom, 0x10); - if (use_factory_eeprom==EEPROM_MJGTASTE) /* We don't emulate the Mahjong panel yet, so default it to joystick */ + if (use_factory_eeprom==eeprom_MJGTASTE) /* We don't emulate the Mahjong panel yet, so default it to joystick */ { memcpy(eeprom_data+0x00, mjgtaste_eeprom, 0x10); memcpy(eeprom_data+0xf0, mjgtaste_eeprom, 0x10); } - EEPROM_set_data(eeprom_data,0x100); + eeprom_set_data(eeprom_data,0x100); } } } @@ -389,9 +389,9 @@ static WRITE32_HANDLER( psh_eeprom_w ) { if (ACCESSING_BITS_24_31) { - EEPROM_write_bit((data & 0x20000000) ? 1 : 0); - EEPROM_set_cs_line((data & 0x80000000) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x40000000) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit((data & 0x20000000) ? 1 : 0); + eeprom_set_cs_line((data & 0x80000000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x40000000) ? ASSERT_LINE : CLEAR_LINE); return; } @@ -403,7 +403,7 @@ static READ32_HANDLER( psh_eeprom_r ) { if (ACCESSING_BITS_24_31) { - return ((EEPROM_read_bit() << 28) | (input_port_read_indexed(machine, 4) << 24)); /* EEPROM | Region */ + return ((eeprom_read_bit() << 28) | (input_port_read_indexed(machine, 4) << 24)); /* EEPROM | Region */ } logerror("Unk EEPROM read mask %x\n", mem_mask); @@ -1230,13 +1230,13 @@ static READ32_HANDLER( mjgtaste_speedup_r ) static DRIVER_INIT( soldivid ) { memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x600000c, 0x600000f, 0, 0, soldivid_speedup_r ); - use_factory_eeprom=EEPROM_0; + use_factory_eeprom=eeprom_0; } static DRIVER_INIT( s1945ii ) { memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x600000c, 0x600000f, 0, 0, s1945ii_speedup_r ); - use_factory_eeprom=EEPROM_DEFAULT; + use_factory_eeprom=eeprom_DEFAULT; } static DRIVER_INIT( daraku ) @@ -1244,13 +1244,13 @@ static DRIVER_INIT( daraku ) UINT8 *RAM = memory_region(REGION_CPU1); memory_set_bankptr(1,&RAM[0x100000]); memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x600000c, 0x600000f, 0, 0, daraku_speedup_r ); - use_factory_eeprom=EEPROM_DARAKU; + use_factory_eeprom=eeprom_DARAKU; } static DRIVER_INIT( sbomberb ) { memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x600000c, 0x600000f, 0, 0, sbomberb_speedup_r ); - use_factory_eeprom=EEPROM_DEFAULT; + use_factory_eeprom=eeprom_DEFAULT; } static DRIVER_INIT( gunbird2 ) @@ -1258,7 +1258,7 @@ static DRIVER_INIT( gunbird2 ) UINT8 *RAM = memory_region(REGION_CPU1); memory_set_bankptr(1,&RAM[0x100000]); memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x604000c, 0x604000f, 0, 0, gunbird2_speedup_r ); - use_factory_eeprom=EEPROM_DEFAULT; + use_factory_eeprom=eeprom_DEFAULT; } static DRIVER_INIT( s1945iii ) @@ -1266,25 +1266,25 @@ static DRIVER_INIT( s1945iii ) UINT8 *RAM = memory_region(REGION_CPU1); memory_set_bankptr(1,&RAM[0x100000]); memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x606000c, 0x606000f, 0, 0, s1945iii_speedup_r ); - use_factory_eeprom=EEPROM_S1945III; + use_factory_eeprom=eeprom_S1945III; } static DRIVER_INIT( dragnblz ) { memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x606000c, 0x606000f, 0, 0, dragnblz_speedup_r ); - use_factory_eeprom=EEPROM_DRAGNBLZ; + use_factory_eeprom=eeprom_DRAGNBLZ; } static DRIVER_INIT( gnbarich ) { memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x606000c, 0x606000f, 0, 0, gnbarich_speedup_r ); - use_factory_eeprom=EEPROM_GNBARICH; + use_factory_eeprom=eeprom_GNBARICH; } static DRIVER_INIT( mjgtaste ) { memory_install_read32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x606000c, 0x606000f, 0, 0, mjgtaste_speedup_r ); - use_factory_eeprom=EEPROM_MJGTASTE; + use_factory_eeprom=eeprom_MJGTASTE; /* needs to install mahjong controls too (can select joystick in test mode tho) */ } diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 37adf42c091..a32a674dbbe 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -450,7 +450,7 @@ static READ32_HANDLER( rabbit_input_r ) rv = (input_port_read_indexed(machine, 1)<<16)|(input_port_read_indexed(machine, 0)); rv &= ~1; - rv |= EEPROM_read_bit(); // as per code at 4d932 + rv |= eeprom_read_bit(); // as per code at 4d932 return rv; } @@ -460,7 +460,7 @@ static READ32_HANDLER( tmmjprd_input_r ) rv = (input_port_read_indexed(machine, 1)<<16)|(input_port_read_indexed(machine, 0)); rv &= ~0x80; - rv |= (EEPROM_read_bit()<<7); // as per code at 778 + rv |= (eeprom_read_bit()<<7); // as per code at 778 return rv; } @@ -725,13 +725,13 @@ static WRITE32_HANDLER( rabbit_eeprom_write ) if (mem_mask == 0xff000000) { // latch the bit - EEPROM_write_bit(data & 0x01000000); + eeprom_write_bit(data & 0x01000000); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x04000000) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x04000000) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x02000000) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x02000000) ? ASSERT_LINE : CLEAR_LINE ); } } diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index b72de501710..469d6c40738 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -1927,15 +1927,15 @@ static const UINT8 r2_v33_default_eeprom_type1[32] = static NVRAM_HANDLER( rdx_v33 ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); - if (file) EEPROM_load(file); + if (file) eeprom_load(file); else { - EEPROM_set_data(r2_v33_default_eeprom_type1,32); + eeprom_set_data(r2_v33_default_eeprom_type1,32); } } } @@ -1945,9 +1945,9 @@ static WRITE16_HANDLER( rdx_v33_eeprom_w ) { if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x20); - EEPROM_set_cs_line((data & 0x08) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x20); + eeprom_set_cs_line((data & 0x08) ? CLEAR_LINE : ASSERT_LINE); if (data&0xc7) logerror("eeprom_w extra bits used %04x\n",data); } @@ -1959,7 +1959,7 @@ static WRITE16_HANDLER( rdx_v33_eeprom_w ) static READ16_HANDLER( rdx_v33_eeprom_r ) { - return input_port_read_indexed(machine, 0) | (EEPROM_read_bit()<<4); + return input_port_read_indexed(machine, 0) | (eeprom_read_bit()<<4); } diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index dfccfa00f06..5fbd5090e42 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -87,7 +87,7 @@ static WRITE16_HANDLER( gms_write3 ) static READ16_HANDLER( eeprom_r ) { - return (EEPROM_read_bit() << 15)|(input_port_read_indexed(machine,3)&0x7fff); + return (eeprom_read_bit() << 15)|(input_port_read_indexed(machine,3)&0x7fff); } static WRITE16_HANDLER( eeprom_w ) @@ -95,10 +95,10 @@ static WRITE16_HANDLER( eeprom_w ) //bad ? if( ACCESSING_BITS_0_7 ) { - EEPROM_write_bit(data & 0x04); - EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE:ASSERT_LINE ); + eeprom_write_bit(data & 0x04); + eeprom_set_cs_line((data & 0x01) ? CLEAR_LINE:ASSERT_LINE ); - EEPROM_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); } } @@ -480,17 +480,17 @@ static VIDEO_UPDATE(rbmk) static NVRAM_HANDLER( syf ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); if (file) { - EEPROM_load(file); + eeprom_load(file); } else { - EEPROM_set_data(memory_region(REGION_USER2),128); + eeprom_set_data(memory_region(REGION_USER2),128); } } } diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 86576b3e684..26f65297360 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -57,7 +57,7 @@ static int init_eeprom_count; static int rng_z80_control; static int rng_sound_status; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -71,15 +71,15 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( rungun ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -124,7 +124,7 @@ static READ16_HANDLER( rng_sysregs_r ) case 0x06/2: if (ACCESSING_BITS_0_7) { - data = input_port_read_indexed(machine, 1) | EEPROM_read_bit(); + data = input_port_read_indexed(machine, 1) | eeprom_read_bit(); if (init_eeprom_count) { @@ -147,18 +147,18 @@ static WRITE16_HANDLER( rng_sysregs_w ) { case 0x08/2: /* - bit0 : EEPROM_write_bit - bit1 : EEPROM_set_cs_line - bit2 : EEPROM_set_clock_line + bit0 : eeprom_write_bit + bit1 : eeprom_set_cs_line + bit2 : eeprom_set_clock_line bit3 : coin counter? bit7 : set before massive memory writes bit10 : IRQ5 ACK */ if (ACCESSING_BITS_0_7) { - EEPROM_write_bit((data & 0x01) ? 1 : 0); - EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit((data & 0x01) ? 1 : 0); + eeprom_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); } if (!(data & 0x40)) diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index f2d64f9a2cf..3a57bf52ec5 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -584,12 +584,6 @@ static INTERRUPT_GEN( start_of_vblank_int ) * *************************************/ -static CUSTOM_INPUT( eeprom_bit_r ) -{ - return EEPROM_read_bit(); -} - - static UINT16 common_io_chip_r(running_machine *machine, int which, offs_t offset, UINT16 mem_mask) { offset &= 0x1f/2; @@ -664,9 +658,9 @@ static void common_io_chip_w(running_machine *machine, int which, offs_t offset, case 0x06/2: if (which == 0) { - EEPROM_write_bit(data & 0x80); - EEPROM_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x80); + eeprom_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE); } /* coin_lockout_w(1 + 2*which, data & 0x08); coin_lockout_w(0 + 2*which, data & 0x04);*/ @@ -681,9 +675,9 @@ static void common_io_chip_w(running_machine *machine, int which, offs_t offset, else { /* multi-32 EEPROM access */ - EEPROM_write_bit(data & 0x80); - EEPROM_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x80); + eeprom_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x40) ? ASSERT_LINE : CLEAR_LINE); } break; @@ -1161,15 +1155,15 @@ static WRITE8_HANDLER( sound_dummy_w ) static NVRAM_HANDLER( system32 ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); if (file) - EEPROM_load(file); + eeprom_load(file); else if (system32_default_eeprom != NULL) - EEPROM_set_data(system32_default_eeprom, 0x80); + eeprom_set_data(system32_default_eeprom, 0x80); } } diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 168b7356b0d..a99bd64173b 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -883,9 +883,9 @@ static WRITE32_HANDLER( eeprom_w ) // tile banks if( ACCESSING_BITS_16_23 ) { rf2_set_layer_banks(data >> 16); - EEPROM_write_bit((data & 0x800000) ? 1 : 0); - EEPROM_set_clock_line((data & 0x400000) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data & 0x200000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit((data & 0x800000) ? 1 : 0); + eeprom_set_clock_line((data & 0x400000) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data & 0x200000) ? CLEAR_LINE : ASSERT_LINE); } // oki banking @@ -930,7 +930,7 @@ static READ32_HANDLER( spi_controls1_r ) static READ32_HANDLER( spi_controls2_r ) { if( ACCESSING_BITS_0_7 ) { - return ((input_port_read_indexed(machine, 2) | 0xffffff00) & ~0x40) | (EEPROM_read_bit() << 6); + return ((input_port_read_indexed(machine, 2) | 0xffffff00) & ~0x40) | (eeprom_read_bit() << 6); } return 0xffffffff; } @@ -1700,7 +1700,7 @@ static NVRAM_HANDLER( spi ) } /* this is a 93C46 but with reset delay */ -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -1716,12 +1716,12 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( sxx2f ) { if( read_or_write ) { - EEPROM_save(file); + eeprom_save(file); } else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if(file) - EEPROM_load(file); + eeprom_load(file); } } diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index ec7052e6136..a7728f5ecf6 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -490,21 +490,21 @@ static NVRAM_HANDLER(93C46_gundamex) { if (read_or_write) { - EEPROM_save(file); + eeprom_save(file); } else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); if (file) { - EEPROM_load(file); + eeprom_load(file); } else { int length; UINT8 *dat; - dat = EEPROM_get_data_pointer(&length); + dat = eeprom_get_data_pointer(&length); dat[0]=0x70; dat[1]=0x08; } @@ -513,14 +513,14 @@ static NVRAM_HANDLER(93C46_gundamex) static READ16_HANDLER( gundamex_eeprom_r ) { - return ((EEPROM_read_bit() & 1)) << 3; + return ((eeprom_read_bit() & 1)) << 3; } static WRITE16_HANDLER( gundamex_eeprom_w ) { - EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x1); - EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x1); + eeprom_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); } static ADDRESS_MAP_START( gundamex_readmem, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index 518f4d19089..e523fab1ed8 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -137,7 +137,7 @@ INPUT_PORTS_END static READ32_HANDLER( simpl156_inputs_read ) { - int eep = EEPROM_read_bit(); + int eep = eeprom_read_bit(); UINT32 returndata; returndata = input_port_read_indexed(machine, 0)^0xffff0000; @@ -184,9 +184,9 @@ static WRITE32_HANDLER( simpl156_eeprom_w ) OKIM6295_set_bank_base(1, 0x40000 * (data & 0x7) ); - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x10); - EEPROM_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x10); + eeprom_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); } @@ -458,16 +458,16 @@ GFXDECODE_END static NVRAM_HANDLER( simpl156 ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46);// 93c45 + eeprom_init(&eeprom_interface_93C46);// 93c45 - if (file) EEPROM_load(file); + if (file) eeprom_load(file); else { if (simpl156_default_eeprom) /* Set the EEPROM to Factory Defaults */ - EEPROM_set_data(simpl156_default_eeprom,0x100); + eeprom_set_data(simpl156_default_eeprom,0x100); } } } diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 0969c4f3a3f..d419810f55f 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -365,12 +365,12 @@ static NVRAM_HANDLER( ssv ) static NVRAM_HANDLER( gdfs ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); - if (file) EEPROM_load(file); + if (file) eeprom_load(file); else { /* Set the EEPROM to Factory Defaults */ @@ -491,7 +491,7 @@ static UINT16 *gdfs_blitram; static READ16_HANDLER( gdfs_eeprom_r ) { - return (((gdfs_lightgun_select & 1) ? 0 : 0xff) ^ input_port_read_indexed(machine, 5 + gdfs_lightgun_select)) | (EEPROM_read_bit() << 8); + return (((gdfs_lightgun_select & 1) ? 0 : 0xff) ^ input_port_read_indexed(machine, 5 + gdfs_lightgun_select)) | (eeprom_read_bit() << 8); } static WRITE16_HANDLER( gdfs_eeprom_w ) @@ -507,13 +507,13 @@ static WRITE16_HANDLER( gdfs_eeprom_w ) // data & 0x0001 ? // latch the bit - EEPROM_write_bit(data & 0x4000); + eeprom_write_bit(data & 0x4000); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x1000) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x1000) ? CLEAR_LINE : ASSERT_LINE ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x2000) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x2000) ? ASSERT_LINE : CLEAR_LINE ); if (!(data_old & 0x0800) && (data & 0x0800)) // rising clock gdfs_lightgun_select = (data & 0x0300) >> 8; diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c index f8166a89c58..e873ead324c 100644 --- a/src/mame/drivers/stlforce.c +++ b/src/mame/drivers/stlforce.c @@ -86,16 +86,16 @@ WRITE16_HANDLER( stlforce_bg_videoram_w ); static READ16_HANDLER( stlforce_input_port_1_r ) { - return (input_port_read_indexed(machine, 1) & ~0x40) | (EEPROM_read_bit() << 6); + return (input_port_read_indexed(machine, 1) & ~0x40) | (eeprom_read_bit() << 6); } static WRITE16_HANDLER( eeprom_w ) { if( ACCESSING_BITS_0_7 ) { - EEPROM_write_bit(data & 0x01); - EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE ); - EEPROM_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_write_bit(data & 0x01); + eeprom_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE ); } } @@ -223,17 +223,17 @@ static const UINT8 twinbrat_default_eeprom[128] = { static NVRAM_HANDLER( stlforce ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); if (file) { - EEPROM_load(file); + eeprom_load(file); } else { - EEPROM_set_data(default_eeprom,128); + eeprom_set_data(default_eeprom,128); } } } diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index 7816da785fa..5b9069747a2 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -521,7 +521,7 @@ static UINT8 stv_SMPC_r8 (running_machine *machine, int offset) return_data = input_port_read_indexed(machine, 0); if (offset == 0x77)//PDR2 read - return_data= (0xfe | EEPROM_read_bit()); + return_data= (0xfe | eeprom_read_bit()); // if (offset == 0x33) //country code // return_data = input_port_read_indexed(machine, 7); @@ -545,9 +545,9 @@ static void stv_SMPC_w8 (running_machine *machine, int offset, UINT8 data) if(offset == 0x75) { - EEPROM_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x10); - EEPROM_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x10); + eeprom_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE); // if (data & 0x01) diff --git a/src/mame/drivers/stvinit.c b/src/mame/drivers/stvinit.c index d0f2ada67e6..47872976b2b 100644 --- a/src/mame/drivers/stvinit.c +++ b/src/mame/drivers/stvinit.c @@ -146,16 +146,16 @@ static int stv_default_eeprom_length; NVRAM_HANDLER( stv ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); - if (file) EEPROM_load(file); + if (file) eeprom_load(file); else { if (stv_default_eeprom) /* Set the EEPROM to Factory Defaults */ - EEPROM_set_data(stv_default_eeprom,stv_default_eeprom_length); + eeprom_set_data(stv_default_eeprom,stv_default_eeprom_length); } } } diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c index 48aff482488..c133dc75914 100644 --- a/src/mame/drivers/superchs.c +++ b/src/mame/drivers/superchs.c @@ -116,7 +116,7 @@ static READ32_HANDLER( superchs_input_r ) { case 0x00: return (input_port_read_indexed(machine,0) << 16) | input_port_read_indexed(machine,1) | - (EEPROM_read_bit() << 7); + (eeprom_read_bit() << 7); case 0x01: return coin_word<<16; @@ -149,9 +149,9 @@ static WRITE32_HANDLER( superchs_input_w ) if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x40); - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x40); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); return; } @@ -374,7 +374,7 @@ static MACHINE_RESET( superchs ) f3_68681_reset(); } -static const struct EEPROM_interface superchs_eeprom_interface = +static const eeprom_interface superchs_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -399,15 +399,15 @@ static const UINT8 default_eeprom[128]={ static NVRAM_HANDLER( superchs ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&superchs_eeprom_interface); + eeprom_init(&superchs_eeprom_interface); if (file) - EEPROM_load(file); + eeprom_load(file); else - EEPROM_set_data(default_eeprom,128); /* Default the wheel setup values */ + eeprom_set_data(default_eeprom,128); /* Default the wheel setup values */ } } diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index ec4d34a43d4..c849383da7f 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -383,7 +383,7 @@ static WRITE16_HANDLER( gain_control_w ) ***************************************************************************/ -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -397,13 +397,13 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( taito_b ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { - EEPROM_load(file); + eeprom_load(file); } } } @@ -412,7 +412,7 @@ static READ16_HANDLER( eeprom_r ) { int res; - res = (EEPROM_read_bit() & 0x01); + res = (eeprom_read_bit() & 0x01); res |= input_port_read_indexed(machine,1) & 0xfe; /* coin inputs */ return res; @@ -443,9 +443,9 @@ static WRITE16_HANDLER( eeprom_w ) /* bit 7 - set all the time (Chip Select?) */ /* EEPROM */ - EEPROM_write_bit(data & 0x04); - EEPROM_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit(data & 0x04); + eeprom_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); } } diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index e66c92a3e86..51cd474bb29 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -55,7 +55,7 @@ static READ32_HANDLER( f3_control_r ) switch (offset) { case 0x0: /* MSW: Test switch, coins, eeprom access, LSW: Player Buttons, Start, Tilt, Service */ - e=EEPROM_read_bit(); + e=eeprom_read_bit(); e=e|(e<<8); return ((e | input_port_read_indexed(machine, 2) | (input_port_read_indexed(machine, 2)<<8))<<16) /* top byte may be mirror of bottom byte?? see bubblem */ | input_port_read_indexed(machine, 1); @@ -98,9 +98,9 @@ static WRITE32_HANDLER( f3_control_w ) return; case 0x04: /* Eeprom */ if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x04); - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x04); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); } return; case 0x05: /* Player 3 & 4 coin counters */ @@ -408,7 +408,7 @@ static MACHINE_RESET( f3 ) static NVRAM_HANDLER( taito_f3 ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { static const UINT8 recalh_eeprom[128] = { @@ -424,13 +424,13 @@ static NVRAM_HANDLER( taito_f3 ) // RecalH does not initialise it's eeprom on first boot, so we provide one. // Same applies to gseeker. - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); if (file) - EEPROM_load(file); + eeprom_load(file); else if (f3_game==RECALH) - EEPROM_set_data(recalh_eeprom,128); + eeprom_set_data(recalh_eeprom,128); else if (f3_game==GSEEKER) - EEPROM_set_data(recalh_eeprom,128); + eeprom_set_data(recalh_eeprom,128); } } diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index 1b015e47d3e..7a1930d6901 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -957,7 +957,7 @@ static const UINT8 default_eeprom[128]= 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff }; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 6, /* address bits */ 16, /* data bits */ @@ -971,21 +971,21 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( spacegun ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) - EEPROM_load(file); + eeprom_load(file); else - EEPROM_set_data(default_eeprom,128); /* Default the gun setup values */ + eeprom_set_data(default_eeprom,128); /* Default the gun setup values */ } } static int eeprom_r(void) { - return (EEPROM_read_bit() & 0x01)<<7; + return (eeprom_read_bit() & 0x01)<<7; } #if 0 @@ -1008,9 +1008,9 @@ static WRITE16_HANDLER( spacegun_output_bypass_w ) x0000000 (unused) */ COMBINE_DATA(&eep_latch); - EEPROM_write_bit(data & 0x40); - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit(data & 0x40); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); break; default: diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index aa90d4ea233..56a93c777b8 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -428,7 +428,7 @@ static READ32_HANDLER ( jc_control_r ) { if (ACCESSING_BITS_24_31) { - UINT32 data = EEPROM_read_bit() & 1; + UINT32 data = eeprom_read_bit() & 1; data |= input_port_read_indexed(machine, 0) & 0xfe; r |= data << 24; } @@ -484,9 +484,9 @@ static WRITE32_HANDLER ( jc_control_w ) { if (ACCESSING_BITS_24_31) { - EEPROM_set_clock_line(((data >> 24) & 0x08) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(((data >> 24) & 0x04) ? 1 : 0); - EEPROM_set_cs_line(((data >> 24) & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line(((data >> 24) & 0x08) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(((data >> 24) & 0x04) ? 1 : 0); + eeprom_set_cs_line(((data >> 24) & 0x10) ? CLEAR_LINE : ASSERT_LINE); } return; } diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index dbfcf21c3d6..5f8a444070c 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -311,7 +311,7 @@ static WRITE16_HANDLER(reg_e80000_w) static READ16_HANDLER( eeprom_r ) { - return ((EEPROM_read_bit() & 0x01) << 11); + return ((eeprom_read_bit() & 0x01) << 11); } @@ -339,9 +339,9 @@ static WRITE16_HANDLER( eeprom_w ) { if ( ACCESSING_BITS_8_15 ) { - EEPROM_write_bit(data & 0x0800); - EEPROM_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE ); - EEPROM_set_clock_line((data & 0x0400) ? CLEAR_LINE: ASSERT_LINE ); + eeprom_write_bit(data & 0x0800); + eeprom_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_clock_line((data & 0x0400) ? CLEAR_LINE: ASSERT_LINE ); } } diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index eb54cdc04b4..6f2e33fdaf3 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -457,7 +457,7 @@ ADDRESS_MAP_END // NVRAM -static const struct EEPROM_interface galgames_eeprom_interface = +static const eeprom_interface galgames_eeprom_interface = { 10, // address bits 10 8, // data bits 8 @@ -472,7 +472,7 @@ static const struct EEPROM_interface galgames_eeprom_interface = static READ16_HANDLER( galgames_eeprom_r ) { - return EEPROM_read_bit() ? 0x80 : 0x00; + return eeprom_read_bit() ? 0x80 : 0x00; } static WRITE16_HANDLER( galgames_eeprom_w ) @@ -483,21 +483,21 @@ static WRITE16_HANDLER( galgames_eeprom_w ) if ( ACCESSING_BITS_0_7 ) { // latch the bit - EEPROM_write_bit(data & 0x0001); + eeprom_write_bit(data & 0x0001); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x0002) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x0002) ? ASSERT_LINE : CLEAR_LINE ); } } static NVRAM_HANDLER( galgames ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&galgames_eeprom_interface); - if (file) EEPROM_load(file); + eeprom_init(&galgames_eeprom_interface); + if (file) eeprom_load(file); } } @@ -548,7 +548,7 @@ static WRITE16_HANDLER( galgames_cart_sel_w ) // 7 resets the eeprom if (ACCESSING_BITS_0_7) - EEPROM_set_cs_line(((data&0xff) == 0x07) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line(((data&0xff) == 0x07) ? ASSERT_LINE : CLEAR_LINE); } static READ16_HANDLER( galgames_cart_clock_r ) diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 4595ae59586..6a727116219 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -455,7 +455,7 @@ static WRITE16_HANDLER( ssriders_protection_w ) static int init_eeprom_count; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -469,15 +469,15 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( eeprom ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -507,7 +507,7 @@ static READ16_HANDLER( blswhstl_eeprom_r ) /* bit 0 is EEPROM data */ /* bit 1 is EEPROM ready */ - res = EEPROM_read_bit() | input_port_read_indexed(machine,3); + res = eeprom_read_bit() | input_port_read_indexed(machine,3); return res; } @@ -520,7 +520,7 @@ static READ16_HANDLER( ssriders_eeprom_r ) /* bit 1 is EEPROM ready */ /* bit 2 is VBLANK (???) */ /* bit 7 is service button */ - res = EEPROM_read_bit() | input_port_read_indexed(machine,3); + res = eeprom_read_bit() | input_port_read_indexed(machine,3); if (init_eeprom_count) { init_eeprom_count--; @@ -539,7 +539,7 @@ static READ16_HANDLER( sunsetbl_eeprom_r ) /* bit 1 is EEPROM ready */ /* bit 2 is VBLANK (???) */ /* bit 3 is service button */ - res = EEPROM_read_bit() | input_port_read_indexed(machine,3); + res = eeprom_read_bit() | input_port_read_indexed(machine,3); if (init_eeprom_count) { init_eeprom_count--; @@ -556,16 +556,16 @@ static WRITE16_HANDLER( blswhstl_eeprom_w ) /* bit 0 is data */ /* bit 1 is cs (active low) */ /* bit 2 is clock (active high) */ - EEPROM_write_bit(data & 0x01); - EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x01); + eeprom_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); } } WRITE16_HANDLER( ssriders_eeprom_w ); /* in video/tmnt.c */ -static const struct EEPROM_interface thndrx2_eeprom_interface = +static const eeprom_interface thndrx2_eeprom_interface = { 7, /* address bits */ 8, /* data bits */ @@ -579,15 +579,15 @@ static const struct EEPROM_interface thndrx2_eeprom_interface = static NVRAM_HANDLER( thndrx2 ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&thndrx2_eeprom_interface); + eeprom_init(&thndrx2_eeprom_interface); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -616,7 +616,7 @@ static READ16_HANDLER( thndrx2_eeprom_r ) /* bit 1 is EEPROM ready */ /* bit 3 is VBLANK (???) */ /* bit 7 is service button */ - res = (EEPROM_read_bit() << 8) | input_port_read_indexed(machine,1); + res = (eeprom_read_bit() << 8) | input_port_read_indexed(machine,1); toggle ^= 0x0800; return (res ^ toggle); } @@ -630,9 +630,9 @@ static WRITE16_HANDLER( thndrx2_eeprom_w ) /* bit 0 is data */ /* bit 1 is cs (active low) */ /* bit 2 is clock (active high) */ - EEPROM_write_bit(data & 0x01); - EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x01); + eeprom_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); /* bit 5 triggers IRQ on sound cpu */ if (last == 0 && (data & 0x20) != 0) @@ -663,7 +663,7 @@ static READ16_HANDLER( prmrsocr_eeprom_r ) { /* bit 8 is EEPROM data */ /* bit 9 is EEPROM ready */ - return (EEPROM_read_bit() << 8) | input_port_read_indexed(machine,1); + return (eeprom_read_bit() << 8) | input_port_read_indexed(machine,1); } static WRITE16_HANDLER( prmrsocr_eeprom_w ) @@ -678,9 +678,9 @@ static WRITE16_HANDLER( prmrsocr_eeprom_w ) /* bit 8 is data */ /* bit 9 is cs (active low) */ /* bit 10 is clock (active high) */ - EEPROM_write_bit(data & 0x0100); - EEPROM_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x0400) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x0100); + eeprom_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x0400) ? ASSERT_LINE : CLEAR_LINE); } } diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 4aff5027551..147f4c9e0d1 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -1295,7 +1295,7 @@ static const UINT8 bbakraid_unlimited_nvram[512] = { -static const struct EEPROM_interface eeprom_interface_93C66 = +static const eeprom_interface eeprom_interface_93C66 = { /* Pin 6 of the 93C66 is connected to Gnd! So it's configured for 512 bytes */ @@ -1317,16 +1317,16 @@ static NVRAM_HANDLER( bbakraid ) /* Pin 6 of 93C66 is connected to Gnd! */ if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C66); + eeprom_init(&eeprom_interface_93C66); - if (file) EEPROM_load(file); + if (file) eeprom_load(file); else { if (bbakraid_unlimited_ver == 1) - EEPROM_set_data(bbakraid_unlimited_nvram, sizeof(bbakraid_unlimited_nvram)); + eeprom_set_data(bbakraid_unlimited_nvram, sizeof(bbakraid_unlimited_nvram)); } } } @@ -1341,7 +1341,7 @@ static READ16_HANDLER( bbakraid_nvram_r ) */ int data; - data = ((EEPROM_read_bit() & 0x01) << 4); + data = ((eeprom_read_bit() & 0x01) << 4); data |= ((raizing_Z80_busreq >> 4) & 0x01); /* Loop BUSRQ to BUSAK */ return data; @@ -1356,13 +1356,13 @@ static WRITE16_HANDLER( bbakraid_nvram_w ) if ( ACCESSING_BITS_0_7 ) { // chip select - EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE ); // latch the bit - EEPROM_write_bit( (data & 0x04) >> 2 ); + eeprom_write_bit( (data & 0x04) >> 2 ); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE ); } raizing_Z80_busreq = data & 0x10; /* see bbakraid_nvram_r above */ } diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index 7154fd11f3c..0d74092b3f2 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -51,7 +51,7 @@ static READ32_HANDLER( eeprom_r ) UINT32 r = 0; if (ACCESSING_BITS_24_31) - r |= (((EEPROM_read_bit()) << 1) | (input_port_read_indexed(machine, 6) << 3)) << 24; + r |= (((eeprom_read_bit()) << 1) | (input_port_read_indexed(machine, 6) << 3)) << 24; return r; } @@ -60,9 +60,9 @@ static WRITE32_HANDLER( eeprom_w ) { if (ACCESSING_BITS_24_31) { - EEPROM_write_bit((data & 0x01000000) ? 1 : 0); - EEPROM_set_clock_line((data & 0x02000000) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_cs_line((data & 0x04000000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit((data & 0x01000000) ? 1 : 0); + eeprom_set_clock_line((data & 0x02000000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x04000000) ? CLEAR_LINE : ASSERT_LINE); } } @@ -190,14 +190,14 @@ static void eeprom_handler(mame_file *file, int read_or_write) { if (read_or_write) { - EEPROM_save(file); + eeprom_save(file); } else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); if (file) { - EEPROM_load(file); + eeprom_load(file); } } } diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c index 9e65fff469e..583faafda7d 100644 --- a/src/mame/drivers/undrfire.c +++ b/src/mame/drivers/undrfire.c @@ -256,7 +256,7 @@ static const UINT8 default_eeprom[128]= 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff }; -static const struct EEPROM_interface undrfire_eeprom_interface = +static const eeprom_interface undrfire_eeprom_interface = { 6, /* address bits */ 16, /* data bits */ @@ -270,13 +270,13 @@ static const struct EEPROM_interface undrfire_eeprom_interface = static NVRAM_HANDLER( undrfire ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&undrfire_eeprom_interface); + eeprom_init(&undrfire_eeprom_interface); if (file) - EEPROM_load(file); + eeprom_load(file); else - EEPROM_set_data(default_eeprom,128); /* Default the gun setup values */ + eeprom_set_data(default_eeprom,128); /* Default the gun setup values */ } } @@ -292,7 +292,7 @@ static READ32_HANDLER( undrfire_input_r ) case 0x00: { return (input_port_read_indexed(machine,0) << 16) | input_port_read_indexed(machine,1) | - (EEPROM_read_bit() << 7) | frame_counter; + (eeprom_read_bit() << 7) | frame_counter; } case 0x01: @@ -317,9 +317,9 @@ static WRITE32_HANDLER( undrfire_input_w ) if (ACCESSING_BITS_0_7) { - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_write_bit(data & 0x40); - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x40); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); return; } diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index f196c9d7bfd..cabdf82db06 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -217,7 +217,7 @@ ADDRESS_MAP_END static READ32_HANDLER( zeropnt2_coins_r ) { return (input_port_read(machine, "IN0") << 16) | 0xffff; } static READ32_HANDLER( zeropnt2_dsw1_r ) { return (input_port_read(machine, "DSW1") << 16) | 0xffff; } static READ32_HANDLER( zeropnt2_dsw2_r ) { return (input_port_read(machine, "DSW2") << 16) | 0xffff; } -static READ32_HANDLER( zeropnt2_buttons_r ) { return ((input_port_read(machine, "IN7") | ((EEPROM_read_bit() & 0x01) << 7)) << 16) | 0xffff; } +static READ32_HANDLER( zeropnt2_buttons_r ) { return ((input_port_read(machine, "IN7") | ((eeprom_read_bit() & 0x01) << 7)) << 16) | 0xffff; } static READ32_HANDLER( zeropnt2_gunx_0_msb_r ) { return (unico_gunx_0_msb_r(machine,0,0xffff)-0x0800) << 16; } static READ32_HANDLER( zeropnt2_guny_0_msb_r ) { return (unico_guny_0_msb_r(machine,0,0xffff)+0x0800) << 16; } @@ -262,13 +262,13 @@ static WRITE32_HANDLER( zeropnt2_eeprom_w ) if ( ACCESSING_BITS_24_31 ) { // latch the bit - EEPROM_write_bit(data & 0x04000000); + eeprom_write_bit(data & 0x04000000); // reset line asserted: reset. - EEPROM_set_cs_line((data & 0x01000000) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x01000000) ? CLEAR_LINE : ASSERT_LINE); // clock line asserted: write latch or select next bit to read - EEPROM_set_clock_line((data & 0x02000000) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_set_clock_line((data & 0x02000000) ? ASSERT_LINE : CLEAR_LINE ); } } @@ -642,7 +642,7 @@ static MACHINE_RESET( unico ) } -static const struct EEPROM_interface zeropnt2_eeprom_interface = +static const eeprom_interface zeropnt2_eeprom_interface = { 7, // address bits 7 8, // data bits 8 @@ -658,11 +658,11 @@ static const struct EEPROM_interface zeropnt2_eeprom_interface = static NVRAM_HANDLER( zeropnt2 ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&zeropnt2_eeprom_interface); - if (file) EEPROM_load(file); + eeprom_init(&zeropnt2_eeprom_interface); + if (file) eeprom_load(file); } } diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 05cad31db25..9fff323a0b4 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -106,38 +106,38 @@ static WRITE32_HANDLER( ym2151_register32_w ) static READ16_HANDLER( eeprom_r ) { if(offset) - return EEPROM_read_bit(); + return eeprom_read_bit(); else return 0; } static READ32_HANDLER( eeprom32_r ) { - return EEPROM_read_bit(); + return eeprom_read_bit(); } static WRITE16_HANDLER( eeprom_w ) { if(offset) { - EEPROM_write_bit(data & 0x01); - EEPROM_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE ); - EEPROM_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_write_bit(data & 0x01); + eeprom_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); } } static WRITE32_HANDLER( eeprom32_w ) { - EEPROM_write_bit(data & 0x01); - EEPROM_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE ); - EEPROM_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_write_bit(data & 0x01); + eeprom_set_cs_line((data & 0x04) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE ); } static WRITE32_HANDLER( finalgdr_eeprom_w ) { - EEPROM_write_bit(data & 0x4000); - EEPROM_set_cs_line((data & 0x1000) ? CLEAR_LINE : ASSERT_LINE ); - EEPROM_set_clock_line((data & 0x2000) ? ASSERT_LINE : CLEAR_LINE ); + eeprom_write_bit(data & 0x4000); + eeprom_set_cs_line((data & 0x1000) ? CLEAR_LINE : ASSERT_LINE ); + eeprom_set_clock_line((data & 0x2000) ? ASSERT_LINE : CLEAR_LINE ); } static WRITE16_HANDLER( flipscreen_w ) @@ -538,18 +538,18 @@ static const UINT8 misncrft_default_nvram[128] = { static NVRAM_HANDLER( 93C46_vamphalf ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); if (file) { - EEPROM_load(file); + eeprom_load(file); } else { - if (!strcmp(machine->gamedrv->name,"suplup")) EEPROM_set_data(suplup_default_nvram,128); - if (!strcmp(machine->gamedrv->name,"misncrft")) EEPROM_set_data(misncrft_default_nvram,128); + if (!strcmp(machine->gamedrv->name,"suplup")) eeprom_set_data(suplup_default_nvram,128); + if (!strcmp(machine->gamedrv->name,"misncrft")) eeprom_set_data(misncrft_default_nvram,128); } } } @@ -558,15 +558,15 @@ static NVRAM_HANDLER( finalgdr ) { if (read_or_write) { - EEPROM_save(file); + eeprom_save(file); mame_fwrite(file, finalgdr_backupram, 0x80*0x100); } else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); if (file) { - EEPROM_load(file); + eeprom_load(file); mame_fread(file, finalgdr_backupram, 0x80*0x100); } } diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index 7bbd7253db4..aab9cc870c7 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -112,7 +112,7 @@ VIDEO_UPDATE( vendetta ); static int init_eeprom_count; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -126,15 +126,15 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( vendetta ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 1000; @@ -145,7 +145,7 @@ static READ8_HANDLER( vendetta_eeprom_r ) { int res; - res = EEPROM_read_bit(); + res = eeprom_read_bit(); res |= 0x02;//konami_eeprom_ack() << 5; /* add the ack */ @@ -176,9 +176,9 @@ static WRITE8_HANDLER( vendetta_eeprom_w ) return; /* EEPROM */ - EEPROM_write_bit(data & 0x20); - EEPROM_set_clock_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data & 0x08) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit(data & 0x20); + eeprom_set_clock_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data & 0x08) ? CLEAR_LINE : ASSERT_LINE); irq_enabled = ( data >> 6 ) & 1; diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index cadb55e26a5..7a7ab8a12c7 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -85,7 +85,7 @@ static int suspension_active, resume_trigger; static emu_timer *dmadelay_timer; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -99,15 +99,15 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( xexex ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -207,7 +207,7 @@ static READ16_HANDLER( control1_r ) /* bit 0 is EEPROM data */ /* bit 1 is EEPROM ready */ /* bit 3 is service button */ - res = EEPROM_read_bit() | input_port_read_indexed(machine,1); + res = eeprom_read_bit() | input_port_read_indexed(machine,1); if (init_eeprom_count) { @@ -227,9 +227,9 @@ static void parse_control2(void) /* bit 6 is enable irq 5 */ /* bit 11 is watchdog */ - EEPROM_write_bit(cur_control2 & 0x01); - EEPROM_set_cs_line((cur_control2 & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((cur_control2 & 0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(cur_control2 & 0x01); + eeprom_set_cs_line((cur_control2 & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((cur_control2 & 0x04) ? ASSERT_LINE : CLEAR_LINE); /* bit 8 = enable sprite ROM reading */ K053246_set_OBJCHA_line((cur_control2 & 0x0100) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 3c13552bf07..33e84a3aeb0 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -39,7 +39,7 @@ UINT16 xmen_current_frame; static int init_eeprom_count; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -53,15 +53,15 @@ static const struct EEPROM_interface eeprom_interface = static NVRAM_HANDLER( xmen ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -76,7 +76,7 @@ logerror("%06x eeprom_r\n",activecpu_get_pc()); /* bit 6 is EEPROM data */ /* bit 7 is EEPROM ready */ /* bit 14 is service button */ - res = (EEPROM_read_bit() << 6) | input_port_read_indexed(machine,2); + res = (eeprom_read_bit() << 6) | input_port_read_indexed(machine,2); if (init_eeprom_count) { init_eeprom_count--; @@ -93,7 +93,7 @@ logerror("%06x xmen6p_eeprom_r\n",activecpu_get_pc()); /* bit 6 is EEPROM data */ /* bit 7 is EEPROM ready */ /* bit 14 is service button */ - res = (EEPROM_read_bit() << 6) | input_port_read_indexed(machine,2); + res = (eeprom_read_bit() << 6) | input_port_read_indexed(machine,2); if (init_eeprom_count) { init_eeprom_count--; @@ -114,9 +114,9 @@ logerror("%06x: write %04x to 108000\n",activecpu_get_pc(),data); /* bit 2 is data */ /* bit 3 is clock (active high) */ /* bit 4 is cs (active low) */ - EEPROM_write_bit(data & 0x04); - EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x04); + eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); } if (ACCESSING_BITS_8_15) { diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c index dffd6043e0d..fd248b4130f 100644 --- a/src/mame/drivers/xorworld.c +++ b/src/mame/drivers/xorworld.c @@ -51,15 +51,15 @@ static NVRAM_HANDLER( xorworld ) { if (read_or_write) { - EEPROM_save(file); + eeprom_save(file); } else { - EEPROM_init(&eeprom_interface_93C46); + eeprom_init(&eeprom_interface_93C46); if (file) { - EEPROM_load(file); + eeprom_load(file); } } } @@ -77,25 +77,25 @@ static NVRAM_HANDLER( xorworld ) /* the EEPROM is read thru bit 4 */ static READ16_HANDLER( xorworld_input_r ) { - return input_port_read_indexed(machine, 0) | ((EEPROM_read_bit() & 0x01) << 4); + return input_port_read_indexed(machine, 0) | ((eeprom_read_bit() & 0x01) << 4); } static WRITE16_HANDLER( eeprom_chip_select_w ) { /* bit 0 is CS (active low) */ - EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE); } static WRITE16_HANDLER( eeprom_serial_clock_w ) { /* bit 0 is SK (active high) */ - EEPROM_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); } static WRITE16_HANDLER( eeprom_data_w ) { /* bit 0 is EEPROM data (DIN) */ - EEPROM_write_bit(data & 0x01); + eeprom_write_bit(data & 0x01); } diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c index f470d0cd99c..d96dedbd3c6 100644 --- a/src/mame/drivers/yumefuda.c +++ b/src/mame/drivers/yumefuda.c @@ -139,9 +139,9 @@ static WRITE8_HANDLER( prot_lock_w ) static WRITE8_HANDLER( eeprom_w ) { - EEPROM_write_bit(data & 0x04); - EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x04); + eeprom_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); } static WRITE8_HANDLER( port_c0_w ) @@ -152,7 +152,7 @@ static WRITE8_HANDLER( port_c0_w ) static READ8_HANDLER( eeprom_r ) { - return ((~EEPROM_read_bit()&0x01)<<6) | (0xff&~0x40); + return ((~eeprom_read_bit()&0x01)<<6) | (0xff&~0x40); } static UINT8 mux_data; diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 99214597fb2..a4a9cd4a47f 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -191,7 +191,7 @@ static READ32_HANDLER( sysreg_r ) { if (ACCESSING_BITS_24_31) { - r |= ((adc083x_sars_read(0) << 5) | (EEPROM_read_bit() << 4)) << 24; + r |= ((adc083x_sars_read(0) << 5) | (eeprom_read_bit() << 4)) << 24; } } //mame_printf_debug("sysreg_r: %08X, %08X at %08X\n", offset, mem_mask, activecpu_get_pc()); @@ -212,9 +212,9 @@ static WRITE32_HANDLER( sysreg_w ) } if (ACCESSING_BITS_0_7) { - EEPROM_write_bit((data & 0x1) ? 1 : 0); - EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); + eeprom_write_bit((data & 0x1) ? 1 : 0); + eeprom_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); if (data & 0x10) cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index a586672ba92..d63623327f5 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -145,8 +145,8 @@ READ16_HANDLER( namcos2_flap_prot_r ); /**************************************************************/ /* EEPROM memory function handlers */ /**************************************************************/ -#define NAMCOS2_68K_EEPROM_W namcos2_68k_eeprom_w -#define NAMCOS2_68K_EEPROM_R namcos2_68k_eeprom_r +#define NAMCOS2_68K_eeprom_W namcos2_68k_eeprom_w +#define NAMCOS2_68K_eeprom_R namcos2_68k_eeprom_r NVRAM_HANDLER( namcos2 ); WRITE16_HANDLER( namcos2_68k_eeprom_w ); READ16_HANDLER( namcos2_68k_eeprom_r ); diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 074c40a055a..711d7aaf3ea 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -10,7 +10,7 @@ VIDEO_START( psikyosh ); VIDEO_UPDATE( psikyosh ); VIDEO_EOF( psikyosh ); -enum { EEPROM_0=0, EEPROM_DEFAULT=1, EEPROM_DARAKU, EEPROM_S1945III, EEPROM_DRAGNBLZ, EEPROM_GNBARICH, EEPROM_USER1, EEPROM_MJGTASTE }; +enum { eeprom_0=0, eeprom_DEFAULT=1, eeprom_DARAKU, eeprom_S1945III, eeprom_DRAGNBLZ, eeprom_GNBARICH, eeprom_USER1, eeprom_MJGTASTE }; /* Psikyo PS6406B */ #define FLIPSCREEN (((psikyosh_vidregs[3] & 0x0000c000) == 0x0000c000) ? 1:0) diff --git a/src/mame/machine/decoprot.c b/src/mame/machine/decoprot.c index 84aa83c9837..aadfed4ef28 100644 --- a/src/mame/machine/decoprot.c +++ b/src/mame/machine/decoprot.c @@ -1305,7 +1305,7 @@ static READ16_HANDLER( deco16_146_core_prot_r ) // case 0x582: return input_port_read_indexed(machine, 0); /* IN0 */ // case 0x672: return input_port_read_indexed(machine, 1); /* IN1 */ -// case 0x04c: return EEPROM_read_bit(); +// case 0x04c: return eeprom_read_bit(); case 0x468: val=DECO_PORT(0x570); @@ -1654,7 +1654,7 @@ READ32_HANDLER( deco16_146_fghthist_prot_r ) { case 0x582: return (input_port_read_indexed(machine, 0)<<16) | 0xffff; /* IN0 */ case 0x672: return (input_port_read_indexed(machine, 1)<<16) | 0xffff; /* IN1 */ - case 0x04c: return (EEPROM_read_bit()<<16) | 0xffff; + case 0x04c: return (eeprom_read_bit()<<16) | 0xffff; } /* Handle 'one shots' - writing data to an address, then immediately reading it back */ diff --git a/src/mame/machine/gaelco2.c b/src/mame/machine/gaelco2.c index 2badfdea8ee..d975605e36b 100644 --- a/src/mame/machine/gaelco2.c +++ b/src/mame/machine/gaelco2.c @@ -164,7 +164,7 @@ WRITE16_HANDLER( wrally2_coin_w ) ***************************************************************************/ -static const struct EEPROM_interface gaelco2_eeprom_interface = +static const eeprom_interface gaelco2_eeprom_interface = { 8, /* address bits */ 16, /* data bits */ @@ -180,11 +180,11 @@ static const struct EEPROM_interface gaelco2_eeprom_interface = NVRAM_HANDLER( gaelco2 ) { if (read_or_write){ - EEPROM_save(file); + eeprom_save(file); } else { - EEPROM_init(&gaelco2_eeprom_interface); + eeprom_init(&gaelco2_eeprom_interface); - if (file) EEPROM_load(file); + if (file) eeprom_load(file); } } @@ -193,25 +193,25 @@ READ16_HANDLER( gaelco2_eeprom_r ) /* bit 6 is EEPROM data (DOUT) */ /* bit 7 is EEPROM ready */ /* bits 0-5, COINSW, STARTSW & Service */ - return (1 << 7) | (EEPROM_read_bit() << 6) | (input_port_read_indexed(machine, 2) & 0x3f); + return (1 << 7) | (eeprom_read_bit() << 6) | (input_port_read_indexed(machine, 2) & 0x3f); } WRITE16_HANDLER( gaelco2_eeprom_cs_w ) { /* bit 0 is CS (active low) */ - EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE); } WRITE16_HANDLER( gaelco2_eeprom_sk_w ) { /* bit 0 is SK (active high) */ - EEPROM_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); } WRITE16_HANDLER( gaelco2_eeprom_data_w ) { /* bit 0 is EEPROM data (DIN) */ - EEPROM_write_bit(data & 0x01); + eeprom_write_bit(data & 0x01); } /*************************************************************************** diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c index 89650d21443..53a8e9d046e 100644 --- a/src/mame/machine/leland.c +++ b/src/mame/machine/leland.c @@ -672,7 +672,7 @@ void ataxx_bankswitch(void) void leland_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offset, UINT8 serial_type) { - static const struct EEPROM_interface eeprom_interface = + static const eeprom_interface eeprom_intf = { 6, 16, @@ -752,7 +752,7 @@ void leland_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offs } } - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); } @@ -765,7 +765,7 @@ void leland_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offs void ataxx_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offset) { - static const struct EEPROM_interface eeprom_interface = + static const eeprom_interface eeprom_intf = { 7, 16, @@ -829,7 +829,7 @@ void ataxx_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offse eeprom_data[0x7f * 2 + 0] = (sum >> 8) & 0xff; eeprom_data[0x7f * 2 + 1] = sum & 0xff; - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); } } @@ -845,7 +845,7 @@ READ8_HANDLER( ataxx_eeprom_r ) { int port = input_port_read_indexed(machine, 2); if (LOG_EEPROM) logerror("%04X:EE read\n", safe_activecpu_get_pc()); - return (port & ~0x01) | EEPROM_read_bit(); + return (port & ~0x01) | eeprom_read_bit(); } @@ -853,9 +853,9 @@ WRITE8_HANDLER( ataxx_eeprom_w ) { if (LOG_EEPROM) logerror("%04X:EE write %d%d%d\n", safe_activecpu_get_pc(), (data >> 6) & 1, (data >> 5) & 1, (data >> 4) & 1); - EEPROM_write_bit ((data & 0x10) >> 4); - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line ((~data & 0x40) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit ((data & 0x10) >> 4); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line ((~data & 0x40) ? ASSERT_LINE : CLEAR_LINE); } @@ -896,17 +896,17 @@ NVRAM_HANDLER( leland ) { if (read_or_write) { - EEPROM_save(file); + eeprom_save(file); mame_fwrite(file, battery_ram, LELAND_BATTERY_RAM_SIZE); } else if (file) { - EEPROM_load(file); + eeprom_load(file); mame_fread(file, battery_ram, LELAND_BATTERY_RAM_SIZE); } else { - EEPROM_set_data(eeprom_data, 64*2); + eeprom_set_data(eeprom_data, 64*2); memset(battery_ram, 0x00, LELAND_BATTERY_RAM_SIZE); } } @@ -916,17 +916,17 @@ NVRAM_HANDLER( ataxx ) { if (read_or_write) { - EEPROM_save(file); + eeprom_save(file); mame_fwrite(file, battery_ram, LELAND_BATTERY_RAM_SIZE); } else if (file) { - EEPROM_load(file); + eeprom_load(file); mame_fread(file, battery_ram, LELAND_BATTERY_RAM_SIZE); } else { - EEPROM_set_data(eeprom_data, 128*2); + eeprom_set_data(eeprom_data, 128*2); memset(battery_ram, 0x00, LELAND_BATTERY_RAM_SIZE); } } @@ -1170,7 +1170,7 @@ READ8_HANDLER( leland_master_input_r ) case 0x11: /* /GIN1 */ result = input_port_read_indexed(machine, 3); if (LOG_EEPROM) logerror("%04X:EE read\n", safe_activecpu_get_pc()); - result = (result & ~0x01) | EEPROM_read_bit(); + result = (result & ~0x01) | eeprom_read_bit(); break; default: @@ -1193,9 +1193,9 @@ WRITE8_HANDLER( leland_master_output_w ) if (LOG_EEPROM) logerror("%04X:EE write %d%d%d\n", safe_activecpu_get_pc(), (data >> 6) & 1, (data >> 5) & 1, (data >> 4) & 1); - EEPROM_write_bit ((data & 0x10) >> 4); - EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); - EEPROM_set_cs_line ((~data & 0x40) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit ((data & 0x10) >> 4); + eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + eeprom_set_cs_line ((~data & 0x40) ? ASSERT_LINE : CLEAR_LINE); break; case 0x0a: /* /OGIA */ diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c index c2991ba7aa6..47ccbf94d03 100644 --- a/src/mame/machine/simpsons.c +++ b/src/mame/machine/simpsons.c @@ -19,7 +19,7 @@ int simpsons_firq_enabled; static int init_eeprom_count; -static const struct EEPROM_interface eeprom_interface = +static const eeprom_interface eeprom_intf = { 7, /* address bits */ 8, /* data bits */ @@ -33,15 +33,15 @@ static const struct EEPROM_interface eeprom_interface = NVRAM_HANDLER( simpsons ) { if (read_or_write) - EEPROM_save(file); + eeprom_save(file); else { - EEPROM_init(&eeprom_interface); + eeprom_init(&eeprom_intf); if (file) { init_eeprom_count = 0; - EEPROM_load(file); + eeprom_load(file); } else init_eeprom_count = 10; @@ -52,7 +52,7 @@ READ8_HANDLER( simpsons_eeprom_r ) { int res; - res = (EEPROM_read_bit() << 4); + res = (eeprom_read_bit() << 4); res |= 0x20;//konami_eeprom_ack() << 5; /* add the ack */ @@ -71,9 +71,9 @@ WRITE8_HANDLER( simpsons_eeprom_w ) if ( data == 0xff ) return; - EEPROM_write_bit(data & 0x80); - EEPROM_set_cs_line((data & 0x08) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x80); + eeprom_set_cs_line((data & 0x08) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE); simpsons_video_banking( machine, data & 3 ); diff --git a/src/mame/machine/ticket.c b/src/mame/machine/ticket.c index 3725e80ae1c..cddd8d71e13 100644 --- a/src/mame/machine/ticket.c +++ b/src/mame/machine/ticket.c @@ -81,6 +81,16 @@ READ8_HANDLER( ticket_dispenser_1_r ) return dispenser[1].status; } +CUSTOM_INPUT( ticket_dispenser_0_port_r ) +{ + return dispenser[0].status ? 1 : 0; +} + +CUSTOM_INPUT( ticket_dispenser_1_port_r ) +{ + return dispenser[1].status ? 1 : 0; +} + /*************************************************************************** ticket_dispenser_w ***************************************************************************/ diff --git a/src/mame/machine/ticket.h b/src/mame/machine/ticket.h index 152263c40e6..48e08e528f9 100644 --- a/src/mame/machine/ticket.h +++ b/src/mame/machine/ticket.h @@ -28,6 +28,9 @@ READ8_HANDLER( ticket_dispenser_r ); READ8_HANDLER( ticket_dispenser_0_r ); READ8_HANDLER( ticket_dispenser_1_r ); +CUSTOM_INPUT( ticket_dispenser_0_port_r ); +CUSTOM_INPUT( ticket_dispenser_1_port_r ); + /*************************************************************************** ticket_dispenser_w diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index ab99daa75bf..802f5cfb7d2 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -468,9 +468,9 @@ WRITE16_HANDLER( ssriders_eeprom_w ) /* bit 0 is data */ /* bit 1 is cs (active low) */ /* bit 2 is clock (active high) */ - EEPROM_write_bit(data & 0x01); - EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); - EEPROM_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); + eeprom_write_bit(data & 0x01); + eeprom_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE); + eeprom_set_clock_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); /* bits 3-4 control palette dimming */ /* 4 = DIMPOL = when set, negate SHAD */ |