Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
David Haywood 2016-03-28 18:14:25 +01:00
commit 1a4e2e3e27
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/devices/machine/eeprom.cpp
View File

@ -146,7 +146,7 @@ void eeprom_base_device::static_set_timing(device_t &device, timing_type type, c
UINT32 eeprom_base_device::read(offs_t address) UINT32 eeprom_base_device::read(offs_t address)
{ {
if (!ready()) if (!ready())
logerror("EEPROM: Read performed before previous operation completed!"); logerror("EEPROM: Read performed before previous operation completed!\n");
return internal_read(address); return internal_read(address);
} }
@ -158,7 +158,7 @@ UINT32 eeprom_base_device::read(offs_t address)
void eeprom_base_device::write(offs_t address, UINT32 data) void eeprom_base_device::write(offs_t address, UINT32 data)
{ {
if (!ready()) if (!ready())
logerror("EEPROM: Write performed before previous operation completed!"); logerror("EEPROM: Write performed before previous operation completed!\n");
internal_write(address, data); internal_write(address, data);
m_completion_time = machine().time() + m_operation_time[WRITE_TIME]; m_completion_time = machine().time() + m_operation_time[WRITE_TIME];
} }
@ -173,7 +173,7 @@ void eeprom_base_device::write(offs_t address, UINT32 data)
void eeprom_base_device::write_all(UINT32 data) void eeprom_base_device::write_all(UINT32 data)
{ {
if (!ready()) if (!ready())
logerror("EEPROM: Write all performed before previous operation completed!"); logerror("EEPROM: Write all performed before previous operation completed!\n");
for (offs_t address = 0; address < (1 << m_address_bits); address++) for (offs_t address = 0; address < (1 << m_address_bits); address++)
internal_write(address, internal_read(address) & data); internal_write(address, internal_read(address) & data);
m_completion_time = machine().time() + m_operation_time[WRITE_ALL_TIME]; m_completion_time = machine().time() + m_operation_time[WRITE_ALL_TIME];
@ -187,7 +187,7 @@ void eeprom_base_device::write_all(UINT32 data)
void eeprom_base_device::erase(offs_t address) void eeprom_base_device::erase(offs_t address)
{ {
if (!ready()) if (!ready())
logerror("EEPROM: Erase performed before previous operation completed!"); logerror("EEPROM: Erase performed before previous operation completed!\n");
internal_write(address, ~0); internal_write(address, ~0);
m_completion_time = machine().time() + m_operation_time[ERASE_TIME]; m_completion_time = machine().time() + m_operation_time[ERASE_TIME];
} }
@ -200,7 +200,7 @@ void eeprom_base_device::erase(offs_t address)
void eeprom_base_device::erase_all() void eeprom_base_device::erase_all()
{ {
if (!ready()) if (!ready())
logerror("EEPROM: Erase all performed before previous operation completed!"); logerror("EEPROM: Erase all performed before previous operation completed!\n");
for (offs_t address = 0; address < (1 << m_address_bits); address++) for (offs_t address = 0; address < (1 << m_address_bits); address++)
internal_write(address, ~0); internal_write(address, ~0);
m_completion_time = machine().time() + m_operation_time[ERASE_ALL_TIME]; m_completion_time = machine().time() + m_operation_time[ERASE_ALL_TIME];

4
src/mame/drivers/hh_melps4.cpp
View File

@ -361,7 +361,7 @@ public:
void gjungler_state::prepare_display() void gjungler_state::prepare_display()
{ {
UINT16 grid = BITSWAP16(m_grid,15,14,13,12,11,10,9,8,7,6,5,4,3,2,0,1); UINT16 grid = BITSWAP16(m_grid,15,14,13,12,11,10,9,8,7,6,5,4,3,2,0,1);
UINT32 plate = BITSWAP24(m_plate,23,22,21,20,19,18,8,9,10,11,17,16,15,14,13,12,0,7,1,6,2,5,3,4) | 0x2000; UINT32 plate = BITSWAP24(m_plate,23,22,21,20,19,18,8,9,10,11,13,16,15,14,13,12,7,0,6,1,5,2,4,3) | 0x2000;
display_matrix(18, 12, plate, grid); display_matrix(18, 12, plate, grid);
} }
@ -467,4 +467,4 @@ ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */ /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
CONS( 1981, cfrogger, 0, 0, cfrogger, cfrogger, driver_device, 0, "Coleco", "Frogger (Coleco)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) CONS( 1981, cfrogger, 0, 0, cfrogger, cfrogger, driver_device, 0, "Coleco", "Frogger (Coleco)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
CONS( 1982, gjungler, 0, 0, gjungler, gjungler, driver_device, 0, "Gakken / Konami", "Jungler (Gakken)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK | MACHINE_NOT_WORKING ) CONS( 1982, gjungler, 0, 0, gjungler, gjungler, driver_device, 0, "Gakken / Konami", "Jungler (Gakken)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )