3b1emu / file diff

diff: src/main.c

src/main.c

changeset 107
566cfc70ef33
parent 97
240e195e4bed
child 111
4c85846b09cd
     1.1 --- a/src/main.c	Fri Mar 04 01:38:39 2011 +0000
     1.2 +++ b/src/main.c	Fri Mar 04 02:12:25 2011 +0000
     1.3 @@ -292,7 +292,7 @@
     1.4  					state.bsr0 = 0x3C00;
     1.5  					state.bsr0 |= (state.dma_address >> 16);
     1.6  					state.bsr1 = state.dma_address & 0xffff;
     1.7 -					m68k_pulse_bus_error();
     1.8 +					if (state.ee) m68k_pulse_bus_error();
     1.9  					printf("BUS ERROR FROM DMA: genstat=%04X, bsr0=%04X, bsr1=%04X\n", state.genstat, state.bsr0, state.bsr1);
    1.10  
    1.11  					// TODO: FIXME: if we get a pagefault, it NEEDS to be tagged as 'peripheral sourced'... this is a HACK!
    1.12 @@ -358,9 +358,9 @@
    1.13  			m68k_set_irq(3);
    1.14  		} else {
    1.15  			lastirq_fdc = wd2797_get_irq(&state.fdc_ctx);
    1.16 -			if (!state.timer_asserted){
    1.17 -				m68k_set_irq(0);
    1.18 -			}
    1.19 +//			if (!state.timer_asserted){
    1.20 +//				m68k_set_irq(0);
    1.21 +//			}
    1.22  		}
    1.23  
    1.24  		// Is it time to run the 60Hz periodic interrupt yet?