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

upd7220: fix copy paste bug in DMA handling

Browse Source
This commit is contained in:
Brian Johnson 2021-04-22 22:11:36 -04:00 committed by Vas Crabb
parent cf00ff3a96
commit d7b759a280
1 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/devices/video/upd7220.cpp
View File

@ -466,7 +466,6 @@ inline uint16_t upd7220_device::read_vram()
inline void upd7220_device::rdat(uint8_t type, uint8_t mod) inline void upd7220_device::rdat(uint8_t type, uint8_t mod)
{ {
uint16_t data;
if (type == 1) if (type == 1)
{ {
LOG("uPD7220 invalid type 1 RDAT parameter\n"); LOG("uPD7220 invalid type 1 RDAT parameter\n");
@ -478,6 +477,7 @@ inline void upd7220_device::rdat(uint8_t type, uint8_t mod)
while (m_figs.m_dc && m_fifo_ptr < (type ? 15 : 14)) while (m_figs.m_dc && m_fifo_ptr < (type ? 15 : 14))
{ {
uint16_t data;
data = read_vram(); data = read_vram();
switch(type) switch(type)
{ {
@ -1546,27 +1546,32 @@ void upd7220_device::write(offs_t offset, uint8_t data)
uint8_t upd7220_device::dack_r() uint8_t upd7220_device::dack_r()
{ {
uint8_t result = 0; uint8_t result = 0;
switch(m_dma_type) { switch(m_dma_type)
case 0: {
if (m_dma_transfer_length % 2 == 0) { case 0:
if (m_dma_transfer_length % 2 == 0)
{
m_dma_data = read_vram();
result = m_dma_data & 0xff;
}
else
{
result = (m_dma_data >> 8) & 0xff;
}
break;
case 2:
m_dma_data = read_vram(); m_dma_data = read_vram();
result = m_dma_data & 0xff; result = m_dma_data & 0xff;
} else { break;
case 3:
m_dma_data = read_vram();
result = (m_dma_data >> 8) & 0xff; result = (m_dma_data >> 8) & 0xff;
} break;
break; default:
case 2: logerror("uPD7220 Invalid DMA Transfer Type\n");
m_dma_data = read_vram();
result = m_dma_data & 0xff;
break;
case 3:
m_dma_data = read_vram();
result = (m_dma_data >> 8) & 0xff;
break;
default:
logerror("uPD7220 Invalid DMA Transfer Type\n");
} }
if (--m_dma_transfer_length == 0) { if (--m_dma_transfer_length == 0)
{
stop_dma(); stop_dma();
} }
return result; return result;
@ -1579,34 +1584,40 @@ uint8_t upd7220_device::dack_r()
void upd7220_device::dack_w(uint8_t data) void upd7220_device::dack_w(uint8_t data)
{ {
switch(m_dma_type) { switch(m_dma_type)
case 0: {
if (m_dma_transfer_length % 2) { case 0:
m_dma_data = ((m_dma_data & 0xff) | data << 8) & m_mask; if (m_dma_transfer_length % 2)
{
m_dma_data = ((m_dma_data & 0xff) | data << 8) & m_mask;
write_vram(m_dma_type, m_dma_mod, m_dma_data);
}
else
{
m_dma_data = (m_dma_data & 0xff00) | data;
}
break;
case 2:
m_dma_data = data & (m_mask & 0xff);
write_vram(m_dma_type, m_dma_mod, m_dma_data); write_vram(m_dma_type, m_dma_mod, m_dma_data);
} else { break;
m_dma_data = (m_dma_data & 0xff00) | data; case 3:
} m_dma_data = (data << 8) & (m_mask & 0xff00);
break; write_vram(m_dma_type, m_dma_mod, m_dma_data);
case 2: break;
m_dma_data = data & (m_mask & 0xff); default:
write_vram(m_dma_type, m_dma_mod, m_dma_data); logerror("uPD7220 Invalid DMA Transfer Type\n");
break;
case 3:
m_dma_data = (data << 8) & (m_mask & 0xff);
write_vram(m_dma_type, m_dma_mod, m_dma_data);
break;
default:
logerror("uPD7220 Invalid DMA Transfer Type\n");
} }
if (--m_dma_transfer_length == 0) { if (--m_dma_transfer_length == 0)
{
stop_dma(); stop_dma();
} }
} }
void upd7220_device::start_dma() void upd7220_device::start_dma()
{ {
if ((m_sr & UPD7220_SR_DMA_EXECUTE) == 0) { if ((m_sr & UPD7220_SR_DMA_EXECUTE) == 0)
{
m_write_drq(ASSERT_LINE); m_write_drq(ASSERT_LINE);
m_sr |= UPD7220_SR_DMA_EXECUTE; m_sr |= UPD7220_SR_DMA_EXECUTE;
} }
@ -1614,7 +1625,8 @@ void upd7220_device::start_dma()
void upd7220_device::stop_dma() void upd7220_device::stop_dma()
{ {
if ((m_sr & UPD7220_SR_DMA_EXECUTE) == UPD7220_SR_DMA_EXECUTE) { if ((m_sr & UPD7220_SR_DMA_EXECUTE) == UPD7220_SR_DMA_EXECUTE)
{
m_write_drq(CLEAR_LINE); m_write_drq(CLEAR_LINE);
m_sr &= ~UPD7220_SR_DMA_EXECUTE; m_sr &= ~UPD7220_SR_DMA_EXECUTE;
reset_figs_param(); reset_figs_param();