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

hd63450: Minor cleanup; initialize registers on device_reset; save state registration (nw)

Browse Source
This commit is contained in:
AJR 2018-06-25 15:29:03 -04:00
parent 4263a71e64
commit f080a1b458
2 changed files with 74 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/devices/machine/hd63450.cpp
View File

@ -15,23 +15,20 @@ hd63450_device::hd63450_device(const machine_config &mconfig, const char *tag, d
: device_t(mconfig, HD63450, tag, owner, clock),
m_dma_end(*this),
m_dma_error(*this),
m_dma_read_0(*this),
m_dma_read_1(*this),
m_dma_read_2(*this),
m_dma_read_3(*this),
m_dma_write_0(*this),
m_dma_write_1(*this),
m_dma_write_2(*this),
m_dma_write_3(*this),
m_dma_read{{*this}, {*this}, {*this}, {*this}},
m_dma_write{{*this}, {*this}, {*this}, {*this}},
m_cpu(*this, finder_base::DUMMY_TAG)
{
for (int i = 0; i < 4; i++)
{
memset(&m_reg[i], 0, sizeof(m_reg[i]));
m_timer[i] = nullptr;
m_in_progress[i] = 0;
m_transfer_size[i] = 0;
m_halted[i] = 0;
m_drq_state[i] = 0;
m_our_clock[i] = attotime::zero;
m_burst_clock[i] = attotime::zero;
}
@ -46,27 +43,56 @@ void hd63450_device::device_start()
// resolve callbacks
m_dma_end.resolve();
m_dma_error.resolve_safe();
m_dma_read_0.resolve();
m_dma_read_1.resolve();
m_dma_read_2.resolve();
m_dma_read_3.resolve();
m_dma_write_0.resolve();
m_dma_write_1.resolve();
m_dma_write_2.resolve();
m_dma_write_3.resolve();
for (auto &cb : m_dma_read)
cb.resolve();
for (auto &cb : m_dma_write)
cb.resolve();
// Initialise timers and registers
for (int x = 0; x < 4 ; x++)
for (int x = 0; x < 4; x++)
{
m_timer[x] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(hd63450_device::dma_transfer_timer), this));
m_reg[x].niv = 0x0f; // defaults?
m_reg[x].eiv = 0x0f;
save_item(NAME(m_reg[x].csr), x);
save_item(NAME(m_reg[x].cer), x);
save_item(NAME(m_reg[x].dcr), x);
save_item(NAME(m_reg[x].ocr), x);
save_item(NAME(m_reg[x].scr), x);
save_item(NAME(m_reg[x].ccr), x);
save_item(NAME(m_reg[x].mtc), x);
save_item(NAME(m_reg[x].mar), x);
save_item(NAME(m_reg[x].dar), x);
save_item(NAME(m_reg[x].btc), x);
save_item(NAME(m_reg[x].niv), x);
save_item(NAME(m_reg[x].eiv), x);
save_item(NAME(m_reg[x].mfc), x);
save_item(NAME(m_reg[x].cpr), x);
save_item(NAME(m_reg[x].dfc), x);
save_item(NAME(m_reg[x].bfc), x);
save_item(NAME(m_reg[x].gcr), x);
}
save_item(NAME(m_in_progress));
save_item(NAME(m_transfer_size));
save_item(NAME(m_halted));
save_item(NAME(m_drq_state));
}
void hd63450_device::device_reset()
{
m_drq_state[0] = m_drq_state[1] = m_drq_state[2] = m_drq_state[3] = 0;
for (int x = 0; x < 4; x++)
{
m_reg[x].niv = 0x0f;
m_reg[x].eiv = 0x0f;
m_reg[x].cpr = 0;
m_reg[x].dcr = 0;
m_reg[x].ocr = 0;
m_reg[x].scr = 0;
m_reg[x].ccr = 0;
m_reg[x].csr &= 0xfe;
m_reg[x].cer = 0;
m_reg[x].gcr = 0;
}
}
READ16_MEMBER(hd63450_device::read)
@ -317,33 +343,33 @@ void hd63450_device::single_transfer(int x)
{
if(m_reg[x].ocr & 0x80) // direction: 1 = device -> memory
{
if((x == 0) && !m_dma_read_0.isnull())
if((x == 0) && !m_dma_read[0].isnull())
{
data = m_dma_read_0(m_reg[x].mar);
data = m_dma_read[0](m_reg[x].mar);
if(data == -1)
return; // not ready to receive data
space.write_byte(m_reg[x].mar,data);
datasize = 1;
}
else if((x == 1) && !m_dma_read_1.isnull())
else if((x == 1) && !m_dma_read[1].isnull())
{
data = m_dma_read_1(m_reg[x].mar);
data = m_dma_read[1](m_reg[x].mar);
if(data == -1)
return; // not ready to receive data
space.write_byte(m_reg[x].mar,data);
datasize = 1;
}
else if((x == 2) && !m_dma_read_2.isnull())
else if((x == 2) && !m_dma_read[2].isnull())
{
data = m_dma_read_2(m_reg[x].mar);
data = m_dma_read[2](m_reg[x].mar);
if(data == -1)
return; // not ready to receive data
space.write_byte(m_reg[x].mar,data);
datasize = 1;
}
else if((x == 3) && !m_dma_read_3.isnull())
else if((x == 3) && !m_dma_read[3].isnull())
{
data = m_dma_read_3(m_reg[x].mar);
data = m_dma_read[3](m_reg[x].mar);
if(data == -1)
return; // not ready to receive data
space.write_byte(m_reg[x].mar,data);
@ -381,28 +407,28 @@ void hd63450_device::single_transfer(int x)
}
else // memory -> device
{
if((x == 0) && !m_dma_write_0.isnull())
if((x == 0) && !m_dma_write[0].isnull())
{
data = space.read_byte(m_reg[x].mar);
m_dma_write_0((offs_t)m_reg[x].mar,data);
m_dma_write[0]((offs_t)m_reg[x].mar,data);
datasize = 1;
}
else if((x == 1) && !m_dma_write_1.isnull())
else if((x == 1) && !m_dma_write[1].isnull())
{
data = space.read_byte(m_reg[x].mar);
m_dma_write_1((offs_t)m_reg[x].mar,data);
m_dma_write[1]((offs_t)m_reg[x].mar,data);
datasize = 1;
}
else if((x == 2) && !m_dma_write_2.isnull())
else if((x == 2) && !m_dma_write[2].isnull())
{
data = space.read_byte(m_reg[x].mar);
m_dma_write_2((offs_t)m_reg[x].mar,data);
m_dma_write[2]((offs_t)m_reg[x].mar,data);
datasize = 1;
}
else if((x == 3) && !m_dma_write_3.isnull())
else if((x == 3) && !m_dma_write[3].isnull())
{
data = space.read_byte(m_reg[x].mar);
m_dma_write_3((offs_t)m_reg[x].mar,data);
m_dma_write[3]((offs_t)m_reg[x].mar,data);
datasize = 1;
}
else

36
src/devices/machine/hd63450.h
View File

@ -17,28 +17,28 @@
devcb = &downcast<hd63450_device &>(*device).set_dma_error_callback(DEVCB_##_devcb);
#define MCFG_HD63450_DMA_READ_0_CB(_devcb) \
devcb = &downcast<hd63450_device &>(*device).set_dma_read_0_callback(DEVCB_##_devcb);
devcb = &downcast<hd63450_device &>(*device).set_dma_read_callback<0>(DEVCB_##_devcb);
#define MCFG_HD63450_DMA_READ_1_CB(_devcb) \
devcb = &downcast<hd63450_device &>(*device).set_dma_read_1_callback(DEVCB_##_devcb);
devcb = &downcast<hd63450_device &>(*device).set_dma_read_callback<1>(DEVCB_##_devcb);
#define MCFG_HD63450_DMA_READ_2_CB(_devcb) \
devcb = &downcast<hd63450_device &>(*device).set_dma_read_2_callback(DEVCB_##_devcb);
devcb = &downcast<hd63450_device &>(*device).set_dma_read_callback<2>(DEVCB_##_devcb);
#define MCFG_HD63450_DMA_READ_3_CB(_devcb) \
devcb = &downcast<hd63450_device &>(*device).set_dma_read_3_callback(DEVCB_##_devcb);
devcb = &downcast<hd63450_device &>(*device).set_dma_read_callback<3>(DEVCB_##_devcb);
#define MCFG_HD63450_DMA_WRITE_0_CB(_devcb) \
devcb = &downcast<hd63450_device &>(*device).set_dma_write_0_callback(DEVCB_##_devcb);
devcb = &downcast<hd63450_device &>(*device).set_dma_write_callback<0>(DEVCB_##_devcb);
#define MCFG_HD63450_DMA_WRITE_1_CB(_devcb) \
devcb = &downcast<hd63450_device &>(*device).set_dma_write_1_callback(DEVCB_##_devcb);
devcb = &downcast<hd63450_device &>(*device).set_dma_write_callback<1>(DEVCB_##_devcb);
#define MCFG_HD63450_DMA_WRITE_2_CB(_devcb) \
devcb = &downcast<hd63450_device &>(*device).set_dma_write_2_callback(DEVCB_##_devcb);
devcb = &downcast<hd63450_device &>(*device).set_dma_write_callback<2>(DEVCB_##_devcb);
#define MCFG_HD63450_DMA_WRITE_3_CB(_devcb) \
devcb = &downcast<hd63450_device &>(*device).set_dma_write_3_callback(DEVCB_##_devcb);
devcb = &downcast<hd63450_device &>(*device).set_dma_write_callback<3>(DEVCB_##_devcb);
#define MCFG_HD63450_CPU(_tag) \
downcast<hd63450_device &>(*device).set_cpu_tag(_tag);
@ -56,14 +56,8 @@ public:
template <class Object> devcb_base &set_dma_end_callback(Object &&cb) { return m_dma_end.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_dma_error_callback(Object &&cb) { return m_dma_error.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_dma_read_0_callback(Object &&cb) { return m_dma_read_0.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_dma_read_1_callback(Object &&cb) { return m_dma_read_1.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_dma_read_2_callback(Object &&cb) { return m_dma_read_2.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_dma_read_3_callback(Object &&cb) { return m_dma_read_3.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_dma_write_0_callback(Object &&cb) { return m_dma_write_0.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_dma_write_1_callback(Object &&cb) { return m_dma_write_1.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_dma_write_2_callback(Object &&cb) { return m_dma_write_2.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_dma_write_3_callback(Object &&cb) { return m_dma_write_3.set_callback(std::forward<Object>(cb)); }
template <int Ch, class Object> devcb_base &set_dma_read_callback(Object &&cb) { return m_dma_read[Ch].set_callback(std::forward<Object>(cb)); }
template <int Ch, class Object> devcb_base &set_dma_write_callback(Object &&cb) { return m_dma_write[Ch].set_callback(std::forward<Object>(cb)); }
template <typename T> void set_cpu_tag(T &&cpu_tag) { m_cpu.set_tag(std::forward<T>(cpu_tag)); }
void set_our_clocks(const attotime &clk1, const attotime &clk2, const attotime &clk3, const attotime &clk4)
@ -123,14 +117,8 @@ private:
devcb_write8 m_dma_end;
devcb_write8 m_dma_error;
devcb_read8 m_dma_read_0;
devcb_read8 m_dma_read_1;
devcb_read8 m_dma_read_2;
devcb_read8 m_dma_read_3;
devcb_write8 m_dma_write_0;
devcb_write8 m_dma_write_1;
devcb_write8 m_dma_write_2;
devcb_write8 m_dma_write_3;
devcb_read8 m_dma_read[4];
devcb_write8 m_dma_write[4];
attotime m_our_clock[4];
attotime m_burst_clock[4];