--- uae/src/include/custom.h	2018/04/24 16:39:29	1.1.1.2
+++ uae/src/include/custom.h	2018/04/24 17:18:57	1.1.1.18
@@ -1,65 +1,104 @@
- /* 
+ /*
   * 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);
+/* These are the masks that are ORed together in the chipset_mask option.
+ * If CSMASK_AGA is set, the ECS bits are guaranteed to be set as well.  */
+#define CSMASK_OCS 0
+#define CSMASK_ECS_AGNUS 1
+#define CSMASK_ECS_DENISE 2
+#define CSMASK_FULL_ECS 3
+#define CSMASK_AGA 4
+
+uae_u32 get_copper_address(int copno);
+
+extern void custom_init (void);
+extern void customreset (void);
+extern int intlev (void);
+extern void dumpcustom (void);
+
+extern void do_disk (void);
+extern void do_copper (void);
+
+extern void notice_new_xcolors (void);
+extern void notice_screen_contents_lost (void);
+extern void init_row_map (void);
+
+extern void custom_prepare_savestate (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;
+extern uae_u16 dmacon;
+extern uae_u16 intena,intreq;
 
 extern int current_hpos (void);
+extern int vpos;
+
+extern int find_copper_record (uaecptr, int *, int *);
+
+extern int n_frames;
 
-static __inline__ int dmaen(UWORD dmamask)
+STATIC_INLINE int dmaen (unsigned int dmamask)
 {
     return (dmamask & dmacon) && (dmacon & 0x200);
 }
 
 #define SPCFLAG_STOP 2
-#define SPCFLAG_DISK 4
-#define SPCFLAG_INT  8
-#define SPCFLAG_BRK  16
+#define SPCFLAG_COPPER 4
+#define SPCFLAG_INT 8
+#define SPCFLAG_BRK 16
 #define SPCFLAG_EXTRA_CYCLES 32
 #define SPCFLAG_TRACE 64
 #define SPCFLAG_DOTRACE 128
 #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 SPCFLAG_RESTORE_SANITY 16384
 
-#define PRESERVED_FLAGS (SPCFLAG_DISK|SPCFLAG_BLTNASTY|SPCFLAG_TIMER)
+extern uae_u16 adkcon;
 
-extern int dskdmaen;
-extern UWORD adkcon;
+extern unsigned int joy0dir, joy1dir;
+extern int joy0button, joy1button;
 
-extern UWORD joy0dir;
-extern int joy0button;
+extern void INTREQ (uae_u16);
+extern void INTREQ_0 (uae_u16);
+extern uae_u16 INTREQR (void);
 
-extern void INTREQ(UWORD);
-extern UWORD INTREQR(void);
-extern UWORD DMACONR(void);
+/* maximums for statically allocated tables */
+
+#define MAXHPOS 256
+#define MAXVPOS 576
+
+/* PAL/NTSC values */
 
-#define maxhpos 227
-#define maxvpos 312
 /* 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)
+ * if minfirstline is set to 29. */
+
+#define MAXHPOS_PAL 227
+#define MAXHPOS_NTSC 227
+#define MAXVPOS_PAL 312
+#define MAXVPOS_NTSC 262
+#define VBLANK_ENDLINE_PAL 27
+#define VBLANK_ENDLINE_NTSC 28
+#define VBLANK_SPRITE_PAL 25
+#define VBLANK_SPRITE_NTSC 20
+#define VBLANK_HZ_PAL 50
+#define VBLANK_HZ_NTSC 60
+
+extern int maxhpos, maxvpos, minfirstline, vblank_endline, numscrlines, vblank_hz;
+extern unsigned long syncbase;
+#define NUMSCRLINES (maxvpos+1-minfirstline+1)
 
 #define DMA_AUD0      0x0001
 #define DMA_AUD1      0x0002
@@ -70,7 +109,32 @@ extern UWORD DMACONR(void);
 #define DMA_BLITTER   0x0040
 #define DMA_COPPER    0x0080
 #define DMA_BITPLANE  0x0100
+#define DMA_MASTER    0x0200
 #define DMA_BLITPRI   0x0400
 
 extern unsigned long frametime, timeframes;
+extern int plfstrt, plfstop, plffirstline, plflastline;
+
+/* 100 words give you 1600 horizontal pixels. Should be more than enough for
+ * superhires. Don't forget to update the definition in genp2c.c as well.
+ * needs to be larger for superhires support */
+#define MAX_WORDS_PER_LINE 100
+
+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];
+
+/* AGA mode color lookup tables */
+extern unsigned int xredcolors[256], xgreencolors[256], xbluecolors[256];
+
+extern int bpl_off[8];
+
+/* get resolution from bplcon0 */
+#define GET_RES(CON0) (((CON0) & 0x8000) ? RES_HIRES : ((CON0) & 0x40) ? RES_SUPERHIRES : RES_LORES)
+/* get sprite width from FMODE */
+#define GET_SPRITEWIDTH(FMODE) ((((FMODE) >> 2) & 3) == 3 ? 64 : (((FMODE) >> 2) & 3) == 0 ? 16 : 32)
+/* Compute the number of bitplanes from a value written to BPLCON0  */
+#define GET_PLANES(x) ((((x) >> 12) & 7) | (((x) & 0x10) >> 1))