diff options
author | Angelo Salese <angelosa@users.noreply.github.com> | 2010-04-04 20:04:55 +0000 |
---|---|---|
committer | Angelo Salese <angelosa@users.noreply.github.com> | 2010-04-04 20:04:55 +0000 |
commit | 63b784570eef9e4193ac79aa8b3f61476ecb4437 (patch) | |
tree | 003e3f3335a0da3bc406192670e755428e3f9be7 | |
parent | 6f657bc29e1df129d242f2535f20dab6c2b09e2d (diff) |
A bunch of small bugfixes, no whatsnew
-rw-r--r-- | src/mame/machine/snes.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 39819f5db31..40f359867ff 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -380,9 +380,9 @@ READ8_HANDLER( snes_r_io ) return value | 0x1c | (snes_open_bus_r(space, 0) & 0xe0); //correct? case RDNMI: /* NMI flag by v-blank and version number */ - value = (snes_ram[offset] & 0x8f) | (snes_open_bus_r(space, 0) & 0x70); - snes_ram[offset] &= 0x7f; /* NMI flag is reset on read */ - return value; + value = (snes_ram[offset] & 0x80) | (snes_open_bus_r(space, 0) & 0x70); + snes_ram[offset] &= 0x70; /* NMI flag is reset on read */ + return value | 2; //CPU version number case TIMEUP: /* IRQ flag by H/V count timer */ value = (snes_open_bus_r(space, 0) & 0x7f) | (snes_ram[TIMEUP] & 0x80); cpu_set_input_line(state->maincpu, G65816_LINE_IRQ, CLEAR_LINE ); @@ -2012,10 +2012,10 @@ static void snes_dma( const address_space *space, UINT8 channels ) if (!length) length = 0x10000; /* 0x0000 really means 0x10000 */ -// printf( "DMA-Ch %d: len: %X, abus: %X, bbus: %X, incr: %d, dir: %s, type: %d\n", i, length, abus, bbus, increment, state->dma_channel[i].dmap & 0x80 ? "PPU->CPU" : "CPU->PPU", state->dma_channel[i].dmap & 0x07); +// printf( "DMA-Ch %d: len: %X, abus: %X, bbus: %X, incr: %d, dir: %s, type: %d\n", i, length, abus | abus_bank, bbus, increment, state->dma_channel[i].dmap & 0x80 ? "PPU->CPU" : "CPU->PPU", state->dma_channel[i].dmap & 0x07); #ifdef SNES_DBG_DMA - mame_printf_debug( "DMA-Ch %d: len: %X, abus: %X, bbus: %X, incr: %d, dir: %s, type: %d\n", i, length, abus, bbus, increment, state->dma_channel[i].dmap & 0x80 ? "PPU->CPU" : "CPU->PPU", state->dma_channel[i].dmap & 0x07); + mame_printf_debug( "DMA-Ch %d: len: %X, abus: %X, bbus: %X, incr: %d, dir: %s, type: %d\n", i, length, abus | abus_bank, bbus, increment, state->dma_channel[i].dmap & 0x80 ? "PPU->CPU" : "CPU->PPU", state->dma_channel[i].dmap & 0x07); #endif switch (state->dma_channel[i].dmap & 0x07) |