--- uae/src/include/custom.h	2018/04/24 16:39:29	1.1.1.2
+++ uae/src/include/custom.h	2018/04/24 16:42:34	1.1.1.4
@@ -1,6 +1,6 @@
- /* 
+ /*
   * UAE - The Un*x Amiga Emulator
-  * 
+  *
   * custom chip support
   *
   * (c) 1995 Bernd Schmidt
@@ -13,15 +13,24 @@ extern void dumpcustom(void);
 
 extern void do_disk(void);
 
-extern int inhibit_frame;
+extern void notice_new_xcolors (void);
+extern void notice_screen_contents_lost (void);
+extern void init_row_map(void);
+
+extern int picasso_requested_on;
+extern int picasso_on;
+
+/* 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;
+extern uae_u16 dmacon;
+extern uae_u16 intena,intreq;
 
 extern int current_hpos (void);
+extern int vpos;
 
-static __inline__ int dmaen(UWORD dmamask)
+static __inline__ int dmaen (unsigned int dmamask)
 {
     return (dmamask & dmacon) && (dmacon & 0x200);
 }
@@ -36,21 +45,17 @@ static __inline__ int dmaen(UWORD dmamas
 #define SPCFLAG_DOINT 256
 #define SPCFLAG_BLTNASTY 512
 #define SPCFLAG_EXEC 1024
-#define SPCFLAG_EMULTRAP 2048
-#define SPCFLAG_TIMER 4096
 #define SPCFLAG_MODE_CHANGE 8192
 
-#define PRESERVED_FLAGS (SPCFLAG_DISK|SPCFLAG_BLTNASTY|SPCFLAG_TIMER)
-
 extern int dskdmaen;
-extern UWORD adkcon;
+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 UWORD DMACONR(void);
+extern void INTREQ (uae_u16);
+extern uae_u16 INTREQR (void);
 
 #define maxhpos 227
 #define maxvpos 312
@@ -74,3 +79,12 @@ extern UWORD DMACONR(void);
 
 extern unsigned long frametime, timeframes;
 
+/* 50 words give you 800 horizontal pixels. An A500 can't do that, so it ought
+ * to be enough. */
+#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];