--- uae/src/include/blitter.h	2018/04/24 16:38:39	1.1
+++ uae/src/include/blitter.h	2018/04/24 17:18:58	1.1.1.6
@@ -1,36 +1,49 @@
- /* 
+ /*
   * UAE - The Un*x Amiga Emulator
-  * 
+  *
   * Blitter emulation
   *
   * (c) 1995 Bernd Schmidt
   */
 
+#if 0
 struct bltinfo {
     int blitzero;
-    UWORD blitpreva,blitprevb,blitashift,blitbshift;
-    UWORD bltadat,bltbdat,bltcdat,bltddat,bltafwm,bltalwm;
-    UWORD vblitsize,hblitsize;
-    WORD  bltamod,bltbmod,bltcmod,bltdmod;
+    int blitashift,blitbshift,blitdownashift,blitdownbshift;
+    uae_u32 bltadat, bltbdat, bltcdat,bltddat,bltahold,bltbhold,bltafwm,bltalwm;
+    int vblitsize,hblitsize;
+    int bltamod,bltbmod,bltcmod,bltdmod;
 };
-
+#else
+struct bltinfo {
+    int blitzero;
+    int blitashift,blitbshift,blitdownashift,blitdownbshift;
+    uae_u16 bltadat, bltbdat, bltcdat,bltddat,bltahold,bltbhold,bltafwm,bltalwm;
+    int vblitsize,hblitsize;
+    int bltamod,bltbmod,bltcmod,bltdmod;
+};
+#endif
 extern enum blitter_states {
     BLT_done, BLT_init, BLT_read, BLT_work, BLT_write, BLT_next
 } bltstate;
 
 extern struct bltinfo blt_info;
 
-extern UWORD bltsize, oldvblts;
-extern UWORD bltcon0,bltcon1;
+extern uae_u16 bltsize, oldvblts;
+extern uae_u16 bltcon0,bltcon1;
 extern int blinea_shift;
-extern ULONG bltapt,bltbpt,bltcpt,bltdpt;
-
-extern void maybe_blit(void);
-extern void blitter_handler(void);
-extern void build_blitfilltable(void);
-extern void do_blitter(void);
-
-typedef void blitter_func(UBYTE *, UBYTE *, UBYTE *, UBYTE *, struct bltinfo *);
+extern uae_u32 bltapt,bltbpt,bltcpt,bltdpt;
 
-extern blitter_func *blitfunc_dofast[256];
-extern blitter_func *blitfunc_dofast_desc[256];
+extern void maybe_blit (int);
+extern int blitnasty (void);
+extern void blitter_handler (void);
+extern void build_blitfilltable (void);
+extern void do_blitter (void);
+extern void blitter_done_notify (void);
+typedef void blitter_func(uaecptr, uaecptr, uaecptr, uaecptr, struct bltinfo *);
+
+#define BLITTER_MAX_WORDS 2048
+
+extern blitter_func *const blitfunc_dofast[256];
+extern blitter_func *const blitfunc_dofast_desc[256];
+extern uae_u32 blit_masktable[BLITTER_MAX_WORDS];