--- uae/src/blitter.c 2018/04/24 16:42:15 1.1.1.4 +++ uae/src/blitter.c 2018/04/24 16:48:49 1.1.1.5 @@ -66,13 +66,13 @@ void build_blitfilltable(void) } } -static __inline__ uae_u8 *blit_xlateptr(uaecptr bltpt, int bytecount) +STATIC_INLINE uae_u8 *blit_xlateptr(uaecptr bltpt, int bytecount) { if (!chipmem_bank.check(bltpt,bytecount)) return NULL; return chipmem_bank.xlateaddr(bltpt); } -static __inline__ uae_u8 *blit_xlateptr_desc(uaecptr bltpt, int bytecount) +STATIC_INLINE uae_u8 *blit_xlateptr_desc(uaecptr bltpt, int bytecount) { if (!chipmem_bank.check(bltpt-bytecount, bytecount)) return NULL; return chipmem_bank.xlateaddr(bltpt); @@ -244,7 +244,7 @@ static void blitter_dofast_desc(void) bltstate = BLT_done; } -static __inline__ int blitter_read(void) +STATIC_INLINE int blitter_read(void) { if (bltcon0 & 0xe00){ if (!dmaen(DMA_BLITTER)) return 1; /* blitter stopped */ @@ -254,7 +254,7 @@ static __inline__ int blitter_read(void) return (bltcon0 & 0xE00) != 0; } -static __inline__ int blitter_write(void) +STATIC_INLINE int blitter_write(void) { if (blt_info.bltddat) blt_info.blitzero = 0; if ((bltcon0 & 0x100) || blitline){ @@ -265,7 +265,7 @@ static __inline__ int blitter_write(void return (bltcon0 & 0x100) != 0; } -static __inline__ void blitter_line_incx(void) +STATIC_INLINE void blitter_line_incx(void) { if (++blinea_shift == 16) { blinea_shift = 0; @@ -274,7 +274,7 @@ static __inline__ void blitter_line_incx } } -static __inline__ void blitter_line_decx(void) +STATIC_INLINE void blitter_line_decx(void) { if (blinea_shift-- == 0) { blinea_shift = 15; @@ -283,14 +283,14 @@ static __inline__ void blitter_line_decx } } -static __inline__ void blitter_line_decy(void) +STATIC_INLINE void blitter_line_decy(void) { bltcnxlpt -= blt_info.bltcmod; bltdnxlpt -= blt_info.bltcmod; /* ??? am I wrong or doesn't KS1.3 set bltdmod? */ blitonedot = 0; } -static __inline__ void blitter_line_incy(void) +STATIC_INLINE void blitter_line_incy(void) { bltcnxlpt += blt_info.bltcmod; bltdnxlpt += blt_info.bltcmod; /* ??? */ @@ -336,7 +336,7 @@ static void blitter_line(void) bltstate = BLT_write; } -static __inline__ void blitter_nxline(void) +STATIC_INLINE void blitter_nxline(void) { bltcpt = bltcnxlpt; bltdpt = bltdnxlpt;