--- generator/main/cpuz80-raze.c	2020/03/04 04:46:43	1.1.1.1
+++ generator/main/cpuz80-raze.c	2020/03/04 04:47:06	1.1.1.3
@@ -15,18 +15,17 @@
 
 uint8 *cpuz80_ram = NULL;
 uint32 cpuz80_bank = 0;
-unsigned int cpuz80_active = 0;
+uint8 cpuz80_active = 0;
+uint8 cpuz80_resetting = 0;
 unsigned int cpuz80_pending = 0;
+unsigned int cpuz80_on = 1;     /* z80 turned on? */
 
 /*** global variables ***/
 
 static unsigned int cpuz80_lastsync = 0;
-static unsigned int cpuz80_resetting = 0;
 
 int cpuz80_init(void)
 {
-  int i;
-
   cpuz80_reset();
   return 0;
 }
@@ -48,18 +47,19 @@ void cpuz80_reset(void)
   cpuz80_active = 0;
   cpuz80_lastsync = 0;
   cpuz80_resetting = 1;
+  cpuz80_pending = 0;
   z80_init_memmap();
   z80_map_fetch(0x0000, 0x3fff, cpuz80_ram);
-  z80_map_fetch(0x4000, 0x7fff, cpuz80_ram); /* ok? */
-  z80_map_fetch(0x8000, 0xbfff, cpuz80_ram); /* ok? */
-  z80_map_fetch(0xc000, 0xffff, cpuz80_ram); /* ok? */
-  z80_add_read( 0x000, 0x3fff, Z80_MAP_DIRECT, cpuz80_ram);
+  z80_map_fetch(0x4000, 0x7fff, cpuz80_ram);    /* ok? */
+  z80_map_fetch(0x8000, 0xbfff, cpuz80_ram);    /* ok? */
+  z80_map_fetch(0xc000, 0xffff, cpuz80_ram);    /* ok? */
+  z80_add_read(0x000, 0x3fff, Z80_MAP_DIRECT, cpuz80_ram);
   z80_add_write(0x000, 0x3fff, Z80_MAP_DIRECT, cpuz80_ram);
   for (i = 1; (memz80_def[i].start != 0) || (memz80_def[i].end != 0); i++) {
     z80_add_read(memz80_def[i].start << 8, (memz80_def[i].end << 8) - 1,
                  Z80_MAP_HANDLED, memz80_def[i].fetch_byte);
     z80_add_write(memz80_def[i].start << 8, (memz80_def[i].end << 8) - 1,
-                 Z80_MAP_HANDLED, memz80_def[i].store_byte);
+                  Z80_MAP_HANDLED, memz80_def[i].store_byte);
   }
   z80_end_memmap();
   z80_reset();
@@ -78,7 +78,7 @@ void cpuz80_resetcpu(void)
 {
   cpuz80_sync();
   z80_reset();
-  cpuz80_resetting = 1; /* suspends execution */
+  cpuz80_resetting = 1;         /* suspends execution */
 }
 
 /*** cpuz80_unresetcpu - unreset z80 cpu ***/
@@ -87,14 +87,14 @@ void cpuz80_unresetcpu(void)
 {
   if (cpuz80_resetting)
     cpuz80_sync();
-  cpuz80_resetting = 0; /* un-suspends execution */
+  cpuz80_resetting = 0;         /* un-suspends execution */
 }
 
 /*** cpuz80_bankwrite - data is being written to latch ***/
 
 void cpuz80_bankwrite(uint8 data)
 {
-  cpuz80_bank = (((cpuz80_bank >> 1) | ((data & 1) <<23)) & 0xff8000);
+  cpuz80_bank = (((cpuz80_bank >> 1) | ((data & 1) << 23)) & 0xff8000);
 }
 
 /*** cpuz80_stop - stop the processor ***/
@@ -126,7 +126,7 @@ void cpuz80_endfield(void)
 void cpuz80_sync(void)
 {
   int cpu68k_wanted = cpu68k_clocks - cpuz80_lastsync;
-  int wanted = (cpu68k_wanted<0?0:cpu68k_wanted)*7/15;
+  int wanted = (cpu68k_wanted < 0 ? 0 : cpu68k_wanted) * 7 / 15;
   int acheived;
 
   if (cpuz80_pending && z80_get_reg(Z80_REG_IFF1)) {
@@ -134,11 +134,11 @@ void cpuz80_sync(void)
     z80_lower_IRQ();
     cpuz80_pending = 0;
   }
-  if (cpuz80_active && !cpuz80_resetting) {
+  if (cpuz80_on && cpuz80_active && !cpuz80_resetting) {
     /* ui_log(LOG_USER, "executing %d z80 clocks @ %X", wanted,
        cpuz80_z80.z80pc); */
     acheived = z80_emulate(wanted);
-    cpuz80_lastsync = cpuz80_lastsync + acheived*15/7;
+    cpuz80_lastsync = cpuz80_lastsync + acheived * 15 / 7;
   } else {
     cpuz80_lastsync = cpu68k_clocks;
   }