--- uae/src/include/custom.h	2018/04/24 16:47:47	1.1.1.7
+++ uae/src/include/custom.h	2018/04/24 16:53:27	1.1.1.11
@@ -18,6 +18,7 @@ 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);
@@ -36,15 +37,15 @@ extern uae_u16 intena,intreq;
 extern int current_hpos (void);
 extern int vpos;
 
-static __inline__ int dmaen (unsigned int 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
@@ -53,7 +54,6 @@ static __inline__ int dmaen (unsigned in
 #define SPCFLAG_EXEC 1024
 #define SPCFLAG_MODE_CHANGE 8192
 
-extern int dskdmaen;
 extern uae_u16 adkcon;
 
 extern unsigned int joy0dir, joy1dir;
@@ -97,6 +97,7 @@ 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;
@@ -110,3 +111,6 @@ 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];