Tidy whitespace in corresponding .h files too

This commit is contained in:
Zoë Blade 2015-04-08 15:17:22 +01:00
parent 1e5c5c9fae
commit a2ac952299
12 changed files with 30 additions and 33 deletions

View File

@ -115,12 +115,10 @@ private:
UINT32 m_simm_base;
dynamic_array<UINT32> m_simm;
UINT32 m_cpu_regs[0x7c];
UINT32 m_pci1_laddr, m_pci2_laddr, m_pci_io_laddr;
UINT32 m_target1_laddr, m_target2_laddr;
};

View File

@ -114,7 +114,6 @@ private:
chan_info m_dac2;
chan_info m_adc;
void transfer_pci_audio(chan_info& chan, int type);
};
extern const device_type ES1373;

View File

@ -31,14 +31,14 @@ public:
DECLARE_WRITE16_MEMBER(videoram_w);
DECLARE_WRITE16_MEMBER(videoram2_w);
DECLARE_WRITE16_MEMBER(videoram3_w);
TILEMAP_MAPPER_MEMBER(bg_scan);
TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(get_tile2_info);
TILE_GET_INFO_MEMBER(get_tile3_info);
virtual void video_start();
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
};

View File

@ -58,7 +58,7 @@ public:
DECLARE_WRITE16_MEMBER(spritebuffer_w);
TILE_GET_INFO_MEMBER(get_pf_tile_info);
TIMER_DEVICE_CALLBACK_MEMBER(scanline_interrupt);
DECLARE_DRIVER_INIT(firebarr);

View File

@ -67,12 +67,12 @@ public:
// majtitle specific
int m_majtitle_rowscroll;
// m72_i8751 specific
UINT8 m_mcu_snd_cmd_latch;
UINT8 m_mcu_sample_latch;
UINT32 m_mcu_sample_addr;
// common
DECLARE_READ16_MEMBER(palette1_r);
DECLARE_READ16_MEMBER(palette2_r);
@ -82,7 +82,7 @@ public:
DECLARE_WRITE16_MEMBER(videoram2_w);
DECLARE_READ16_MEMBER(soundram_r);
DECLARE_WRITE16_MEMBER(soundram_w);
// m72_i8751 specific
DECLARE_WRITE16_MEMBER(main_mcu_sound_w);
DECLARE_WRITE16_MEMBER(main_mcu_w);
@ -118,14 +118,14 @@ public:
DECLARE_READ16_MEMBER(poundfor_trackball_r);
DECLARE_WRITE16_MEMBER(rtype2_port02_w);
DECLARE_WRITE16_MEMBER(majtitle_gfx_ctrl_w);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(hharry_get_bg_tile_info);
TILE_GET_INFO_MEMBER(rtype2_get_bg_tile_info);
TILE_GET_INFO_MEMBER(rtype2_get_fg_tile_info);
TILEMAP_MAPPER_MEMBER(majtitle_scan_rows);
void machine_start();
void machine_reset();
DECLARE_VIDEO_START(m72);
@ -147,15 +147,15 @@ public:
DECLARE_DRIVER_INIT(nspirit);
DECLARE_DRIVER_INIT(loht);
DECLARE_DRIVER_INIT(imgfight);
INTERRUPT_GEN_MEMBER(mcu_int);
INTERRUPT_GEN_MEMBER(fake_nmi);
TIMER_CALLBACK_MEMBER(synch_callback);
TIMER_CALLBACK_MEMBER(scanline_interrupt);
TIMER_CALLBACK_MEMBER(kengo_scanline_interrupt);
TIMER_CALLBACK_MEMBER(delayed_ram16_w);
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_majtitle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
inline void get_tile_info(tile_data &tileinfo,int tile_index,const UINT16 *vram,int gfxnum);

View File

@ -24,23 +24,23 @@ public:
tilemap_t *m_bg_tilemap;
int m_sound_cpu_busy;
UINT32 m_bg_tile_offset;
DECLARE_WRITE8_MEMBER(sound_command_w);
DECLARE_READ8_MEMBER(sound_ack_r);
DECLARE_WRITE8_MEMBER(c600_w);
DECLARE_WRITE8_MEMBER(fgram_w);
DECLARE_WRITE8_MEMBER(bgram_w);
DECLARE_CUSTOM_INPUT_MEMBER(sound_r);
TILEMAP_MAPPER_MEMBER(marvins_tx_scan_cols);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(mainsnk);
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int scrollx, int scrolly );
};

View File

@ -346,7 +346,7 @@ const unsigned int ddZoneSecSize[16] = {232,216,208,192,176,160,144,128,
216,208,192,176,160,144,128,112};
const unsigned int ddZoneTrackSize[16] = {158,158,149,149,149,149,149,114,
158,158,149,149,149,149,149,114};
const unsigned int ddStartOffset[16] =
const unsigned int ddStartOffset[16] =
{0x0,0x5F15E0,0xB79D00,0x10801A0,0x1523720,0x1963D80,0x1D414C0,0x20BBCE0,
0x23196E0,0x28A1E00,0x2DF5DC0,0x3299340,0x36D99A0,0x3AB70E0,0x3E31900,0x4149200};

View File

@ -51,12 +51,12 @@ public:
UINT8 *m_clut[VRAM_MAX];
int m_flipscreen_old[VRAM_MAX];
emu_timer *m_blitter_timer;
// musobana and derived machine configs
int m_musobana_inputport;
int m_musobana_outcoin_flag;
UINT8 m_motor_on;
// common
DECLARE_WRITE8_MEMBER(soundbank_w);
DECLARE_WRITE8_MEMBER(soundlatch_clear_w);
@ -76,7 +76,7 @@ public:
DECLARE_WRITE8_MEMBER(clutsel_1_w);
DECLARE_WRITE8_MEMBER(clutsel_2_w);
DECLARE_WRITE16_MEMBER(tmp68301_parallel_port_w);
// musobana and derived machine configs
DECLARE_READ16_MEMBER(musobana_inputport_0_r);
DECLARE_WRITE16_MEMBER(musobana_inputport_w);

View File

@ -41,9 +41,9 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_0);
TILE_GET_INFO_MEMBER(get_tile_info_1);
TILEMAP_MAPPER_MEMBER(get_memory_offset_0);
virtual void video_start();
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
};

View File

@ -32,11 +32,11 @@ public:
required_shared_ptr<UINT8> m_videoram_d;
required_shared_ptr<UINT8> m_videoram_e;
required_shared_ptr<UINT8> m_videoram_f;
/* machine state */
int m_vert_pos;
int m_horiz_pos;
/* video state */
UINT8 m_y_scroll_d;
UINT8 m_y_scroll_e;

View File

@ -39,10 +39,10 @@ public:
DECLARE_WRITE8_MEMBER(flip_screen_x_w);
DECLARE_WRITE8_MEMBER(flip_screen_y_w);
DECLARE_READ8_MEMBER(input_port_0_r);
DECLARE_READ8_MEMBER(intrepid_colorram_mirror_r);
DECLARE_WRITE8_MEMBER(intrepid_graphics_bank_w);
DECLARE_READ8_MEMBER(rtriv_question_r);
TILE_GET_INFO_MEMBER(solid_get_tile_info);
@ -57,6 +57,6 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_desertdan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority_to_draw);
INTERRUPT_GEN_MEMBER(vblank_irq);
};

View File

@ -25,7 +25,7 @@ public:
UINT8 m_control;
tilemap_t *m_fg_tilemap;
bitmap_ind16 m_tmpbitmap;
DECLARE_WRITE8_MEMBER(control_w);
DECLARE_READ8_MEMBER(button_r);
DECLARE_WRITE8_MEMBER(videoram_w);
@ -34,7 +34,7 @@ public:
DECLARE_READ8_MEMBER(dsw2_2r);
DECLARE_READ8_MEMBER(dsw2_3r);
DECLARE_READ8_MEMBER(dsw2_4r);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
virtual void video_start();