--- uae/src/include/custom.h	2018/04/24 16:38:39	1.1
+++ uae/src/include/custom.h	2018/04/24 16:46:32	1.1.1.6
@@ -1,29 +1,40 @@
- /* 
+ /*
   * UAE - The Un*x Amiga Emulator
-  * 
+  *
   * custom chip support
   *
   * (c) 1995 Bernd Schmidt
   */
 
-extern void custom_init(void);
-extern void customreset(void);
-extern int intlev(void);
-extern void dumpcustom(void);
+extern void custom_init (void);
+extern void customreset (void);
+extern int intlev (void);
+extern void dumpcustom (void);
+
+extern void do_disk (void);
+
+extern void notice_new_xcolors (void);
+extern void notice_screen_contents_lost (void);
+extern void init_row_map (void);
 
-extern void do_disk(void);
+extern int picasso_requested_on;
+extern int picasso_on;
 
-extern int inhibit_frame;
+/* Set to 1 to leave out the current frame in average frame time calculation.
+ * Useful if the debugger was active.  */
 extern int bogusframe;
 
-extern UWORD dmacon;
-extern UWORD intena,intreq;
-static __inline__ int dmaen(UWORD dmamask)
+extern uae_u16 dmacon;
+extern uae_u16 intena,intreq;
+
+extern int current_hpos (void);
+extern int vpos;
+
+static __inline__ int dmaen (unsigned int dmamask)
 {
     return (dmamask & dmacon) && (dmacon & 0x200);
 }
 
-#define SPCFLAG_BLIT 1
 #define SPCFLAG_STOP 2
 #define SPCFLAG_DISK 4
 #define SPCFLAG_INT  8
@@ -34,24 +45,25 @@ static __inline__ int dmaen(UWORD dmamas
 #define SPCFLAG_DOINT 256
 #define SPCFLAG_BLTNASTY 512
 #define SPCFLAG_EXEC 1024
-#define SPCFLAG_EMULTRAP 2048
-
-#define PRESERVED_FLAGS (SPCFLAG_DISK|SPCFLAG_BLIT|SPCFLAG_BLTNASTY)
+#define SPCFLAG_MODE_CHANGE 8192
 
 extern int dskdmaen;
-extern UWORD adkcon;
-
-extern int max_diwstop, prev_max_diwstop;
+extern uae_u16 adkcon;
 
-extern UWORD joy0dir;
-extern int joy0button;
+extern unsigned int joy0dir, joy1dir;
+extern int joy0button, joy1button;
+extern uae_u32 mousehack_helper (void);
 
-extern void INTREQ(UWORD);
-extern UWORD INTREQR(void);
+extern void INTREQ (uae_u16);
+extern uae_u16 INTREQR (void);
 
 #define maxhpos 227
 #define maxvpos 312
-#define minfirstline 29
+/* The HRM says: The vertical blanking area (PAL) ranges from line 0 to line 29,
+ * and no data can be displayed there. Nevertheless, we lose some overscan data
+ * if this is set to 29. */
+#define minfirstline 21
+#define vblank_endline 29
 #define numscrlines (maxvpos+1-minfirstline+1)
 
 #define DMA_AUD0      0x0001
@@ -64,19 +76,15 @@ extern UWORD INTREQR(void);
 #define DMA_COPPER    0x0080
 #define DMA_BITPLANE  0x0100
 #define DMA_BLITPRI   0x0400
-/*
-struct bltinfo {
-    int blitzero;
-    UWORD blitpreva,blitprevb,blitashift,blitbshift;
-    UWORD bltadat,bltbdat,bltcdat,bltddat,bltafwm,bltalwm;
-    UWORD vblitsize,hblitsize;
-    WORD  bltamod,bltbmod,bltcmod,bltdmod;
-};
-
-extern void do_blitter(void);
-
-typedef void blitter_func(UWORD *, UWORD *, UWORD *, UWORD *, struct bltinfo *);
-
-extern blitter_func *blitfunc_dofast[256];
-extern blitter_func *blitfunc_dofast_desc[256];
-*/
+
+extern unsigned long frametime, timeframes;
+
+/* 50 words give you 800 horizontal pixels. An A500 can't do that, so it ought
+ * to be enough.  Don't forget to update the definition in genp2c.c as well.  */
+#define MAX_WORDS_PER_LINE 50
+
+extern uae_u32 hirestab_h[256][2];
+extern uae_u32 lorestab_h[256][4];
+
+extern uae_u32 hirestab_l[256][1];
+extern uae_u32 lorestab_l[256][2];