diff options
author | 2015-07-02 17:57:53 -0500 | |
---|---|---|
committer | 2015-07-08 14:34:59 -0500 | |
commit | 735e6c6db79da2cfd16ac4c453ebe23e158ba06a (patch) | |
tree | 6df67d9575aa9de6ae24eba109e0fec66b49b368 /src | |
parent | 21b5ebeba7dc4ef9d8b1f809741ad73418989a16 (diff) |
Quiet LTO ODR warnings (NW)
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/cpu/m37710/m7700ds.c | 10 | ||||
-rw-r--r-- | src/mame/includes/galastrm.h | 6 | ||||
-rw-r--r-- | src/mame/includes/groundfx.h | 4 | ||||
-rw-r--r-- | src/mame/includes/gunbustr.h | 4 | ||||
-rw-r--r-- | src/mame/includes/superchs.h | 4 | ||||
-rw-r--r-- | src/mame/includes/undrfire.h | 4 | ||||
-rw-r--r-- | src/mame/video/galastrm.c | 12 | ||||
-rw-r--r-- | src/mame/video/groundfx.c | 4 | ||||
-rw-r--r-- | src/mame/video/gunbustr.c | 4 | ||||
-rw-r--r-- | src/mame/video/midzeus.c | 18 | ||||
-rw-r--r-- | src/mame/video/model2.c | 6 | ||||
-rw-r--r-- | src/mame/video/model2rd.inc | 4 | ||||
-rw-r--r-- | src/mame/video/superchs.c | 4 | ||||
-rw-r--r-- | src/mame/video/undrfire.c | 6 |
14 files changed, 45 insertions, 45 deletions
diff --git a/src/emu/cpu/m37710/m7700ds.c b/src/emu/cpu/m37710/m7700ds.c index 07bc981e9d0..f6b77932b1e 100644 --- a/src/emu/cpu/m37710/m7700ds.c +++ b/src/emu/cpu/m37710/m7700ds.c @@ -18,7 +18,7 @@ Based on G65C816 CPU Emulator by Karl Stenerud #define ADDRESS_24BIT(A) ((A)&0xffffff) -struct opcode_struct +struct m7700_opcode_struct { unsigned char name; unsigned char flag; @@ -72,7 +72,7 @@ static const char *const g_opnames[] = "BBC", "BBS", "TBY", "ANDB","PUL", "PSH", "PLB", "XAB", "PHB", }; -static const opcode_struct g_opcodes[256] = +static const m7700_opcode_struct g_opcodes[256] = { {BRK, I, SIG }, {ORA, M, DXI }, {UNK, I, SIG }, {ORA, M, S }, {SEB, M, LDM4 }, {ORA, M, D }, {ASL, M, D }, {ORA, M, DLI }, @@ -155,7 +155,7 @@ static const opcode_struct g_opcodes[256] = {JSR, I, AXI }, {SBC, M, AX }, {INC, M, AX }, {SBC, M, ALX } }; -static const opcode_struct g_opcodes_prefix42[256] = +static const m7700_opcode_struct g_opcodes_prefix42[256] = { {BRK, I, SIG }, {ORB, M, DXI }, {COP, I, SIG }, {ORB, M, S }, {TSB, M, D }, {ORB, M, D }, {ASL, M, D }, {ORB, M, DLI }, @@ -238,7 +238,7 @@ static const opcode_struct g_opcodes_prefix42[256] = {JSR, I, AXI }, {SBCB, M, AX }, {INC, M, AX }, {SBCB, M, ALX } }; -static const opcode_struct g_opcodes_prefix89[256] = +static const m7700_opcode_struct g_opcodes_prefix89[256] = { {BRK, I, SIG }, {MPY, M, DXI }, {COP, I, SIG }, {MPY, M, S }, {TSB, M, D }, {MPY, M, D }, {ASL, M, D }, {MPY, M, DLI }, @@ -371,7 +371,7 @@ INLINE char* int_16_str(unsigned int val) int m7700_disassemble(char* buff, unsigned int pc, unsigned int pb, const UINT8 *oprom, int m_flag, int x_flag) { unsigned int instruction; - const opcode_struct *opcode; + const m7700_opcode_struct *opcode; char* ptr; int var; signed char varS; diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index 5bede2632db..5ac71d4cc79 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -5,7 +5,7 @@ #include "video/tc0100scn.h" #include "video/tc0480scp.h" -struct tempsprite +struct gs_tempsprite { int gfx; int code,color; @@ -53,8 +53,8 @@ public: int m_tc0610_1_addr; UINT32 m_mem[2]; INT16 m_tc0610_ctrl_reg[2][8]; - struct tempsprite *m_spritelist; - struct tempsprite *m_sprite_ptr_pre; + struct gs_tempsprite *m_spritelist; + struct gs_tempsprite *m_sprite_ptr_pre; bitmap_ind16 m_tmpbitmaps; bitmap_ind16 m_polybitmap; legacy_poly_manager *m_poly; diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index c774d6784fc..16c122c2116 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -3,7 +3,7 @@ #include "video/tc0100scn.h" #include "video/tc0480scp.h" -struct tempsprite +struct gfx_tempsprite { int gfx; int code,color; @@ -43,7 +43,7 @@ public: UINT16 m_coin_word; UINT16 m_frame_counter; UINT16 m_port_sel; - struct tempsprite *m_spritelist; + struct gfx_tempsprite *m_spritelist; UINT16 m_rotate_ctrl[8]; rectangle m_hack_cliprect; diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index a8e291517e2..3a258082ba7 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -3,7 +3,7 @@ #include "machine/eepromser.h" #include "video/tc0480scp.h" -struct tempsprite +struct gb_tempsprite { int gfx; int code,color; @@ -44,7 +44,7 @@ public: bool m_coin_lockout; UINT16 m_coin_word; - struct tempsprite *m_spritelist; + struct gb_tempsprite *m_spritelist; UINT32 m_mem[2]; DECLARE_WRITE32_MEMBER(gunbustr_input_w); diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 45424c596a4..05993a82556 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -4,7 +4,7 @@ #include "video/tc0480scp.h" -struct tempsprite +struct schs_tempsprite { int gfx; int code,color; @@ -34,7 +34,7 @@ public: required_shared_ptr<UINT32> m_spriteram; required_shared_ptr<UINT32> m_shared_ram; - struct tempsprite *m_spritelist; + struct schs_tempsprite *m_spritelist; UINT32 m_mem[2]; DECLARE_READ16_MEMBER(shared_ram_r); diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index c17354b3763..4060c0a543d 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -4,7 +4,7 @@ #include "video/tc0100scn.h" #include "video/tc0480scp.h" -struct tempsprite +struct uf_tempsprite { int gfx; int code,color; @@ -45,7 +45,7 @@ public: UINT16 m_coin_word; UINT16 m_port_sel; int m_frame_counter; - struct tempsprite *m_spritelist; + struct uf_tempsprite *m_spritelist; UINT16 m_rotate_ctrl[8]; UINT8 m_dislayer[6]; required_shared_ptr<UINT32> m_spriteram; diff --git a/src/mame/video/galastrm.c b/src/mame/video/galastrm.c index 622837c4bc0..d37ccb5bef3 100644 --- a/src/mame/video/galastrm.c +++ b/src/mame/video/galastrm.c @@ -7,7 +7,7 @@ #define X_OFFSET 96 #define Y_OFFSET 60 -struct poly_extra_data +struct gs_poly_extra_data { bitmap_ind16 *texbase; }; @@ -28,12 +28,12 @@ void galastrm_state::galastrm_exit() void galastrm_state::video_start() { - m_spritelist = auto_alloc_array(machine(), struct tempsprite, 0x4000); + m_spritelist = auto_alloc_array(machine(), struct gs_tempsprite, 0x4000); m_screen->register_screen_bitmap(m_tmpbitmaps); m_screen->register_screen_bitmap(m_polybitmap); - m_poly = poly_alloc(machine(), 16, sizeof(poly_extra_data), POLYFLAG_ALLOW_QUADS); + m_poly = poly_alloc(machine(), 16, sizeof(gs_poly_extra_data), POLYFLAG_ALLOW_QUADS); machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(galastrm_state::galastrm_exit), this)); } @@ -191,7 +191,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks); void galastrm_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, const int *primasks, int priority) { - struct tempsprite *sprite_ptr = m_sprite_ptr_pre; + struct gs_tempsprite *sprite_ptr = m_sprite_ptr_pre; while (sprite_ptr != m_spritelist) { @@ -217,7 +217,7 @@ void galastrm_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c static void tc0610_draw_scanline(void *dest, INT32 scanline, const poly_extent *extent, const void *extradata, int threadid) { - const poly_extra_data *extra = (const poly_extra_data *)extradata; + const gs_poly_extra_data *extra = (const gs_poly_extra_data *)extradata; bitmap_ind16 *destmap = (bitmap_ind16 *)dest; UINT16 *framebuffer = &destmap->pix16(scanline); bitmap_ind16 *texbase = extra->texbase; @@ -239,7 +239,7 @@ static void tc0610_draw_scanline(void *dest, INT32 scanline, const poly_extent * void galastrm_state::tc0610_rotate_draw(bitmap_ind16 &bitmap, bitmap_ind16 &srcbitmap, const rectangle &clip) { - poly_extra_data *extra = (poly_extra_data *)poly_get_extra_data(m_poly); + gs_poly_extra_data *extra = (gs_poly_extra_data *)poly_get_extra_data(m_poly); poly_draw_scanline_func callback; poly_vertex vert[4]; int rsx = m_tc0610_ctrl_reg[1][0]; diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c index d910db9aa37..0f5d385845e 100644 --- a/src/mame/video/groundfx.c +++ b/src/mame/video/groundfx.c @@ -7,7 +7,7 @@ void groundfx_state::video_start() { - m_spritelist = auto_alloc_array(machine(), struct tempsprite, 0x4000); + m_spritelist = auto_alloc_array(machine(), struct gfx_tempsprite, 0x4000); /* Hack */ m_hack_cliprect.set(69, 250, 24 + 5, 24 + 44); @@ -74,7 +74,7 @@ void groundfx_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co /* pdrawgfx() needs us to draw sprites front to back, so we have to build a list while processing sprite ram and then draw them all at the end */ - struct tempsprite *sprite_ptr = m_spritelist; + struct gfx_tempsprite *sprite_ptr = m_spritelist; for (offs = (m_spriteram.bytes()/4-4);offs >= 0;offs -= 4) { diff --git a/src/mame/video/gunbustr.c b/src/mame/video/gunbustr.c index 902cc232480..854f46c72f7 100644 --- a/src/mame/video/gunbustr.c +++ b/src/mame/video/gunbustr.c @@ -7,7 +7,7 @@ void gunbustr_state::video_start() { - m_spritelist = auto_alloc_array(machine(), struct tempsprite, 0x4000); + m_spritelist = auto_alloc_array(machine(), struct gb_tempsprite, 0x4000); } /************************************************************ @@ -69,7 +69,7 @@ void gunbustr_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co /* pdrawgfx() needs us to draw sprites front to back, so we have to build a list while processing sprite ram and then draw them all at the end */ - struct tempsprite *sprite_ptr = m_spritelist; + struct gb_tempsprite *sprite_ptr = m_spritelist; for (offs = (m_spriteram.bytes()/4-4);offs >= 0;offs -= 4) { diff --git a/src/mame/video/midzeus.c b/src/mame/video/midzeus.c index da34aa8da44..f3694d1e23e 100644 --- a/src/mame/video/midzeus.c +++ b/src/mame/video/midzeus.c @@ -35,7 +35,7 @@ * *************************************/ -struct poly_extra_data +struct mz_poly_extra_data { const void * palbase; const void * texbase; @@ -260,7 +260,7 @@ VIDEO_START_MEMBER(midzeus_state,midzeus) m_palette->set_pen_color(i, pal5bit(i >> 10), pal5bit(i >> 5), pal5bit(i >> 0)); /* initialize polygon engine */ - poly = poly_alloc(machine(), 10000, sizeof(poly_extra_data), POLYFLAG_ALLOW_QUADS); + poly = poly_alloc(machine(), 10000, sizeof(mz_poly_extra_data), POLYFLAG_ALLOW_QUADS); /* we need to cleanup on exit */ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(midzeus_state::exit_handler), this)); @@ -623,7 +623,7 @@ void midzeus_state::zeus_register_update(offs_t offset) // m_zeusbase[0x46] = ??? = 0x00000000 // m_zeusbase[0x4c] = ??? = 0x00808080 (brightness?) // m_zeusbase[0x4e] = ??? = 0x00808080 (brightness?) - poly_extra_data *extra = (poly_extra_data *)poly_get_extra_data(poly); + mz_poly_extra_data *extra = (mz_poly_extra_data *)poly_get_extra_data(poly); poly_vertex vert[4]; vert[0].x = (INT16)m_zeusbase[0x08]; @@ -1084,7 +1084,7 @@ void midzeus_state::zeus_draw_model(UINT32 texdata, int logit) void midzeus_state::zeus_draw_quad(int long_fmt, const UINT32 *databuffer, UINT32 texdata, int logit) { poly_draw_scanline_func callback; - poly_extra_data *extra; + mz_poly_extra_data *extra; poly_vertex clipvert[8]; poly_vertex vert[4]; float uscale, vscale; @@ -1212,7 +1212,7 @@ void midzeus_state::zeus_draw_quad(int long_fmt, const UINT32 *databuffer, UINT3 clipvert[i].y += 0.0005f; } - extra = (poly_extra_data *)poly_get_extra_data(poly); + extra = (mz_poly_extra_data *)poly_get_extra_data(poly); if ((ctrl_word & 0x000c0000) == 0x000c0000) { @@ -1269,7 +1269,7 @@ void midzeus_state::zeus_draw_quad(int long_fmt, const UINT32 *databuffer, UINT3 static void render_poly_texture(void *dest, INT32 scanline, const poly_extent *extent, const void *extradata, int threadid) { - const poly_extra_data *extra = (const poly_extra_data *)extradata; + const mz_poly_extra_data *extra = (const mz_poly_extra_data *)extradata; INT32 curz = extent->param[0].start; INT32 curu = extent->param[1].start; INT32 curv = extent->param[2].start; @@ -1324,7 +1324,7 @@ static void render_poly_texture(void *dest, INT32 scanline, const poly_extent *e static void render_poly_shade(void *dest, INT32 scanline, const poly_extent *extent, const void *extradata, int threadid) { - const poly_extra_data *extra = (const poly_extra_data *)extradata; + const mz_poly_extra_data *extra = (const mz_poly_extra_data *)extradata; int x; for (x = extent->startx; x < extent->stopx; x++) @@ -1351,7 +1351,7 @@ static void render_poly_shade(void *dest, INT32 scanline, const poly_extent *ext static void render_poly_solid(void *dest, INT32 scanline, const poly_extent *extent, const void *extradata, int threadid) { - const poly_extra_data *extra = (const poly_extra_data *)extradata; + const mz_poly_extra_data *extra = (const mz_poly_extra_data *)extradata; UINT16 color = extra->solidcolor; INT32 curz = (INT32)(extent->param[0].start); INT32 curv = extent->param[2].start; @@ -1377,7 +1377,7 @@ static void render_poly_solid(void *dest, INT32 scanline, const poly_extent *ext static void render_poly_solid_fixedz(void *dest, INT32 scanline, const poly_extent *extent, const void *extradata, int threadid) { - const poly_extra_data *extra = (const poly_extra_data *)extradata; + const mz_poly_extra_data *extra = (const mz_poly_extra_data *)extradata; UINT16 color = extra->solidcolor; UINT16 depth = extra->zoffset; int x; diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c index 106ba7f4aa0..56ba04cd024 100644 --- a/src/mame/video/model2.c +++ b/src/mame/video/model2.c @@ -139,7 +139,7 @@ struct quad_m2 UINT8 luma; }; -struct poly_extra_data +struct m2_poly_extra_data { model2_state * state; UINT32 lumabase; @@ -927,7 +927,7 @@ static const poly_draw_scanline_func render_funcs[8] = static void model2_3d_render( model2_state *state, bitmap_rgb32 &bitmap, triangle *tri, const rectangle &cliprect ) { legacy_poly_manager *poly = state->m_poly; - poly_extra_data *extra = (poly_extra_data *)poly_get_extra_data(poly); + m2_poly_extra_data *extra = (m2_poly_extra_data *)poly_get_extra_data(poly); UINT8 renderer; /* select renderer based on attributes (bit15 = checker, bit14 = textured, bit13 = transparent */ @@ -2707,7 +2707,7 @@ VIDEO_START_MEMBER(model2_state,model2) m_sys24_bitmap.allocate(width, height+4); - m_poly = poly_alloc(machine(), 4000, sizeof(poly_extra_data), 0); + m_poly = poly_alloc(machine(), 4000, sizeof(m2_poly_extra_data), 0); machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(model2_state::model2_exit), this)); /* initialize the hardware rasterizer */ diff --git a/src/mame/video/model2rd.inc b/src/mame/video/model2rd.inc index d646b8a3a11..07c744e08cc 100644 --- a/src/mame/video/model2rd.inc +++ b/src/mame/video/model2rd.inc @@ -59,7 +59,7 @@ static void MODEL2_FUNC_NAME(void *dest, INT32 scanline, const poly_extent *extent, const void *extradata, int threadid) { #if !defined( MODEL2_TRANSLUCENT) - const poly_extra_data *extra = (const poly_extra_data *)extradata; + const m2_poly_extra_data *extra = (const m2_poly_extra_data *)extradata; model2_state *state = extra->state; bitmap_rgb32 *destmap = (bitmap_rgb32 *)dest; UINT32 *p = &destmap->pix32(scanline); @@ -111,7 +111,7 @@ static void MODEL2_FUNC_NAME(void *dest, INT32 scanline, const poly_extent *exte /* textured render path */ static void MODEL2_FUNC_NAME(void *dest, INT32 scanline, const poly_extent *extent, const void *extradata, int threadid) { - const poly_extra_data *extra = (const poly_extra_data *)extradata; + const m2_poly_extra_data *extra = (const m2_poly_extra_data *)extradata; model2_state *state = extra->state; bitmap_rgb32 *destmap = (bitmap_rgb32 *)dest; UINT32 *p = &destmap->pix32(scanline); diff --git a/src/mame/video/superchs.c b/src/mame/video/superchs.c index 5783ef9c587..fe42cfbdd9b 100644 --- a/src/mame/video/superchs.c +++ b/src/mame/video/superchs.c @@ -5,7 +5,7 @@ void superchs_state::video_start() { - m_spritelist = auto_alloc_array(machine(), struct tempsprite, 0x4000); + m_spritelist = auto_alloc_array(machine(), struct schs_tempsprite, 0x4000); } /************************************************************ @@ -67,7 +67,7 @@ void superchs_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co /* pdrawgfx() needs us to draw sprites front to back, so we have to build a list while processing sprite ram and then draw them all at the end */ - struct tempsprite *sprite_ptr = m_spritelist; + struct schs_tempsprite *sprite_ptr = m_spritelist; for (offs = (m_spriteram.bytes()/4-4);offs >= 0;offs -= 4) { diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c index bc476538eb4..ab2f2a187ec 100644 --- a/src/mame/video/undrfire.c +++ b/src/mame/video/undrfire.c @@ -11,7 +11,7 @@ void undrfire_state::video_start() { int i; - m_spritelist = auto_alloc_array(machine(), struct tempsprite, 0x4000); + m_spritelist = auto_alloc_array(machine(), struct uf_tempsprite, 0x4000); for (i = 0; i < 16384; i++) /* Fix later - some weird colours in places */ m_palette->set_pen_color(i, rgb_t(0,0,0)); @@ -77,7 +77,7 @@ void undrfire_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co /* pdrawgfx() needs us to draw sprites front to back, so we have to build a list while processing sprite ram and then draw them all at the end */ - struct tempsprite *sprite_ptr = m_spritelist; + struct uf_tempsprite *sprite_ptr = m_spritelist; for (offs = (m_spriteram.bytes()/4-4);offs >= 0;offs -= 4) { @@ -222,7 +222,7 @@ void undrfire_state::draw_sprites_cbombers(screen_device &screen, bitmap_ind16 & /* pdrawgfx() needs us to draw sprites front to back, so we have to build a list while processing sprite ram and then draw them all at the end */ - struct tempsprite *sprite_ptr = m_spritelist; + struct uf_tempsprite *sprite_ptr = m_spritelist; for (offs = (m_spriteram.bytes()/4-4);offs >= 0;offs -= 4) { |