--- uae/src/include/custom.h 2018/04/24 16:50:27 1.1.1.9 +++ uae/src/include/custom.h 2018/04/24 16:57:12 1.1.1.13 @@ -37,6 +37,8 @@ extern uae_u16 intena,intreq; extern int current_hpos (void); extern int vpos; +extern int n_frames; + STATIC_INLINE int dmaen (unsigned int dmamask) { return (dmamask & dmacon) && (dmacon & 0x200); @@ -54,7 +56,6 @@ STATIC_INLINE int dmaen (unsigned int dm #define SPCFLAG_EXEC 1024 #define SPCFLAG_MODE_CHANGE 8192 -extern int dskdmaen; extern uae_u16 adkcon; extern unsigned int joy0dir, joy1dir; @@ -98,6 +99,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; @@ -111,3 +113,14 @@ 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]; + +/* 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)) +