From: beeanyew Date: Wed, 21 Apr 2021 07:48:13 +0000 (+0200) Subject: Merge pull request #11 from shanshe/wip-crap X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=513e2291ea278168ecc5c5222f4b5fa570bf0e77;hp=7ea67b29f747902978cce9d5ea59ed632551e5f7;p=pistorm Merge pull request #11 from shanshe/wip-crap RTG off after Amiga reset - fixes Pi keyboard reset with RTG active --- diff --git a/emulator.c b/emulator.c index 0dac22a..6e0e0f9 100644 --- a/emulator.c +++ b/emulator.c @@ -59,6 +59,7 @@ extern uint8_t gayle_a4k_int; extern volatile unsigned int *gpio; extern volatile uint16_t srdata; extern uint8_t realtime_graphics_debug; +extern uint8_t rtg_on; uint8_t realtime_disassembly, int2_enabled = 0; uint32_t do_disasm = 0, old_level; uint32_t last_irq = 8, last_last_irq = 8; @@ -235,9 +236,9 @@ cpu_loop: }*/ if (do_reset) { cpu_pulse_reset(); - m68k_pulse_reset(); do_reset=0; usleep(1000000); // 1sec + rtg_on=0; // while(amiga_reset==0); // printf("CPU emulation reset.\n"); }