Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

(From AtariAce)

Browse Source 
This patch should complete the addition of static qualifiers to all
MAME symbols that aren't explicitly exported.  It primarily handles
generated code (e.g. amspdwy.c), plus a handful of cases I'd
previously missed and some new cases introduced in the last update.
One interesting bit was the discovery that the 32-bit scanline
routines in drawgfx.c are unused.  I debated eliminating them but
decided instead to just export them.  Various internal drawgfx
functions were conditionally removed by examining a new RAW define,
although one routine (blockmove_8toN_alphaone) was determined to be
dead code.

While investigating constifying MESS, I came across a few core APIs
that were missing const qualifiers which this patch fixes.  I also
consted up tx1.c while I was at it.
This commit is contained in:
Aaron Giles 2007-12-26 16:55:35 +00:00
parent 6e44952678
commit 28d23853ae
28 changed files with 92 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/cpu/f8/f3853.c
View File

@ -72,7 +72,7 @@ static TIMER_CALLBACK( f3853_timer_callback )
} }
void f3853_init(F3853_CONFIG *config) void f3853_init(const F3853_CONFIG *config)
{ {
UINT8 reg=0xfe; UINT8 reg=0xfe;
int i; int i;

2
src/emu/cpu/f8/f3853.h
View File

@ -12,7 +12,7 @@ typedef struct {
void (*interrupt_request)(UINT16 addr, int level); void (*interrupt_request)(UINT16 addr, int level);
} F3853_CONFIG; } F3853_CONFIG;
void f3853_init(F3853_CONFIG *config); void f3853_init(const F3853_CONFIG *config);
void f3853_reset(void); void f3853_reset(void);
// ports 0x0c - 0x0f // ports 0x0c - 0x0f

2
src/emu/cpu/z80gb/z80gb.h
View File

@ -4,7 +4,7 @@
#include "cpuintrf.h" #include "cpuintrf.h"
typedef struct { typedef struct {
UINT16 *regs; const UINT16 *regs;
UINT8 features; UINT8 features;
void (*timer_callback)(int cycles); void (*timer_callback)(int cycles);
} Z80GB_CONFIG; } Z80GB_CONFIG;

66
src/emu/drawgfx.c
View File

@ -617,43 +617,50 @@ int pdrawgfx_shadow_lowpri = 0;
int leftskip,int topskip,int flipx,int flipy, \ int leftskip,int topskip,int flipx,int flipy, \
DATA_TYPE *dstdata,int dstwidth,int dstheight,int dstmodulo DATA_TYPE *dstdata,int dstwidth,int dstheight,int dstmodulo
#define RAW 1
#define COLOR_ARG unsigned int colorbase,UINT8 *pridata,UINT32 pmask #define COLOR_ARG unsigned int colorbase,UINT8 *pridata,UINT32 pmask
#define INCREMENT_DST(n) {dstdata+=(n);pridata += (n);} #define INCREMENT_DST(n) {dstdata+=(n);pridata += (n);}
#define LOOKUP(n) (colorbase + (n)) #define LOOKUP(n) (colorbase + (n))
#define SETPIXELCOLOR(dest,n) { if (((1 << (pridata[dest] & 0x1f)) & pmask) == 0) { if (pridata[dest] & 0x80) { dstdata[dest] = palette_shadow_table[n];} else { dstdata[dest] = (n);} } pridata[dest] = (pridata[dest] & 0x7f) | afterdrawmask; } #define SETPIXELCOLOR(dest,n) { if (((1 << (pridata[dest] & 0x1f)) & pmask) == 0) { if (pridata[dest] & 0x80) { dstdata[dest] = palette_shadow_table[n];} else { dstdata[dest] = (n);} } pridata[dest] = (pridata[dest] & 0x7f) | afterdrawmask; }
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##_raw_pri8 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##_raw_pri8 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
#undef LOOKUP #undef LOOKUP
#undef SETPIXELCOLOR #undef SETPIXELCOLOR
#undef RAW
#define RAW 0
#define COLOR_ARG const pen_t *paldata,UINT8 *pridata,UINT32 pmask #define COLOR_ARG const pen_t *paldata,UINT8 *pridata,UINT32 pmask
#define LOOKUP(n) (paldata[n]) #define LOOKUP(n) (paldata[n])
#define SETPIXELCOLOR(dest,n) { if (((1 << (pridata[dest] & 0x1f)) & pmask) == 0) { if (pridata[dest] & 0x80) { dstdata[dest] = palette_shadow_table[n];} else { dstdata[dest] = (n);} } pridata[dest] = (pridata[dest] & 0x7f) | afterdrawmask; } #define SETPIXELCOLOR(dest,n) { if (((1 << (pridata[dest] & 0x1f)) & pmask) == 0) { if (pridata[dest] & 0x80) { dstdata[dest] = palette_shadow_table[n];} else { dstdata[dest] = (n);} } pridata[dest] = (pridata[dest] & 0x7f) | afterdrawmask; }
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##_pri8 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##_pri8 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
#undef LOOKUP #undef LOOKUP
#undef INCREMENT_DST #undef INCREMENT_DST
#undef SETPIXELCOLOR #undef SETPIXELCOLOR
#undef RAW
#define RAW 1
#define COLOR_ARG unsigned int colorbase #define COLOR_ARG unsigned int colorbase
#define INCREMENT_DST(n) {dstdata+=(n);} #define INCREMENT_DST(n) {dstdata+=(n);}
#define LOOKUP(n) (colorbase + (n)) #define LOOKUP(n) (colorbase + (n))
#define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);} #define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);}
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##_raw8 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##_raw8 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
#undef LOOKUP #undef LOOKUP
#undef SETPIXELCOLOR #undef SETPIXELCOLOR
#undef RAW
#define RAW 0
#define COLOR_ARG const pen_t *paldata #define COLOR_ARG const pen_t *paldata
#define LOOKUP(n) (paldata[n]) #define LOOKUP(n) (paldata[n])
#define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);} #define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);}
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##8 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##8 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
@ -667,7 +674,7 @@ int pdrawgfx_shadow_lowpri = 0;
#undef DECLARE #undef DECLARE
#undef DECLAREG #undef DECLAREG
#define DECLARE(function,args,body) void function##8 args body #define DECLARE(function,args,body) static void function##8 args body
#define DECLAREG(function,args,body) void function##8 args body #define DECLAREG(function,args,body) void function##8 args body
#define DECLARE_SWAP_RAW_PRI(function,args,body) #define DECLARE_SWAP_RAW_PRI(function,args,body)
#define BLOCKMOVE(function,flipx,args) \ #define BLOCKMOVE(function,flipx,args) \
@ -691,6 +698,7 @@ int pdrawgfx_shadow_lowpri = 0;
#undef BLOCKMOVEPRI #undef BLOCKMOVEPRI
#undef BLOCKMOVERAWPRI #undef BLOCKMOVERAWPRI
#undef RAW
#undef DEPTH #undef DEPTH
#undef DATA_TYPE #undef DATA_TYPE
@ -710,43 +718,50 @@ int pdrawgfx_shadow_lowpri = 0;
int leftskip,int topskip,int flipx,int flipy, \ int leftskip,int topskip,int flipx,int flipy, \
DATA_TYPE *dstdata,int dstwidth,int dstheight,int dstmodulo DATA_TYPE *dstdata,int dstwidth,int dstheight,int dstmodulo
#define RAW 1
#define COLOR_ARG unsigned int colorbase,UINT8 *pridata,UINT32 pmask #define COLOR_ARG unsigned int colorbase,UINT8 *pridata,UINT32 pmask
#define INCREMENT_DST(n) {dstdata+=(n);pridata += (n);} #define INCREMENT_DST(n) {dstdata+=(n);pridata += (n);}
#define LOOKUP(n) (colorbase + (n)) #define LOOKUP(n) (colorbase + (n))
#define SETPIXELCOLOR(dest,n) { if (((1 << (pridata[dest] & 0x1f)) & pmask) == 0) { if (pridata[dest] & 0x80) { dstdata[dest] = palette_shadow_table[n];} else { dstdata[dest] = (n);} } pridata[dest] = (pridata[dest] & 0x7f) | afterdrawmask; } #define SETPIXELCOLOR(dest,n) { if (((1 << (pridata[dest] & 0x1f)) & pmask) == 0) { if (pridata[dest] & 0x80) { dstdata[dest] = palette_shadow_table[n];} else { dstdata[dest] = (n);} } pridata[dest] = (pridata[dest] & 0x7f) | afterdrawmask; }
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##_raw_pri16 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##_raw_pri16 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
#undef LOOKUP #undef LOOKUP
#undef SETPIXELCOLOR #undef SETPIXELCOLOR
#undef RAW
#define RAW 0
#define COLOR_ARG const pen_t *paldata,UINT8 *pridata,UINT32 pmask #define COLOR_ARG const pen_t *paldata,UINT8 *pridata,UINT32 pmask
#define LOOKUP(n) (paldata[n]) #define LOOKUP(n) (paldata[n])
#define SETPIXELCOLOR(dest,n) { if (((1 << (pridata[dest] & 0x1f)) & pmask) == 0) { if (pridata[dest] & 0x80) { dstdata[dest] = palette_shadow_table[n];} else { dstdata[dest] = (n);} } pridata[dest] = (pridata[dest] & 0x7f) | afterdrawmask; } #define SETPIXELCOLOR(dest,n) { if (((1 << (pridata[dest] & 0x1f)) & pmask) == 0) { if (pridata[dest] & 0x80) { dstdata[dest] = palette_shadow_table[n];} else { dstdata[dest] = (n);} } pridata[dest] = (pridata[dest] & 0x7f) | afterdrawmask; }
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##_pri16 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##_pri16 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
#undef LOOKUP #undef LOOKUP
#undef INCREMENT_DST #undef INCREMENT_DST
#undef SETPIXELCOLOR #undef SETPIXELCOLOR
#undef RAW
#define RAW 1
#define COLOR_ARG unsigned int colorbase #define COLOR_ARG unsigned int colorbase
#define INCREMENT_DST(n) {dstdata+=(n);} #define INCREMENT_DST(n) {dstdata+=(n);}
#define LOOKUP(n) (colorbase + (n)) #define LOOKUP(n) (colorbase + (n))
#define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);} #define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);}
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##_raw16 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##_raw16 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
#undef LOOKUP #undef LOOKUP
#undef SETPIXELCOLOR #undef SETPIXELCOLOR
#undef RAW
#define RAW 0
#define COLOR_ARG const pen_t *paldata #define COLOR_ARG const pen_t *paldata
#define LOOKUP(n) (paldata[n]) #define LOOKUP(n) (paldata[n])
#define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);} #define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);}
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##16 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##16 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
@ -760,7 +775,7 @@ int pdrawgfx_shadow_lowpri = 0;
#undef DECLARE #undef DECLARE
#undef DECLAREG #undef DECLAREG
#define DECLARE(function,args,body) void function##16 args body #define DECLARE(function,args,body) static void function##16 args body
#define DECLAREG(function,args,body) void function##16 args body #define DECLAREG(function,args,body) void function##16 args body
#define DECLARE_SWAP_RAW_PRI(function,args,body) #define DECLARE_SWAP_RAW_PRI(function,args,body)
#define BLOCKMOVE(function,flipx,args) \ #define BLOCKMOVE(function,flipx,args) \
@ -784,6 +799,7 @@ int pdrawgfx_shadow_lowpri = 0;
#undef BLOCKMOVEPRI #undef BLOCKMOVEPRI
#undef BLOCKMOVERAWPRI #undef BLOCKMOVERAWPRI
#undef RAW
#undef DEPTH #undef DEPTH
#undef DATA_TYPE #undef DATA_TYPE
#undef alpha_blend_r #undef alpha_blend_r
@ -810,43 +826,50 @@ INLINE UINT32 SHADOW32(pen_t *shadow_table, UINT32 c) {
int leftskip,int topskip,int flipx,int flipy, \ int leftskip,int topskip,int flipx,int flipy, \
DATA_TYPE *dstdata,int dstwidth,int dstheight,int dstmodulo DATA_TYPE *dstdata,int dstwidth,int dstheight,int dstmodulo
#define RAW 1
#define COLOR_ARG unsigned int colorbase,UINT8 *pridata,UINT32 pmask #define COLOR_ARG unsigned int colorbase,UINT8 *pridata,UINT32 pmask
#define INCREMENT_DST(n) {dstdata+=(n);pridata += (n);} #define INCREMENT_DST(n) {dstdata+=(n);pridata += (n);}
#define LOOKUP(n) (colorbase + (n)) #define LOOKUP(n) (colorbase + (n))
#define SETPIXELCOLOR(dest,n) { UINT8 r8=pridata[dest]; if(!(1<<(r8&0x1f)&pmask)){ if(afterdrawmask){ r8&=0x7f; r8|=0x1f; dstdata[dest]=(n); pridata[dest]=r8; } else if(!(r8&0x80)){ dstdata[dest]=SHADOW32(palette_shadow_table,n); pridata[dest]|=0x80; } } } #define SETPIXELCOLOR(dest,n) { UINT8 r8=pridata[dest]; if(!(1<<(r8&0x1f)&pmask)){ if(afterdrawmask){ r8&=0x7f; r8|=0x1f; dstdata[dest]=(n); pridata[dest]=r8; } else if(!(r8&0x80)){ dstdata[dest]=SHADOW32(palette_shadow_table,n); pridata[dest]|=0x80; } } }
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##_raw_pri32 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##_raw_pri32 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
#undef LOOKUP #undef LOOKUP
#undef SETPIXELCOLOR #undef SETPIXELCOLOR
#undef RAW
#define RAW 0
#define COLOR_ARG const pen_t *paldata,UINT8 *pridata,UINT32 pmask #define COLOR_ARG const pen_t *paldata,UINT8 *pridata,UINT32 pmask
#define LOOKUP(n) (paldata[n]) #define LOOKUP(n) (paldata[n])
#define SETPIXELCOLOR(dest,n) { UINT8 r8=pridata[dest]; if(!(1<<(r8&0x1f)&pmask)){ if(afterdrawmask){ r8&=0x7f; r8|=0x1f; dstdata[dest]=(n); pridata[dest]=r8; } else if(!(r8&0x80)){ dstdata[dest]=SHADOW32(palette_shadow_table,n); pridata[dest]|=0x80; } } } #define SETPIXELCOLOR(dest,n) { UINT8 r8=pridata[dest]; if(!(1<<(r8&0x1f)&pmask)){ if(afterdrawmask){ r8&=0x7f; r8|=0x1f; dstdata[dest]=(n); pridata[dest]=r8; } else if(!(r8&0x80)){ dstdata[dest]=SHADOW32(palette_shadow_table,n); pridata[dest]|=0x80; } } }
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##_pri32 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##_pri32 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
#undef LOOKUP #undef LOOKUP
#undef INCREMENT_DST #undef INCREMENT_DST
#undef SETPIXELCOLOR #undef SETPIXELCOLOR
#undef RAW
#define RAW 1
#define COLOR_ARG unsigned int colorbase #define COLOR_ARG unsigned int colorbase
#define INCREMENT_DST(n) {dstdata+=(n);} #define INCREMENT_DST(n) {dstdata+=(n);}
#define LOOKUP(n) (colorbase + (n)) #define LOOKUP(n) (colorbase + (n))
#define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);} #define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);}
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##_raw32 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##_raw32 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
#undef LOOKUP #undef LOOKUP
#undef SETPIXELCOLOR #undef SETPIXELCOLOR
#undef RAW
#define RAW 0
#define COLOR_ARG const pen_t *paldata #define COLOR_ARG const pen_t *paldata
#define LOOKUP(n) (paldata[n]) #define LOOKUP(n) (paldata[n])
#define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);} #define SETPIXELCOLOR(dest,n) {dstdata[dest] = (n);}
#define DECLARE_SWAP_RAW_PRI(function,args,body) void function##32 args body #define DECLARE_SWAP_RAW_PRI(function,args,body) static void function##32 args body
#include "drawgfx.c" #include "drawgfx.c"
#undef DECLARE_SWAP_RAW_PRI #undef DECLARE_SWAP_RAW_PRI
#undef COLOR_ARG #undef COLOR_ARG
@ -860,7 +883,7 @@ INLINE UINT32 SHADOW32(pen_t *shadow_table, UINT32 c) {
#undef DECLARE #undef DECLARE
#undef DECLAREG #undef DECLAREG
#define DECLARE(function,args,body) void function##32 args body #define DECLARE(function,args,body) static void function##32 args body
#define DECLAREG(function,args,body) void function##32 args body #define DECLAREG(function,args,body) void function##32 args body
#define DECLARE_SWAP_RAW_PRI(function,args,body) #define DECLARE_SWAP_RAW_PRI(function,args,body)
#define BLOCKMOVE(function,flipx,args) \ #define BLOCKMOVE(function,flipx,args) \
@ -884,6 +907,7 @@ INLINE UINT32 SHADOW32(pen_t *shadow_table, UINT32 c) {
#undef BLOCKMOVEPRI #undef BLOCKMOVEPRI
#undef BLOCKMOVERAWPRI #undef BLOCKMOVERAWPRI
#undef RAW
#undef DEPTH #undef DEPTH
#undef DATA_TYPE #undef DATA_TYPE
#undef alpha_blend_r #undef alpha_blend_r
@ -3755,6 +3779,7 @@ DECLARE_SWAP_RAW_PRI(blockmove_4toN_transpen,(COMMON_ARGS,
} }
}) })
#if (RAW == 1)
DECLARE_SWAP_RAW_PRI(blockmove_8toN_transblend,(COMMON_ARGS, DECLARE_SWAP_RAW_PRI(blockmove_8toN_transblend,(COMMON_ARGS,
COLOR_ARG,int transpen), COLOR_ARG,int transpen),
{ {
@ -3866,6 +3891,7 @@ DECLARE_SWAP_RAW_PRI(blockmove_8toN_transblend,(COMMON_ARGS,
} }
} }
}) })
#endif
#define PEN_IS_OPAQUE ((1<<col)&transmask) == 0 #define PEN_IS_OPAQUE ((1<<col)&transmask) == 0
@ -3976,6 +4002,7 @@ DECLARE_SWAP_RAW_PRI(blockmove_8toN_transmask,(COMMON_ARGS,
} }
}) })
#if (RAW == 0)
DECLARE_SWAP_RAW_PRI(blockmove_8toN_transcolor,(COMMON_ARGS, DECLARE_SWAP_RAW_PRI(blockmove_8toN_transcolor,(COMMON_ARGS,
COLOR_ARG,const UINT16 *colortable,int transcolor), COLOR_ARG,const UINT16 *colortable,int transcolor),
{ {
@ -4099,6 +4126,7 @@ DECLARE_SWAP_RAW_PRI(blockmove_4toN_transcolor,(COMMON_ARGS,
} }
} }
}) })
#endif
#if DEPTH == 32 #if DEPTH == 32
DECLARE_SWAP_RAW_PRI(blockmove_8toN_pen_table,(COMMON_ARGS, DECLARE_SWAP_RAW_PRI(blockmove_8toN_pen_table,(COMMON_ARGS,
@ -4261,6 +4289,7 @@ DECLARE_SWAP_RAW_PRI(blockmove_8toN_pen_table,(COMMON_ARGS,
#endif #endif
#if DEPTH >= 16 #if DEPTH >= 16
#if (1 == 0)
DECLARE_SWAP_RAW_PRI(blockmove_8toN_alphaone,(COMMON_ARGS, DECLARE_SWAP_RAW_PRI(blockmove_8toN_alphaone,(COMMON_ARGS,
COLOR_ARG,int transpen, int alphapen), COLOR_ARG,int transpen, int alphapen),
{ {
@ -4446,7 +4475,9 @@ DECLARE_SWAP_RAW_PRI(blockmove_8toN_alphaone,(COMMON_ARGS,
} }
} }
}) })
#endif
#if (RAW == 0)
DECLARE_SWAP_RAW_PRI(blockmove_8toN_alpha,(COMMON_ARGS, DECLARE_SWAP_RAW_PRI(blockmove_8toN_alpha,(COMMON_ARGS,
COLOR_ARG,int transpen), COLOR_ARG,int transpen),
{ {
@ -4623,17 +4654,22 @@ DECLARE_SWAP_RAW_PRI(blockmove_8toN_alpharange,(COMMON_ARGS,
} }
} }
}) })
#endif
#else #else
#if (1 == 0)
DECLARE_SWAP_RAW_PRI(blockmove_8toN_alphaone,(COMMON_ARGS, DECLARE_SWAP_RAW_PRI(blockmove_8toN_alphaone,(COMMON_ARGS,
COLOR_ARG,int transpen, int alphapen),{}) COLOR_ARG,int transpen, int alphapen),{})
#endif
#if (RAW == 0)
DECLARE_SWAP_RAW_PRI(blockmove_8toN_alpha,(COMMON_ARGS, DECLARE_SWAP_RAW_PRI(blockmove_8toN_alpha,(COMMON_ARGS,
COLOR_ARG,int transpen),{}) COLOR_ARG,int transpen),{})
DECLARE_SWAP_RAW_PRI(blockmove_8toN_alpharange,(COMMON_ARGS, DECLARE_SWAP_RAW_PRI(blockmove_8toN_alpharange,(COMMON_ARGS,
COLOR_ARG,int transpen),{}) COLOR_ARG,int transpen),{})
#endif
#endif #endif

3
src/emu/drawgfx.h
View File

@ -227,10 +227,13 @@ void mdrawgfxzoom( mame_bitmap *dest_bmp,const gfx_element *gfx,
void draw_scanline8(mame_bitmap *bitmap,int x,int y,int length,const UINT8 *src,const pen_t *pens,int transparent_pen); void draw_scanline8(mame_bitmap *bitmap,int x,int y,int length,const UINT8 *src,const pen_t *pens,int transparent_pen);
void draw_scanline16(mame_bitmap *bitmap,int x,int y,int length,const UINT16 *src,const pen_t *pens,int transparent_pen); void draw_scanline16(mame_bitmap *bitmap,int x,int y,int length,const UINT16 *src,const pen_t *pens,int transparent_pen);
void draw_scanline32(mame_bitmap *bitmap,int x,int y,int length,const UINT32 *src,const pen_t *pens,int transparent_pen);
void pdraw_scanline8(mame_bitmap *bitmap,int x,int y,int length,const UINT8 *src,const pen_t *pens,int transparent_pen,int pri); void pdraw_scanline8(mame_bitmap *bitmap,int x,int y,int length,const UINT8 *src,const pen_t *pens,int transparent_pen,int pri);
void pdraw_scanline16(mame_bitmap *bitmap,int x,int y,int length,const UINT16 *src,const pen_t *pens,int transparent_pen,int pri); void pdraw_scanline16(mame_bitmap *bitmap,int x,int y,int length,const UINT16 *src,const pen_t *pens,int transparent_pen,int pri);
void pdraw_scanline32(mame_bitmap *bitmap,int x,int y,int length,const UINT32 *src,const pen_t *pens,int transparent_pen,int pri);
void extract_scanline8(mame_bitmap *bitmap,int x,int y,int length,UINT8 *dst); void extract_scanline8(mame_bitmap *bitmap,int x,int y,int length,UINT8 *dst);
void extract_scanline16(mame_bitmap *bitmap,int x,int y,int length,UINT16 *dst); void extract_scanline16(mame_bitmap *bitmap,int x,int y,int length,UINT16 *dst);
void extract_scanline32(mame_bitmap *bitmap,int x,int y,int length,UINT32 *dst);
void copybitmap(mame_bitmap *dest,mame_bitmap *src,int flipx,int flipy,int sx,int sy, void copybitmap(mame_bitmap *dest,mame_bitmap *src,int flipx,int flipy,int sx,int sy,

2
src/emu/sound/sidenvel.c
View File

@ -214,7 +214,7 @@ INLINE UINT16 enveEmuAlterShortAttack(sidOperator*);
INLINE UINT16 enveEmuShortAttack(sidOperator*); INLINE UINT16 enveEmuShortAttack(sidOperator*);
ptr2sidUwordFunc enveModeTable[] = const ptr2sidUwordFunc enveModeTable[] =
{ {
/* 0 */ /* 0 */
&enveEmuStartAttack, &enveEmuStartRelease, &enveEmuStartAttack, &enveEmuStartRelease,

2
src/emu/sound/sidenvel.h
View File

@ -10,7 +10,7 @@ extern void enveEmuInit(UINT32 updateFreq, int measuredValues);
void enveEmuResetOperator(sidOperator* pVoice); void enveEmuResetOperator(sidOperator* pVoice);
extern ptr2sidUwordFunc enveModeTable[]; // -> envelope.cpp extern const ptr2sidUwordFunc enveModeTable[]; // -> envelope.cpp
extern const UINT8 masterVolumeLevels[16]; // -> envelope.cpp extern const UINT8 masterVolumeLevels[16]; // -> envelope.cpp
static const UINT8 ENVE_STARTATTACK = 0; static const UINT8 ENVE_STARTATTACK = 0;

2
src/emu/sound/speaker.h
View File

@ -15,7 +15,7 @@ extern "C" {
struct Speaker_interface struct Speaker_interface
{ {
int num_level; /* optional: number of levels (if not two) */ int num_level; /* optional: number of levels (if not two) */
INT16 *levels; /* optional: pointer to level lookup table */ const INT16 *levels; /* optional: pointer to level lookup table */
}; };
void speaker_level_w (int which, int new_level); void speaker_level_w (int which, int new_level);

2
src/mame/drivers/amspdwy.c
View File

@ -43,7 +43,7 @@ VIDEO_UPDATE( amspdwy );
Or last value when wheel delta = 0 Or last value when wheel delta = 0
*/ */
#define AMSPDWY_WHEEL_R( _n_ ) \ #define AMSPDWY_WHEEL_R( _n_ ) \
READ8_HANDLER( amspdwy_wheel_##_n_##_r ) \ static READ8_HANDLER( amspdwy_wheel_##_n_##_r ) \
{ \ { \
static UINT8 wheel_old, ret; \ static UINT8 wheel_old, ret; \
UINT8 wheel = readinputport(5 + _n_); \ UINT8 wheel = readinputport(5 + _n_); \

2
src/mame/drivers/galpani3.c
View File

@ -286,7 +286,7 @@ static void galpani3_mcu_run(void)
* com2=com3=0xFFFF -> status reading only * com2=com3=0xFFFF -> status reading only
*/ */
#define GALPANI3_MCU_COM_W(_n_) \ #define GALPANI3_MCU_COM_W(_n_) \
WRITE16_HANDLER( galpani3_mcu_com##_n_##_w ) \ static WRITE16_HANDLER( galpani3_mcu_com##_n_##_w ) \
{ \ { \
COMBINE_DATA(&galpani3_mcu_com[_n_]); \ COMBINE_DATA(&galpani3_mcu_com[_n_]); \
if (galpani3_mcu_com[0] != 0xFFFF) return; \ if (galpani3_mcu_com[0] != 0xFFFF) return; \

2
src/mame/drivers/jchan.c
View File

@ -367,7 +367,7 @@ are loaded in RAM then saved with cmd 0x42 (see code @ $5196 & $50d4)
} }
#define JCHAN_MCU_COM_W(_n_) \ #define JCHAN_MCU_COM_W(_n_) \
WRITE16_HANDLER( jchan_mcu_com##_n_##_w ) \ static WRITE16_HANDLER( jchan_mcu_com##_n_##_w ) \
{ \ { \
COMBINE_DATA(&jchan_mcu_com[_n_]); \ COMBINE_DATA(&jchan_mcu_com[_n_]); \
if (jchan_mcu_com[0] != 0xFFFF) return; \ if (jchan_mcu_com[0] != 0xFFFF) return; \

4
src/mame/drivers/megadriv.c
View File

@ -1435,8 +1435,8 @@ static void init_megadri6_io(void)
} }
/* pointers to our io data read/write functions */ /* pointers to our io data read/write functions */
UINT8 (*megadrive_io_read_data_port_ptr)(int offset); static UINT8 (*megadrive_io_read_data_port_ptr)(int offset);
void (*megadrive_io_write_data_port_ptr)(int offset, UINT16 data); static void (*megadrive_io_write_data_port_ptr)(int offset, UINT16 data);
INPUT_PORTS_START( megadri6 ) INPUT_PORTS_START( megadri6 )
PORT_START /* Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */ PORT_START /* Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)

3
src/mame/drivers/model2.c
View File

@ -64,7 +64,8 @@ extern VIDEO_UPDATE(model2);
extern void model2_3d_set_zclip( UINT8 clip ); extern void model2_3d_set_zclip( UINT8 clip );
UINT32 *model2_bufferram, *model2_colorxlat, *model2_workram, *model2_backup1, *model2_backup2; UINT32 *model2_bufferram, *model2_colorxlat;
static UINT32 *model2_workram, *model2_backup1, *model2_backup2;
UINT32 *model2_textureram0, *model2_textureram1, *model2_lumaram; UINT32 *model2_textureram0, *model2_textureram1, *model2_lumaram;
static UINT32 model2_intreq; static UINT32 model2_intreq;
static UINT32 model2_intena; static UINT32 model2_intena;

2
src/mame/drivers/mpu4drvr.c
View File

@ -1463,7 +1463,7 @@ static GFXDECODE_START( dealem )
GFXDECODE_ENTRY( REGION_GFX1, 0x0000, dealemcharlayout, 0, 32 ) GFXDECODE_ENTRY( REGION_GFX1, 0x0000, dealemcharlayout, 0, 32 )
GFXDECODE_END GFXDECODE_END
UINT8 *dealem_videoram,*dealem_charram; UINT8 *dealem_videoram;
/*************************************************************************** /***************************************************************************

4
src/mame/drivers/nmk16.c
View File

@ -4737,10 +4737,6 @@ static DRIVER_INIT( ssmissin )
decode_ssmissin(); decode_ssmissin();
} }
int is_blkheart;
static DRIVER_INIT( bjtwin ) static DRIVER_INIT( bjtwin )
{ {
driver_init_nmk(machine); driver_init_nmk(machine);

2
src/mame/drivers/starwars.c
View File

@ -123,7 +123,7 @@ static WRITE8_HANDLER( esb_slapstic_w )
* *
*************************************/ *************************************/
OPBASE_HANDLER( esb_setopbase ) static OPBASE_HANDLER( esb_setopbase )
{ {
int prevpc = activecpu_get_previouspc(); int prevpc = activecpu_get_previouspc();

14
src/mame/drivers/tx1.c
View File

@ -579,7 +579,7 @@ GFXDECODE_END
* *
*************************************/ *************************************/
static struct AY8910interface tx1_ay8910_interface = static const struct AY8910interface tx1_ay8910_interface =
{ {
/* TODO */ /* TODO */
0, 0,
@ -590,7 +590,7 @@ static struct AY8910interface tx1_ay8910_interface =
/* YM2149 IC19 */ /* YM2149 IC19 */
static struct AY8910interface buggyboy_ym2149_interface_1 = static const struct AY8910interface buggyboy_ym2149_interface_1 =
{ {
input_port_1_r, input_port_1_r,
input_port_2_r, input_port_2_r,
@ -599,7 +599,7 @@ static struct AY8910interface buggyboy_ym2149_interface_1 =
}; };
/* YM2149 IC24 */ /* YM2149 IC24 */
static struct AY8910interface buggyboy_ym2149_interface_2 = static const struct AY8910interface buggyboy_ym2149_interface_2 =
{ {
0, 0,
0, 0,
@ -613,7 +613,7 @@ static WRITE8_HANDLER( tx1_coin_cnt )
coin_counter_w(1, data & 0x40); coin_counter_w(1, data & 0x40);
} }
ppi8255_interface tx1_ppi8255_intf = const ppi8255_interface tx1_ppi8255_intf =
{ {
1, 1,
{ tx1_ppi_porta_r }, /* Accelerator and brake */ { tx1_ppi_porta_r }, /* Accelerator and brake */
@ -624,7 +624,7 @@ ppi8255_interface tx1_ppi8255_intf =
{ tx1_coin_cnt }, { tx1_coin_cnt },
}; };
static struct CustomSound_interface tx1_custom_interface = static const struct CustomSound_interface tx1_custom_interface =
{ {
tx1_sh_start, tx1_sh_start,
NULL, NULL,
@ -632,7 +632,7 @@ static struct CustomSound_interface tx1_custom_interface =
}; };
/* Buggy Boy uses an 8255 PPI instead of YM2149 ports for inputs! */ /* Buggy Boy uses an 8255 PPI instead of YM2149 ports for inputs! */
ppi8255_interface buggyboy_ppi8255_intf = const ppi8255_interface buggyboy_ppi8255_intf =
{ {
1, 1,
{ input_port_1_r }, { input_port_1_r },
@ -643,7 +643,7 @@ ppi8255_interface buggyboy_ppi8255_intf =
{ 0 }, { 0 },
}; };
static struct CustomSound_interface bb_custom_interface = static const struct CustomSound_interface bb_custom_interface =
{ {
buggyboy_sh_start, buggyboy_sh_start,
NULL, NULL,

4
src/mame/drivers/wecleman.c
View File

@ -788,11 +788,11 @@ static WRITE8_HANDLER( hotchase_sound_control_w )
/* Read and write handlers for one K007232 chip: /* Read and write handlers for one K007232 chip:
even and odd register are mapped swapped */ even and odd register are mapped swapped */
#define HOTCHASE_K007232_RW(_chip_) \ #define HOTCHASE_K007232_RW(_chip_) \
READ8_HANDLER( hotchase_K007232_##_chip_##_r ) \ static READ8_HANDLER( hotchase_K007232_##_chip_##_r ) \
{ \ { \
return K007232_read_port_##_chip_##_r(offset ^ 1); \ return K007232_read_port_##_chip_##_r(offset ^ 1); \
} \ } \
WRITE8_HANDLER( hotchase_K007232_##_chip_##_w ) \ static WRITE8_HANDLER( hotchase_K007232_##_chip_##_w ) \
{ \ { \
K007232_write_port_##_chip_##_w(offset ^ 1, data); \ K007232_write_port_##_chip_##_w(offset ^ 1, data); \
} \ } \

2
src/mame/includes/amiga.h
View File

@ -390,7 +390,7 @@ WRITE16_HANDLER( amiga_custom_w );
void amiga_serial_in_w(UINT16 data); void amiga_serial_in_w(UINT16 data);
attotime amiga_get_serial_char_period(void); attotime amiga_get_serial_char_period(void);
void amiga_add_autoconfig(amiga_autoconfig_device *device); void amiga_add_autoconfig(const amiga_autoconfig_device *device);
READ16_HANDLER( amiga_autoconfig_r ); READ16_HANDLER( amiga_autoconfig_r );
WRITE16_HANDLER( amiga_autoconfig_w ); WRITE16_HANDLER( amiga_autoconfig_w );

4
src/mame/includes/tx1.h
View File

@ -29,8 +29,8 @@
/*----------- defined in drivers/tx1.c -----------*/ /*----------- defined in drivers/tx1.c -----------*/
extern UINT16 *tx1_math_ram; extern UINT16 *tx1_math_ram;
extern ppi8255_interface tx1_ppi8255_intf; extern const ppi8255_interface tx1_ppi8255_intf;
extern ppi8255_interface buggyboy_ppi8255_intf; extern const ppi8255_interface buggyboy_ppi8255_intf;
/*----------- defined in machine/tx1.c -----------*/ /*----------- defined in machine/tx1.c -----------*/
READ16_HANDLER( tx1_spcs_rom_r ); READ16_HANDLER( tx1_spcs_rom_r );

2
src/mame/machine/amiga.c
View File

@ -1529,7 +1529,7 @@ attotime amiga_get_serial_char_period(void)
* *
*************************************/ *************************************/
void amiga_add_autoconfig(amiga_autoconfig_device *device) void amiga_add_autoconfig(const amiga_autoconfig_device *device)
{ {
autoconfig_device *dev, **d; autoconfig_device *dev, **d;

2
src/mame/machine/tx1.c
View File

@ -229,7 +229,7 @@ static void sn_divide(void)
SN74S516.ZWfl = 0; SN74S516.ZWfl = 0;
} }
void sn74s516_update(const int ins) static void sn74s516_update(const int ins)
{ {
SN74S516.state = state_table[SN74S516.state][ins]; SN74S516.state = state_table[SN74S516.state][ins];

3
src/mame/video/nmk16.c
View File

@ -12,7 +12,6 @@
UINT16 *nmk_bgvideoram,*nmk_fgvideoram,*nmk_txvideoram; UINT16 *nmk_bgvideoram,*nmk_fgvideoram,*nmk_txvideoram;
UINT16 *gunnail_scrollram; UINT16 *gunnail_scrollram;
static UINT16 gunnail_scrolly; static UINT16 gunnail_scrolly;
UINT16 tharrier_scroll;
static int redraw_bitmap; static int redraw_bitmap;
@ -871,6 +870,7 @@ UINT16 *afega_vram_1, *afega_scroll_1;
***************************************************************************/ ***************************************************************************/
#ifdef UNUSED_FUNCTION
WRITE16_HANDLER( afega_palette_w ) WRITE16_HANDLER( afega_palette_w )
{ {
int r,g,b; int r,g,b;
@ -880,6 +880,7 @@ WRITE16_HANDLER( afega_palette_w )
r = ((data & 0xF000) >> 11) + ((data & 0x0008) >> 3); r = ((data & 0xF000) >> 11) + ((data & 0x0008) >> 3);
palette_set_color_rgb( Machine, offset, pal5bit(r) , pal5bit(g) , pal5bit(b) ); palette_set_color_rgb( Machine, offset, pal5bit(r) , pal5bit(g) , pal5bit(b) );
} }
#endif
/* This game uses 8 bit tiles, so it ignores the color codes and just /* This game uses 8 bit tiles, so it ignores the color codes and just
uses the same 256 colors for every tile */ uses the same 256 colors for every tile */

2
src/mame/video/seta.c
View File

@ -150,7 +150,7 @@ static int tilemaps_flip;
int seta_tiles_offset; int seta_tiles_offset;
UINT16 *seta_vram_0, *seta_vctrl_0; UINT16 *seta_vram_0, *seta_vctrl_0;
UINT16 *seta_vram_2, *seta_vram_3, *seta_vctrl_2; UINT16 *seta_vram_2, *seta_vctrl_2;
UINT16 *seta_vregs; UINT16 *seta_vregs;
UINT16 *seta_workram; // Used for zombraid crosshair hack UINT16 *seta_workram; // Used for zombraid crosshair hack

3
src/mame/video/taito_h.c
View File

@ -55,9 +55,6 @@ extern UINT16 *TC0080VCO_spriteram;
extern UINT16 *TC0080VCO_scroll_ram; extern UINT16 *TC0080VCO_scroll_ram;
extern int TC0080VCO_flipscreen; extern int TC0080VCO_flipscreen;
/* Needed in the sprite palette color marking */
extern int TC0080VCO_has_tx;
/* These are hand-tuned values */ /* These are hand-tuned values */
static const int zoomy_conv_table[] = static const int zoomy_conv_table[] =
{ {

3
src/mame/video/taitoair.c
View File

@ -55,9 +55,6 @@ extern UINT16 *TC0080VCO_spriteram;
extern UINT16 *TC0080VCO_scroll_ram; extern UINT16 *TC0080VCO_scroll_ram;
extern int TC0080VCO_flipscreen; extern int TC0080VCO_flipscreen;
/* Needed in the sprite palette color marking */
extern int TC0080VCO_has_tx;
/* These are hand-tuned values */ /* These are hand-tuned values */
static const int zoomy_conv_table[] = static const int zoomy_conv_table[] =
{ {

3
src/mame/video/taitoic.c
View File

@ -1367,7 +1367,8 @@ static int TC0080VCO_bg_gfx,TC0080VCO_tx_gfx;
static int TC0080VCO_bg_xoffs,TC0080VCO_bg_yoffs; static int TC0080VCO_bg_xoffs,TC0080VCO_bg_yoffs;
static int TC0080VCO_bg_flip_yoffs; static int TC0080VCO_bg_flip_yoffs;
INT32 TC0080VCO_flipscreen = 0,TC0080VCO_has_tx; INT32 TC0080VCO_flipscreen = 0;
static int TC0080VCO_has_tx;
#if 0 #if 0

9
src/mame/video/tx1.c
View File

@ -582,12 +582,11 @@ UINT16 *buggybjr_vram;
size_t buggyboy_objram_size; size_t buggyboy_objram_size;
size_t buggyboy_rcram_size; size_t buggyboy_rcram_size;
tilemap *buggybjr_tilemap; static tilemap *buggyboy_tilemap;
tilemap *buggyboy_tilemap;
UINT8 *chr_bmp; static UINT8 *chr_bmp;
UINT8 *obj_bmp; static UINT8 *obj_bmp;
UINT8 *rod_bmp; static UINT8 *rod_bmp;
/*************************************************************************** /***************************************************************************