--- uae/src/include/custom.h	2018/04/24 16:47:47	1.1.1.7
+++ uae/src/include/custom.h	2018/04/24 17:18:57	1.1.1.18
@@ -8,21 +8,28 @@
 
 /* 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 int picasso_requested_on;
 extern int picasso_on;
 
@@ -36,15 +43,19 @@ extern uae_u16 intena,intreq;
 extern int current_hpos (void);
 extern int vpos;
 
-static __inline__ int dmaen (unsigned int dmamask)
+extern int find_copper_record (uaecptr, int *, int *);
+
+extern int n_frames;
+
+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
@@ -52,20 +63,21 @@ static __inline__ int dmaen (unsigned in
 #define SPCFLAG_BLTNASTY 512
 #define SPCFLAG_EXEC 1024
 #define SPCFLAG_MODE_CHANGE 8192
+#define SPCFLAG_RESTORE_SANITY 16384
 
-extern int dskdmaen;
 extern uae_u16 adkcon;
 
 extern unsigned int joy0dir, joy1dir;
 extern int joy0button, joy1button;
 
 extern void INTREQ (uae_u16);
+extern void INTREQ_0 (uae_u16);
 extern uae_u16 INTREQR (void);
 
 /* maximums for statically allocated tables */
 
-#define MAXHPOS 227
-#define MAXVPOS 312
+#define MAXHPOS 256
+#define MAXVPOS 576
 
 /* PAL/NTSC values */
 
@@ -77,10 +89,10 @@ extern uae_u16 INTREQR (void);
 #define MAXHPOS_NTSC 227
 #define MAXVPOS_PAL 312
 #define MAXVPOS_NTSC 262
-#define MINFIRSTLINE_PAL 21
-#define MINFIRSTLINE_NTSC 18
-#define VBLANK_ENDLINE_PAL 29
-#define VBLANK_ENDLINE_NTSC 24
+#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
 
@@ -97,16 +109,32 @@ extern unsigned long syncbase;
 #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;
 
-/* 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
+/* 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))
+