Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-22 13:48:55 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix regressions.

Browse Source
This commit is contained in:
Aaron Giles 2010-09-18 22:22:39 +00:00
parent 1d5e3b7e4a
commit 435b49fc1d
6 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/emu/machine/eeprom.c
View File

@ -1,6 +1,6 @@
/***************************************************************************
eeprom.h
eeprom.c
Serial eeproms.
@ -78,10 +78,10 @@ eeprom_device_config::eeprom_device_config(const machine_config &mconfig, const
: device_config(mconfig, static_alloc_device_config, "EEPROM", tag, owner, clock),
device_config_memory_interface(mconfig, *this),
device_config_nvram_interface(mconfig, *this),
m_default_data(NULL),
m_default_data_size(0),
m_default_value(0)
{
m_default_data.u8 = NULL;
}
@ -133,7 +133,7 @@ void eeprom_device_config::static_set_default_data(device_config *device, const
{
eeprom_device_config *eeprom = downcast<eeprom_device_config *>(device);
assert(eeprom->m_data_bits == 8);
eeprom->m_default_data = data;
eeprom->m_default_data.u8 = const_cast<UINT8 *>(data);
eeprom->m_default_data_size = size;
}
@ -141,8 +141,8 @@ void eeprom_device_config::static_set_default_data(device_config *device, const
{
eeprom_device_config *eeprom = downcast<eeprom_device_config *>(device);
assert(eeprom->m_data_bits == 16);
eeprom->m_default_data = reinterpret_cast<const UINT8 *>(data);
eeprom->m_default_data_size = size;
eeprom->m_default_data.u16 = const_cast<UINT16 *>(data);
eeprom->m_default_data_size = size / 2;
}
@ -264,9 +264,12 @@ void eeprom_device::nvram_default()
m_addrspace[0]->write_word(offs * 2, default_value);
/* handle hard-coded data from the driver */
if (m_config.m_default_data != NULL)
if (m_config.m_default_data.u8 != NULL)
for (offs_t offs = 0; offs < m_config.m_default_data_size; offs++)
m_addrspace[0]->write_byte(offs, m_config.m_default_data[offs]);
if (m_config.m_data_bits == 8)
m_addrspace[0]->write_byte(offs, m_config.m_default_data.u8[offs]);
else
m_addrspace[0]->write_word(offs * 2, m_config.m_default_data.u16[offs]);
/* populate from a memory region if present */
if (m_region != NULL)

2
src/emu/machine/eeprom.h
View File

@ -92,7 +92,7 @@ protected:
address_space_config m_space_config;
// internal state
const UINT8 * m_default_data;
generic_ptr m_default_data;
int m_default_data_size;
UINT32 m_default_value;
};

4
src/emu/machine/intelfsh.h
View File

@ -68,14 +68,14 @@ protected:
FLASH_INTEL_28F016S5 = 0x0800,
FLASH_FUJITSU_29F016A,
FLASH_SHARP_LH28F016S,
FLASH_INTEL_E28F400,
FLASH_INTEL_E28F008SA,
FLASH_MACRONIX_29L001MC,
FLASH_PANASONIC_MN63F805MNP,
FLASH_SANYO_LE26FV10N1TS,
// 16-bit variants
FLASH_SHARP_LH28F400 = 0x1000,
FLASH_INTEL_E28F008SA,
FLASH_INTEL_E28F400,
FLASH_INTEL_TE28F160,
FLASH_SHARP_UNK128MBIT
};

4
src/mame/drivers/pcxt.c
View File

@ -935,6 +935,8 @@ static MACHINE_CONFIG_START( filetto, driver_device )
MDRV_PIC8259_ADD( "pic8259_2", pic8259_2_config )
MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
MDRV_GFXDECODE(filetto)
MDRV_SCREEN_ADD("screen", RASTER)
@ -980,6 +982,8 @@ static MACHINE_CONFIG_START( tetriskr, driver_device )
MDRV_PIC8259_ADD( "pic8259_2", pic8259_2_config )
MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
MDRV_GFXDECODE(tetriskr)
MDRV_SCREEN_ADD("screen", RASTER)

3
src/mame/drivers/quizo.c
View File

@ -260,8 +260,7 @@ ROM_END
static DRIVER_INIT(quizo)
{
quizo_state *state = machine->driver_data<quizo_state>();
UINT8 *videoram = state->videoram;
videoram=auto_alloc_array(machine, UINT8, 0x4000*2);
state->videoram=auto_alloc_array(machine, UINT8, 0x4000*2);
}
GAME( 1985, quizo, 0, quizo, quizo, quizo, ROT0, "Seoul Coin Corp.", "Quiz Olympic (set 1)", 0 )

6
src/mame/drivers/taitogn.c
View File

@ -937,7 +937,7 @@ static MACHINE_CONFIG_START( coh3002t, driver_device )
MDRV_MB3773_ADD("mb3773")
MDRV_INTEL_TE28F160_ADD("biosflash")
MDRV_INTEL_E28F008SA_ADD("pgmflash")
MDRV_INTEL_E28F400_ADD("pgmflash")
MDRV_INTEL_TE28F160_ADD("sndflash0")
MDRV_INTEL_TE28F160_ADD("sndflash1")
MDRV_INTEL_TE28F160_ADD("sndflash2")
@ -1060,12 +1060,12 @@ INPUT_PORTS_END
//
#define ROM_LOAD16_WORD_BIOS(bios,name,offset,length,hash) \
ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_BIOS(bios+1)) /* Note '+1' */
ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(bios+1)) /* Note '+1' */
#define TAITOGNET_BIOS \
ROM_REGION32_LE( 0x080000, "mainbios", 0 ) \
ROM_LOAD( "coh-3002t.353", 0x000000, 0x080000, CRC(03967fa7) SHA1(0e17fec2286e4e25deb23d40e41ce0986f373d49) ) \
ROM_REGION16_LE( 0x200000, "biosflash", 0 ) \
ROM_REGION( 0x200000, "biosflash", 0 ) \
ROM_SYSTEM_BIOS( 0, "v1", "G-NET Bios v1" ) \
ROM_LOAD16_WORD_BIOS(0, "flash.u30", 0x000000, 0x200000, CRC(c48c8236) SHA1(c6dad60266ce2ff635696bc0d91903c543273559) ) \
ROM_SYSTEM_BIOS( 1, "v2", "G-NET Bios v2" ) \