From 2faf6023bcb70d77e9d9912a89d148418d5a447f Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Mon, 26 Jun 2017 21:13:17 -0700 Subject: Fix DMA from byte-wide SRAM --- genesis.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'genesis.c') diff --git a/genesis.c b/genesis.c index 149b2a7..aae2577 100644 --- a/genesis.c +++ b/genesis.c @@ -35,13 +35,13 @@ uint32_t MCLKS_PER_68K; uint16_t read_dma_value(uint32_t address) { genesis_context *genesis = (genesis_context *)current_system; - //addresses here are word addresses (i.e. bit 0 corresponds to A1), so no need to do multiply by 2 - uint16_t *ptr = get_native_pointer(address*2, (void **)genesis->m68k->mem_pointers, &genesis->m68k->options->gen); - if (ptr) { - return *ptr; - } //TODO: Figure out what happens when you try to DMA from weird adresses like IO or banked Z80 area - return 0; + if ((address >= 0xA00000 && address < 0xB00000) || (address >= 0xC00000 && address <= 0xE00000)) { + return 0; + } + + //addresses here are word addresses (i.e. bit 0 corresponds to A1), so no need to do multiply by 2 + return read_word(address * 2, (void **)genesis->m68k->mem_pointers, &genesis->m68k->options->gen, genesis->m68k); } static uint16_t get_open_bus_value(system_header *system) -- cgit v1.2.3