Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-27 18:53:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

a2065: Fix DMA/memory accesses

Browse Source
This commit is contained in:
Dirk Best 2018-11-21 11:08:30 +01:00
parent 05449c1ca3
commit 56f1d01eaa
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/devices/bus/amiga/zorro/a2065.cpp
View File

@ -33,8 +33,8 @@ void a2065_device::device_add_mconfig(machine_config &config)
{ {
AM7990(config, m_lance); AM7990(config, m_lance);
m_lance->intr_out().set(FUNC(a2065_device::lance_irq_w)); m_lance->intr_out().set(FUNC(a2065_device::lance_irq_w));
m_lance->dma_in().set(FUNC(a2065_device::ram_r)); m_lance->dma_in().set(FUNC(a2065_device::lance_ram_r));
m_lance->dma_out().set(FUNC(a2065_device::ram_w)); m_lance->dma_out().set(FUNC(a2065_device::lance_ram_w));
} }
@ -97,8 +97,8 @@ void a2065_device::autoconfig_base_address(offs_t address)
// install access to onboard ram (32k) // install access to onboard ram (32k)
m_slot->m_space->install_readwrite_handler(address + 0x8000, address + 0x8000 + 0x7fff, m_slot->m_space->install_readwrite_handler(address + 0x8000, address + 0x8000 + 0x7fff,
read16_delegate(FUNC(a2065_device::ram_r), this), read16_delegate(FUNC(a2065_device::host_ram_r), this),
write16_delegate(FUNC(a2065_device::ram_w), this), 0xffff); write16_delegate(FUNC(a2065_device::host_ram_w), this), 0xffff);
// we're done // we're done
m_slot->cfgout_w(0); m_slot->cfgout_w(0);
@ -117,7 +117,7 @@ WRITE_LINE_MEMBER( a2065_device::cfgin_w )
autoconfig_product(0x70); autoconfig_product(0x70);
autoconfig_manufacturer(0x0202); autoconfig_manufacturer(0x0202);
autoconfig_serial(0x00000000); // last 3 bytes = last 3 bytes of mac address autoconfig_serial(0x00123456); // last 3 bytes = last 3 bytes of mac address
autoconfig_link_into_memory(false); autoconfig_link_into_memory(false);
autoconfig_rom_vector_valid(false); autoconfig_rom_vector_valid(false);
@ -132,16 +132,30 @@ WRITE_LINE_MEMBER( a2065_device::cfgin_w )
} }
} }
READ16_MEMBER( a2065_device::ram_r ) READ16_MEMBER( a2065_device::host_ram_r )
{ {
// logerror("read offset %04x\n", offset); // logerror("host read offset %04x\n", offset);
return m_ram[offset & 0x3fff]; return m_ram[offset & 0x3fff];
} }
WRITE16_MEMBER( a2065_device::ram_w ) WRITE16_MEMBER( a2065_device::host_ram_w )
{ {
// logerror("write %04x = %04x\n", offset, data); // logerror("host write %04x = %04x\n", offset, data);
m_ram[offset & 0x3fff] = data; COMBINE_DATA(&m_ram[offset]);
}
READ16_MEMBER( a2065_device::lance_ram_r )
{
offset = (offset >> 1) & 0x3fff;
// logerror("lance read offset %04x\n", offset);
return m_ram[offset];
}
WRITE16_MEMBER( a2065_device::lance_ram_w )
{
offset = (offset >> 1) & 0x3fff;
// logerror("lance write %04x = %04x\n", offset, data);
COMBINE_DATA(&m_ram[offset]);
} }
WRITE_LINE_MEMBER( a2065_device::lance_irq_w ) WRITE_LINE_MEMBER( a2065_device::lance_irq_w )

6
src/devices/bus/amiga/zorro/a2065.h
View File

@ -30,9 +30,11 @@ public:
// construction/destruction // construction/destruction
a2065_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); a2065_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ16_MEMBER( ram_r ); DECLARE_READ16_MEMBER( host_ram_r );
DECLARE_WRITE16_MEMBER( ram_w ); DECLARE_WRITE16_MEMBER( host_ram_w );
DECLARE_READ16_MEMBER( lance_ram_r );
DECLARE_WRITE16_MEMBER( lance_ram_w );
DECLARE_WRITE_LINE_MEMBER( lance_irq_w ); DECLARE_WRITE_LINE_MEMBER( lance_irq_w );
protected: protected: