--- uae/src/blitter.c	2018/04/24 16:53:06	1.1.1.7
+++ uae/src/blitter.c	2018/04/24 17:00:18	1.1.1.10
@@ -15,12 +15,11 @@
 #include "uae.h"
 #include "memory.h"
 #include "custom.h"
-#include "readcpu.h"
 #include "newcpu.h"
 #include "blitter.h"
 #include "blit.h"
 
-uae_u16 bltsize, oldvblts;
+uae_u16 oldvblts;
 uae_u16 bltcon0,bltcon1;
 uae_u32 bltapt,bltbpt,bltcpt,bltdpt;
 
@@ -425,15 +424,15 @@ void blitter_handler(void)
 {
     if (!dmaen(DMA_BLITTER)) {
 	eventtab[ev_blitter].active = 1;
-	eventtab[ev_blitter].oldcycles = cycles;
-	eventtab[ev_blitter].evtime = 10 + cycles; /* wait a little */
+	eventtab[ev_blitter].oldcycles = get_cycles ();
+	eventtab[ev_blitter].evtime = 10 * CYCLE_UNIT + get_cycles (); /* wait a little */
 	return; /* gotta come back later. */
     }
     actually_do_blit();
 
     INTREQ(0x8040);
     eventtab[ev_blitter].active = 0;
-    regs.spcflags &= ~SPCFLAG_BLTNASTY;
+    unset_special (SPCFLAG_BLTNASTY);
 }
 
 void do_blitter(void)
@@ -456,16 +455,16 @@ void do_blitter(void)
     blit_init();
 
     eventtab[ev_blitter].active = 1;
-    eventtab[ev_blitter].oldcycles = cycles;
-    eventtab[ev_blitter].evtime = blit_cycles + cycles;
+    eventtab[ev_blitter].oldcycles = get_cycles ();
+    eventtab[ev_blitter].evtime = blit_cycles * CYCLE_UNIT + get_cycles ();
     events_schedule();
 
-    regs.spcflags &= ~SPCFLAG_BLTNASTY;
+    unset_special (SPCFLAG_BLTNASTY);
     if (dmaen(DMA_BLITPRI))
-	regs.spcflags |= SPCFLAG_BLTNASTY;
+	set_special (SPCFLAG_BLTNASTY);
 }
 
-void maybe_blit(void)
+void maybe_blit (void)
 {
     static int warned = 0;
     if (bltstate == BLT_done)
@@ -477,7 +476,5 @@ void maybe_blit(void)
     }
     if (!eventtab[ev_blitter].active)
 	printf("FOO!!?\n");
-    actually_do_blit();
-    eventtab[ev_blitter].active = 0;
-    regs.spcflags &= ~SPCFLAG_BLTNASTY;
+    blitter_handler ();
 }