Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

dp8573: minor changes (nw)

Browse Source 
* synchronize time after loading nvram
* simplify read/write handlers
* irq active low
* there's no reset
* pfail is an input (not implemented)
This commit is contained in:
Patrick Mackinlay 2019-08-26 18:18:39 +07:00
parent 6bf0a5c8bb
commit bdac293d8c
2 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/devices/machine/dp8573.cpp
View File

@ -23,8 +23,8 @@ DEFINE_DEVICE_TYPE(DP8573, dp8573_device, "dp8573", "DP8573 Real-Time Clock")
dp8573_device::dp8573_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DP8573, tag, owner, clock)
, device_nvram_interface(mconfig, *this)
, m_irq(*this)
, m_pfail(*this)
, m_intr_cb(*this)
, m_mfo_cb(*this)
{
}
@ -38,31 +38,36 @@ void dp8573_device::device_start()
m_timer = timer_alloc(TIMER_ID);
m_timer->adjust(attotime::never);
m_irq.resolve_safe();
m_pfail.resolve_safe();
m_intr_cb.resolve_safe();
m_mfo_cb.resolve_safe();
memset(m_ram, 0, 32);
sync_time();
m_tscr = 0;
m_pfr = 0;
m_millis = 0;
m_timer->adjust(attotime::from_msec(1), 0, attotime::from_msec(1));
}
void dp8573_device::sync_time()
{
system_time systime;
machine().base_datetime(systime);
m_ram[REG_SECOND] = time_helper::make_bcd(systime.local_time.second);
m_ram[REG_MINUTE] = time_helper::make_bcd(systime.local_time.minute);
m_ram[REG_HOUR] = time_helper::make_bcd(systime.local_time.hour);
m_ram[REG_DAY] = time_helper::make_bcd(systime.local_time.mday);
m_ram[REG_MONTH] = time_helper::make_bcd(systime.local_time.month + 1);
m_ram[REG_YEAR] = time_helper::make_bcd(systime.local_time.year % 100);
m_ram[REG_DAYOFWEEK] = time_helper::make_bcd(systime.local_time.weekday + 1);
m_ram[REG_RTMR] = RTMR_CSS;
}
m_millis = 0;
m_ram[REG_HUNDREDTH] = 0;
m_ram[REG_SECOND] = time_helper::make_bcd(systime.utc_time.second);
m_ram[REG_MINUTE] = time_helper::make_bcd(systime.utc_time.minute);
m_ram[REG_HOUR] = time_helper::make_bcd(systime.utc_time.hour);
m_ram[REG_DAY] = time_helper::make_bcd(systime.utc_time.mday);
m_ram[REG_MONTH] = time_helper::make_bcd(systime.utc_time.month + 1);
m_ram[REG_YEAR] = time_helper::make_bcd(systime.utc_time.year % 100);
m_ram[REG_DAYOFWEEK] = time_helper::make_bcd(systime.utc_time.weekday + 1);
void dp8573_device::device_reset()
{
m_timer->adjust(attotime::from_msec(1), 0, attotime::from_msec(1));
m_pfr = 0;
// FIXME: should probably rely on nvram start/stop state
m_ram[REG_RTMR] = RTMR_CSS;
}
void dp8573_device::save_registers()
@ -82,28 +87,28 @@ void dp8573_device::device_timer(emu_timer &timer, device_timer_id id, int param
return;
}
m_pfr ^= PFR_1MS;
m_pfr |= PFR_1MS;
bool carry = false;
bool tens_carry = false;
time_helper::inc_bcd(&m_millis, 0xff, 0x00, 0x09, &tens_carry);
if (tens_carry)
{
m_pfr ^= PFR_10MS;
m_pfr |= PFR_10MS;
carry = time_helper::inc_bcd(&m_ram[REG_HUNDREDTH], 0xff, 0x00, 0x99, &tens_carry);
if (tens_carry)
m_pfr ^= PFR_100MS;
m_pfr |= PFR_100MS;
}
if (carry)
{
m_pfr ^= PFR_1S;
m_pfr |= PFR_1S;
carry = time_helper::inc_bcd(&m_ram[REG_SECOND], 0xff, 0x00, 0x59, &tens_carry);
if (tens_carry)
m_pfr ^= PFR_10S;
m_pfr |= PFR_10S;
}
if (carry)
{
m_pfr ^= PFR_1MIN;
m_pfr |= PFR_1MIN;
carry = time_helper::inc_bcd(&m_ram[REG_MINUTE], 0xff, 0x00, 0x59);
}
if (carry)
@ -113,7 +118,7 @@ void dp8573_device::device_timer(emu_timer &timer, device_timer_id id, int param
carry = time_helper::inc_bcd(&m_ram[REG_HOUR], 0xff, 0x01, 0x12);
if (carry)
{
m_ram[REG_HOUR] ^= 0x20;
m_ram[REG_HOUR] |= 0x20;
carry = !(m_ram[REG_HOUR] & 0x20);
}
}
@ -201,7 +206,7 @@ void dp8573_device::set_interrupt(uint8_t mask)
m_ram[REG_MSR] |= MSR_INT;
if (!was_intr && (m_ram[REG_MSR] & MSR_INT))
m_irq(1);
m_intr_cb(0);
}
void dp8573_device::clear_interrupt(uint8_t mask)
@ -210,10 +215,10 @@ void dp8573_device::clear_interrupt(uint8_t mask)
m_ram[REG_MSR] &= ~mask;
if (was_intr && !(m_ram[REG_MSR] & MSR_INT))
m_irq(0);
m_intr_cb(1);
}
WRITE8_MEMBER(dp8573_device::write)
void dp8573_device::write(offs_t offset, u8 data)
{
LOGMASKED(LOG_GENERAL, "%s: DP8573 - Register Write: %02x = %02x\n", machine().describe_context(), offset, data);
@ -301,7 +306,7 @@ WRITE8_MEMBER(dp8573_device::write)
}
}
READ8_MEMBER(dp8573_device::read)
u8 dp8573_device::read(offs_t offset)
{
uint8_t ret = m_ram[offset];
@ -338,14 +343,13 @@ READ8_MEMBER(dp8573_device::read)
void dp8573_device::nvram_default()
{
memset(m_ram, 0, 32);
m_pfr = 0;
m_ram[REG_RTMR] = RTMR_CSS;
sync_time();
}
void dp8573_device::nvram_read(emu_file &file)
{
file.read(m_ram, 32);
sync_time();
}
void dp8573_device::nvram_write(emu_file &file)

17
src/devices/machine/dp8573.h
View File

@ -21,16 +21,16 @@ public:
dp8573_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE8_MEMBER(write);
DECLARE_READ8_MEMBER(read);
void write(offs_t offset, u8 data);
u8 read(offs_t offset);
void pfail_w(int state) {}
auto irq() { return m_irq.bind(); }
auto power_fail() { return m_pfail.bind(); }
auto intr() { return m_intr_cb.bind(); }
auto mfo() { return m_mfo_cb.bind(); }
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_nvram_interface overrides
@ -38,6 +38,7 @@ protected:
virtual void nvram_read(emu_file &file) override;
virtual void nvram_write(emu_file &file) override;
void sync_time();
void save_registers();
void set_interrupt(uint8_t mask);
void clear_interrupt(uint8_t mask);
@ -51,7 +52,7 @@ protected:
REG_OMR = 0x02, // Not Applicable / Output Mode Register
REG_PFR_ICR0 = 0x03, // Periodic Flag Register / Interrupt Control Register 0
REG_TSCR_ICR1 = 0x04, // Time Save Control Register / Interrupt Control Register 1
REG_HUNDREDTH = 0x05, // Hundredths and Teneths of a Second (0-99)
REG_HUNDREDTH = 0x05, // Hundredths and Tenths of a Second (0-99)
REG_SECOND = 0x06, // Seconds (0-59)
REG_MINUTE = 0x07, // Minutes (0-59)
REG_HOUR = 0x08, // Hours (1-12, 0-23)
@ -139,8 +140,8 @@ protected:
emu_timer *m_timer;
devcb_write_line m_irq;
devcb_write_line m_pfail;
devcb_write_line m_intr_cb;
devcb_write_line m_mfo_cb;
};
DECLARE_DEVICE_TYPE(DP8573, dp8573_device)