summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Ted Green <tedgreen99@users.noreply.github.com>2019-01-09 07:44:01 -0700
committer Ted Green <tedgreen99@users.noreply.github.com>2019-01-09 07:46:47 -0700
commita368aad4b309d2fa3b6ef7e9c919bd3d78692b72 (patch)
tree0d72570fa296233148570d65efcfb08be26e8609
parent9b31c1ea2990658213a3aee53ef79377be5a904d (diff)
Revert midwayic: Make initial serial number random. No linking for you! (nw)
This reverts commit 70b83845641c46b93f182d5ea41190502d14c79e.
-rw-r--r--src/devices/machine/smc91c9x.cpp4
-rw-r--r--src/mame/machine/midwayic.cpp14
-rw-r--r--src/mame/machine/midwayic.h2
3 files changed, 6 insertions, 14 deletions
diff --git a/src/devices/machine/smc91c9x.cpp b/src/devices/machine/smc91c9x.cpp
index d6aa2d264a8..21fcb11d1f7 100644
--- a/src/devices/machine/smc91c9x.cpp
+++ b/src/devices/machine/smc91c9x.cpp
@@ -352,8 +352,8 @@ int smc91c9x_device::address_filter(u8 *buf)
return ADDR_MULTICAST;
}
- LOGMASKED(LOG_FILTER, "address_filter rejected multicast %02x-%02x-%02x-%02x-%02x-%02x crc: %08x hash: %02x multi: %08x%08x\n",
- buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], crc, m_rx_hash, *(u32*)&m_reg[B3_MT2_3], *(u32*)&m_reg[B3_MT0_1]);
+ LOGMASKED(LOG_FILTER, "address_filter rejected multicast %02x-%02x-%02x-%02x-%02x-%02x crc: %08x hash: %02x multi: %16ullx\n",
+ buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], crc, m_rx_hash, *(u64*)&m_reg[B3_MT0_1]);
}
else
{
diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp
index 0fb6ab5ca86..1744942fd77 100644
--- a/src/mame/machine/midwayic.cpp
+++ b/src/mame/machine/midwayic.cpp
@@ -32,12 +32,13 @@
*
*************************************/
-void midway_serial_pic_device::generate_serial_data(int upper, uint32_t serial_number)
+void midway_serial_pic_device::generate_serial_data(int upper)
{
int year = atoi(machine().system().year), month = 12, day = 11;
- uint32_t temp;
+ uint32_t serial_number, temp;
uint8_t serial_digit[9];
+ serial_number = 123456;
serial_number += upper * 1000000;
serial_digit[0] = (serial_number / 100000000) % 10;
@@ -319,9 +320,6 @@ void midway_serial_pic2_device::device_start()
m_time_just_written = 0;
m_time_write_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(midway_serial_pic2_device::reset_timer),this));
memset(m_default_nvram, 0xff, sizeof(m_default_nvram));
- // Set the first four bytes to random serial number
- u32 rand_serial = rand() & 0x7ffff;
- memcpy(m_default_nvram, &rand_serial, 4);
}
@@ -582,17 +580,11 @@ WRITE8_MEMBER(midway_serial_pic2_device::write)
void midway_serial_pic2_device::nvram_default()
{
memcpy(m_nvram, m_default_nvram, sizeof(m_nvram));
-
- // Create serial number from first 4 bytes of nvram memory
- generate_serial_data(m_upper, (*(uint32_t*)m_nvram) & 0x7ffff);
}
void midway_serial_pic2_device::nvram_read(emu_file &file)
{
file.read(m_nvram, sizeof(m_nvram));
-
- // Create serial number from first 4 bytes of nvram memory
- generate_serial_data(m_upper, (*(uint32_t*)m_nvram) & 0x7ffff);
}
void midway_serial_pic2_device::nvram_write(emu_file &file)
diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h
index d83b56fa7b2..e5a422782b5 100644
--- a/src/mame/machine/midwayic.h
+++ b/src/mame/machine/midwayic.h
@@ -36,7 +36,7 @@ protected:
// device-level overrides
virtual void device_start() override;
- void generate_serial_data(int upper, uint32_t serial_number = 123456);
+ void generate_serial_data(int upper);
void serial_register_state();
uint8_t m_data[16]; // reused by other devices