--- uae/src/include/custom.h	2018/04/24 17:00:40	1.1.1.15
+++ uae/src/include/custom.h	2018/04/24 17:18:57	1.1.1.18
@@ -8,8 +8,10 @@
 
 /* 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);
@@ -61,6 +63,7 @@ STATIC_INLINE int dmaen (unsigned int dm
 #define SPCFLAG_BLTNASTY 512
 #define SPCFLAG_EXEC 1024
 #define SPCFLAG_MODE_CHANGE 8192
+#define SPCFLAG_RESTORE_SANITY 16384
 
 extern uae_u16 adkcon;
 
@@ -73,8 +76,8 @@ 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 */
 
@@ -86,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
 
@@ -110,6 +113,7 @@ extern unsigned long syncbase;
 #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.
@@ -125,7 +129,7 @@ extern uae_u32 lorestab_l[256][2];
 /* AGA mode color lookup tables */
 extern unsigned int xredcolors[256], xgreencolors[256], xbluecolors[256];
 
-extern int bploff[8];
+extern int bpl_off[8];
 
 /* get resolution from bplcon0 */
 #define GET_RES(CON0) (((CON0) & 0x8000) ? RES_HIRES : ((CON0) & 0x40) ? RES_SUPERHIRES : RES_LORES)