run latest srcclean on rest of files (nw)

This commit is contained in:
Miodrag Milanovic 2013-03-19 11:39:56 +00:00
parent 4337250fbe
commit a08ae67178
57 changed files with 64 additions and 172 deletions

View File

@ -343,7 +343,6 @@ void aristmk4_state::video_start()
void aristmk4_state::uBackgroundColour()
{
/* SW7 can be set when the main door is open, this allows the colours for the background
to be adjusted whilst the machine is running.

View File

@ -2265,7 +2265,6 @@ int bfm_sc2_state::sc2_find_project_string( )
void bfm_sc2_state::sc2_common_init(int decrypt)
{
if (decrypt) bfm_decode_mainrom(machine(), "maincpu", m_codec_data); // decode main rom
memset(m_sc2_Inputs, 0, sizeof(m_sc2_Inputs)); // clear all inputs
@ -3833,7 +3832,6 @@ MACHINE_CONFIG_END
void bfm_sc2_state::sc2awp_common_init(int reels, int decrypt)
{
int n;
sc2_common_init(decrypt);
/* setup n default 96 half step reels */
@ -3848,7 +3846,6 @@ void bfm_sc2_state::sc2awp_common_init(int reels, int decrypt)
void bfm_sc2_state::sc2awpdmd_common_init(int reels, int decrypt)
{
int n;
BFM_dm01_config(machine(), &dm01_interface);
sc2_common_init(decrypt);

View File

@ -319,7 +319,6 @@ public:
m_io_an7(*this, "AN7"),
m_io_config(*this, "CONFIG")
{
}
// Blitter state
@ -521,8 +520,7 @@ public:
};
#define PRINT_BLIT_STUFF \
printf("type blit %08x %08x(%d, %03x) %08x(%02x, %03x) %08x(%06x) %08x(%08x, %d, %d, %d) %08x(%d,%d) %04x %04x %04x %04x %08x %08x %d %d\n", blit0, blit1_unused,b1mode,b1colorNumber, blit2_unused,b2tpen,b2colorNumber, blit3_unused,b3romoffset, blit4_unused, blit4blendlevel, blit_flipy,blit_rotate, blit_flipx, blit5_unused, indirect_tile_enable, indirect_zoom_enable, vCellCount, hCellCount, vZoom, hZoom, blit10, textlookup, vPosition, hPosition); \
printf("type blit %08x %08x(%d, %03x) %08x(%02x, %03x) %08x(%06x) %08x(%08x, %d, %d, %d) %08x(%d,%d) %04x %04x %04x %04x %08x %08x %d %d\n", blit0, blit1_unused,b1mode,b1colorNumber, blit2_unused,b2tpen,b2colorNumber, blit3_unused,b3romoffset, blit4_unused, blit4blendlevel, blit_flipy,blit_rotate, blit_flipx, blit5_unused, indirect_tile_enable, indirect_zoom_enable, vCellCount, hCellCount, vZoom, hZoom, blit10, textlookup, vPosition, hPosition);
/* video */
@ -1014,8 +1012,7 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
/* if (object->screen==0) printf("marking offset %04x as decoded (sprite number %08x ptr %08x)\n", v*used_hCellCount + h, spriteNumber, ((UINT64)(void*)tempshape)&0xffffffff);*/ \
} \
} \
} \
}
#define CHECK_DECODE \
@ -1046,8 +1043,7 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
continue; \
} \
else \
if (blankcount==0) continue; \
if (blankcount==0) continue;
#define GET_SPRITE_NUMBER \
@ -1096,15 +1092,12 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
} \
} \
} \
UINT32 spriteNumber = (expanded_10bit_gfx[ (b3romoffset) + (lookupnum<<1) +0 ] << 10) | (expanded_10bit_gfx[ (b3romoffset) + (lookupnum<<1) + 1 ]); \
UINT32 spriteNumber = (expanded_10bit_gfx[ (b3romoffset) + (lookupnum<<1) +0 ] << 10) | (expanded_10bit_gfx[ (b3romoffset) + (lookupnum<<1) + 1 ]);
#define DO_XCLIP_REAL \
if (drawx>clipmaxX) { break; } \
if (drawx<clipminX) { drawx++; continue; } \
#define DO_XCLIP_NONE \
if (drawx<clipminX) { drawx++; continue; }
#define DO_XCLIP_NONE
#define GET_CURRENT_LINESCROLLZOOM \
UINT32 dword = object->indirect_zoom[v*16+realy]; \
@ -1132,8 +1125,7 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
case 3: \
/* invalid? */ \
break; \
} \
}
@ -1179,8 +1171,7 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
} \
} \
drawy++; \
} \
}
#define YXLOOP_NO_LINEZOOM \
for (int y = 0; y < blockhigh; y++) \
@ -1198,8 +1189,7 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
GET_PIX; \
DRAW_PIX \
} \
} \
}
#define YXLOOP_NO_ZOOM \
@ -1216,8 +1206,7 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
GET_PIX; \
DRAW_PIX \
} \
} \
}
/* the two tables that the patent claims are located at:
@ -1271,19 +1260,16 @@ TODO: fix anything that isn't text.
} \
} \
} \
drawx++; \
drawx++;
//object->rearranged_16bit_gfx
//object->expanded_10bit_gfx
#define GET_PIX_ROTATED \
UINT16 pix = tempshape[realx*16+realy]; \
UINT16 pix = tempshape[realx*16+realy];
#define GET_PIX_NORMAL \
UINT16 pix = tempshape[realy*16+realx]; \
UINT16 pix = tempshape[realy*16+realx];
void *coolridr_state::draw_object_threaded(void *param, int threadid)
{
@ -1892,8 +1878,6 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
// Splat some sprites
for (int v = 0; v < used_vCellCount; v++)
{
const int pixelOffsetY = ((vPosition) + (v* 16 * vZoom)) / 0x40;
const int pixelOffsetnextY = ((vPosition) + ((v+1)* 16 * vZoom)) / 0x40;
@ -1921,7 +1905,6 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
if (!indirect_zoom_enable)
{
int sizex = used_hCellCount * 16 * hZoom;
hPosition = hPositionx * 0x40;
@ -1948,11 +1931,9 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
UINT32 lastSpriteNumber = 0xffffffff;
UINT16 blankcount = 0;
int color_offs = (0x7b20 + (b1colorNumber & 0x7ff))*0x40 * 5; /* yes, * 5 */ \
int color_offs2 = (0x7b20 + (b2colorNumber & 0x7ff))*0x40 * 5; \
int color_offs2 = (0x7b20 + (b2colorNumber & 0x7ff))*0x40 * 5;
for (int h = 0; h < used_hCellCount; h++)
{
int current_decoded = false;
if (!indirect_tile_enable && size < DECODECACHE_NUMSPRITETILES)
@ -2187,9 +2168,6 @@ void coolridr_state::blit_current_sprite(address_space &space)
}
else if (blit0==1)
{
if (m_blitterMode&0x80)
{
// HACK...
@ -2710,7 +2688,6 @@ WRITE32_MEMBER(coolridr_state::sysh1_unk_blit_w)
case 0x02:
{
// writes 3d0dxxxx / 3d0exxxx before a level start.. offset for a transfer read at 0x400000c, stored in work RAM H
//printf("sysh1_unk_blit_w unhandled offset %04x %08x %08x\n", offset, data, mem_mask);
@ -3430,8 +3407,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(coolridr_state::system_h1_sub)
#define READ_COMPRESSED_ROM(chip) \
m_compressedgfx[(chip)*0x400000 + romoffset] << 8 | m_compressedgfx[(chip)*0x0400000 + romoffset +1]; \
m_compressedgfx[(chip)*0x400000 + romoffset] << 8 | m_compressedgfx[(chip)*0x0400000 + romoffset +1];
// this helps you feth the 20bit words from an address in the compressed data
UINT32 coolridr_state::get_20bit_data(UINT32 romoffset, int _20bitwordnum)
{

View File

@ -405,7 +405,6 @@ WRITE8_MEMBER(cyclemb_state::cyclemb_flip_w)
void cyclemb_state::skydest_i8741_reset()
{
m_mcu[0].rxd = 0;
m_mcu[0].txd = 0;
m_mcu[0].rst = 0;

View File

@ -148,7 +148,6 @@ READ32_MEMBER(deco_mlc_state::mlc_44001c_r)
WRITE32_MEMBER(deco_mlc_state::mlc_44001c_w)
{
}
READ32_MEMBER(deco_mlc_state::mlc_200070_r)
@ -298,7 +297,6 @@ WRITE32_MEMBER( deco_mlc_state::mlc_spriteram_w )
{
if (mem_mask & 0xffff0000)
{
}
if (mem_mask & 0x0000ffff)

View File

@ -65,7 +65,6 @@ public:
UINT32 dreambal_state::screen_update_dreambal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
address_space &space = generic_space();
UINT16 flip = deco16ic_pf_control_r(m_deco_tilegen1, space, 0, 0xffff);
@ -291,7 +290,6 @@ void dreambal_state::machine_start()
void dreambal_state::machine_reset()
{
}
// xtals = 28.000, 9.8304

View File

@ -1093,7 +1093,6 @@ WRITE8_MEMBER(gunpey_state::gunpey_blitter_w)
{
if(rle == 8)
{
// compressed stream format:
//
// byte 0 = source width (data is often stored in fairly narrow columns)
@ -1126,7 +1125,6 @@ WRITE8_MEMBER(gunpey_state::gunpey_blitter_w)
for (;;)
{
int test = gunpey_state_get_stream_bits(2);
int data;
int getbits = 1;
@ -1163,7 +1161,6 @@ WRITE8_MEMBER(gunpey_state::gunpey_blitter_w)
//if (count<512)
{
{
if (test==0x0)
{
printf("00");
@ -1507,7 +1504,6 @@ ROM_END
DRIVER_INIT_MEMBER(gunpey_state,gunpey)
{
m_blit_rom = memregion("blit_data")->base();
m_blit_rom2 = memregion("blit_data2")->base();

View File

@ -1202,7 +1202,6 @@ WRITE32_MEMBER(ksys573_state::atapi_w)
void ksys573_state::atapi_init()
{
m_atapi_regs[ATAPI_REG_CMDSTATUS] = 0;
m_atapi_regs[ATAPI_REG_ERRFEAT] = 1;
m_atapi_regs[ATAPI_REG_COUNTLOW] = 0x14;
@ -1633,7 +1632,6 @@ READ32_MEMBER(ksys573_state::gx700pwbf_io_r)
void ksys573_state::gx700pwbf_output( int offset, UINT8 data )
{
if( m_gx700pwfbf_output_callback != NULL )
{
int i;
@ -1694,7 +1692,6 @@ WRITE32_MEMBER(ksys573_state::gx700pwbf_io_w)
void ksys573_state::gx700pwfbf_init( void (ksys573_state::*output_callback_func)( int offset, int data ) )
{
memset( m_gx700pwbf_output_data, 0, sizeof( m_gx700pwbf_output_data ) );
m_gx700pwfbf_output_callback = output_callback_func;
@ -1727,7 +1724,6 @@ static const int mask[] =
void ksys573_state::gn845pwbb_do_w( int offset, int data )
{
m_stage[ offset ].DO = !data;
}
@ -2058,7 +2054,6 @@ char *ksys573_state::binary( char *s, UINT32 data )
void ksys573_state::gx894pwbba_output( int offset, UINT8 data )
{
if( m_gx894pwbba_output_callback != NULL )
{
int i;

View File

@ -1536,7 +1536,6 @@ ROM_END
void mcr68_state::mcr68_common_init(int clip, int xoffset)
{
m_sprite_clip = clip;
m_sprite_xoffset = xoffset;

View File

@ -6265,7 +6265,6 @@ ROM_END
void metro_state::metro_common( )
{
memset(m_requested_int, 0, ARRAY_LENGTH(m_requested_int));
m_vblank_bit = 0;
m_blitter_bit = 2;

View File

@ -871,7 +871,6 @@ WRITE16_MEMBER(namcos11_state::c76_speedup_w)
void namcos11_state::namcos11_init_common(int n_daughterboard)
{
// C76 idle skipping, large speedboost
if (C76_SPEEDUP)
{

View File

@ -340,7 +340,6 @@ void rabbit_state::rabbit_clearspritebitmap( bitmap_ind16 &bitmap, const rectang
/* todo: fix zoom, its inaccurate and this code is ugly */
void rabbit_state::draw_sprite_bitmap( bitmap_ind16 &bitmap, const rectangle &cliprect )
{
UINT32 x,y;
UINT16 *srcline;
UINT16 *dstline;

View File

@ -2842,7 +2842,6 @@ ROM_END
void seattle_state::init_common(int ioasic, int serialnum, int yearoffs, int config)
{
/* initialize the subsystems */
midway_ioasic_init(machine(),ioasic, serialnum, yearoffs, ioasic_irq);

View File

@ -305,7 +305,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(snk6502_state::sasuke_update_counter)
void snk6502_state::sasuke_start_counter()
{
m_sasuke_counter = 0;
}

View File

@ -109,7 +109,6 @@ static const UINT8 puzznic_mcu_reply[] = { 0x50, 0x1f, 0xb6, 0xba, 0x06, 0x03, 0
void taitol_state::state_register( )
{
save_item(NAME(m_irq_adr_table));
save_item(NAME(m_irq_enable));
save_item(NAME(m_cur_rambank));

View File

@ -744,7 +744,6 @@ ADDRESS_MAP_END
#if 1
inline UINT32 tmnt_state::tmnt2_get_word( UINT32 addr )
{
if (addr <= 0x07ffff / 2)
return(m_tmnt2_rom[addr]);
else if (addr >= 0x104000 / 2 && addr <= 0x107fff / 2)

View File

@ -43,7 +43,6 @@ WRITE8_MEMBER(mexico86_state::mexico86_f008_w)
void mexico86_state::mcu_simulate( )
{
if (!m_mcu_initialised)
{
if (m_protection_ram[0x01] == 0x00)

View File

@ -26,7 +26,6 @@ struct game_keys
static const struct game_keys keys_table[] =
{
// name key gameid # year
// M2
{ "wldkicks", 0x00ae2901 }, // 25209801 2000
@ -111,7 +110,6 @@ static const struct game_keys keys_table[] =
UINT32 get_naomi_key(running_machine &machine)
{
const char *gamename = machine.system().name;
const struct game_keys *k = &keys_table[0];

View File

@ -314,7 +314,6 @@ TIMER_CALLBACK_MEMBER(opwolf_state::opwolf_timer_callback)
void opwolf_state::updateDifficulty( int mode )
{
// The game is made up of 6 rounds, when you complete the
// sixth you return to the start but with harder difficulty.
if (mode == 0)
@ -709,7 +708,6 @@ TIMER_CALLBACK_MEMBER(opwolf_state::cchip_timer)
void opwolf_state::opwolf_cchip_init( )
{
m_cchip_ram.allocate(0x400 * 8);
save_item(NAME(m_current_bank));

View File

@ -199,7 +199,6 @@ void starwars_state::starwars_mproc_reset()
void starwars_state::run_mproc()
{
int RAMWORD = 0;
int MA_byte;
int tmp;

View File

@ -119,7 +119,6 @@ READ8_MEMBER(tnzs_state::arknoid2_sh_f000_r)
void tnzs_state::mcu_reset( )
{
m_mcu_initializing = 3;
m_mcu_coinage_init = 0;
m_mcu_coinage[0] = 1;
@ -135,7 +134,6 @@ void tnzs_state::mcu_reset( )
void tnzs_state::mcu_handle_coins( int coin )
{
/* The coin inputs and coin counters are managed by the i8742 mcu. */
/* Here we simulate it. */
/* Credits are limited to 9, so more coins should be rejected */

View File

@ -130,7 +130,6 @@ READ16_MEMBER(toaplan1_state::demonwld_BIO_r)
void toaplan1_state::demonwld_dsp(int enable)
{
m_dsp_on = enable;
if (enable)
{
@ -381,7 +380,6 @@ MACHINE_RESET_MEMBER(toaplan1_state,toaplan1)
void toaplan1_state::toaplan1_driver_savestate()
{
save_item(NAME(m_intenable));
save_item(NAME(m_coin_count));
save_item(NAME(m_unk_reset_port));
@ -403,7 +401,6 @@ MACHINE_RESET_MEMBER(toaplan1_state,demonwld)
void toaplan1_state::demonwld_driver_savestate()
{
save_item(NAME(m_dsp_on));
save_item(NAME(m_dsp_addr_w));
save_item(NAME(m_main_ram_seg));
@ -422,7 +419,6 @@ MACHINE_RESET_MEMBER(toaplan1_state,vimana)
void toaplan1_state::vimana_driver_savestate()
{
save_item(NAME(m_vimana_coins[0]));
save_item(NAME(m_vimana_coins[1]));
save_item(NAME(m_vimana_credits));

View File

@ -320,7 +320,6 @@ MACHINE_RESET_MEMBER(twincobr_state,wardner)
void twincobr_state::twincobr_driver_savestate()
{
state_save_register_global(machine(), m_toaplan_main_cpu);
state_save_register_global(machine(), m_intenable);
state_save_register_global(machine(), m_dsp_on);

View File

@ -480,7 +480,6 @@ READ16_MEMBER(volfied_state::volfied_cchip_ram_r)
void volfied_state::volfied_cchip_init( )
{
m_cchip_ram = auto_alloc_array_clear(machine(), UINT8, 0x400 * 8);
save_item(NAME(m_current_bank));
@ -492,7 +491,6 @@ void volfied_state::volfied_cchip_init( )
void volfied_state::volfied_cchip_reset( )
{
m_current_bank = 0;
m_current_flag = 0;
m_cc_port = 0;

View File

@ -41,7 +41,6 @@ static void mlc_drawgfxzoomline(
int transparent_color,int use8bpp,
int scalex, int alpha, int srcline )
{
if (!scalex) return;
/*
@ -372,7 +371,6 @@ void deco_mlc_state::draw_sprites( const rectangle &cliprect, int scanline, UINT
if (raster_select==1 || raster_select==2 || raster_select==3)
{
int irq_base_reg; /* 6, 9, 12 are possible */
if (raster_select== 1) irq_base_reg = 6; // OK upper screen.. left?
else if (raster_select== 2) irq_base_reg = 9; // OK upper screen.. main / center
@ -455,7 +453,6 @@ void deco_mlc_state::draw_sprites( const rectangle &cliprect, int scanline, UINT
for (bx=0; bx<w; bx++) {
int realxbase = xbase + bx * xinc;
int count = 0;
if (fx)

View File

@ -86,7 +86,6 @@ WRITE8_MEMBER(m10_state::m15_chargen_w)
inline void m10_state::plot_pixel_m10( bitmap_ind16 &bm, int x, int y, int col )
{
if (!m_flip)
bm.pix16(y, x) = col;
else

View File

@ -267,7 +267,6 @@ void m58_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect )
void m58_state::draw_panel( bitmap_ind16 &bitmap, const rectangle &cliprect )
{
if (!*m_yard_score_panel_disabled)
{
const rectangle clippanel(26*8, 32*8-1, 1*8, 31*8-1);

View File

@ -285,7 +285,6 @@ PALETTE_INIT_MEMBER(m62_state,spelunk2)
void m62_state::register_savestate( )
{
save_item(NAME(m_flipscreen));
save_item(NAME(m_m62_background_hscroll));
save_item(NAME(m_m62_background_vscroll));

View File

@ -505,7 +505,6 @@ void m92_state::m92_update_scroll_positions()
void m92_state::m92_draw_tiles(bitmap_ind16 &bitmap,const rectangle &cliprect)
{
if ((~m_pf_master_control[2] >> 4) & 1)
{
m_pf_layer[2].wide_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);

View File

@ -953,7 +953,6 @@ void nmk16_state::video_update(bitmap_ind16 &bitmap, const rectangle &cliprect,
void nmk16_state::redhawki_video_update(bitmap_ind16 &bitmap, const rectangle &cliprect )
{
m_bg_tilemap0->set_scrollx(0, m_afega_scroll_1[0]&0xff);
m_bg_tilemap0->set_scrolly(0, m_afega_scroll_1[1]&0xff);

View File

@ -134,7 +134,6 @@ WRITE32_MEMBER(psikyo_state::psikyo_vram_1_w)
void psikyo_state::psikyo_switch_banks( int tmap, int bank )
{
if ((tmap == 0) && (bank != m_tilemap_0_bank))
{
m_tilemap_0_bank = bank;
@ -256,7 +255,6 @@ Note: Not all sprites are displayed: in the top part of spriteram
void psikyo_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int trans_pen )
{
/* tile layers 0 & 1 have priorities 1 & 2 */
static const int pri[] = { 0, 0xfc, 0xff, 0xff };
int offs;
@ -374,7 +372,6 @@ void psikyo_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect
// it might be a problem with the actual bootleg
void psikyo_state::draw_sprites_bootleg( bitmap_ind16 &bitmap, const rectangle &cliprect, int trans_pen )
{
/* tile layers 0 & 1 have priorities 1 & 2 */
static const int pri[] = { 0, 0xfc, 0xff, 0xff };
int offs;

View File

@ -508,7 +508,6 @@ VIDEO_START_MEMBER(seta_state,twineagl_1_layer)
int setac_gfxbank_callback( running_machine &machine, UINT16 code, UINT8 color )
{
int bank = (color & 0x06) >> 1;
code = (code & 0x3fff) + (bank * 0x4000);

View File

@ -318,7 +318,6 @@ void sidearms_state::sidearms_draw_starfield( bitmap_ind16 &bitmap )
void sidearms_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
{
if (m_gameid == 2 || m_gameid == 3) // Dyger and Whizz have simple front-to-back sprite priority
draw_sprites_region(bitmap, cliprect, 0x0000, 0x1000);
else

View File

@ -377,7 +377,6 @@ void slapshot_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clipre
void slapshot_state::taito_handle_sprite_buffering( )
{
if (m_prepare_sprites) /* no buffering */
{
memcpy(m_spriteram_buffered, m_spriteram, m_spriteram.bytes());

View File

@ -50,7 +50,6 @@ TILE_GET_INFO_MEMBER(snk68_state::get_searchar_tile_info)
void snk68_state::common_video_start()
{
m_fg_tilemap->set_transparent_pen(0);
m_fg_tilemap->set_scrolldx(0, machine().primary_screen->width() - 256);

View File

@ -986,7 +986,6 @@ UINT32 ssv_state::screen_update_gdfs(screen_device &screen, bitmap_ind16 &bitmap
void ssv_state::ssv_enable_video(int enable)
{
m_enable_video = enable;
}

View File

@ -220,7 +220,6 @@ VIDEO_START_MEMBER(suna8_state,suna8_starfigh) { suna8_vh_start_common(
void suna8_state::draw_normal_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, int which)
{
UINT8 *spriteram = m_spriteram + which * 0x2000 * 2;
int i;

View File

@ -32,7 +32,6 @@
void segas1x_bootleg_state::setup_system16_bootleg_spritebanking( )
{
if (m_spritebank_type == 1)
{
static const UINT8 default_banklist[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };

View File

@ -817,7 +817,6 @@ void taitof2_state::update_spritebanks( )
void taitof2_state::taitof2_handle_sprite_buffering( )
{
if (m_prepare_sprites) /* no buffering */
{
memcpy(m_spriteram_buffered, m_spriteram, m_spriteram.bytes());
@ -1052,7 +1051,6 @@ UINT32 taitof2_state::screen_update_taitof2_pri(screen_device &screen, bitmap_in
void taitof2_state::draw_roz_layer( bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32 priority)
{
if (m_tc0280grd != NULL)
tc0280grd_zoom_draw(m_tc0280grd, bitmap, cliprect, m_pivot_xdisp, m_pivot_ydisp, priority);

View File

@ -753,7 +753,6 @@ void taitojc_renderer::render_polygons(running_machine &machine, UINT16 *polygon
void taitojc_state::taitojc_clear_frame()
{
m_framebuffer.fill(0, machine().primary_screen->visible_area());
m_zbuffer.fill(0xffff, machine().primary_screen->visible_area());
}

View File

@ -208,7 +208,6 @@ TILE_GET_INFO_MEMBER(toaplan1_state::get_pf4_tile_info)
void toaplan1_state::toaplan1_create_tilemaps()
{
m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
m_pf3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toaplan1_state::get_pf3_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
@ -225,14 +224,12 @@ void toaplan1_state::toaplan1_create_tilemaps()
void toaplan1_state::toaplan1_paletteram_alloc()
{
UINT32 bytes = (m_colorram1.bytes() + m_colorram2.bytes())/2;
m_generic_paletteram_16.allocate(bytes);
}
void toaplan1_state::toaplan1_vram_alloc()
{
m_pf1_tilevram16 = auto_alloc_array_clear(machine(), UINT16, TOAPLAN1_TILEVRAM_SIZE/2);
m_pf2_tilevram16 = auto_alloc_array_clear(machine(), UINT16, TOAPLAN1_TILEVRAM_SIZE/2);
m_pf3_tilevram16 = auto_alloc_array_clear(machine(), UINT16, TOAPLAN1_TILEVRAM_SIZE/2);
@ -254,7 +251,6 @@ void toaplan1_state::toaplan1_vram_alloc()
void toaplan1_state::toaplan1_spritevram_alloc()
{
m_spriteram.allocate(TOAPLAN1_SPRITERAM_SIZE/2);
m_buffered_spriteram = auto_alloc_array_clear(machine(), UINT16, TOAPLAN1_SPRITERAM_SIZE/2);
m_spritesizeram16 = auto_alloc_array_clear(machine(), UINT16, TOAPLAN1_SPRITESIZERAM_SIZE/2);
@ -267,7 +263,6 @@ void toaplan1_state::toaplan1_spritevram_alloc()
void toaplan1_state::toaplan1_set_scrolls()
{
m_pf1_tilemap->set_scrollx(0, (m_pf1_scrollx >> 7) - (m_tiles_offsetx - m_scrollx_offs1));
m_pf2_tilemap->set_scrollx(0, (m_pf2_scrollx >> 7) - (m_tiles_offsetx - m_scrollx_offs2));
m_pf3_tilemap->set_scrollx(0, (m_pf3_scrollx >> 7) - (m_tiles_offsetx - m_scrollx_offs3));
@ -294,7 +289,6 @@ void toaplan1_state::toaplan1_flipscreen()
void toaplan1_state::register_common()
{
save_item(NAME(m_scrollx_offs1));
save_item(NAME(m_scrollx_offs2));
save_item(NAME(m_scrollx_offs3));

View File

@ -57,7 +57,6 @@ TILE_GET_INFO_MEMBER(toaplan2_state::get_text_tile_info)
void toaplan2_state::truxton2_create_tx_tilemap()
{
m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(toaplan2_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
m_tx_tilemap->set_scroll_rows(8*32); /* line scrolling */
m_tx_tilemap->set_scroll_cols(1);
@ -66,7 +65,6 @@ void toaplan2_state::truxton2_create_tx_tilemap()
void toaplan2_state::register_state_save()
{
save_item(NAME(m_tx_flip));
}

View File

@ -284,7 +284,6 @@ VIDEO_START_MEMBER(tumbleb_state,suprtrio)
void tumbleb_state::tumbleb_draw_common(bitmap_ind16 &bitmap, const rectangle &cliprect, int pf1x_offs, int pf1y_offs, int pf2x_offs, int pf2y_offs)
{
m_pf1_tilemap->set_scrollx(0, m_control_0[1] + pf1x_offs);
m_pf1_tilemap->set_scrolly(0, m_control_0[2] + pf1y_offs);
m_pf1_alt_tilemap->set_scrollx(0, m_control_0[1] + pf1x_offs);

View File

@ -146,7 +146,6 @@ void twincobr_state::twincobr_restore_screen()
void twincobr_state::twincobr_display(int enable)
{
m_display_on = enable;
m_bg_tilemap->enable(enable);
m_fg_tilemap->enable(enable);
@ -155,7 +154,6 @@ void twincobr_state::twincobr_display(int enable)
void twincobr_state::twincobr_flipscreen(int flip)
{
machine().tilemap().set_flip_all((flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0));
m_flip_screen = flip;
if (flip) {
@ -350,7 +348,6 @@ WRITE8_MEMBER(twincobr_state::wardner_sprite_w)
void twincobr_state::wardner_sprite_priority_hack()
{
if (m_fgscrollx != m_bgscrollx) {
UINT16 *buffered_spriteram16 = reinterpret_cast<UINT16 *>(m_spriteram8->buffer());
if ((m_fgscrollx==0x1c9) || (m_flip_screen && (m_fgscrollx==0x17a))) { /* in the shop ? */

View File

@ -83,7 +83,6 @@ void vball_state::vb_bgprombank_w( int bank )
void vball_state::vb_spprombank_w( int bank )
{
int i;
UINT8* color_prom;

View File

@ -18,7 +18,6 @@ channelf_sound_device::channelf_sound_device(const machine_config &mconfig, cons
m_forced_ontime(0),
m_min_ontime(0)
{
}
//-------------------------------------------------

View File

@ -630,7 +630,6 @@ UINT32 apexc_state::screen_update_apexc(screen_device &screen, bitmap_ind16 &bit
void apexc_state::apexc_teletyper_init()
{
m_letters = FALSE;
m_pos = 0;
}

View File

@ -82,7 +82,7 @@ public:
: saturn_state(mconfig, type, tag)
, m_exp(*this, "exp")
{ }
DECLARE_INPUT_CHANGED_MEMBER(key_stroke);
DECLARE_INPUT_CHANGED_MEMBER(nmi_reset);
DECLARE_INPUT_CHANGED_MEMBER(tray_open);
@ -90,10 +90,10 @@ public:
DECLARE_MACHINE_START(saturn);
DECLARE_MACHINE_RESET(saturn);
DECLARE_READ8_MEMBER(saturn_cart_type_r);
DECLARE_READ32_MEMBER( abus_dummy_r );
DECLARE_READ32_MEMBER(saturn_null_ram_r);
DECLARE_WRITE32_MEMBER(saturn_null_ram_w);
@ -101,7 +101,7 @@ public:
DECLARE_DRIVER_INIT(saturnus);
DECLARE_DRIVER_INIT(saturneu);
DECLARE_DRIVER_INIT(saturnjp);
required_device<sat_cart_slot_device> m_exp;
};
@ -174,7 +174,7 @@ static ADDRESS_MAP_START( saturn_mem, AS_PROGRAM, 32, sat_console_state )
AM_RANGE(0x00200000, 0x002fffff) AM_RAM AM_MIRROR(0x20100000) AM_SHARE("workram_l")
AM_RANGE(0x01000000, 0x017fffff) AM_WRITE(saturn_minit_w)
AM_RANGE(0x01800000, 0x01ffffff) AM_WRITE(saturn_sinit_w)
// AM_RANGE(0x02000000, 0x023fffff) AM_ROM // Cartridge area
// AM_RANGE(0x02000000, 0x023fffff) AM_ROM // Cartridge area
// AM_RANGE(0x02400000, 0x027fffff) AM_RAM // External Data RAM area
// AM_RANGE(0x04000000, 0x047fffff) AM_RAM // External Battery RAM area
AM_RANGE(0x04fffffc, 0x04ffffff) AM_READ8(saturn_cart_type_r,0x000000ff)
@ -193,7 +193,7 @@ static ADDRESS_MAP_START( saturn_mem, AS_PROGRAM, 32, sat_console_state )
AM_RANGE(0x05fe0000, 0x05fe00cf) AM_READWRITE(saturn_scu_r, saturn_scu_w)
AM_RANGE(0x06000000, 0x060fffff) AM_RAM AM_MIRROR(0x21f00000) AM_SHARE("workram_h")
AM_RANGE(0x20000000, 0x2007ffff) AM_ROM AM_SHARE("share6") // bios mirror
// AM_RANGE(0x22000000, 0x24ffffff) AM_ROM // Cartridge area mirror
// AM_RANGE(0x22000000, 0x24ffffff) AM_ROM // Cartridge area mirror
AM_RANGE(0x45000000, 0x46ffffff) AM_WRITENOP
AM_RANGE(0x60000000, 0x600003ff) AM_WRITENOP // cache address array
AM_RANGE(0xc0000000, 0xc00007ff) AM_RAM // cache data array, Dragon Ball Z sprites relies on this
@ -617,18 +617,18 @@ MACHINE_START_MEMBER(sat_console_state,saturn)
m_audiocpu = downcast<legacy_cpu_device*>( machine().device<cpu_device>("audiocpu") );
scsp_set_ram_base(machine().device("scsp"), m_sound_ram);
machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x02400000, 0x027fffff, read32_delegate(FUNC(sat_console_state::saturn_null_ram_r),this), write32_delegate(FUNC(sat_console_state::saturn_null_ram_w),this));
machine().device("slave")->memory().space(AS_PROGRAM).install_readwrite_handler(0x02400000, 0x027fffff, read32_delegate(FUNC(sat_console_state::saturn_null_ram_r),this), write32_delegate(FUNC(sat_console_state::saturn_null_ram_w),this));
machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(0x04000000, 0x047fffff);
machine().device("slave")->memory().space(AS_PROGRAM).nop_readwrite(0x04000000, 0x047fffff);
if (m_exp)
{
switch (m_exp->get_cart_type())
{
case 0x21: // Battery RAM cart
case 0x21: // Battery RAM cart
case 0x22:
case 0x23:
case 0x24:
@ -637,7 +637,7 @@ MACHINE_START_MEMBER(sat_console_state,saturn)
machine().device("slave")->memory().space(AS_PROGRAM).install_read_handler(0x04000000, 0x047fffff, read32_delegate(FUNC(device_sat_cart_interface::read_ext_bram), m_exp->m_cart));
machine().device("slave")->memory().space(AS_PROGRAM).install_write_handler(0x04000000, 0x047fffff, write32_delegate(FUNC(device_sat_cart_interface::write_ext_bram), m_exp->m_cart));
break;
case 0x5a: // Data RAM cart
case 0x5a: // Data RAM cart
case 0x5c:
machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x02400000, 0x025fffff, read32_delegate(FUNC(device_sat_cart_interface::read_ext_dram0), m_exp->m_cart));
machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x02400000, 0x025fffff, write32_delegate(FUNC(device_sat_cart_interface::write_ext_dram0), m_exp->m_cart));
@ -648,7 +648,7 @@ MACHINE_START_MEMBER(sat_console_state,saturn)
machine().device("slave")->memory().space(AS_PROGRAM).install_read_handler(0x02600000, 0x027fffff, read32_delegate(FUNC(device_sat_cart_interface::read_ext_dram1), m_exp->m_cart));
machine().device("slave")->memory().space(AS_PROGRAM).install_write_handler(0x02600000, 0x027fffff, write32_delegate(FUNC(device_sat_cart_interface::write_ext_dram1), m_exp->m_cart));
break;
case 0: // ROM cart + mirror
case 0: // ROM cart + mirror
machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x02000000, 0x023fffff, read32_delegate(FUNC(device_sat_cart_interface::read_rom), m_exp->m_cart));
machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x22000000, 0x24ffffff, read32_delegate(FUNC(device_sat_cart_interface::read_rom), m_exp->m_cart));
machine().device("slave")->memory().space(AS_PROGRAM).install_read_handler(0x02000000, 0x023fffff, read32_delegate(FUNC(device_sat_cart_interface::read_rom), m_exp->m_cart));
@ -656,7 +656,7 @@ MACHINE_START_MEMBER(sat_console_state,saturn)
break;
}
}
// save states
state_save_register_global_pointer(machine(), m_scu_regs, 0x100/4);
state_save_register_global_pointer(machine(), m_scsp_regs, 0x1000/2);

View File

@ -240,7 +240,6 @@ inline void supracan_state::verboselog(const char *tag, int n_level, const char
int supracan_state::supracan_tilemap_get_region(int layer)
{
// HACK!!!
if (layer==2)
{
@ -283,7 +282,6 @@ int supracan_state::supracan_tilemap_get_region(int layer)
void supracan_state::supracan_tilemap_get_info_common(int layer, tile_data &tileinfo, int count)
{
UINT16* supracan_vram = m_vram;
UINT32 base = (m_tilemap_base_addr[layer]);
@ -337,7 +335,6 @@ void supracan_state::supracan_tilemap_get_info_common(int layer, tile_data &tile
// I wonder how different this really is.. my guess, not at all.
void supracan_state::supracan_tilemap_get_info_roz(int layer, tile_data &tileinfo, int count)
{
UINT16* supracan_vram = m_vram;
UINT32 base = m_roz_base_addr;

View File

@ -306,8 +306,6 @@ void vtech1_state::vtech1_get_track()
void vtech1_state::vtech1_put_track()
{
/* drive selected and image file ok? */
if (m_drive >= 0 && floppy_get_device(machine(),m_drive) != NULL)
{

View File

@ -950,7 +950,6 @@ int threecom3c505_device::ethernet_packet_is_for_me(const UINT8 mac_address[])
void threecom3c505_device::recv_cb(UINT8 *data, int length)
{
if (length < ETHERNET_ADDR_SIZE || !ethernet_packet_is_for_me(data))
{
// skip packet

View File

@ -13,7 +13,7 @@ class saturn_bram_device : public device_t,
public:
// construction/destruction
saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size);
// device-level overrides
virtual void device_start();
virtual void device_reset();
@ -23,7 +23,7 @@ public:
virtual void nvram_default() { }
virtual void nvram_read(emu_file &file) { if (m_ext_bram != NULL) { file.read(m_ext_bram, m_ext_bram_size); } }
virtual void nvram_write(emu_file &file) { if (m_ext_bram != NULL) { file.write(m_ext_bram, m_ext_bram_size); } }
// reading and writing
virtual DECLARE_READ32_MEMBER(read_ext_bram);
virtual DECLARE_WRITE32_MEMBER(write_ext_bram);
@ -32,7 +32,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ext_bram);
#endif
UINT32 m_size; // this is the size of Battery RAM in bytes
UINT32 m_size; // this is the size of Battery RAM in bytes
};
class saturn_bram4mb_device : public saturn_bram_device
@ -40,7 +40,7 @@ class saturn_bram4mb_device : public saturn_bram_device
public:
// construction/destruction
saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_config_complete() { m_shortname = "sat_bram_4mb"; }
};
@ -50,7 +50,7 @@ class saturn_bram8mb_device : public saturn_bram_device
public:
// construction/destruction
saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_config_complete() { m_shortname = "sat_bram_8mb"; }
};
@ -60,7 +60,7 @@ class saturn_bram16mb_device : public saturn_bram_device
public:
// construction/destruction
saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_config_complete() { m_shortname = "sat_bram_16mb"; }
};
@ -70,7 +70,7 @@ class saturn_bram32mb_device : public saturn_bram_device
public:
// construction/destruction
saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_config_complete() { m_shortname = "sat_bram_32mb"; }
};

View File

@ -24,7 +24,7 @@ public:
virtual DECLARE_WRITE32_MEMBER(write_ext_dram0);
virtual DECLARE_WRITE32_MEMBER(write_ext_dram1);
UINT32 m_size; // this is the size of DRAM0 + DRAM1 in dword units, so accesses to each bank go up to (m_size/2)-1
UINT32 m_size; // this is the size of DRAM0 + DRAM1 in dword units, so accesses to each bank go up to (m_size/2)-1
};
class saturn_dram8mb_device : public saturn_dram_device
@ -32,7 +32,7 @@ class saturn_dram8mb_device : public saturn_dram_device
public:
// construction/destruction
saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_config_complete() { m_shortname = "sat_dram_8mb"; }
};
@ -42,7 +42,7 @@ class saturn_dram32mb_device : public saturn_dram_device
public:
// construction/destruction
saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
virtual void device_config_complete() { m_shortname = "sat_dram_32mb"; }
};

View File

@ -51,4 +51,3 @@ READ32_MEMBER(saturn_rom_device::read_rom)
{
return m_rom[offset & (m_rom_size - 1)];
}

View File

@ -20,7 +20,7 @@ public:
virtual void device_start();
virtual void device_reset();
virtual void device_config_complete() { m_shortname = "sat_rom"; }
// reading and writing
virtual DECLARE_READ32_MEMBER(read_rom);
};

View File

@ -7,16 +7,16 @@
Despite the system having a single cart slot, 3 different kinds of cart can be inserted and
different memory areas are exposed to each of them
* ROM carts are accessed in range 0x02000000-0x023fffff and 0x22000000-0x24ffffff of both CPUs
* Data RAM carts are accessed in range 0x02400000-0x027fffff of both CPUs (each DRAM chip is
mapped independently, the 1st at 0x2400000, the second at 0x2600000)
* Data RAM carts are accessed in range 0x02400000-0x027fffff of both CPUs (each DRAM chip is
mapped independently, the 1st at 0x2400000, the second at 0x2600000)
* Battery RAM carts are accessed in range 0x04000000-0x047fffff of both CPUs
It is not clear what happens to accesses beyond the cart size (open bus? mirror of cart data?),
It is not clear what happens to accesses beyond the cart size (open bus? mirror of cart data?),
e.g. if you have a 16Mbit battery cart inserted and the system tries to read/write above 0x04400000,
so for the moment the whole range is mapped and an error message is printed for out-of-bounds
so for the moment the whole range is mapped and an error message is printed for out-of-bounds
accesses
***********************************************************************************************************/
@ -128,7 +128,7 @@ bool sat_cart_slot_device::call_load()
{
UINT32 *ROM;
UINT32 len;
if (software_entry() != NULL)
len = get_software_region_length("cart");
else
@ -143,15 +143,15 @@ bool sat_cart_slot_device::call_load()
fread(ROM, len);
// fix endianness....
// for (int i = 0; i < len; i += 4)
// {
// UINT8 tempa = ROM[i+0];
// UINT8 tempb = ROM[i+1];
// ROM[i+1] = ROM[i+2];
// ROM[i+0] = ROM[i+3];
// ROM[i+3] = tempa;
// ROM[i+2] = tempb;
// }
// for (int i = 0; i < len; i += 4)
// {
// UINT8 tempa = ROM[i+0];
// UINT8 tempb = ROM[i+1];
// ROM[i+1] = ROM[i+2];
// ROM[i+0] = ROM[i+3];
// ROM[i+3] = tempa;
// ROM[i+2] = tempb;
// }
return IMAGE_INIT_PASS;
}
@ -242,7 +242,7 @@ READ32_MEMBER(sat_cart_slot_device::read_ext_bram)
{
if (m_cart)
{
return (m_cart->read_ext_bram(space, offset * 2) << 16)
return (m_cart->read_ext_bram(space, offset * 2) << 16)
| m_cart->read_ext_bram(space, offset * 2 + 1);
}
else

View File

@ -29,10 +29,10 @@ public:
virtual DECLARE_READ8_MEMBER(read_ext_bram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ext_bram) {}
#endif
virtual int get_cart_type() { return m_cart_type; };
void rom_alloc(running_machine &machine, UINT32 size);
UINT32* get_rom_base() { return m_rom; }
UINT32* get_ext_dram0_base() { return m_ext_dram0; }
@ -61,8 +61,8 @@ public:
// ======================> sat_cart_slot_device
class sat_cart_slot_device : public device_t,
public device_image_interface,
public device_slot_interface
public device_image_interface,
public device_slot_interface
{
public:
// construction/destruction
@ -101,7 +101,7 @@ public:
virtual DECLARE_WRITE32_MEMBER(write_ext_dram1);
virtual DECLARE_READ32_MEMBER(read_ext_bram);
virtual DECLARE_WRITE32_MEMBER(write_ext_bram);
//protected:
device_sat_cart_interface* m_cart;
};
@ -116,7 +116,7 @@ extern const device_type SATURN_CART_SLOT;
***************************************************************************/
#define MCFG_SATURN_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot,_def_inp) \
MCFG_DEVICE_ADD(_tag, SATURN_CART_SLOT, 0) \
MCFG_DEVICE_ADD(_tag, SATURN_CART_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false)