diff options
author | Aaron Giles <aaron@aarongiles.com> | 2011-04-01 06:50:56 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2011-04-01 06:50:56 +0000 |
commit | 8409f7d3233f0dd5d211f68e564ca4ebb662f8bf (patch) | |
tree | 3edea78fc971015d4b0799f6c5999657685df573 /src/mame/includes | |
parent | 86afc9b913dd13338a8888f27bb13d1548ef8f33 (diff) |
Final bulk rename for 0.142: ensure that all members of
driver_device classes have an m_ prefix on them. When we
eventually move functions using these into member functions,
we will be able to remove the state-> pointers, and having
the member variables prefixed will allow them to be
distinguished from local variables.
Some regex'es used (plus manually fixing the remaining stuff):
In src/mame/...
state->([a-zA-Z_][^_][a-zA-Z0-9_]*)
state->m_\1
state->([^m]_[a-zA-Z0-9_]*)
state->m_\1
state->m_save_item
state->save_item
state->m_save_pointer
state->save_pointer
(AM_BASE_MEMBER *\( *[a-zA-Z0-9_]+ *, *)([a-zA-Z_][^_])
\1m_\2
(AM_BASE_SIZE_MEMBER *\( *[a-zA-Z0-9_]+ *, *)([a-zA-Z_][^_][a-zA-Z0-9_]* *, *)([a-zA-Z_][^_])
\1m_\2m_\3
(AM_SIZE_MEMBER *\( *[a-zA-Z0-9_]+ *, *)([a-zA-Z_][^_])
\1m_\2
m__
m_
In src/mame/includes/...
(\t[a-zA-Z0-9_<>]+[ \t]+[&*]*[ \t]*)([a-zA-Z_][^_][][a-zA-Z0-9_]*;)$
\1m_\2
(\t[a-zA-Z0-9_<>]+[ \t]*[&*]*[ \t]+)([a-zA-Z_][^_][][a-zA-Z0-9_]*;)$
\1m_\2
Diffstat (limited to 'src/mame/includes')
642 files changed, 10539 insertions, 9765 deletions
diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 8a7b8cc4ba4..b146f1d8e05 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -11,18 +11,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * fg_videoram; - UINT8 * bg_videoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_fg_videoram; + UINT8 * m_bg_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - int palette_bank; - UINT8 scroll[2]; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_palette_bank; + UINT8 m_scroll[2]; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index 3d676288426..6988726c630 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -11,17 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * scrollx; - UINT8 * scrolly; - UINT8 * bgscrollx; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_scrollx; + UINT8 * m_scrolly; + UINT8 * m_bgscrollx; + size_t m_spriteram_size; /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap, *bg2_tilemap; - int char_on, obj_on, bg1_on, bg2_on; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_bg2_tilemap; + int m_char_on; + int m_obj_on; + int m_bg1_on; + int m_bg2_on; }; diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h index aad1dcb899c..ffb8e294ed4 100644 --- a/src/mame/includes/20pacgal.h +++ b/src/mame/includes/20pacgal.h @@ -14,27 +14,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 *char_gfx_ram; - UINT8 *video_ram; - UINT8 *flip; - UINT8 *stars_seed; - UINT8 *stars_ctrl; + UINT8 *m_char_gfx_ram; + UINT8 *m_video_ram; + UINT8 *m_flip; + UINT8 *m_stars_seed; + UINT8 *m_stars_ctrl; /* machine state */ - UINT8 game_selected; /* 0 = Ms. Pac-Man, 1 = Galaga */ + UINT8 m_game_selected; /* 0 = Ms. Pac-Man, 1 = Galaga */ /* devices */ - device_t *maincpu; - device_t *eeprom; + device_t *m_maincpu; + device_t *m_eeprom; /* memory */ - UINT8 sprite_gfx_ram[0x2000]; - UINT8 sprite_ram[0x180]; - UINT8 sprite_color_lookup[0x100]; - UINT8 ram_48000[0x2000]; + UINT8 m_sprite_gfx_ram[0x2000]; + UINT8 m_sprite_ram[0x180]; + UINT8 m_sprite_color_lookup[0x100]; + UINT8 m_ram_48000[0x2000]; /* 25pacman and 20pacgal store the sprite palette at a different address, this is a hardware difference and confirmed NOT to be a register */ - UINT8 sprite_pal_base; + UINT8 m_sprite_pal_base; }; diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index 52f1a48af57..0ac4986d9c2 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -5,44 +5,54 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * spriteram2; - UINT8 * video_ctrl; - size_t spriteram_size; - size_t spriteram2_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; + UINT8 * m_video_ctrl; + size_t m_spriteram_size; + size_t m_spriteram2_size; /* video-related */ - bitmap_t *tmp_bitmap1, *tmp_bitmap2; - tilemap_t *bg_tilemap; - UINT8 flipscreen, pix_redraw; - UINT8 xoffset; - UINT8 *pixram1; - UINT8 *pixram2; - bitmap_t *pixel_bitmap1; - bitmap_t *pixel_bitmap2; - int pixram_sel; + bitmap_t *m_tmp_bitmap1; + bitmap_t *m_tmp_bitmap2; + tilemap_t *m_bg_tilemap; + UINT8 m_flipscreen; + UINT8 m_pix_redraw; + UINT8 m_xoffset; + UINT8 *m_pixram1; + UINT8 *m_pixram2; + bitmap_t *m_pixel_bitmap1; + bitmap_t *m_pixel_bitmap2; + int m_pixram_sel; /* sound-related */ - int sound_nmi_enable, pending_nmi; + int m_sound_nmi_enable; + int m_pending_nmi; /* fake mcu */ - UINT8 * mcu_ram; - UINT8 from_mcu; - int mcu_sent, main_sent; - UINT8 mcu_in[2][16], mcu_out[2][16]; - int mcu_cmd; + UINT8 * m_mcu_ram; + UINT8 m_from_mcu; + int m_mcu_sent; + int m_main_sent; + UINT8 m_mcu_in[2][16]; + UINT8 m_mcu_out[2][16]; + int m_mcu_cmd; /* misc */ - int pix_color[4]; - UINT8 pix1, pix2[2]; - UINT8 snd_data, snd_flag; - int vol_ctrl[16]; - UINT8 snd_ctrl0, snd_ctrl1, snd_ctrl2, snd_ctrl3; + int m_pix_color[4]; + UINT8 m_pix1; + UINT8 m_pix2[2]; + UINT8 m_snd_data; + UINT8 m_snd_flag; + int m_vol_ctrl[16]; + UINT8 m_snd_ctrl0; + UINT8 m_snd_ctrl1; + UINT8 m_snd_ctrl2; + UINT8 m_snd_ctrl3; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index 88dba59ac13..43ecc447023 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -11,15 +11,15 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - size_t videoram_size; + UINT8 * m_videoram; + size_t m_videoram_size; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* sound-related */ - int soundlatch; - int last_snd_ctrl; + int m_soundlatch; + int m_last_snd_ctrl; }; diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index 9969e960468..07ae3f9eff0 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -17,21 +17,21 @@ public: : mw8080bw_state(machine, config) { } /* misc game specific */ - emu_timer *schaser_effect_555_timer; - attotime schaser_effect_555_time_remain; - INT32 schaser_effect_555_time_remain_savable; - int schaser_effect_555_is_low; - int schaser_explosion; - int schaser_last_effect; - UINT8 polaris_cloud_speed; - UINT8 polaris_cloud_pos; - UINT8 schaser_background_disable; - UINT8 schaser_background_select; - UINT8 c8080bw_flip_screen; - UINT8 color_map; - UINT8 screen_red; - - device_t *speaker; + emu_timer *m_schaser_effect_555_timer; + attotime m_schaser_effect_555_time_remain; + INT32 m_schaser_effect_555_time_remain_savable; + int m_schaser_effect_555_is_low; + int m_schaser_explosion; + int m_schaser_last_effect; + UINT8 m_polaris_cloud_speed; + UINT8 m_polaris_cloud_pos; + UINT8 m_schaser_background_disable; + UINT8 m_schaser_background_select; + UINT8 m_c8080bw_flip_screen; + UINT8 m_color_map; + UINT8 m_screen_red; + + device_t *m_speaker; }; diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index fb9fe2b1fd6..039451ffb46 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -11,26 +11,28 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; - UINT8 * banked_rom; -// UINT8 * paletteram_1000; // this currently uses generic palette handling -// UINT8 * nvram; // this currently uses generic nvram handling - UINT8 *paletteram_1000; + UINT8 * m_ram; + UINT8 * m_banked_rom; +// UINT8 * m_paletteram_1000; // this currently uses generic palette handling +// UINT8 * m_nvram; // this currently uses generic nvram handling + UINT8 *m_paletteram_1000; /* video-related */ - int k88games_priority; - int layer_colorbase[3], sprite_colorbase, zoom_colorbase; - int videobank; - int zoomreadroms; - int speech_chip; + int m_k88games_priority; + int m_layer_colorbase[3]; + int m_sprite_colorbase; + int m_zoom_colorbase; + int m_videobank; + int m_zoomreadroms; + int m_speech_chip; /* devices */ - device_t *audiocpu; - device_t *k052109; - device_t *k051960; - device_t *k051316; - device_t *upd_1; - device_t *upd_2; + device_t *m_audiocpu; + device_t *m_k052109; + device_t *m_k051960; + device_t *m_k051316; + device_t *m_upd_1; + device_t *m_upd_2; }; diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index 02cf93b3b2d..4bf51d69ee7 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -11,20 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * main_ram; -// UINT8 * spriteram; // currently this uses buffered_spriteram -// UINT8 * paletteram; // currently this uses generic palette handling - UINT16 spriteram16[0x800/2]; // a 16-bit copy of spriteram for use with the MXC06 code + UINT8 * m_main_ram; +// UINT8 * m_spriteram; // currently this uses buffered_spriteram +// UINT8 * m_paletteram; // currently this uses generic palette handling + UINT16 m_spriteram16[0x800/2]; // a 16-bit copy of spriteram for use with the MXC06 code /* video-related */ - int flipscreen; + int m_flipscreen; /* misc */ - int trio_control_select; + int m_trio_control_select; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index 8754aecdf69..7b9dbe09173 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -11,30 +11,33 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * mainram; - UINT8 * spriteram; - UINT8 * videoram; - UINT8 * hscroll; - UINT8 * vscroll; - UINT8 * tilecolor; - UINT8 * starx; - UINT8 * stary; - UINT8 * bgcolor; - size_t spriteram_size; + UINT8 * m_mainram; + UINT8 * m_spriteram; + UINT8 * m_videoram; + UINT8 * m_hscroll; + UINT8 * m_vscroll; + UINT8 * m_tilecolor; + UINT8 * m_starx; + UINT8 * m_stary; + UINT8 * m_bgcolor; + size_t m_spriteram_size; /* stars layout */ - UINT8 * stars_rom; - int stars_length; + UINT8 * m_stars_rom; + int m_stars_length; /* video-related */ - tilemap_t *bg_tilemap; - int charbank, starsoff; - int sx, sy; - UINT8 ox, oy; + tilemap_t *m_bg_tilemap; + int m_charbank; + int m_starsoff; + int m_sx; + int m_sy; + UINT8 m_ox; + UINT8 m_oy; /* misc */ - int count; - int disable_irq; + int m_count; + int m_disable_irq; }; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 39487f932fc..3c40658afa0 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -6,33 +6,39 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bg1videoram; - UINT16 * bg2videoram; - UINT16 * rasterram; - UINT16 * bitmapram; - UINT16 * spriteram1; - UINT16 * spriteram2; - UINT16 * spriteram3; - UINT16 * tx_tilemap_ram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram1_size; - size_t spriteram2_size; - size_t spriteram3_size; + UINT16 * m_bg1videoram; + UINT16 * m_bg2videoram; + UINT16 * m_rasterram; + UINT16 * m_bitmapram; + UINT16 * m_spriteram1; + UINT16 * m_spriteram2; + UINT16 * m_spriteram3; + UINT16 * m_tx_tilemap_ram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram1_size; + size_t m_spriteram2_size; + size_t m_spriteram3_size; /* video-related */ - tilemap_t *bg1_tilemap, *bg2_tilemap; - UINT8 gfxbank[8]; - UINT16 bank[4]; - UINT16 bg1scrollx, bg1scrolly, bg2scrollx, bg2scrolly, wbbc97_bitmap_enable; - int charpalettebank, spritepalettebank; - int sprite_gfx; - int spikes91_lookup; + tilemap_t *m_bg1_tilemap; + tilemap_t *m_bg2_tilemap; + UINT8 m_gfxbank[8]; + UINT16 m_bank[4]; + UINT16 m_bg1scrollx; + UINT16 m_bg1scrolly; + UINT16 m_bg2scrollx; + UINT16 m_bg2scrolly; + UINT16 m_wbbc97_bitmap_enable; + int m_charpalettebank; + int m_spritepalettebank; + int m_sprite_gfx; + int m_spikes91_lookup; /* misc */ - int pending_command; + int m_pending_command; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index 6e385fc0cf9..2d4bd18335d 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -11,28 +11,34 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * videoram2; - UINT8 * colorram; - UINT8 * colorram2; - UINT8 * paletteram; - UINT8 * devram; + UINT8 * m_videoram; + UINT8 * m_videoram2; + UINT8 * m_colorram; + UINT8 * m_colorram2; + UINT8 * m_paletteram; + UINT8 * m_devram; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - bitmap_t *sprites_bitmap; - int bg_scrollx, bg_scrolly, fg_scrollx, fg_scrolly, highbits; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + bitmap_t *m_sprites_bitmap; + int m_bg_scrollx; + int m_bg_scrolly; + int m_fg_scrollx; + int m_fg_scrolly; + int m_highbits; /* misc */ - int soundlatch_status, soundlatch2_status; - int master_addr; - int slave_addr; + int m_soundlatch_status; + int m_soundlatch2_status; + int m_master_addr; + int m_slave_addr; /* devices */ - device_t *master; - device_t *slave; - device_t *audiocpu; - device_t *pandora; + device_t *m_master; + device_t *m_slave; + device_t *m_audiocpu; + device_t *m_pandora; }; diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index 32b9784db83..a26cfd29a4f 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -6,24 +6,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase, zoom_colorbase; - UINT8 priority; + int m_layer_colorbase[3]; + int m_sprite_colorbase; + int m_zoom_colorbase; + UINT8 m_priority; /* misc */ - int firq_enable; + int m_firq_enable; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *subcpu; - device_t *k007232_1; - device_t *k007232_2; - device_t *k052109; - device_t *k051960; - device_t *k051316; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_subcpu; + device_t *m_k007232_1; + device_t *m_k007232_2; + device_t *m_k052109; + device_t *m_k051960; + device_t *m_k051316; }; diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h index a2ac5bdd207..3767a38faee 100644 --- a/src/mame/includes/aliens.h +++ b/src/mame/includes/aliens.h @@ -11,21 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; + int m_layer_colorbase[3]; + int m_sprite_colorbase; /* misc */ - int palette_selected; + int m_palette_selected; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k007232; - device_t *k052109; - device_t *k051960; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k007232; + device_t *m_k052109; + device_t *m_k051960; }; /*----------- defined in video/aliens.c -----------*/ diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index e7f2e18570c..1aa7a58cb54 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -11,28 +11,35 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; - UINT16 * spriteram; - UINT16 * shared_ram; - UINT16 * paletteram; + UINT16 * m_videoram; + UINT16 * m_spriteram; + UINT16 * m_shared_ram; + UINT16 * m_paletteram; /* video-related */ - tilemap_t *fix_tilemap; - int bank_base, flipscreen, last_bank; - int buffer_28, buffer_60, buffer_68; + tilemap_t *m_fix_tilemap; + int m_bank_base; + int m_flipscreen; + int m_last_bank; + int m_buffer_28; + int m_buffer_60; + int m_buffer_68; /* misc */ - int invert_controls; - int microcontroller_id; - int coin_id; - unsigned trigstate, deposits1, deposits2, credits; - unsigned coinvalue; - unsigned microcontroller_data; - int latch; - unsigned game_id; // see below + int m_invert_controls; + int m_microcontroller_id; + int m_coin_id; + unsigned m_trigstate; + unsigned m_deposits1; + unsigned m_deposits2; + unsigned m_credits; + unsigned m_coinvalue; + unsigned m_microcontroller_data; + int m_latch; + unsigned m_game_id; // see below /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; /* game_id - used to deal with a few game specific situations */ diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h index b268b8c5dd3..fc369e3fdf7 100644 --- a/src/mame/includes/ambush.h +++ b/src/mame/includes/ambush.h @@ -11,14 +11,14 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * colorram; - UINT8 * scrollram; - UINT8 * colorbank; - - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_colorram; + UINT8 * m_scrollram; + UINT8 * m_colorbank; + + size_t m_videoram_size; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 11b5877adcd..24a98b5fe69 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -27,9 +27,9 @@ Ernesto Corvi & Mariusz Wojcieszek /* read them on both big-endian and little-endian systems, we store the custom */ /* registers in 32-bit natural order. This means we need to XOR the register */ /* address with 1 on little-endian systems. */ -#define CUSTOM_REG(x) (state->custom_regs[BYTE_XOR_BE(x)]) +#define CUSTOM_REG(x) (state->m_custom_regs[BYTE_XOR_BE(x)]) #define CUSTOM_REG_SIGNED(x) ((INT16)CUSTOM_REG(x)) -#define CUSTOM_REG_LONG(x) (*(UINT32 *)&state->custom_regs[x]) +#define CUSTOM_REG_LONG(x) (*(UINT32 *)&state->m_custom_regs[x]) /* A = Angus @@ -378,57 +378,57 @@ public: amiga_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *chip_ram; - size_t chip_ram_size; - UINT16 (*chip_ram_r)(amiga_state *state, offs_t offset); - void (*chip_ram_w)(amiga_state *state, offs_t offset, UINT16 data); - UINT16 *custom_regs; + UINT16 *m_chip_ram; + size_t m_chip_ram_size; + UINT16 (*m_chip_ram_r)(amiga_state *state, offs_t offset); + void (*m_chip_ram_w)(amiga_state *state, offs_t offset, UINT16 data); + UINT16 *m_custom_regs; - const amiga_machine_interface *intf; - autoconfig_device *autoconfig_list; - autoconfig_device *cur_autoconfig; - emu_timer * irq_timer; - emu_timer * blitter_timer; - device_t *sound_device; + const amiga_machine_interface *m_intf; + autoconfig_device *m_autoconfig_list; + autoconfig_device *m_cur_autoconfig; + emu_timer * m_irq_timer; + emu_timer * m_blitter_timer; + device_t *m_sound_device; /* sprite states */ - UINT8 sprite_comparitor_enable_mask; - UINT8 sprite_dma_reload_mask; - UINT8 sprite_dma_live_mask; - UINT8 sprite_ctl_written; - UINT32 sprite_shiftreg[8]; - UINT8 sprite_remain[8]; + UINT8 m_sprite_comparitor_enable_mask; + UINT8 m_sprite_dma_reload_mask; + UINT8 m_sprite_dma_live_mask; + UINT8 m_sprite_ctl_written; + UINT32 m_sprite_shiftreg[8]; + UINT8 m_sprite_remain[8]; /* copper states */ - UINT32 copper_pc; - UINT8 copper_waiting; - UINT8 copper_waitblit; - UINT16 copper_waitval; - UINT16 copper_waitmask; - UINT16 copper_pending_offset; - UINT16 copper_pending_data; + UINT32 m_copper_pc; + UINT8 m_copper_waiting; + UINT8 m_copper_waitblit; + UINT16 m_copper_waitval; + UINT16 m_copper_waitmask; + UINT16 m_copper_pending_offset; + UINT16 m_copper_pending_data; #if GUESS_COPPER_OFFSET - int wait_offset; + int m_wait_offset; #endif /* playfield states */ - int last_scanline; - int ham_color; + int m_last_scanline; + int m_ham_color; /* misc states */ - UINT16 genlock_color; + UINT16 m_genlock_color; /* separate 6 in-order bitplanes into 2 x 3-bit bitplanes in two nibbles */ - UINT8 separate_bitplanes[2][64]; + UINT8 m_separate_bitplanes[2][64]; /* aga */ - int aga_diwhigh_written; - pen_t aga_palette[256]; - UINT64 aga_bpldat[8]; - UINT16 aga_sprdata[8][4]; - UINT16 aga_sprdatb[8][4]; - int aga_sprite_fetched_words; - int aga_sprite_dma_used_words[8]; + int m_aga_diwhigh_written; + pen_t m_aga_palette[256]; + UINT64 m_aga_bpldat[8]; + UINT16 m_aga_sprdata[8][4]; + UINT16 m_aga_sprdatb[8][4]; + int m_aga_sprite_fetched_words; + int m_aga_sprite_dma_used_words[8]; }; diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index 99f45d4052a..114a47a9c25 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -4,8 +4,8 @@ public: ampoker2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - tilemap_t *bg_tilemap; + UINT8 *m_videoram; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 416e24e2a01..41ecb4b7caa 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -11,22 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * colorram; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_colorram; // UINT8 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int flipscreen; + tilemap_t *m_bg_tilemap; + int m_flipscreen; /* misc */ - UINT8 wheel_old[2]; - UINT8 wheel_return[2]; + UINT8 m_wheel_old[2]; + UINT8 m_wheel_return[2]; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index 291711325f1..dd9530540c2 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -11,23 +11,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * paletteram; - UINT8 * spriteram; - UINT8 * txvideoram; - UINT8 * bgtopvideoram; - UINT8 * bgbotvideoram; - - tilemap_t *tx_tilemap, *bgbot_tilemap, *bgtop_tilemap; - int txbank; - int bgbotbank; - int bgtopbank; - - UINT8 sound[4]; - UINT8 sound2[4]; - UINT8 layer_ctrl; + UINT8 * m_paletteram; + UINT8 * m_spriteram; + UINT8 * m_txvideoram; + UINT8 * m_bgtopvideoram; + UINT8 * m_bgbotvideoram; + + tilemap_t *m_tx_tilemap; + tilemap_t *m_bgbot_tilemap; + tilemap_t *m_bgtop_tilemap; + int m_txbank; + int m_bgbotbank; + int m_bgtopbank; + + UINT8 m_sound[4]; + UINT8 m_sound2[4]; + UINT8 m_layer_ctrl; /* devices */ - device_t *subcpu; + device_t *m_subcpu; }; diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 717d6a54abc..7fae09c0273 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -7,24 +7,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bg_videoram; - UINT8 * bg_colorram; - UINT8 * fg_videoram; - UINT8 * fg_colorram; - UINT8 * spriteram; - UINT8 * spriteram_2; + UINT8 * m_bg_videoram; + UINT8 * m_bg_colorram; + UINT8 * m_fg_videoram; + UINT8 * m_fg_colorram; + UINT8 * m_spriteram; + UINT8 * m_spriteram_2; /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - int scroll_x; - int priority; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_scroll_x; + int m_priority; /* sound-related */ - UINT32 adpcm_data; - UINT32 adpcm_address; + UINT32 m_adpcm_data; + UINT32 m_adpcm_address; /* devices */ - device_t *adpcm; + device_t *m_adpcm; }; #define CHR1_OFST 0x00 /* palette page of char set #1 */ diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index a8a66090dbf..aafdce7a669 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -8,22 +8,24 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * scroll; - UINT16 * txt_videoram; - UINT16 * mid_videoram; - UINT16 * bak_videoram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_scroll; + UINT16 * m_txt_videoram; + UINT16 * m_mid_videoram; + UINT16 * m_bak_videoram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *txt_tilemap, *mid_tilemap, *bak_tilemap; + tilemap_t *m_txt_tilemap; + tilemap_t *m_mid_tilemap; + tilemap_t *m_bak_tilemap; /* misc */ - int aquarium_snd_ack; + int m_aquarium_snd_ack; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index 8bdb6dd7bee..6691e672dd6 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -13,20 +13,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * blitter; - UINT8 * custom_cpu_ram; + UINT8 * m_blitter; + UINT8 * m_custom_cpu_ram; - UINT8 * main_bitmap; - UINT8 * converted_gfx; + UINT8 * m_main_bitmap; + UINT8 * m_converted_gfx; /* video-related */ - UINT8 video_control; - UINT8 flip_screen; + UINT8 m_video_control; + UINT8 m_flip_screen; /* MCU */ - UINT8 mcu_port_o; - UINT8 mcu_port_p; - UINT8 mcu_port_r[4]; + UINT8 m_mcu_port_o; + UINT8 m_mcu_port_p; + UINT8 m_mcu_port_r[4]; }; diff --git a/src/mame/includes/arcadecl.h b/src/mame/includes/arcadecl.h index 639fa61a51c..fd54696f44d 100644 --- a/src/mame/includes/arcadecl.h +++ b/src/mame/includes/arcadecl.h @@ -13,8 +13,8 @@ public: arcadecl_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 * bitmap; - UINT8 has_mo; + UINT16 * m_bitmap; + UINT8 m_has_mo; }; /*----------- defined in video/arcadecl.c -----------*/ diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index 6732644d8fb..35a10f783e9 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -4,37 +4,37 @@ public: argus_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *paletteram; - UINT8 *txram; - UINT8 *bg0_scrollx; - UINT8 *bg0_scrolly; - UINT8 *bg1ram; - UINT8 *bg1_scrollx; - UINT8 *bg1_scrolly; - UINT8 *butasan_bg1ram; - UINT8 *dummy_bg0ram; - UINT8 *butasan_txram; - UINT8 *butasan_bg0ram; - UINT8 *butasan_bg0backram; - UINT8 *butasan_txbackram; - UINT8 *butasan_pagedram[2]; - UINT8 butasan_page_latch; - tilemap_t *tx_tilemap; - tilemap_t *bg0_tilemap; - tilemap_t *bg1_tilemap; - UINT8 bg_status; - UINT8 butasan_bg1_status; - UINT8 flipscreen; - UINT16 palette_intensity; - int lowbitscroll; - int prvscrollx; - UINT8 valtric_mosaic; - bitmap_t *mosaicbitmap; - UINT8 valtric_unknown; - UINT8 butasan_unknown; - int mosaic; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_paletteram; + UINT8 *m_txram; + UINT8 *m_bg0_scrollx; + UINT8 *m_bg0_scrolly; + UINT8 *m_bg1ram; + UINT8 *m_bg1_scrollx; + UINT8 *m_bg1_scrolly; + UINT8 *m_butasan_bg1ram; + UINT8 *m_dummy_bg0ram; + UINT8 *m_butasan_txram; + UINT8 *m_butasan_bg0ram; + UINT8 *m_butasan_bg0backram; + UINT8 *m_butasan_txbackram; + UINT8 *m_butasan_pagedram[2]; + UINT8 m_butasan_page_latch; + tilemap_t *m_tx_tilemap; + tilemap_t *m_bg0_tilemap; + tilemap_t *m_bg1_tilemap; + UINT8 m_bg_status; + UINT8 m_butasan_bg1_status; + UINT8 m_flipscreen; + UINT16 m_palette_intensity; + int m_lowbitscroll; + int m_prvscrollx; + UINT8 m_valtric_mosaic; + bitmap_t *m_mosaicbitmap; + UINT8 m_valtric_unknown; + UINT8 m_butasan_unknown; + int m_mosaic; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 9604773d9a3..ac83ae91c90 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -17,27 +17,34 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t spriteram_size; - size_t videoram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; + size_t m_videoram_size; /* video-related */ - tilemap_t *bg_tilemap; - UINT8 gfxbank, palettebank; + tilemap_t *m_bg_tilemap; + UINT8 m_gfxbank; + UINT8 m_palettebank; /* input-related */ - UINT8 paddle_select; + UINT8 m_paddle_select; /* misc */ - int bootleg_id; - UINT8 z80write, fromz80, m68705write, toz80; - UINT8 port_a_in, port_a_out, ddr_a; - UINT8 port_c_out, ddr_c; - UINT8 bootleg_cmd; + int m_bootleg_id; + UINT8 m_z80write; + UINT8 m_fromz80; + UINT8 m_m68705write; + UINT8 m_toz80; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_c_out; + UINT8 m_ddr_c; + UINT8 m_bootleg_cmd; /* devices */ - device_t *mcu; + device_t *m_mcu; }; diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index 637c27d1771..f8b04932601 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -9,22 +9,29 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * text_videoram; - UINT16 * bg_videoram; - UINT16 * fg_videoram; - UINT16 * legion_cmd; // legion only! -// UINT16 * spriteram; // currently this uses generic buffered_spriteram -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_text_videoram; + UINT16 * m_bg_videoram; + UINT16 * m_fg_videoram; + UINT16 * m_legion_cmd; // legion only! +// UINT16 * m_spriteram; // currently this uses generic buffered_spriteram +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *bg_tilemap,*fg_tilemap, *tx_tilemap; - UINT16 scroll_msb; - UINT16 vreg; - UINT16 fg_scrollx, fg_scrolly; - UINT16 bg_scrollx, bg_scrolly; - int scroll_type, sprite_offy, mcu_mode, old_mcu_mode; - int waiting_msb; - int oldmode; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_tx_tilemap; + UINT16 m_scroll_msb; + UINT16 m_vreg; + UINT16 m_fg_scrollx; + UINT16 m_fg_scrolly; + UINT16 m_bg_scrollx; + UINT16 m_bg_scrolly; + int m_scroll_type; + int m_sprite_offy; + int m_mcu_mode; + int m_old_mcu_mode; + int m_waiting_msb; + int m_oldmode; }; diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h index 83f90a2c648..d05e8c66fbd 100644 --- a/src/mame/includes/artmagic.h +++ b/src/mame/includes/artmagic.h @@ -10,26 +10,26 @@ public: artmagic_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *control; - UINT8 tms_irq; - UINT8 hack_irq; - UINT8 prot_input[16]; - UINT8 prot_input_index; - UINT8 prot_output[16]; - UINT8 prot_output_index; - UINT8 prot_output_bit; - UINT8 prot_bit_index; - UINT16 prot_save; - void (*protection_handler)(running_machine &); - UINT16 *vram0; - UINT16 *vram1; - int _xor[16]; - int is_stoneball; - UINT16 *blitter_base; - UINT32 blitter_mask; - UINT16 blitter_data[8]; - UINT8 blitter_page; - attotime blitter_busy_until; + UINT16 *m_control; + UINT8 m_tms_irq; + UINT8 m_hack_irq; + UINT8 m_prot_input[16]; + UINT8 m_prot_input_index; + UINT8 m_prot_output[16]; + UINT8 m_prot_output_index; + UINT8 m_prot_output_bit; + UINT8 m_prot_bit_index; + UINT16 m_prot_save; + void (*m_protection_handler)(running_machine &); + UINT16 *m_vram0; + UINT16 *m_vram1; + int m_xor[16]; + int m_is_stoneball; + UINT16 *m_blitter_base; + UINT32 m_blitter_mask; + UINT16 m_blitter_data[8]; + UINT8 m_blitter_page; + attotime m_blitter_busy_until; }; diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 56e506154df..ed589e92a5d 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -11,27 +11,33 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * tileram; - UINT16 * tileram_1; - UINT16 * tileram_2; - UINT16 * tileram_3; - UINT16 * tileram_4; - UINT16 * tileram_5; - UINT16 * tileram_6; - UINT16 * tileram_7; - UINT16 * tilemap_reg; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_tileram; + UINT16 * m_tileram_1; + UINT16 * m_tileram_2; + UINT16 * m_tileram_3; + UINT16 * m_tileram_4; + UINT16 * m_tileram_5; + UINT16 * m_tileram_6; + UINT16 * m_tileram_7; + UINT16 * m_tilemap_reg; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *joetilemap, *joetilemap2, *joetilemap3, *joetilemap4, *joetilemap5, *joetilemap6, *joetilemap7; + tilemap_t *m_joetilemap; + tilemap_t *m_joetilemap2; + tilemap_t *m_joetilemap3; + tilemap_t *m_joetilemap4; + tilemap_t *m_joetilemap5; + tilemap_t *m_joetilemap6; + tilemap_t *m_joetilemap7; /* sound-related */ - UINT8 adpcm_byte; - int soundlatch_status; - int msm5205_vclk_toggle; + UINT8 m_adpcm_byte; + int m_soundlatch_status; + int m_msm5205_vclk_toggle; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index 0c213e5779d..edb9e686149 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -11,26 +11,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int sprite_colorbase; - int layer_colorbase[4], layerpri[3]; - UINT16 spritebank; - int tilebanks[4]; - int spritebanks[4]; + int m_sprite_colorbase; + int m_layer_colorbase[4]; + int m_layerpri[3]; + UINT16 m_spritebank; + int m_tilebanks[4]; + int m_spritebanks[4]; /* misc */ - UINT8 cur_control2; - UINT16 prot[2]; + UINT8 m_cur_control2; + UINT16 m_prot[2]; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k053260; - device_t *k056832; - device_t *k053244; - device_t *k053251; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k053260; + device_t *m_k056832; + device_t *m_k053244; + device_t *m_k053251; }; diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h index 2e1f55787ca..159096392e0 100644 --- a/src/mame/includes/asteroid.h +++ b/src/mame/includes/asteroid.h @@ -12,8 +12,8 @@ public: asteroid_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *ram1; - UINT8 *ram2; + UINT8 *m_ram1; + UINT8 *m_ram2; }; diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index ca9428adbd3..9bb302eeb10 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -18,7 +18,7 @@ public: astrocde_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; + UINT8 *m_videoram; }; diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index bad5fd8dc7d..4a077716cac 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -11,30 +11,30 @@ public: : driver_device(machine, config) { } /* video-related */ - UINT8 * videoram; - size_t videoram_size; + UINT8 * m_videoram; + size_t m_videoram_size; - UINT8 * colorram; - UINT8 * tomahawk_protection; + UINT8 * m_colorram; + UINT8 * m_tomahawk_protection; - UINT8 * astrof_color; - UINT8 astrof_palette_bank; - UINT8 red_on; - UINT8 flipscreen; - UINT8 screen_off; - UINT16 abattle_count; + UINT8 * m_astrof_color; + UINT8 m_astrof_palette_bank; + UINT8 m_red_on; + UINT8 m_flipscreen; + UINT8 m_screen_off; + UINT16 m_abattle_count; /* sound-related */ - UINT8 port_1_last; - UINT8 port_2_last; - UINT8 astrof_start_explosion; - UINT8 astrof_death_playing; - UINT8 astrof_bosskill_playing; + UINT8 m_port_1_last; + UINT8 m_port_2_last; + UINT8 m_astrof_start_explosion; + UINT8 m_astrof_death_playing; + UINT8 m_astrof_bosskill_playing; /* devices */ - device_t *maincpu; - device_t *samples; // astrof & abattle - device_t *sn; // tomahawk + device_t *m_maincpu; + device_t *m_samples; // astrof & abattle + device_t *m_sn; // tomahawk }; /*----------- defined in audio/astrof.c -----------*/ diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h index 3bfd6ce38f5..04f77809e70 100644 --- a/src/mame/includes/asuka.h +++ b/src/mame/includes/asuka.h @@ -14,26 +14,26 @@ public: // UINT16 * paletteram; // this currently uses generic palette handlers /* video-related */ - UINT16 video_ctrl; - UINT16 video_mask; + UINT16 m_video_ctrl; + UINT16 m_video_mask; /* c-chip */ - int current_round; - int current_bank; + int m_current_round; + int m_current_bank; - UINT8 cval[26]; - UINT8 cc_port; - UINT8 restart_status; + UINT8 m_cval[26]; + UINT8 m_cc_port; + UINT8 m_restart_status; /* misc */ - int adpcm_pos; - int adpcm_data; + int m_adpcm_pos; + int m_adpcm_data; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *pc090oj; - device_t *tc0100scn; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_pc090oj; + device_t *m_tc0100scn; }; diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index ef51f518a49..eb39a2007ec 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -22,30 +22,38 @@ public: : driver_device(machine, config) { } /* video-related */ - UINT8 * alphap1_videoram; - UINT8 * alphap2_videoram; - UINT8 * field_videoram; - UINT8 * spriteram; - UINT8 * scroll_register; - size_t spriteram_size; + UINT8 * m_alphap1_videoram; + UINT8 * m_alphap2_videoram; + UINT8 * m_field_videoram; + UINT8 * m_spriteram; + UINT8 * m_scroll_register; + size_t m_spriteram_size; - tilemap_t *alpha1_tilemap; - tilemap_t *alpha2_tilemap; - tilemap_t *field_tilemap; + tilemap_t *m_alpha1_tilemap; + tilemap_t *m_alpha2_tilemap; + tilemap_t *m_field_tilemap; /* sound-related */ - int CTRLD; - int sign_x_1, sign_y_1; - int sign_x_2, sign_y_2; - int sign_x_3, sign_y_3; - int sign_x_4, sign_y_4; - int counter_x_in0, counter_y_in0; - int counter_x_in0b, counter_y_in0b; - int counter_x_in2, counter_y_in2; - int counter_x_in2b, counter_y_in2b; + int m_CTRLD; + int m_sign_x_1; + int m_sign_y_1; + int m_sign_x_2; + int m_sign_y_2; + int m_sign_x_3; + int m_sign_y_3; + int m_sign_x_4; + int m_sign_y_4; + int m_counter_x_in0; + int m_counter_y_in0; + int m_counter_x_in0b; + int m_counter_y_in0b; + int m_counter_x_in2; + int m_counter_y_in2; + int m_counter_x_in2b; + int m_counter_y_in2b; /* devices */ - device_t *maincpu; + device_t *m_maincpu; }; diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index 62864db3a66..3382d5051f2 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -12,23 +12,23 @@ public: atarig1_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT8 is_pitfight; + UINT8 m_is_pitfight; - UINT8 which_input; - UINT16 * mo_command; + UINT8 m_which_input; + UINT16 * m_mo_command; - UINT16 * bslapstic_base; - void * bslapstic_bank0; - UINT8 bslapstic_bank; - UINT8 bslapstic_primed; + UINT16 * m_bslapstic_base; + void * m_bslapstic_bank0; + UINT8 m_bslapstic_bank; + UINT8 m_bslapstic_primed; - int pfscroll_xoffset; - UINT16 current_control; - UINT8 playfield_tile_bank; - UINT16 playfield_xscroll; - UINT16 playfield_yscroll; + int m_pfscroll_xoffset; + UINT16 m_current_control; + UINT8 m_playfield_tile_bank; + UINT16 m_playfield_xscroll; + UINT16 m_playfield_yscroll; - device_t * rle; + device_t * m_rle; }; diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index 209cce40460..218237deaa2 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -12,25 +12,25 @@ public: atarig42_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 playfield_base; + UINT16 m_playfield_base; - UINT16 current_control; - UINT8 playfield_tile_bank; - UINT8 playfield_color_bank; - UINT16 playfield_xscroll; - UINT16 playfield_yscroll; + UINT16 m_current_control; + UINT8 m_playfield_tile_bank; + UINT8 m_playfield_color_bank; + UINT16 m_playfield_xscroll; + UINT16 m_playfield_yscroll; - UINT8 analog_data; - UINT16 * mo_command; + UINT8 m_analog_data; + UINT16 * m_mo_command; - int sloop_bank; - int sloop_next_bank; - int sloop_offset; - int sloop_state; - UINT16 * sloop_base; + int m_sloop_bank; + int m_sloop_next_bank; + int m_sloop_offset; + int m_sloop_state; + UINT16 * m_sloop_base; - device_t * rle; - UINT32 last_accesses[8]; + device_t * m_rle; + UINT32 m_last_accesses[8]; }; diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h index 5904651bcef..746ad541dd4 100644 --- a/src/mame/includes/atarigt.h +++ b/src/mame/includes/atarigt.h @@ -19,33 +19,33 @@ public: atarigt_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT8 is_primrage; - UINT16 * colorram; + UINT8 m_is_primrage; + UINT16 * m_colorram; - bitmap_t * pf_bitmap; - bitmap_t * an_bitmap; + bitmap_t * m_pf_bitmap; + bitmap_t * m_an_bitmap; - UINT8 playfield_tile_bank; - UINT8 playfield_color_bank; - UINT16 playfield_xscroll; - UINT16 playfield_yscroll; + UINT8 m_playfield_tile_bank; + UINT8 m_playfield_color_bank; + UINT16 m_playfield_xscroll; + UINT16 m_playfield_yscroll; - UINT32 tram_checksum; + UINT32 m_tram_checksum; - UINT32 expanded_mram[MRAM_ENTRIES * 3]; + UINT32 m_expanded_mram[MRAM_ENTRIES * 3]; - UINT32 * mo_command; + UINT32 * m_mo_command; - void (*protection_w)(address_space *space, offs_t offset, UINT16 data); - void (*protection_r)(address_space *space, offs_t offset, UINT16 *data); + void (*m_protection_w)(address_space *space, offs_t offset, UINT16 data); + void (*m_protection_r)(address_space *space, offs_t offset, UINT16 *data); - UINT8 ignore_writes; - offs_t protaddr[ADDRSEQ_COUNT]; - UINT8 protmode; - UINT16 protresult; - UINT8 protdata[0x800]; + UINT8 m_ignore_writes; + offs_t m_protaddr[ADDRSEQ_COUNT]; + UINT8 m_protmode; + UINT16 m_protresult; + UINT8 m_protdata[0x800]; - device_t * rle; + device_t * m_rle; }; diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index 165d72b307c..3197a8c26bc 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -12,21 +12,21 @@ public: atarigx2_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 playfield_base; + UINT16 m_playfield_base; - UINT32 * mo_command; - UINT32 * protection_base; + UINT32 * m_mo_command; + UINT32 * m_protection_base; - UINT16 current_control; - UINT8 playfield_tile_bank; - UINT8 playfield_color_bank; - UINT16 playfield_xscroll; - UINT16 playfield_yscroll; + UINT16 m_current_control; + UINT8 m_playfield_tile_bank; + UINT8 m_playfield_color_bank; + UINT16 m_playfield_xscroll; + UINT16 m_playfield_yscroll; - UINT16 last_write; - UINT16 last_write_offset; + UINT16 m_last_write; + UINT16 m_last_write_offset; - device_t * rle; + device_t * m_rle; }; diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index f115ae307b5..6b3fb2f3b21 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -11,37 +11,37 @@ class atarisy1_state : public atarigen_state public: atarisy1_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config), - joystick_timer(*this, "joystick_timer"), - yscroll_reset_timer(*this, "yreset_timer"), - scanline_timer(*this, "scan_timer"), - int3off_timer(*this, "int3off_timer") { } + m_joystick_timer(*this, "joystick_timer"), + m_yscroll_reset_timer(*this, "yreset_timer"), + m_scanline_timer(*this, "scan_timer"), + m_int3off_timer(*this, "int3off_timer") { } - UINT16 * bankselect; + UINT16 * m_bankselect; - UINT8 joystick_type; - UINT8 trackball_type; + UINT8 m_joystick_type; + UINT8 m_trackball_type; - required_device<timer_device> joystick_timer; - UINT8 joystick_int; - UINT8 joystick_int_enable; - UINT8 joystick_value; + required_device<timer_device> m_joystick_timer; + UINT8 m_joystick_int; + UINT8 m_joystick_int_enable; + UINT8 m_joystick_value; /* playfield parameters */ - UINT16 playfield_lookup[256]; - UINT8 playfield_tile_bank; - UINT16 playfield_priority_pens; - required_device<timer_device> yscroll_reset_timer; + UINT16 m_playfield_lookup[256]; + UINT8 m_playfield_tile_bank; + UINT16 m_playfield_priority_pens; + required_device<timer_device> m_yscroll_reset_timer; /* INT3 tracking */ - int next_timer_scanline; - required_device<timer_device> scanline_timer; - required_device<timer_device> int3off_timer; + int m_next_timer_scanline; + required_device<timer_device> m_scanline_timer; + required_device<timer_device> m_int3off_timer; /* graphics bank tracking */ - UINT8 bank_gfx[3][8]; - UINT8 bank_color_shift[MAX_GFX_ELEMENTS]; + UINT8 m_bank_gfx[3][8]; + UINT8 m_bank_color_shift[MAX_GFX_ELEMENTS]; - UINT8 cur[2][2]; + UINT8 m_cur[2][2]; }; diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index 79e1f991dae..68be7cc0006 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -12,39 +12,39 @@ public: atarisy2_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 * slapstic_base; + UINT16 * m_slapstic_base; - UINT8 interrupt_enable; - UINT16 * bankselect; + UINT8 m_interrupt_enable; + UINT16 * m_bankselect; - INT8 pedal_count; + INT8 m_pedal_count; - UINT8 has_tms5220; + UINT8 m_has_tms5220; - UINT8 which_adc; + UINT8 m_which_adc; - UINT8 p2portwr_state; - UINT8 p2portrd_state; + UINT8 m_p2portwr_state; + UINT8 m_p2portrd_state; - UINT16 * rombank1; - UINT16 * rombank2; + UINT16 * m_rombank1; + UINT16 * m_rombank2; - UINT8 sound_reset_state; + UINT8 m_sound_reset_state; - emu_timer * yscroll_reset_timer; - UINT32 playfield_tile_bank[2]; - UINT32 videobank; + emu_timer * m_yscroll_reset_timer; + UINT32 m_playfield_tile_bank[2]; + UINT32 m_videobank; // 720 fake joystick - double joy_last_angle; - int joy_rotations; + double m_joy_last_angle; + int m_joy_rotations; // 720 fake spinner - UINT32 spin_last_rotate_count; - INT32 spin_pos; /* track fake position of spinner */ - UINT32 spin_center_count; + UINT32 m_spin_last_rotate_count; + INT32 m_spin_pos; /* track fake position of spinner */ + UINT32 m_spin_center_count; - UINT16 vram[0x8000/2]; + UINT16 m_vram[0x8000/2]; }; diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index f0c43b0c90c..c655c193c74 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -12,13 +12,13 @@ public: m_nvram(*this, "nvram") { } required_shared_ptr<UINT8> m_nvram; - UINT8 *videoram; - UINT8 *slapstic_source; - UINT8 *slapstic_base; - UINT8 current_bank; - UINT8 nvram_write_enable; - emu_timer *interrupt_timer; - tilemap_t *bg_tilemap; + UINT8 *m_videoram; + UINT8 *m_slapstic_source; + UINT8 *m_slapstic_base; + UINT8 m_current_bank; + UINT8 m_nvram_write_enable; + emu_timer *m_interrupt_timer; + tilemap_t *m_bg_tilemap; }; /*----------- defined in video/atetris.c -----------*/ diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h index 11136999eba..d92097e4487 100644 --- a/src/mame/includes/avalnche.h +++ b/src/mame/includes/avalnche.h @@ -14,10 +14,10 @@ public: : driver_device(machine, config) { } /* video-related */ - UINT8 * videoram; - size_t videoram_size; + UINT8 * m_videoram; + size_t m_videoram_size; - UINT8 avalance_video_inverted; + UINT8 m_avalance_video_inverted; }; /*----------- defined in audio/avalnche.c -----------*/ diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h index 77efb6b6ec9..6d03394b6ac 100644 --- a/src/mame/includes/aztarac.h +++ b/src/mame/includes/aztarac.h @@ -12,10 +12,10 @@ public: m_nvram(*this, "nvram") { } required_shared_ptr<UINT16> m_nvram; - int sound_status; - UINT16 *vectorram; - int xcenter; - int ycenter; + int m_sound_status; + UINT16 *m_vectorram; + int m_xcenter; + int m_ycenter; }; /*----------- defined in audio/aztarac.c -----------*/ diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index f05ee5ebfdd..46f6958076f 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -12,12 +12,12 @@ public: badlands_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT8 pedal_value[2]; + UINT8 m_pedal_value[2]; - UINT8 * bank_base; - UINT8 * bank_source_data; + UINT8 * m_bank_base; + UINT8 * m_bank_source_data; - UINT8 playfield_tile_bank; + UINT8 m_playfield_tile_bank; }; diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index 95e9af30017..73d21aaed3b 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -5,27 +5,27 @@ public: bagman_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 ls259_buf[8]; - UINT8 p1_res; - UINT8 p1_old_val; - UINT8 p2_res; - UINT8 p2_old_val; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *video_enable; + UINT8 m_ls259_buf[8]; + UINT8 m_p1_res; + UINT8 m_p1_old_val; + UINT8 m_p2_res; + UINT8 m_p2_old_val; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_video_enable; /*table holds outputs of all ANDs (after AND map)*/ - UINT8 andmap[64]; + UINT8 m_andmap[64]; /*table holds inputs (ie. not x, x, not q, q) to the AND map*/ - UINT8 columnvalue[32]; + UINT8 m_columnvalue[32]; /*8 output pins (actually 6 output and 2 input/output)*/ - UINT8 outvalue[8]; + UINT8 m_outvalue[8]; - tilemap_t *bg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index 7901a457b6a..01cf6787fe3 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -31,8 +31,8 @@ class balsente_state : public driver_device public: balsente_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - scanline_timer(*this, "scan_timer"), - counter_0_timer(*this, "8253_0_timer"), + m_scanline_timer(*this, "scan_timer"), + m_counter_0_timer(*this, "8253_0_timer"), m_cem1(*this, "cem1"), m_cem2(*this, "cem2"), m_cem3(*this, "cem3"), @@ -41,12 +41,12 @@ public: m_cem6(*this, "cem6") { } /* global data */ - UINT8 shooter; - UINT8 shooter_x; - UINT8 shooter_y; - UINT8 adc_shift; - UINT16 *shrike_shared; - UINT16 *shrike_io; + UINT8 m_shooter; + UINT8 m_shooter_x; + UINT8 m_shooter_y; + UINT8 m_adc_shift; + UINT16 *m_shrike_shared; + UINT16 *m_shrike_io; /* 8253 counter state */ struct @@ -60,69 +60,69 @@ public: UINT8 mode; UINT8 readbyte; UINT8 writebyte; - } counter[3]; + } m_counter[3]; - required_device<timer_device> scanline_timer; + required_device<timer_device> m_scanline_timer; /* manually clocked counter 0 states */ - UINT8 counter_control; - UINT8 counter_0_ff; - required_device<timer_device> counter_0_timer; - UINT8 counter_0_timer_active; + UINT8 m_counter_control; + UINT8 m_counter_0_ff; + required_device<timer_device> m_counter_0_timer; + UINT8 m_counter_0_timer_active; /* random number generator states */ - UINT8 poly17[POLY17_SIZE + 1]; - UINT8 rand17[POLY17_SIZE + 1]; + UINT8 m_poly17[POLY17_SIZE + 1]; + UINT8 m_rand17[POLY17_SIZE + 1]; /* ADC I/O states */ - INT8 analog_input_data[4]; - UINT8 adc_value; + INT8 m_analog_input_data[4]; + UINT8 m_adc_value; /* CEM3394 DAC control states */ - UINT16 dac_value; - UINT8 dac_register; - UINT8 chip_select; + UINT16 m_dac_value; + UINT8 m_dac_register; + UINT8 m_chip_select; /* main CPU 6850 states */ - UINT8 m6850_status; - UINT8 m6850_control; - UINT8 m6850_input; - UINT8 m6850_output; - UINT8 m6850_data_ready; + UINT8 m_m6850_status; + UINT8 m_m6850_control; + UINT8 m_m6850_input; + UINT8 m_m6850_output; + UINT8 m_m6850_data_ready; /* sound CPU 6850 states */ - UINT8 m6850_sound_status; - UINT8 m6850_sound_control; - UINT8 m6850_sound_input; - UINT8 m6850_sound_output; + UINT8 m_m6850_sound_status; + UINT8 m_m6850_sound_control; + UINT8 m_m6850_sound_input; + UINT8 m_m6850_sound_output; /* noise generator states */ - UINT32 noise_position[6]; + UINT32 m_noise_position[6]; required_device<cem3394_device> m_cem1; required_device<cem3394_device> m_cem2; required_device<cem3394_device> m_cem3; required_device<cem3394_device> m_cem4; required_device<cem3394_device> m_cem5; required_device<cem3394_device> m_cem6; - cem3394_device *cem_device[6]; + cem3394_device *m_cem_device[6]; /* game-specific states */ - UINT8 nstocker_bits; - UINT8 spiker_expand_color; - UINT8 spiker_expand_bgcolor; - UINT8 spiker_expand_bits; - UINT8 grudge_steering_result; - UINT8 grudge_last_steering[3]; + UINT8 m_nstocker_bits; + UINT8 m_spiker_expand_color; + UINT8 m_spiker_expand_bgcolor; + UINT8 m_spiker_expand_bits; + UINT8 m_grudge_steering_result; + UINT8 m_grudge_last_steering[3]; /* video data */ - UINT8 *videoram; - UINT8 expanded_videoram[256*256]; - UINT8 *sprite_data; - UINT32 sprite_mask; - UINT8 *sprite_bank[2]; - - UINT8 palettebank_vis; - UINT8 *spriteram; + UINT8 *m_videoram; + UINT8 m_expanded_videoram[256*256]; + UINT8 *m_sprite_data; + UINT32 m_sprite_mask; + UINT8 *m_sprite_bank[2]; + + UINT8 m_palettebank_vis; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 6f2317fe80d..1fae0ad0e8f 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -16,14 +16,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * videoram2; - UINT8 * colorram2; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_videoram2; + UINT8 * m_colorram2; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - int scroll_x, priority; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_scroll_x; + int m_priority; }; diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index 6380ec875f9..9d3fa0ea161 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -4,16 +4,16 @@ public: baraduke_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int inputport_selected; - int counter; - UINT8 *textram; - UINT8 *videoram; - UINT8 *spriteram; - tilemap_t *tx_tilemap; - tilemap_t *bg_tilemap[2]; - int xscroll[2]; - int yscroll[2]; - int copy_sprites; + int m_inputport_selected; + int m_counter; + UINT8 *m_textram; + UINT8 *m_videoram; + UINT8 *m_spriteram; + tilemap_t *m_tx_tilemap; + tilemap_t *m_bg_tilemap[2]; + int m_xscroll[2]; + int m_yscroll[2]; + int m_copy_sprites; }; diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h index 46e21818d6b..6138845b9d5 100644 --- a/src/mame/includes/batman.h +++ b/src/mame/includes/batman.h @@ -12,9 +12,9 @@ public: batman_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 latch_data; + UINT16 m_latch_data; - UINT8 alpha_tile_bank; + UINT8 m_alpha_tile_bank; }; diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index 58f6577c340..e5c419abf9a 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -11,18 +11,18 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * tileram; - UINT8 * spriteram; + UINT8 * m_tileram; + UINT8 * m_spriteram; /* video-related */ - tilemap_t *bg_tilemap; - bitmap_t *screen_bitmap; - int video_ctrl; - int cpu_control; /* CPU interrupt control register */ + tilemap_t *m_bg_tilemap; + bitmap_t *m_screen_bitmap; + int m_video_ctrl; + int m_cpu_control; /* CPU interrupt control register */ /* devices */ - device_t *maincpu; - device_t *subcpu; + device_t *m_maincpu; + device_t *m_subcpu; }; diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index fed506e2724..1eeac3338fe 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -4,25 +4,25 @@ public: battlera_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int control_port_select; - int msm5205next; - int toggle; - int HuC6270_registers[20]; - int VDC_register; - int vram_ptr; - UINT8 *HuC6270_vram; - UINT8 *vram_dirty; - bitmap_t *tile_bitmap; - bitmap_t *front_bitmap; - UINT32 tile_dirtyseq; - int current_scanline; - int inc_value; - int irq_enable; - int rcr_enable; - int sb_enable; - int bb_enable; - int bldwolf_vblank; - UINT8 blank_tile[32]; + int m_control_port_select; + int m_msm5205next; + int m_toggle; + int m_HuC6270_registers[20]; + int m_VDC_register; + int m_vram_ptr; + UINT8 *m_HuC6270_vram; + UINT8 *m_vram_dirty; + bitmap_t *m_tile_bitmap; + bitmap_t *m_front_bitmap; + UINT32 m_tile_dirtyseq; + int m_current_scanline; + int m_inc_value; + int m_irq_enable; + int m_rcr_enable; + int m_sb_enable; + int m_bb_enable; + int m_bldwolf_vblank; + UINT8 m_blank_tile[32]; }; diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index 3ccd3dcbfe1..d76e50736e5 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -10,16 +10,17 @@ public: battlex_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 in0_b4; + UINT8 m_in0_b4; /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; + UINT8 * m_videoram; + UINT8 * m_spriteram; /* video-related */ - tilemap_t *bg_tilemap; - UINT8 scroll_lsb, scroll_msb; - UINT8 starfield_enabled; + tilemap_t *m_bg_tilemap; + UINT8 m_scroll_lsb; + UINT8 m_scroll_msb; + UINT8 m_starfield_enabled; }; diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index 26da93f5d10..32a59c5d851 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -14,14 +14,14 @@ public: // UINT8 * paletteram; // this currently uses generic palette handling /* video-related */ - int spritebank; - int layer_colorbase[2]; + int m_spritebank; + int m_layer_colorbase[2]; /* devices */ - device_t *audiocpu; - device_t *k007342; - device_t *k007420; + device_t *m_audiocpu; + device_t *m_k007342; + device_t *m_k007420; }; /*----------- defined in video/battlnts.c -----------*/ diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 9c57e09edee..b6c36a43955 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -3,24 +3,24 @@ class bbusters_state : public driver_device public: bbusters_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - eprom_data(*this, "eeprom") { } + m_eprom_data(*this, "eeprom") { } - UINT16 *videoram; - UINT16 *ram; - optional_shared_ptr<UINT16> eprom_data; - int sound_status; - int gun_select; + UINT16 *m_videoram; + UINT16 *m_ram; + optional_shared_ptr<UINT16> m_eprom_data; + int m_sound_status; + int m_gun_select; - tilemap_t *fix_tilemap; - tilemap_t *pf1_tilemap; - tilemap_t *pf2_tilemap; - const UINT8 *scale_table_ptr; - UINT8 scale_line_count; + tilemap_t *m_fix_tilemap; + tilemap_t *m_pf1_tilemap; + tilemap_t *m_pf2_tilemap; + const UINT8 *m_scale_table_ptr; + UINT8 m_scale_line_count; - UINT16 *pf1_data; - UINT16 *pf2_data; - UINT16 *pf1_scroll_data; - UINT16 *pf2_scroll_data; + UINT16 *m_pf1_data; + UINT16 *m_pf2_data; + UINT16 *m_pf1_scroll_data; + UINT16 *m_pf2_scroll_data; }; diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h index b7802157d59..cc824fb600b 100644 --- a/src/mame/includes/beezer.h +++ b/src/mame/includes/beezer.h @@ -6,10 +6,10 @@ public: beezer_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - int pbus; - int banklatch; - int scanline; + UINT8 *m_videoram; + int m_pbus; + int m_banklatch; + int m_scanline; }; diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index e9a357c7b0f..9fb0af6c858 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -6,37 +6,47 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * paletteram; - UINT8 * spriteram1; - UINT8 * spriteram2; + UINT8 * m_paletteram; + UINT8 * m_spriteram1; + UINT8 * m_spriteram2; /* video-related */ - bitmap_t *tmp_bitmap[4]; - UINT8 *vidram; - UINT32 vidram_bank, plane_selected, plane_visible; + bitmap_t *m_tmp_bitmap[4]; + UINT8 *m_vidram; + UINT32 m_vidram_bank; + UINT32 m_plane_selected; + UINT32 m_plane_visible; /* sound-related */ - int sound_nmi_enable, pending_nmi; - UINT8 for_sound; - UINT8 from_sound; - UINT8 sound_state; + int m_sound_nmi_enable; + int m_pending_nmi; + UINT8 m_for_sound; + UINT8 m_from_sound; + UINT8 m_sound_state; /* MCU related */ - UINT8 from_mcu; - int mcu_sent, main_sent; - UINT8 port_a_in, port_a_out, ddr_a; - UINT8 port_b_in, port_b_out, ddr_b; - UINT8 port_c_in, port_c_out, ddr_c; - int mcu_coin_bit5; + UINT8 m_from_mcu; + int m_mcu_sent; + int m_main_sent; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_b_in; + UINT8 m_port_b_out; + UINT8 m_ddr_b; + UINT8 m_port_c_in; + UINT8 m_port_c_out; + UINT8 m_ddr_c; + int m_mcu_coin_bit5; /* misc */ - UINT32 beg_bank; - UINT8 beg13_ls74[2]; - UINT8 port_select; /* for muxed controls */ + UINT32 m_beg_bank; + UINT8 m_beg13_ls74[2]; + UINT8 m_port_select; /* for muxed controls */ /* devices */ - device_t *audiocpu; - device_t *mcu; + device_t *m_audiocpu; + device_t *m_mcu; }; diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index 76ea70e7aa8..c12e209b96e 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -4,17 +4,17 @@ public: bigstrkb_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - tilemap_t *tilemap; - tilemap_t *tilemap2; - tilemap_t *tilemap3; + tilemap_t *m_tilemap; + tilemap_t *m_tilemap2; + tilemap_t *m_tilemap3; - UINT16 *videoram; - UINT16 *videoram2; - UINT16 *videoram3; + UINT16 *m_videoram; + UINT16 *m_videoram2; + UINT16 *m_videoram3; - UINT16 *vidreg1; - UINT16 *vidreg2; - UINT16 *spriteram; + UINT16 *m_vidreg1; + UINT16 *m_vidreg2; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index 4cc5847f689..4186df23a15 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -11,18 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bgvideoram; - UINT16 * fgvideoram; - UINT16 * txvideoram; - UINT16 * paletteram; -// UINT16 * spriteram; // needed for EOF, but currently handled through buffer_spriteram16 + UINT16 * m_bgvideoram; + UINT16 * m_fgvideoram; + UINT16 * m_txvideoram; + UINT16 * m_paletteram; +// UINT16 * m_spriteram; // needed for EOF, but currently handled through buffer_spriteram16 /* video-related */ - tilemap_t *tx_tilemap, *bg_tilemap, *fg_tilemap; - UINT16 scroll[4]; + tilemap_t *m_tx_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT16 m_scroll[4]; - UINT16 inp[3]; - UINT16 soundcommand; + UINT16 m_inp[3]; + UINT16 m_soundcommand; }; diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index 02cc17e21f9..ca16477862a 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -14,22 +14,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[4]; + int m_layer_colorbase[4]; /* misc */ - UINT16 cur_control, cur_control2; + UINT16 m_cur_control; + UINT16 m_cur_control2; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k007232; - device_t *k056832; - device_t *k054338; - device_t *k055555; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k007232; + device_t *m_k056832; + device_t *m_k054338; + device_t *m_k055555; }; /*----------- defined in video/bishi.c -----------*/ diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index 048118ed250..e64ada8c9f4 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -5,36 +5,47 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * playfield_ram; + UINT8 * m_playfield_ram; /* video-related */ - bitmap_t *tmp_bitmap1, *tmp_bitmap2; - tilemap_t *bg_tilemap; - int pc3259_output[4]; - int pc3259_mask; - UINT8 xld1, xld2, xld3; - UINT8 yld1, yld2, yld3; - int ball1_pic, ball2_pic; - int crow_pic, crow_flip; - int palette_bank, controller, hit; + bitmap_t *m_tmp_bitmap1; + bitmap_t *m_tmp_bitmap2; + tilemap_t *m_bg_tilemap; + int m_pc3259_output[4]; + int m_pc3259_mask; + UINT8 m_xld1; + UINT8 m_xld2; + UINT8 m_xld3; + UINT8 m_yld1; + UINT8 m_yld2; + UINT8 m_yld3; + int m_ball1_pic; + int m_ball2_pic; + int m_crow_pic; + int m_crow_flip; + int m_palette_bank; + int m_controller; + int m_hit; /* sound-related */ - int sound_nmi_enable, pending_nmi; + int m_sound_nmi_enable; + int m_pending_nmi; /* misc */ - int addr_h, addr_l; + int m_addr_h; + int m_addr_l; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; #if 0 /* 68705 */ - UINT8 port_a_in; - UINT8 port_a_out; - UINT8 ddr_a; - UINT8 port_b_in; - UINT8 port_b_out; - UINT8 ddr_b; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_b_in; + UINT8 m_port_b_out; + UINT8 m_ddr_b; #endif }; diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 85a5772aecf..1091e8a71ae 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -11,19 +11,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * paletteram; + UINT8 * m_paletteram; /* video-related */ - int spritebank; - int layer_colorbase[2]; + int m_spritebank; + int m_layer_colorbase[2]; /* misc */ - int last_track[4]; + int m_last_track[4]; /* devices */ - device_t *audiocpu; - device_t *k007342; - device_t *k007420; + device_t *m_audiocpu; + device_t *m_k007342; + device_t *m_k007420; }; diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 1067502399d..edfc7fbc7a2 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -11,26 +11,31 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * txvideoram; -// UINT8 * spriteram; // currently this uses generic buffer_spriteram_w -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram2; // currently this uses generic palette handling + UINT8 * m_txvideoram; +// UINT8 * m_spriteram; // currently this uses generic buffer_spriteram_w +// UINT8 * m_paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram2; // currently this uses generic palette handling /* video-related */ - tilemap_t *tx_tilemap, *bg_tilemap8x4, *bg_tilemap4x8; - UINT32 scroll_bank; - UINT8 scroll_x[2]; - UINT8 scroll_y[2]; - UINT8 *scroll_ram; - UINT8 screen_layout; - UINT8 chon, objon, bgon; + tilemap_t *m_tx_tilemap; + tilemap_t *m_bg_tilemap8x4; + tilemap_t *m_bg_tilemap4x8; + UINT32 m_scroll_bank; + UINT8 m_scroll_x[2]; + UINT8 m_scroll_y[2]; + UINT8 *m_scroll_ram; + UINT8 m_screen_layout; + UINT8 m_chon; + UINT8 m_objon; + UINT8 m_bgon; /* mcu-related */ - UINT8 z80_latch, i8751_latch; + UINT8 m_z80_latch; + UINT8 m_i8751_latch; /* devices */ - device_t *mcu; - device_t *audiocpu; + device_t *m_mcu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index fdc255011db..f6d13e74e52 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -11,21 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * vram_0; - UINT16 * scroll_0; - UINT16 * vram_1; - UINT16 * scroll_1; - UINT16 * spriteram; - UINT16 * paletteram; - size_t spriteram_size; + UINT16 * m_vram_0; + UINT16 * m_scroll_0; + UINT16 * m_vram_1; + UINT16 * m_scroll_1; + UINT16 * m_spriteram; + UINT16 * m_paletteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *tilemap_0, *tilemap_1; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; /* input-related */ - UINT8 pot_wheel; // blmbycar - int old_val; // blmbycar - int retvalue; // waterball + UINT8 m_pot_wheel; // blmbycar + int m_old_val; // blmbycar + int m_retvalue; // waterball }; diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index 27efebdf803..c9603ef4708 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -7,14 +7,14 @@ public: blockade_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 * videoram; + UINT8 * m_videoram; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* input-related */ - UINT8 coin_latch; /* Active Low */ - UINT8 just_been_reset; + UINT8 m_coin_latch; /* Active Low */ + UINT8 m_just_been_reset; }; diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h index ea975270087..30ae67c94a3 100644 --- a/src/mame/includes/blockhl.h +++ b/src/mame/includes/blockhl.h @@ -11,21 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; + int m_layer_colorbase[3]; + int m_sprite_colorbase; /* misc */ - int palette_selected; - int rombank; + int m_palette_selected; + int m_rombank; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k052109; - device_t *k051960; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k052109; + device_t *m_k051960; }; /*----------- defined in video/blockhl.c -----------*/ diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index f52394ed9e0..d4c73f96768 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -11,16 +11,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; - UINT16 * frontvideoram; - UINT16 * paletteram; + UINT16 * m_videoram; + UINT16 * m_frontvideoram; + UINT16 * m_paletteram; /* video-related */ - bitmap_t *tmpbitmap; - UINT16 color; + bitmap_t *m_tmpbitmap; + UINT16 m_color; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index 608807c8b7a..3fbdc366451 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -4,15 +4,15 @@ public: bloodbro_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *bgvideoram; - UINT16 *fgvideoram; - UINT16 *txvideoram; - UINT16 *scroll; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *tx_tilemap; - UINT16 *spriteram; - size_t spriteram_size; + UINT16 *m_bgvideoram; + UINT16 *m_fgvideoram; + UINT16 *m_txvideoram; + UINT16 *m_scroll; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_tx_tilemap; + UINT16 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index 170ae8f1957..9a2937c0ef4 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -12,7 +12,7 @@ public: blstroid_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 * priorityram; + UINT16 * m_priorityram; }; diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index 9bad50241ac..20ab103a3ad 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -11,21 +11,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * scrollram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_scrollram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int gfx_bank; + tilemap_t *m_bg_tilemap; + int m_gfx_bank; /* misc */ - int dipsw; + int m_dipsw; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index a3d6bdf6d34..265118491f8 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -11,21 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * videoram2; - UINT8 * colorram; - UINT8 * colorram2; - UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_videoram2; + UINT8 * m_colorram; + UINT8 * m_colorram2; + UINT8 * m_spriteram; +// UINT8 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; /* misc */ - int psg_latch; - int last_write; - int colbank; + int m_psg_latch; + int m_last_write; + int m_colbank; }; diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index e783c93ca3b..4c2232663a9 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -11,18 +11,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; +// UINT8 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - UINT8 background_image; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + UINT8 m_background_image; /* sound-related */ - UINT8 latch; + UINT8 m_latch; }; diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h index 0cdff1bd02b..638060127a4 100644 --- a/src/mame/includes/boogwing.h +++ b/src/mame/includes/boogwing.h @@ -13,28 +13,28 @@ class boogwing_state : public driver_device public: boogwing_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - audiocpu(*this, "audiocpu"), - decocomn(*this, "deco_common"), - deco_tilegen1(*this, "tilegen1"), - deco_tilegen2(*this, "tilegen2"), - oki1(*this, "oki1"), - oki2(*this, "oki2") { } + m_maincpu(*this, "maincpu"), + m_audiocpu(*this, "audiocpu"), + m_decocomn(*this, "deco_common"), + m_deco_tilegen1(*this, "tilegen1"), + m_deco_tilegen2(*this, "tilegen2"), + m_oki1(*this, "oki1"), + m_oki2(*this, "oki2") { } /* memory pointers */ - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT16 * pf3_rowscroll; - UINT16 * pf4_rowscroll; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT16 * m_pf3_rowscroll; + UINT16 * m_pf4_rowscroll; /* devices */ - required_device<cpu_device> maincpu; - required_device<cpu_device> audiocpu; - required_device<decocomn_device> decocomn; - required_device<deco16ic_device> deco_tilegen1; - required_device<deco16ic_device> deco_tilegen2; - required_device<okim6295_device> oki1; - required_device<okim6295_device> oki2; + required_device<cpu_device> m_maincpu; + required_device<cpu_device> m_audiocpu; + required_device<decocomn_device> m_decocomn; + required_device<deco16ic_device> m_deco_tilegen1; + required_device<deco16ic_device> m_deco_tilegen2; + required_device<okim6295_device> m_oki1; + required_device<okim6295_device> m_oki2; }; diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index 5ddd9a35812..bc84afe5c74 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -11,24 +11,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase, zoom_colorbase; + int m_layer_colorbase[3]; + int m_sprite_colorbase; + int m_zoom_colorbase; /* misc */ - int video_enable; - int zoomreadroms, k052109_selected; - int nmienable; + int m_video_enable; + int m_zoomreadroms; + int m_k052109_selected; + int m_nmienable; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k007232_1; - device_t *k007232_2; - device_t *k052109; - device_t *k051960; - device_t *k051316; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k007232_1; + device_t *m_k007232_2; + device_t *m_k052109; + device_t *m_k051960; + device_t *m_k051316; }; /*----------- defined in video/bottom9.c -----------*/ diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 811d53245ac..b851ffe12ef 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -11,23 +11,24 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * fg_videoram; - size_t videoram_size; - size_t spriteram_size; - size_t fg_videoram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_fg_videoram; + size_t m_videoram_size; + size_t m_spriteram_size; + size_t m_fg_videoram_size; /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - int bgscroll; - int bgbasecolor; - int flipscreen; - //UINT8 *brkthru_nmi_enable; /* needs to be tracked down */ + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_bgscroll; + int m_bgbasecolor; + int m_flipscreen; + //UINT8 *m_brkthru_nmi_enable; /* needs to be tracked down */ /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index 7206911e6f0..9976176fba9 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -20,20 +20,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * motion; + UINT8 * m_videoram; + UINT8 * m_motion; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* misc */ - UINT32 nmi_on; - int i256v; + UINT32 m_nmi_on; + int m_i256v; /* input-related */ - int ld1, ld2; - int dir0, dir1, dir2, dir3; - int last_p1_horiz, last_p1_vert, last_p2_horiz, last_p2_vert; + int m_ld1; + int m_ld2; + int m_dir0; + int m_dir1; + int m_dir2; + int m_dir3; + int m_last_p1_horiz; + int m_last_p1_vert; + int m_last_p2_horiz; + int m_last_p2_vert; }; diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 72d4692c8f1..7057a06b2e3 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -6,42 +6,42 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; -// UINT8 * paletteram; // currently this uses generic palette handling - UINT8 * lnc_charbank; - UINT8 * bnj_backgroundram; - UINT8 * zoar_scrollram; - UINT8 * deco_charram; - UINT8 * spriteram; // used by disco -// UINT8 * decrypted; - UINT8 * rambase; - UINT8 * audio_rambase; - size_t videoram_size; - size_t spriteram_size; - size_t bnj_backgroundram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; +// UINT8 * m_paletteram; // currently this uses generic palette handling + UINT8 * m_lnc_charbank; + UINT8 * m_bnj_backgroundram; + UINT8 * m_zoar_scrollram; + UINT8 * m_deco_charram; + UINT8 * m_spriteram; // used by disco +// UINT8 * m_decrypted; + UINT8 * m_rambase; + UINT8 * m_audio_rambase; + size_t m_videoram_size; + size_t m_spriteram_size; + size_t m_bnj_backgroundram_size; /* video-related */ - bitmap_t *background_bitmap; - UINT8 btime_palette; - UINT8 bnj_scroll1; - UINT8 bnj_scroll2; - UINT8 btime_tilemap[4]; + bitmap_t *m_background_bitmap; + UINT8 m_btime_palette; + UINT8 m_bnj_scroll1; + UINT8 m_bnj_scroll2; + UINT8 m_btime_tilemap[4]; /* audio-related */ - UINT8 audio_nmi_enable_type; - UINT8 audio_nmi_enabled; - UINT8 audio_nmi_state; + UINT8 m_audio_nmi_enable_type; + UINT8 m_audio_nmi_enabled; + UINT8 m_audio_nmi_state; /* protection-related (for mmonkey) */ - int protection_command; - int protection_status; - int protection_value; - int protection_ret; + int m_protection_command; + int m_protection_status; + int m_protection_value; + int m_protection_ret; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h index 4cf177a5665..05f885977d6 100644 --- a/src/mame/includes/btoads.h +++ b/src/mame/includes/btoads.h @@ -12,30 +12,30 @@ public: btoads_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 main_to_sound_data; - UINT8 main_to_sound_ready; - UINT8 sound_to_main_data; - UINT8 sound_to_main_ready; - UINT8 sound_int_state; - UINT16 *vram_fg0; - UINT16 *vram_fg1; - UINT16 *vram_fg_data; - UINT16 *vram_bg0; - UINT16 *vram_bg1; - UINT16 *sprite_scale; - UINT16 *sprite_control; - UINT8 *vram_fg_draw; - UINT8 *vram_fg_display; - INT32 xscroll0; - INT32 yscroll0; - INT32 xscroll1; - INT32 yscroll1; - UINT8 screen_control; - UINT16 sprite_source_offs; - UINT8 *sprite_dest_base; - UINT16 sprite_dest_offs; - UINT16 misc_control; - int xcount; + UINT8 m_main_to_sound_data; + UINT8 m_main_to_sound_ready; + UINT8 m_sound_to_main_data; + UINT8 m_sound_to_main_ready; + UINT8 m_sound_int_state; + UINT16 *m_vram_fg0; + UINT16 *m_vram_fg1; + UINT16 *m_vram_fg_data; + UINT16 *m_vram_bg0; + UINT16 *m_vram_bg1; + UINT16 *m_sprite_scale; + UINT16 *m_sprite_control; + UINT8 *m_vram_fg_draw; + UINT8 *m_vram_fg_display; + INT32 m_xscroll0; + INT32 m_yscroll0; + INT32 m_xscroll1; + INT32 m_yscroll1; + UINT8 m_screen_control; + UINT16 m_sprite_source_offs; + UINT8 *m_sprite_dest_base; + UINT16 m_sprite_dest_offs; + UINT16 m_misc_control; + int m_xcount; }; diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index 89b324724f1..7f00dcd4ac2 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -6,38 +6,55 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * mcu_sharedram; - UINT8 * videoram; - UINT8 * objectram; + UINT8 * m_mcu_sharedram; + UINT8 * m_videoram; + UINT8 * m_objectram; // UINT8 * paletteram; // currently this uses generic palette handling - size_t videoram_size; - size_t objectram_size; + size_t m_videoram_size; + size_t m_objectram_size; /* video-related */ - int video_enable; + int m_video_enable; /* sound-related */ - int sound_nmi_enable, pending_nmi, sound_status; + int m_sound_nmi_enable; + int m_pending_nmi; + int m_sound_status; /* mcu-related */ /* Tokio*/ - int tokio_prot_count; + int m_tokio_prot_count; /* Bubble Bobble MCU */ - UINT8 ddr1, ddr2, ddr3, ddr4; - UINT8 port1_in, port2_in, port3_in, port4_in; - UINT8 port1_out, port2_out, port3_out, port4_out; + UINT8 m_ddr1; + UINT8 m_ddr2; + UINT8 m_ddr3; + UINT8 m_ddr4; + UINT8 m_port1_in; + UINT8 m_port2_in; + UINT8 m_port3_in; + UINT8 m_port4_in; + UINT8 m_port1_out; + UINT8 m_port2_out; + UINT8 m_port3_out; + UINT8 m_port4_out; /* Bubble Bobble 68705 */ - UINT8 port_a_in, port_a_out, ddr_a; - UINT8 port_b_in, port_b_out, ddr_b; - int address, latch; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_b_in; + UINT8 m_port_b_out; + UINT8 m_ddr_b; + int m_address; + int m_latch; /* Bobble Bobble */ - int ic43_a, ic43_b; + int m_ic43_a; + int m_ic43_b; /* devices */ - device_t *maincpu; - device_t *mcu; - device_t *audiocpu; - device_t *slave; + device_t *m_maincpu; + device_t *m_mcu; + device_t *m_audiocpu; + device_t *m_slave; }; diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index adef26d4310..8b0e2c18b1a 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -9,25 +9,31 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * scrollv; - UINT8 * scrollh; - UINT8 * charram; - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_scrollv; + UINT8 * m_scrollh; + UINT8 * m_charram; + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - bitmap_t *tmp_bitmap1, *tmp_bitmap2; - tilemap_t *bg_tilemap; - int sl_bank, bg_on, sky_on, sprite_color_base, bg_scrollx; - UINT8 sprite_lookup[0x2000]; + bitmap_t *m_tmp_bitmap1; + bitmap_t *m_tmp_bitmap2; + tilemap_t *m_bg_tilemap; + int m_sl_bank; + int m_bg_on; + int m_sky_on; + int m_sprite_color_base; + int m_bg_scrollx; + UINT8 m_sprite_lookup[0x2000]; /* sound-related */ - int sound_nmi_enable, pending_nmi; + int m_sound_nmi_enable; + int m_pending_nmi; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index e80b3b3c72d..927faaac3fa 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -14,32 +14,44 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * paletteram; - UINT8 * bwp1_sharedram1; - UINT8 * bwp2_sharedram1; - UINT8 * bwp3_rombase; - size_t bwp3_romsize; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_paletteram; + UINT8 * m_bwp1_sharedram1; + UINT8 * m_bwp2_sharedram1; + UINT8 * m_bwp3_rombase; + size_t m_bwp3_romsize; /* video-related */ - tilemap_t *charmap, *fgmap, *bgmap; - UINT8 *srbase[4], *fgdata, *bgdata; - int *srxlat; - unsigned sreg[8], palatch, srbank, mapmask, mapflip; + tilemap_t *m_charmap; + tilemap_t *m_fgmap; + tilemap_t *m_bgmap; + UINT8 *m_srbase[4]; + UINT8 *m_fgdata; + UINT8 *m_bgdata; + int *m_srxlat; + unsigned m_sreg[8]; + unsigned m_palatch; + unsigned m_srbank; + unsigned m_mapmask; + unsigned m_mapflip; /* sound-related */ - UINT8 sound_fifo[MAX_SOUNDS]; - int bwp3_nmimask, bwp3_u8F_d, ffcount, ffhead, fftail; + UINT8 m_sound_fifo[MAX_SOUNDS]; + int m_bwp3_nmimask; + int m_bwp3_u8F_d; + int m_ffcount; + int m_ffhead; + int m_fftail; /* misc */ - UINT8 *bwp123_membase[3]; - int coin; + UINT8 *m_bwp123_membase[3]; + int m_coin; /* device */ - device_t *maincpu; - device_t *subcpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_subcpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h index 44645e64219..7d06911a4e5 100644 --- a/src/mame/includes/bzone.h +++ b/src/mame/includes/bzone.h @@ -15,8 +15,8 @@ public: bzone_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 analog_data; - UINT8 rb_input_select; + UINT8 m_analog_data; + UINT8 m_rb_input_select; }; diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index d5b9b47e263..76015c97a88 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -4,15 +4,15 @@ public: cabal_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *spriteram; - UINT16 *colorram; - UINT16 *videoram; - size_t spriteram_size; - tilemap_t *background_layer; - tilemap_t *text_layer; - int sound_command1; - int sound_command2; - int last[4]; + UINT16 *m_spriteram; + UINT16 *m_colorram; + UINT16 *m_videoram; + size_t m_spriteram_size; + tilemap_t *m_background_layer; + tilemap_t *m_text_layer; + int m_sound_command1; + int m_sound_command2; + int m_last[4]; }; diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index 6196ff95f39..780330a0a02 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -4,13 +4,13 @@ public: calomega_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 tx_line; - UINT8 rx_line; - int s903_mux_data; - int s905_mux_data; - UINT8 *videoram; - UINT8 *colorram; - tilemap_t *bg_tilemap; + UINT8 m_tx_line; + UINT8 m_rx_line; + int m_s903_mux_data; + int m_s905_mux_data; + UINT8 *m_videoram; + UINT8 *m_colorram; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 1c38ba15065..8aa5e832bc1 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -24,10 +24,10 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; + UINT8 * m_videoram; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 1a91d679438..faa10baf663 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -15,17 +15,17 @@ public: void init_nvram(nvram_device &nvram, void *base, size_t size); /* memory pointers */ - UINT8 * rowaddress; + UINT8 * m_rowaddress; /* video-related */ - offs_t blitter_addr; + offs_t m_blitter_addr; /* input-related */ - UINT8 last_trackball_val[2]; + UINT8 m_last_trackball_val[2]; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; /*----------- defined in video/capbowl.c -----------*/ diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index 661ae70cbda..8a5d816e644 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -11,14 +11,14 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *cj_tilemap; - UINT8 flipscreen; - UINT16 bgcolor; + tilemap_t *m_cj_tilemap; + UINT8 m_flipscreen; + UINT16 m_bgcolor; }; diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index 58fb78ccbff..0b62973d55f 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -14,36 +14,36 @@ public: carpolo_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *alpharam; - UINT8 *spriteram; - UINT8 ball_screen_collision_cause; - UINT8 car_ball_collision_x; - UINT8 car_ball_collision_y; - UINT8 car_car_collision_cause; - UINT8 car_goal_collision_cause; - UINT8 car_ball_collision_cause; - UINT8 car_border_collision_cause; - UINT8 priority_0_extension; - UINT8 last_wheel_value[4]; - device_t *ttl74148_3s; - device_t *ttl74153_1k; - device_t *ttl7474_2s_1; - device_t *ttl7474_2s_2; - device_t *ttl7474_2u_1; - device_t *ttl7474_2u_2; - device_t *ttl7474_1f_1; - device_t *ttl7474_1f_2; - device_t *ttl7474_1d_1; - device_t *ttl7474_1d_2; - device_t *ttl7474_1c_1; - device_t *ttl7474_1c_2; - device_t *ttl7474_1a_1; - device_t *ttl7474_1a_2; - bitmap_t *sprite_sprite_collision_bitmap1; - bitmap_t *sprite_sprite_collision_bitmap2; - bitmap_t *sprite_goal_collision_bitmap1; - bitmap_t *sprite_goal_collision_bitmap2; - bitmap_t *sprite_border_collision_bitmap; + UINT8 *m_alpharam; + UINT8 *m_spriteram; + UINT8 m_ball_screen_collision_cause; + UINT8 m_car_ball_collision_x; + UINT8 m_car_ball_collision_y; + UINT8 m_car_car_collision_cause; + UINT8 m_car_goal_collision_cause; + UINT8 m_car_ball_collision_cause; + UINT8 m_car_border_collision_cause; + UINT8 m_priority_0_extension; + UINT8 m_last_wheel_value[4]; + device_t *m_ttl74148_3s; + device_t *m_ttl74153_1k; + device_t *m_ttl7474_2s_1; + device_t *m_ttl7474_2s_2; + device_t *m_ttl7474_2u_1; + device_t *m_ttl7474_2u_2; + device_t *m_ttl7474_1f_1; + device_t *m_ttl7474_1f_2; + device_t *m_ttl7474_1d_1; + device_t *m_ttl7474_1d_2; + device_t *m_ttl7474_1c_1; + device_t *m_ttl7474_1c_2; + device_t *m_ttl7474_1a_1; + device_t *m_ttl7474_1a_2; + bitmap_t *m_sprite_sprite_collision_bitmap1; + bitmap_t *m_sprite_sprite_collision_bitmap2; + bitmap_t *m_sprite_goal_collision_bitmap1; + bitmap_t *m_sprite_goal_collision_bitmap2; + bitmap_t *m_sprite_border_collision_bitmap; }; diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index e430c3e32d5..142cfd7903d 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -25,27 +25,27 @@ class cave_state : public driver_device { public: cave_state(running_machine &machine, const driver_device_config_base &config) - : driver_device(machine, config), int_timer(*this, "int_timer") { } + : driver_device(machine, config), m_int_timer(*this, "int_timer") { } /* memory pointers */ - UINT16 * videoregs; - UINT16 * vram_0; - UINT16 * vram_1; - UINT16 * vram_2; - UINT16 * vram_3; - UINT16 * vctrl_0; - UINT16 * vctrl_1; - UINT16 * vctrl_2; - UINT16 * vctrl_3; - UINT16 * spriteram; - UINT16 * spriteram_2; - UINT16 * paletteram; - size_t spriteram_size; - size_t paletteram_size; + UINT16 * m_videoregs; + UINT16 * m_vram_0; + UINT16 * m_vram_1; + UINT16 * m_vram_2; + UINT16 * m_vram_3; + UINT16 * m_vctrl_0; + UINT16 * m_vctrl_1; + UINT16 * m_vctrl_2; + UINT16 * m_vctrl_3; + UINT16 * m_spriteram; + UINT16 * m_spriteram_2; + UINT16 * m_paletteram; + size_t m_spriteram_size; + size_t m_paletteram_size; /* video-related */ - struct sprite_cave *sprite; - struct sprite_cave *sprite_table[MAX_PRIORITY][MAX_SPRITE_NUM + 1]; + struct sprite_cave *m_sprite; + struct sprite_cave *m_sprite_table[MAX_PRIORITY][MAX_SPRITE_NUM + 1]; struct { @@ -54,67 +54,76 @@ public: int line_offset; UINT8 *baseaddr_zbuf; int line_offset_zbuf; - } blit; + } m_blit; - void (*get_sprite_info)(running_machine &machine); - void (*sprite_draw)(running_machine &machine, int priority); + void (*m_get_sprite_info)(running_machine &machine); + void (*m_sprite_draw)(running_machine &machine, int priority); - tilemap_t *tilemap_0, *tilemap_1, *tilemap_2, *tilemap_3; - int tiledim_0, old_tiledim_0; - int tiledim_1, old_tiledim_1; - int tiledim_2, old_tiledim_2; - int tiledim_3, old_tiledim_3; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; + tilemap_t *m_tilemap_2; + tilemap_t *m_tilemap_3; + int m_tiledim_0; + int m_old_tiledim_0; + int m_tiledim_1; + int m_old_tiledim_1; + int m_tiledim_2; + int m_old_tiledim_2; + int m_tiledim_3; + int m_old_tiledim_3; - bitmap_t *sprite_zbuf; - UINT16 sprite_zbuf_baseval; + bitmap_t *m_sprite_zbuf; + UINT16 m_sprite_zbuf_baseval; - int num_sprites; + int m_num_sprites; - int spriteram_bank; - int spriteram_bank_delay; + int m_spriteram_bank; + int m_spriteram_bank_delay; - UINT16 *palette_map; + UINT16 *m_palette_map; - int layers_offs_x, layers_offs_y; - int row_effect_offs_n; - int row_effect_offs_f; - int background_color; + int m_layers_offs_x; + int m_layers_offs_y; + int m_row_effect_offs_n; + int m_row_effect_offs_f; + int m_background_color; - int spritetype[2]; - int kludge; + int m_spritetype[2]; + int m_kludge; /* misc */ - int time_vblank_irq; - UINT8 irq_level; - UINT8 vblank_irq; - UINT8 sound_irq; - UINT8 unknown_irq; - UINT8 agallet_vblank_irq; + int m_time_vblank_irq; + UINT8 m_irq_level; + UINT8 m_vblank_irq; + UINT8 m_sound_irq; + UINT8 m_unknown_irq; + UINT8 m_agallet_vblank_irq; /* sound related */ - int soundbuf_len; - UINT8 soundbuf_data[32]; - //UINT8 sound_flag1, sound_flag2; + int m_soundbuf_len; + UINT8 m_soundbuf_data[32]; + //UINT8 m_sound_flag1; + //UINT8 m_sound_flag2; /* eeprom-related */ - int region_byte; + int m_region_byte; /* game specific */ // sailormn - int sailormn_tilebank; - UINT8 *mirror_ram; + int m_sailormn_tilebank; + UINT8 *m_mirror_ram; // korokoro - UINT16 leds[2]; - int hopper; + UINT16 m_leds[2]; + int m_hopper; /* devices */ - device_t *maincpu; - device_t *audiocpu; - required_device<timer_device> int_timer; - int rasflag; - int old_rasflag; + device_t *m_maincpu; + device_t *m_audiocpu; + required_device<timer_device> m_int_timer; + int m_rasflag; + int m_old_rasflag; }; /*----------- defined in video/cave.c -----------*/ diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index a717f2679c4..b5384938ec1 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -11,20 +11,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT8 * m_spriteram; +// UINT8 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - UINT8 *textram, *scrollram; - UINT8 scroll_x[2], scroll_y[2]; - int tilebank, spritebank; - int text_on, bg_on, obj_on; - int flipscreen; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + UINT8 *m_textram; + UINT8 *m_scrollram; + UINT8 m_scroll_x[2]; + UINT8 m_scroll_y[2]; + int m_tilebank; + int m_spritebank; + int m_text_on; + int m_bg_on; + int m_obj_on; + int m_flipscreen; /* misc */ - UINT8 rambank; + UINT8 m_rambank; }; /*----------- defined in video/cbasebal.c -----------*/ diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index 8ad5239af90..616feabcc1e 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -11,23 +11,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT16 * pf3_rowscroll; - UINT16 * pf4_rowscroll; - UINT16 * ram; - UINT16 * spriteram16; - UINT16 spriteram16_buffer[0x400]; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT16 * m_pf3_rowscroll; + UINT16 * m_pf4_rowscroll; + UINT16 * m_ram; + UINT16 * m_spriteram16; + UINT16 m_spriteram16_buffer[0x400]; /* misc */ - UINT16 prot; - int pri; + UINT16 m_prot; + int m_pri; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *deco_tilegen1; - device_t *deco_tilegen2; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_deco_tilegen1; + device_t *m_deco_tilegen2; }; diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 7c5793ad5a9..56bc7273a0c 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -12,36 +12,38 @@ class ccastles_state : public driver_device public: ccastles_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - nvram_4b(*this, "nvram_4b"), - nvram_4a(*this, "nvram_4a") { } + m_maincpu(*this, "maincpu"), + m_nvram_4b(*this, "nvram_4b"), + m_nvram_4a(*this, "nvram_4a") { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; + UINT8 * m_videoram; + UINT8 * m_spriteram; /* video-related */ - const UINT8 *syncprom; - const UINT8 *wpprom; - const UINT8 *priprom; - bitmap_t *spritebitmap; - double rweights[3], gweights[3], bweights[3]; - UINT8 video_control[8]; - UINT8 bitmode_addr[2]; - UINT8 hscroll; - UINT8 vscroll; + const UINT8 *m_syncprom; + const UINT8 *m_wpprom; + const UINT8 *m_priprom; + bitmap_t *m_spritebitmap; + double m_rweights[3]; + double m_gweights[3]; + double m_bweights[3]; + UINT8 m_video_control[8]; + UINT8 m_bitmode_addr[2]; + UINT8 m_hscroll; + UINT8 m_vscroll; /* misc */ - int vblank_start; - int vblank_end; - emu_timer *irq_timer; - UINT8 irq_state; - UINT8 nvram_store[2]; + int m_vblank_start; + int m_vblank_end; + emu_timer *m_irq_timer; + UINT8 m_irq_state; + UINT8 m_nvram_store[2]; /* devices */ - required_device<m6502_device> maincpu; - required_device<x2212_device> nvram_4b; - required_device<x2212_device> nvram_4a; + required_device<m6502_device> m_maincpu; + required_device<x2212_device> m_nvram_4b; + required_device<x2212_device> m_nvram_4a; }; diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h index da96e59fc56..95419370336 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -12,14 +12,14 @@ public: cchasm_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int sound_flags; - int coin_flag; - device_t *ctc; - int channel_active[2]; - int output[2]; - UINT16 *ram; - int xcenter; - int ycenter; + int m_sound_flags; + int m_coin_flag; + device_t *m_ctc; + int m_channel_active[2]; + int m_output[2]; + UINT16 *m_ram; + int m_xcenter; + int m_ycenter; }; diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index 1af11d24498..71bc8d4790c 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -4,24 +4,24 @@ public: cclimber_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *colorram; - UINT8 *spriteram; - UINT8 *bigsprite_videoram; - UINT8 *bigsprite_control; - UINT8 *column_scroll; - UINT8 *flip_screen; - UINT8 *swimmer_background_color; - UINT8 *swimmer_side_background_enabled; - UINT8 *swimmer_palettebank; - UINT8 *toprollr_bg_videoram; - UINT8 *toprollr_bg_coloram; - UINT8 yamato_p0; - UINT8 yamato_p1; - UINT8 toprollr_rombank; - tilemap_t *pf_tilemap; - tilemap_t *bs_tilemap; - tilemap_t *toproller_bg_tilemap; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_spriteram; + UINT8 *m_bigsprite_videoram; + UINT8 *m_bigsprite_control; + UINT8 *m_column_scroll; + UINT8 *m_flip_screen; + UINT8 *m_swimmer_background_color; + UINT8 *m_swimmer_side_background_enabled; + UINT8 *m_swimmer_palettebank; + UINT8 *m_toprollr_bg_videoram; + UINT8 *m_toprollr_bg_coloram; + UINT8 m_yamato_p0; + UINT8 m_yamato_p1; + UINT8 m_toprollr_rombank; + tilemap_t *m_pf_tilemap; + tilemap_t *m_bs_tilemap; + tilemap_t *m_toproller_bg_tilemap; }; diff --git a/src/mame/includes/cd32.h b/src/mame/includes/cd32.h index 59d6a7a9381..b7209cb7ae3 100644 --- a/src/mame/includes/cd32.h +++ b/src/mame/includes/cd32.h @@ -15,10 +15,10 @@ public: cd32_state(running_machine &machine, const driver_device_config_base &config) : amiga_state(machine, config) { } - UINT16 potgo_value; - int cd32_shifter[2]; - void (*input_hack)(running_machine &machine); - int oldstate[2]; + UINT16 m_potgo_value; + int m_cd32_shifter[2]; + void (*m_input_hack)(running_machine &machine); + int m_oldstate[2]; }; /*----------- defined in machine/cd32.c -----------*/ diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h index ecb2856d495..9572918a759 100644 --- a/src/mame/includes/cdi.h +++ b/src/mame/includes/cdi.h @@ -18,17 +18,17 @@ public: cdi_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *planea; - UINT16 *planeb; + UINT16 *m_planea; + UINT16 *m_planeb; - dmadac_sound_device *dmadac[2]; + dmadac_sound_device *m_dmadac[2]; - UINT8 timer_set; - emu_timer *test_timer; - bitmap_t* lcdbitmap; - scc68070_regs_t scc68070_regs; - mcd212_regs_t mcd212_regs; - mcd212_ab_t mcd212_ab; + UINT8 m_timer_set; + emu_timer *m_test_timer; + bitmap_t* m_lcdbitmap; + scc68070_regs_t m_scc68070_regs; + mcd212_regs_t m_mcd212_regs; + mcd212_ab_t m_mcd212_ab; }; /*----------- debug defines -----------*/ diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 1fdab1c2639..caf381dccd6 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -10,18 +10,18 @@ public: centiped_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 oldpos[4]; - UINT8 sign[4]; - UINT8 dsw_select; - UINT8 control_select; - UINT8 *rambase; - UINT8 flipscreen; - UINT8 *bullsdrt_tiles_bankram; - tilemap_t *bg_tilemap; - UINT8 bullsdrt_sprites_bank; - UINT8 penmask[64]; - UINT8 *spriteram; + UINT8 *m_videoram; + UINT8 m_oldpos[4]; + UINT8 m_sign[4]; + UINT8 m_dsw_select; + UINT8 m_control_select; + UINT8 *m_rambase; + UINT8 m_flipscreen; + UINT8 *m_bullsdrt_tiles_bankram; + tilemap_t *m_bg_tilemap; + UINT8 m_bullsdrt_sprites_bank; + UINT8 m_penmask[64]; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index cd691011a2a..60e154af438 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -10,23 +10,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * mcu_ram; - UINT8 * tx_ram; - UINT8 * spr_ram; - UINT8 * attr_ram; - size_t spr_ram_size; + UINT8 * m_mcu_ram; + UINT8 * m_tx_ram; + UINT8 * m_spr_ram; + UINT8 * m_attr_ram; + size_t m_spr_ram_size; /* mcu-related */ - UINT8 mcu_seed; - UINT8 mcu_select; - UINT8 mcu_result; + UINT8 m_mcu_seed; + UINT8 m_mcu_select; + UINT8 m_mcu_result; /* video-related */ - tilemap_t *tx_tilemap; - UINT8 *vram1, *vram2, *vram3, *vram4; - UINT8 gfxmode; - UINT8 flip_x, flip_y; + tilemap_t *m_tx_tilemap; + UINT8 *m_vram1; + UINT8 *m_vram2; + UINT8 *m_vram3; + UINT8 *m_vram4; + UINT8 m_gfxmode; + UINT8 m_flip_x; + UINT8 m_flip_y; }; diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index cf94641642d..52cb971e20e 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -15,23 +15,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bg_videoram; - UINT8 * spriteram; - UINT8 * spriteram_2; - size_t spriteram_size; + UINT8 * m_bg_videoram; + UINT8 * m_spriteram; + UINT8 * m_spriteram_2; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - UINT8 gfx_bank; - UINT8 palette_bank; + tilemap_t *m_bg_tilemap; + UINT8 m_gfx_bank; + UINT8 m_palette_bank; /* misc */ - int watchdog_count; + int m_watchdog_count; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *mcu; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_mcu; }; diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index d33050c7639..44ba0d2f537 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -7,46 +7,54 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; /* video-related */ - bitmap_t *obj0_bitmap, *river_bitmap, *tree0_bitmap, *tree1_bitmap; - UINT8* tree_ram; - UINT8* memory_devices; - UINT32 mem_dev_selected; /* an offset within memory_devices area */ - UINT32 slopeROM_bank; - UINT8 tree_en; - UINT8 horizon; - UINT8 v_count_river; - UINT8 v_count_tree; - int tree_on[2]; - emu_timer* scanline_timer; + bitmap_t *m_obj0_bitmap; + bitmap_t *m_river_bitmap; + bitmap_t *m_tree0_bitmap; + bitmap_t *m_tree1_bitmap; + UINT8* m_tree_ram; + UINT8* m_memory_devices; + UINT32 m_mem_dev_selected; /* an offset within memory_devices area */ + UINT32 m_slopeROM_bank; + UINT8 m_tree_en; + UINT8 m_horizon; + UINT8 m_v_count_river; + UINT8 m_v_count_tree; + int m_tree_on[2]; + emu_timer* m_scanline_timer; /* misc */ - UINT8 tree0_col; - UINT8 tree1_col; - UINT8 left_bank_col; - UINT8 right_bank_col; - UINT8 boat_shore_col; - UINT8 collision_reset; - UINT8 tree_collision_reset; - UINT8 prev_value_31; - int dir_31; + UINT8 m_tree0_col; + UINT8 m_tree1_col; + UINT8 m_left_bank_col; + UINT8 m_right_bank_col; + UINT8 m_boat_shore_col; + UINT8 m_collision_reset; + UINT8 m_tree_collision_reset; + UINT8 m_prev_value_31; + int m_dir_31; /* mcu-related */ - UINT8 port_a_in, port_a_out, ddr_a; - UINT8 port_b_out, ddr_b; - UINT8 port_c_in, port_c_out, ddr_c; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_b_out; + UINT8 m_ddr_b; + UINT8 m_port_c_in; + UINT8 m_port_c_out; + UINT8 m_ddr_c; - UINT8 mcu_out; - UINT8 mcu_in; - UINT8 mcu_pc_1; - UINT8 mcu_pc_0; + UINT8 m_mcu_out; + UINT8 m_mcu_in; + UINT8 m_mcu_pc_1; + UINT8 m_mcu_pc_0; /* devices */ - device_t *mcu; + device_t *m_mcu; }; /*----------- defined in video/changela.c -----------*/ diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index bacbf946e63..8a8cb0e585e 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -12,17 +12,17 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * port_80; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_port_80; /* video-related */ - tilemap_t *cm_tilemap; - bitmap_t *bitmap_buffer; + tilemap_t *m_cm_tilemap; + bitmap_t *m_bitmap_buffer; /* devices */ - device_t *maincpu; - device_t *dac; + device_t *m_maincpu; + device_t *m_dac; }; diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index d56b77d01a1..7598629f372 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -11,26 +11,28 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int zoom_colorbase[2], sprite_colorbase; + int m_zoom_colorbase[2]; + int m_sprite_colorbase; /* misc */ - int k051316_readroms; - int last_vreg; - int analog_ctrl; - int accel, wheel; + int m_k051316_readroms; + int m_last_vreg; + int m_analog_ctrl; + int m_accel; + int m_wheel; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k007232_1; - device_t *k007232_2; - device_t *k051960; - device_t *k051316_1; - device_t *k051316_2; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k007232_1; + device_t *m_k007232_2; + device_t *m_k051960; + device_t *m_k051316_1; + device_t *m_k051316_2; }; /*----------- defined in video/chqflag.c -----------*/ diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index a11660f1ed5..abe4889a1c2 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -11,31 +11,31 @@ public: cinemat_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 sound_control; - void (*sound_handler)(running_machine &,UINT8 sound_val, UINT8 bits_changed); - UINT32 current_shift; - UINT32 last_shift; - UINT32 last_shift2; - UINT32 current_pitch; - UINT32 last_frame; - UINT8 sound_fifo[16]; - UINT8 sound_fifo_in; - UINT8 sound_fifo_out; - UINT8 last_portb_write; - float target_volume; - float current_volume; - UINT16 *rambase; - UINT8 coin_detected; - UINT8 coin_last_reset; - UINT8 mux_select; - int gear; - int color_mode; - rgb_t vector_color; - INT16 lastx; - INT16 lasty; - UINT8 last_control; - int qb3_lastx; - int qb3_lasty; + UINT8 m_sound_control; + void (*m_sound_handler)(running_machine &,UINT8 sound_val, UINT8 bits_changed); + UINT32 m_current_shift; + UINT32 m_last_shift; + UINT32 m_last_shift2; + UINT32 m_current_pitch; + UINT32 m_last_frame; + UINT8 m_sound_fifo[16]; + UINT8 m_sound_fifo_in; + UINT8 m_sound_fifo_out; + UINT8 m_last_portb_write; + float m_target_volume; + float m_current_volume; + UINT16 *m_rambase; + UINT8 m_coin_detected; + UINT8 m_coin_last_reset; + UINT8 m_mux_select; + int m_gear; + int m_color_mode; + rgb_t m_vector_color; + INT16 m_lastx; + INT16 m_lasty; + UINT8 m_last_control; + int m_qb3_lastx; + int m_qb3_lasty; }; diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index 96703f38dc6..725968a5607 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -7,19 +7,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; + UINT8 * m_videoram; /* video-related */ - tilemap_t *bg_tilemap; - int clown_x, clown_y, clown_z; + tilemap_t *m_bg_tilemap; + int m_clown_x; + int m_clown_y; + int m_clown_z; /* devices */ - device_t *maincpu; - device_t *samples; - device_t *discrete; + device_t *m_maincpu; + device_t *m_samples; + device_t *m_discrete; /* game id */ - int game_id; + int m_game_id; }; diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index d0f242b014c..2a191c1a9a5 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -11,26 +11,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * spriteram_2; - UINT8 * spritebank; - UINT8 * scroll; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_spriteram_2; + UINT8 * m_spritebank; + UINT8 * m_scroll; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* sound-related */ - UINT8 sn_latch; + UINT8 m_sn_latch; /* devices */ - cpu_device *audiocpu; - device_t *sn1; - device_t *sn2; - device_t *dac; - device_t *discrete; + cpu_device *m_audiocpu; + device_t *m_sn1; + device_t *m_sn2; + device_t *m_dac; + device_t *m_discrete; }; diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index 1c85907d38b..645655dd182 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -4,33 +4,34 @@ public: cischeat_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *scrollram[3]; - UINT16 *objectram; - UINT16 *vregs; - UINT16 *ram; - tilemap_t *tmap[3]; - tilemap_t *tilemap[3][2][4]; - int scrollx[3], scrolly[3]; - int active_layers; - int bits_per_color_code; - int scroll_flag[3]; + UINT16 *m_scrollram[3]; + UINT16 *m_objectram; + UINT16 *m_vregs; + UINT16 *m_ram; + tilemap_t *m_tmap[3]; + tilemap_t *m_tilemap[3][2][4]; + int m_scrollx[3]; + int m_scrolly[3]; + int m_active_layers; + int m_bits_per_color_code; + int m_scroll_flag[3]; - UINT16 *rom_1; - UINT16 *rom_2; - UINT16 *rom_3; - UINT16 *sharedram1; - UINT16 *sharedram2; - int prev; - int armold; - UINT16 scudhamm_motor_command; - UINT16 *roadram[2]; - UINT16 *f1gpstr2_ioready; - int ip_select; - int shift_ret; - UINT8 drawmode_table[16]; - int debugsprites; - int show_unknown; - UINT16 *spriteram; + UINT16 *m_rom_1; + UINT16 *m_rom_2; + UINT16 *m_rom_3; + UINT16 *m_sharedram1; + UINT16 *m_sharedram2; + int m_prev; + int m_armold; + UINT16 m_scudhamm_motor_command; + UINT16 *m_roadram[2]; + UINT16 *m_f1gpstr2_ioready; + int m_ip_select; + int m_shift_ret; + UINT8 m_drawmode_table[16]; + int m_debugsprites; + int m_show_unknown; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 05bf5a04591..59d69461318 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -11,19 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * linecolor; - UINT8 * scroll; - UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_linecolor; + UINT8 * m_scroll; + UINT8 * m_spriteram; +// UINT8 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap,*fg_tilemap; - int bg_image; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_bg_image; /* devices */ - device_t *maincpu; + device_t *m_maincpu; }; diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 07ee2de2e65..2febd0851c1 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -10,18 +10,18 @@ public: cloak_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *spriteram; - int nvram_enabled; - UINT8 bitmap_videoram_selected; - UINT8 bitmap_videoram_address_x; - UINT8 bitmap_videoram_address_y; - UINT8 *bitmap_videoram1; - UINT8 *bitmap_videoram2; - UINT8 *current_bitmap_videoram_accessed; - UINT8 *current_bitmap_videoram_displayed; - UINT16 *palette_ram; - tilemap_t *bg_tilemap; + UINT8 *m_videoram; + UINT8 *m_spriteram; + int m_nvram_enabled; + UINT8 m_bitmap_videoram_selected; + UINT8 m_bitmap_videoram_address_x; + UINT8 m_bitmap_videoram_address_y; + UINT8 *m_bitmap_videoram1; + UINT8 *m_bitmap_videoram2; + UINT8 *m_current_bitmap_videoram_accessed; + UINT8 *m_current_bitmap_videoram_displayed; + UINT16 *m_palette_ram; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 575bc15314e..56fd5afd34b 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -12,32 +12,34 @@ class cloud9_state : public driver_device public: cloud9_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - nvram(*this, "nvram") { } + m_maincpu(*this, "maincpu"), + m_nvram(*this, "nvram") { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * paletteram; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_paletteram; /* video-related */ - const UINT8 *syncprom; - const UINT8 *wpprom; - const UINT8 *priprom; - bitmap_t *spritebitmap; - double rweights[3], gweights[3], bweights[3]; - UINT8 video_control[8]; - UINT8 bitmode_addr[2]; + const UINT8 *m_syncprom; + const UINT8 *m_wpprom; + const UINT8 *m_priprom; + bitmap_t *m_spritebitmap; + double m_rweights[3]; + double m_gweights[3]; + double m_bweights[3]; + UINT8 m_video_control[8]; + UINT8 m_bitmode_addr[2]; /* misc */ - int vblank_start; - int vblank_end; - emu_timer *irq_timer; - UINT8 irq_state; + int m_vblank_start; + int m_vblank_end; + emu_timer *m_irq_timer; + UINT8 m_irq_state; /* devices */ - required_device<m6502_device> maincpu; - required_device<x2212_device> nvram; + required_device<m6502_device> m_maincpu; + required_device<x2212_device> m_nvram; }; diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index 312cabaa7bf..46e604c4b2b 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -4,14 +4,14 @@ public: clshroad_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *vram_0; - UINT8 *vram_1; - UINT8 *vregs; - tilemap_t *tilemap_0a; - tilemap_t *tilemap_0b; - tilemap_t *tilemap_1; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_vram_0; + UINT8 *m_vram_1; + UINT8 *m_vregs; + tilemap_t *m_tilemap_0a; + tilemap_t *m_tilemap_0b; + tilemap_t *m_tilemap_1; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index 9461276d7db..b58e5b1423c 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -13,32 +13,33 @@ class cninja_state : public driver_device public: cninja_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - audiocpu(*this, "audiocpu"), - decocomn(*this, "deco_common"), - deco_tilegen1(*this, "tilegen1"), - deco_tilegen2(*this, "tilegen2"), - raster_irq_timer(*this, "raster_timer"), - oki2(*this, "oki2") { } + m_maincpu(*this, "maincpu"), + m_audiocpu(*this, "audiocpu"), + m_decocomn(*this, "deco_common"), + m_deco_tilegen1(*this, "tilegen1"), + m_deco_tilegen2(*this, "tilegen2"), + m_raster_irq_timer(*this, "raster_timer"), + m_oki2(*this, "oki2") { } /* memory pointers */ - UINT16 * ram; - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT16 * pf3_rowscroll; - UINT16 * pf4_rowscroll; + UINT16 * m_ram; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT16 * m_pf3_rowscroll; + UINT16 * m_pf4_rowscroll; /* misc */ - int scanline, irq_mask; + int m_scanline; + int m_irq_mask; /* devices */ - required_device<cpu_device> maincpu; - required_device<cpu_device> audiocpu; - required_device<decocomn_device> decocomn; - required_device<deco16ic_device> deco_tilegen1; - required_device<deco16ic_device> deco_tilegen2; - optional_device<timer_device> raster_irq_timer; - optional_device<okim6295_device> oki2; + required_device<cpu_device> m_maincpu; + required_device<cpu_device> m_audiocpu; + required_device<decocomn_device> m_decocomn; + required_device<deco16ic_device> m_deco_tilegen1; + required_device<deco16ic_device> m_deco_tilegen2; + optional_device<timer_device> m_raster_irq_timer; + optional_device<okim6295_device> m_oki2; }; /*----------- defined in video/cninja.c -----------*/ diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index e394276885a..79149298259 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -11,34 +11,36 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * scrollram; - UINT8 * io_ram; - UINT8 * paletteram; - UINT8 * spriteram[2]; + UINT8 * m_videoram; + UINT8 * m_scrollram; + UINT8 * m_io_ram; + UINT8 * m_paletteram; + UINT8 * m_spriteram[2]; /* video-related */ - tilemap_t *bg_tilemap[2], *textlayer; - UINT8 scrollram0[0x40]; - UINT8 scrollram1[0x40]; - int priority; + tilemap_t *m_bg_tilemap[2]; + tilemap_t *m_textlayer; + UINT8 m_scrollram0[0x40]; + UINT8 m_scrollram1[0x40]; + int m_priority; - int vreg; - int bank_select; /* 0x00..0x1f */ - int video_circuit; /* 0 or 1 */ - UINT8 *page[2]; + int m_vreg; + int m_bank_select; /* 0x00..0x1f */ + int m_video_circuit; /* 0 or 1 */ + UINT8 *m_page[2]; /* misc */ - UINT8 pos[4],sign[4]; - int prot[2]; - int boost; - emu_timer *interleave_timer; + UINT8 m_pos[4]; + UINT8 m_sign[4]; + int m_prot[2]; + int m_boost; + emu_timer *m_interleave_timer; /* devices */ - cpu_device *audiocpu; - device_t *k007121_1; - device_t *k007121_2; + cpu_device *m_audiocpu; + device_t *m_k007121_1; + device_t *m_k007121_2; }; diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index d838090fdd3..ce48a8bc629 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -11,19 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * videoram2; - UINT8 * colorram2; -// UINT8 * spriteram; // currently this uses generic buffered_spriteram + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_videoram2; + UINT8 * m_colorram2; +// UINT8 * m_spriteram; // currently this uses generic buffered_spriteram /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - UINT8 scroll_x[2]; - UINT8 scroll_y[2]; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 m_scroll_x[2]; + UINT8 m_scroll_y[2]; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 159612cd721..9df1cfdbda7 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -11,17 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * bg_ram; - UINT8 * spriteram; + UINT8 * m_videoram; + UINT8 * m_bg_ram; + UINT8 * m_spriteram; /* video-related */ - tilemap_t *text_tilemap, *bg_tilemap; - int scrollx_lo, scrollx_hi; - int scrolly_lo, scrolly_hi; + tilemap_t *m_text_tilemap; + tilemap_t *m_bg_tilemap; + int m_scrollx_lo; + int m_scrollx_hi; + int m_scrolly_lo; + int m_scrolly_hi; /* misc */ - int bank; + int m_bank; }; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index c4b9016d43a..f8dbb01b603 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -11,26 +11,30 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * spriteram; - UINT8 * buffered_spriteram; - UINT8 * buffered_spriteram_2; - UINT8 * paletteram; - UINT8 * bg_vram; - UINT8 * bg_cram; - UINT8 * fg_vram; - UINT8 * fg_cram; - UINT8 * tx_vram; - UINT8 * tx_cram; + UINT8 * m_spriteram; + UINT8 * m_buffered_spriteram; + UINT8 * m_buffered_spriteram_2; + UINT8 * m_paletteram; + UINT8 * m_bg_vram; + UINT8 * m_bg_cram; + UINT8 * m_fg_vram; + UINT8 * m_fg_cram; + UINT8 * m_tx_vram; + UINT8 * m_tx_cram; // this driver also uses a large generic spriteram region... /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; - rectangle bg_clip, fg_clip, tx_clip; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_tx_tilemap; + rectangle m_bg_clip; + rectangle m_fg_clip; + rectangle m_tx_clip; /* devices */ - device_t *audiocpu; - device_t *k007121_1; - device_t *k007121_2; + device_t *m_audiocpu; + device_t *m_k007121_1; + device_t *m_k007121_2; }; diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h index 50925c4348d..116fff0d61d 100644 --- a/src/mame/includes/coolpool.h +++ b/src/mame/includes/coolpool.h @@ -7,28 +7,28 @@ public: : driver_device(machine, config), m_nvram(*this, "nvram") { } - UINT16 *vram_base; + UINT16 *m_vram_base; required_shared_ptr<UINT16> m_nvram; - UINT8 cmd_pending; - UINT16 iop_cmd; - UINT16 iop_answer; - int iop_romaddr; + UINT8 m_cmd_pending; + UINT16 m_iop_cmd; + UINT16 m_iop_answer; + int m_iop_romaddr; - UINT8 newx[3]; - UINT8 newy[3]; - UINT8 oldx[3]; - UINT8 oldy[3]; - int dx[3]; - int dy[3]; + UINT8 m_newx[3]; + UINT8 m_newy[3]; + UINT8 m_oldx[3]; + UINT8 m_oldy[3]; + int m_dx[3]; + int m_dy[3]; - UINT16 result; - UINT16 lastresult; + UINT16 m_result; + UINT16 m_lastresult; - device_t *maincpu; - device_t *dsp; - UINT16 nvram_write_seq[NVRAM_UNLOCK_SEQ_LEN]; - UINT8 nvram_write_enable; - UINT8 old_cmd; - UINT8 same_cmd_count; + device_t *m_maincpu; + device_t *m_dsp; + UINT16 m_nvram_write_seq[NVRAM_UNLOCK_SEQ_LEN]; + UINT8 m_nvram_write_enable; + UINT8 m_old_cmd; + UINT8 m_same_cmd_count; }; diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index c69b984dc2a..56a057f3790 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -11,21 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bgvideoram; - UINT8 * fgvideoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_bgvideoram; + UINT8 * m_fgvideoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - UINT8 vreg[4]; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 m_vreg[4]; /* sound-related */ - int pulse; - int timer; // kludge for ym3526 in mightguy + int m_pulse; + int m_timer; // kludge for ym3526 in mightguy /* devices */ - cpu_device *audiocpu; + cpu_device *m_audiocpu; }; diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index cf7f86d8a4e..e76cd39cad5 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -14,17 +14,17 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * trucky; - UINT8 * truckram; - UINT8 * bulletsram; - UINT8 * cary; - UINT8 * carimage; - size_t videoram_size; + UINT8 * m_videoram; + UINT8 * m_trucky; + UINT8 * m_truckram; + UINT8 * m_bulletsram; + UINT8 * m_cary; + UINT8 * m_carimage; + size_t m_videoram_size; /* misc */ - UINT8 misc; - UINT8 ic_h3_data; + UINT8 m_misc; + UINT8 m_ic_h3_data; }; diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index ace50638efc..379a6c7b57d 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -15,27 +15,29 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - pen_t (*map_color)(running_machine &machine, UINT8 x, UINT8 y); - int color_registers[3]; - int background_enable; - int magspot_pen_mask; + pen_t (*m_map_color)(running_machine &machine, UINT8 x, UINT8 y); + int m_color_registers[3]; + int m_background_enable; + int m_magspot_pen_mask; /* sound-related */ - int sound_enabled; - int march_select, gun_die_select, dive_bomb_b_select; + int m_sound_enabled; + int m_march_select; + int m_gun_die_select; + int m_dive_bomb_b_select; /* misc */ - UINT32 pixel_clock; + UINT32 m_pixel_clock; /* devices */ - device_t *samples; - device_t *dac; + device_t *m_samples; + device_t *m_dac; }; diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 8ba62282928..720d3f0a550 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -67,72 +67,80 @@ public: /* memory pointers */ // cps1 - UINT16 * gfxram; - UINT16 * cps_a_regs; - UINT16 * cps_b_regs; - UINT16 * scroll1; - UINT16 * scroll2; - UINT16 * scroll3; - UINT16 * obj; - UINT16 * other; - UINT16 * buffered_obj; - UINT8 * qsound_sharedram1; - UINT8 * qsound_sharedram2; - size_t gfxram_size; + UINT16 * m_gfxram; + UINT16 * m_cps_a_regs; + UINT16 * m_cps_b_regs; + UINT16 * m_scroll1; + UINT16 * m_scroll2; + UINT16 * m_scroll3; + UINT16 * m_obj; + UINT16 * m_other; + UINT16 * m_buffered_obj; + UINT8 * m_qsound_sharedram1; + UINT8 * m_qsound_sharedram2; + size_t m_gfxram_size; // cps2 - UINT16 * objram1; - UINT16 * objram2; - UINT16 * output; - UINT16 * cps2_buffered_obj; - size_t output_size; + UINT16 * m_objram1; + UINT16 * m_objram2; + UINT16 * m_output; + UINT16 * m_cps2_buffered_obj; + size_t m_output_size; // game-specific - UINT16 * gigamn2_dummyqsound_ram; + UINT16 * m_gigamn2_dummyqsound_ram; /* video-related */ - tilemap_t *bg_tilemap[3]; - int scanline1; - int scanline2; - int scancalls; - int scancount; - - int scroll1x, scroll1y; - int scroll2x, scroll2y; - int scroll3x, scroll3y; - - int stars_enabled[2]; /* Layer enabled [Y/N] */ - int stars1x, stars1y, stars2x, stars2y; - int last_sprite_offset; /* Offset of the last sprite */ - int cps2_last_sprite_offset; /* Offset of the last sprite */ - int pri_ctrl; /* Sprite layer priorities */ - int objram_bank; + tilemap_t *m_bg_tilemap[3]; + int m_scanline1; + int m_scanline2; + int m_scancalls; + int m_scancount; + + int m_scroll1x; + int m_scroll1y; + int m_scroll2x; + int m_scroll2y; + int m_scroll3x; + int m_scroll3y; + + int m_stars_enabled[2]; /* Layer enabled [Y/N] */ + int m_stars1x; + int m_stars1y; + int m_stars2x; + int m_stars2y; + int m_last_sprite_offset; /* Offset of the last sprite */ + int m_cps2_last_sprite_offset; /* Offset of the last sprite */ + int m_pri_ctrl; /* Sprite layer priorities */ + int m_objram_bank; /* misc */ - int dial[2]; // forgottn - int readpaddle; // pzloop2 - int cps2networkpresent; + int m_dial[2]; // forgottn + int m_readpaddle; // pzloop2 + int m_cps2networkpresent; /* fcrash sound hw */ - int sample_buffer1, sample_buffer2; - int sample_select1, sample_select2; + int m_sample_buffer1; + int m_sample_buffer2; + int m_sample_select1; + int m_sample_select2; /* video config (never changed after VIDEO_START) */ - const struct CPS1config *game_config; - int scroll_size; - int obj_size; - int cps2_obj_size; - int other_size; - int palette_align; - int palette_size; - int stars_rom_size; - UINT8 empty_tile8x8[8*8]; - UINT8 empty_tile[32*32/2]; - int cps_version; + const struct CPS1config *m_game_config; + int m_scroll_size; + int m_obj_size; + int m_cps2_obj_size; + int m_other_size; + int m_palette_align; + int m_palette_size; + int m_stars_rom_size; + UINT8 m_empty_tile8x8[8*8]; + UINT8 m_empty_tile[32*32/2]; + int m_cps_version; /* devices */ - device_t *maincpu; - device_t *audiocpu; - msm5205_device *msm_1; // fcrash - msm5205_device *msm_2; // fcrash + device_t *m_maincpu; + device_t *m_audiocpu; + msm5205_device *m_msm_1; // fcrash + msm5205_device *m_msm_2; // fcrash }; /*----------- defined in drivers/cps1.c -----------*/ diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index 925ff16ec77..0c9ff69fd9e 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -13,51 +13,51 @@ public: cps3_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - fujitsu_29f016a_device *simm[7][8]; - UINT32* decrypted_bios; - UINT32* decrypted_gamerom; - UINT32 cram_gfxflash_bank; - UINT32* nops; - UINT32* tilemap20_regs_base; - UINT32* tilemap30_regs_base; - UINT32* tilemap40_regs_base; - UINT32* tilemap50_regs_base; - UINT32* _0xc0000000_ram; - UINT32* _0xc0000000_ram_decrypted; - UINT32* char_ram; - UINT32* spriteram; - UINT32* eeprom; - UINT32* fullscreenzoom; - UINT32 ss_pal_base; - UINT32* colourram; - UINT32 unk_vidregs[0x20/4]; - UINT32 ss_bank_base; - UINT32 screenwidth; - UINT32* mame_colours; - bitmap_t *renderbuffer_bitmap; - rectangle renderbuffer_clip; - UINT8* user4region; - UINT32 key1; - UINT32 key2; - int altEncryption; - UINT32* ss_ram; - UINT32 cram_bank; - UINT16 current_eeprom_read; - UINT32 paldma_source; - UINT32 paldma_realsource; - UINT32 paldma_dest; - UINT32 paldma_fade; - UINT32 paldma_other2; - UINT32 paldma_length; - UINT32 chardma_source; - UINT32 chardma_other; - UINT32 current_table_address; - int rle_length; - int last_normal_byte; - unsigned short lastb; - unsigned short lastb2; - UINT32* mainram; - UINT8* user5region; + fujitsu_29f016a_device *m_simm[7][8]; + UINT32* m_decrypted_bios; + UINT32* m_decrypted_gamerom; + UINT32 m_cram_gfxflash_bank; + UINT32* m_nops; + UINT32* m_tilemap20_regs_base; + UINT32* m_tilemap30_regs_base; + UINT32* m_tilemap40_regs_base; + UINT32* m_tilemap50_regs_base; + UINT32* m_0xc0000000_ram; + UINT32* m_0xc0000000_ram_decrypted; + UINT32* m_char_ram; + UINT32* m_spriteram; + UINT32* m_eeprom; + UINT32* m_fullscreenzoom; + UINT32 m_ss_pal_base; + UINT32* m_colourram; + UINT32 m_unk_vidregs[0x20/4]; + UINT32 m_ss_bank_base; + UINT32 m_screenwidth; + UINT32* m_mame_colours; + bitmap_t *m_renderbuffer_bitmap; + rectangle m_renderbuffer_clip; + UINT8* m_user4region; + UINT32 m_key1; + UINT32 m_key2; + int m_altEncryption; + UINT32* m_ss_ram; + UINT32 m_cram_bank; + UINT16 m_current_eeprom_read; + UINT32 m_paldma_source; + UINT32 m_paldma_realsource; + UINT32 m_paldma_dest; + UINT32 m_paldma_fade; + UINT32 m_paldma_other2; + UINT32 m_paldma_length; + UINT32 m_chardma_source; + UINT32 m_chardma_other; + UINT32 m_current_table_address; + int m_rle_length; + int m_last_normal_byte; + unsigned short m_lastb; + unsigned short m_lastb2; + UINT32* m_mainram; + UINT8* m_user5region; }; diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index d5f6e325e48..c8a5e3733e3 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -14,13 +14,13 @@ public: crbaloon_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *pc3092_data; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *spriteram; - UINT16 collision_address; - UINT8 collision_address_clear; - tilemap_t *bg_tilemap; + UINT8 *m_pc3092_data; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_spriteram; + UINT16 m_collision_address; + UINT8 m_collision_address_clear; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h index eae3f887c4f..4faf328099b 100644 --- a/src/mame/includes/crgolf.h +++ b/src/mame/includes/crgolf.h @@ -14,23 +14,24 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram_a; - UINT8 * videoram_b; - UINT8 * color_select; - UINT8 * screen_flip; - UINT8 * screen_select; - UINT8 * screena_enable; - UINT8 * screenb_enable; + UINT8 * m_videoram_a; + UINT8 * m_videoram_b; + UINT8 * m_color_select; + UINT8 * m_screen_flip; + UINT8 * m_screen_select; + UINT8 * m_screena_enable; + UINT8 * m_screenb_enable; /* misc */ - UINT8 port_select; - UINT8 main_to_sound_data, sound_to_main_data; - UINT16 sample_offset; - UINT8 sample_count; + UINT8 m_port_select; + UINT8 m_main_to_sound_data; + UINT8 m_sound_to_main_data; + UINT16 m_sample_offset; + UINT8 m_sample_count; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; /*----------- defined in video/crgolf.c -----------*/ diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index f8f52f9219f..edc29e27077 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -11,17 +11,18 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; + int m_layer_colorbase[3]; + int m_sprite_colorbase; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k007232; - device_t *k052109; - device_t *k051960; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k007232; + device_t *m_k052109; + device_t *m_k051960; }; /*----------- defined in video/crimfght.c -----------*/ diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index 8ca23316c13..f93cfdcb089 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -11,19 +11,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bg_videoram; - UINT16 * fg_videoram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_bg_videoram; + UINT16 * m_fg_videoram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_layer,*fg_layer; - int xsproff, ysproff; - int bestri_tilebank; + tilemap_t *m_bg_layer; + tilemap_t *m_fg_layer; + int m_xsproff; + int m_ysproff; + int m_bestri_tilebank; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index 446d142ffad..b16665055bc 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -6,22 +6,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram1; - UINT16 * videoram2; -// UINT16 * spriteram1; // currently this uses generic buffered spriteram -// UINT16 * spriteram2; // currently this uses generic buffered spriteram -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_videoram1; + UINT16 * m_videoram2; +// UINT16 * m_spriteram1; // currently this uses generic buffered spriteram +// UINT16 * m_spriteram2; // currently this uses generic buffered spriteram +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *tilemap1, *tilemap2; - int roz_bank, gfxctrl, flipscreen; + tilemap_t *m_tilemap1; + tilemap_t *m_tilemap2; + int m_roz_bank; + int m_gfxctrl; + int m_flipscreen; /* misc */ - int pending_command; + int m_pending_command; /* devices */ - device_t *audiocpu; - device_t *k053936; + device_t *m_audiocpu; + device_t *m_k053936; }; /*----------- defined in video/crshrace.c -----------*/ diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index b8df9d9fb99..63a43c63221 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -23,46 +23,46 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * video_ram; - UINT8 * bullet_ram; - UINT8 * fo_state; - UINT8 * cvs_4_bit_dac_data; - UINT8 * tms5110_ctl_data; - UINT8 * dac3_state; + UINT8 * m_video_ram; + UINT8 * m_bullet_ram; + UINT8 * m_fo_state; + UINT8 * m_cvs_4_bit_dac_data; + UINT8 * m_tms5110_ctl_data; + UINT8 * m_dac3_state; /* video-related */ - struct cvs_star stars[CVS_MAX_STARS]; - bitmap_t *collision_background; - bitmap_t *background_bitmap; - bitmap_t *scrolled_collision_background; - int collision_register; - int total_stars; - int stars_on; - UINT8 scroll_reg; - int stars_scroll; + struct cvs_star m_stars[CVS_MAX_STARS]; + bitmap_t *m_collision_background; + bitmap_t *m_background_bitmap; + bitmap_t *m_scrolled_collision_background; + int m_collision_register; + int m_total_stars; + int m_stars_on; + UINT8 m_scroll_reg; + int m_stars_scroll; /* misc */ - emu_timer *cvs_393hz_timer; - UINT8 cvs_393hz_clock; + emu_timer *m_cvs_393hz_timer; + UINT8 m_cvs_393hz_clock; - UINT8 character_banking_mode; - UINT16 character_ram_page_start; - UINT16 speech_rom_bit_address; + UINT8 m_character_banking_mode; + UINT16 m_character_ram_page_start; + UINT16 m_speech_rom_bit_address; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *speech; - device_t *dac3; - device_t *tms; - device_t *s2636_0; - device_t *s2636_1; - device_t *s2636_2; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_speech; + device_t *m_dac3; + device_t *m_tms; + device_t *m_s2636_0; + device_t *m_s2636_1; + device_t *m_s2636_2; /* memory */ - UINT8 color_ram[0x400]; - UINT8 palette_ram[0x10]; - UINT8 character_ram[3 * 0x800]; /* only half is used, but + UINT8 m_color_ram[0x400]; + UINT8 m_palette_ram[0x10]; + UINT8 m_character_ram[3 * 0x800]; /* only half is used, but by allocating twice the amount, we can use the same gfx_layout */ }; @@ -73,9 +73,10 @@ public: quasar_state(running_machine &machine, const driver_device_config_base &config) : cvs_state(machine, config) { } - UINT8 * effectram; - UINT8 effectcontrol; - UINT8 page, io_page; + UINT8 * m_effectram; + UINT8 m_effectcontrol; + UINT8 m_page; + UINT8 m_io_page; }; diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index 8de555b67e4..81b3257d5e4 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -12,20 +12,20 @@ public: cyberbal_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 * paletteram_0; - UINT16 * paletteram_1; - UINT16 current_slip[2]; - UINT8 playfield_palette_bank[2]; - UINT16 playfield_xscroll[2]; - UINT16 playfield_yscroll[2]; - - UINT8 * bank_base; - UINT8 fast_68k_int; - UINT8 io_68k_int; - UINT8 sound_data_from_68k; - UINT8 sound_data_from_6502; - UINT8 sound_data_from_68k_ready; - UINT8 sound_data_from_6502_ready; + UINT16 * m_paletteram_0; + UINT16 * m_paletteram_1; + UINT16 m_current_slip[2]; + UINT8 m_playfield_palette_bank[2]; + UINT16 m_playfield_xscroll[2]; + UINT16 m_playfield_yscroll[2]; + + UINT8 * m_bank_base; + UINT8 m_fast_68k_int; + UINT8 m_io_68k_int; + UINT8 m_sound_data_from_68k; + UINT8 m_sound_data_from_6502; + UINT8 m_sound_data_from_68k_ready; + UINT8 m_sound_data_from_6502_ready; }; diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index 6a3410251df..6f32a882068 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -14,53 +14,53 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * spriteram; - UINT16 * fg_ram; - size_t spriteram_size; + UINT16 * m_spriteram; + UINT16 * m_fg_ram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *fg_tilemap; + tilemap_t *m_fg_tilemap; /* misc */ - UINT16 cpua_ctrl; - UINT16 coin_word; - INT32 banknum; - UINT8 adpcm_command; - UINT8 nmi_enable; - UINT32 def_vol[0x10]; - UINT8 vol[DARIUS_VOL_MAX]; - UINT8 pan[DARIUS_PAN_MAX]; + UINT16 m_cpua_ctrl; + UINT16 m_coin_word; + INT32 m_banknum; + UINT8 m_adpcm_command; + UINT8 m_nmi_enable; + UINT32 m_def_vol[0x10]; + UINT8 m_vol[DARIUS_VOL_MAX]; + UINT8 m_pan[DARIUS_PAN_MAX]; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *cpub; - device_t *adpcm; - device_t *tc0140syt; - device_t *pc080sn; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_cpub; + device_t *m_adpcm; + device_t *m_tc0140syt; + device_t *m_pc080sn; - device_t *lscreen; - device_t *mscreen; - device_t *rscreen; + device_t *m_lscreen; + device_t *m_mscreen; + device_t *m_rscreen; - device_t *filter0_0l; - device_t *filter0_0r; - device_t *filter0_1l; - device_t *filter0_1r; - device_t *filter0_2l; - device_t *filter0_2r; - device_t *filter0_3l; - device_t *filter0_3r; - device_t *filter1_0l; - device_t *filter1_0r; - device_t *filter1_1l; - device_t *filter1_1r; - device_t *filter1_2l; - device_t *filter1_2r; - device_t *filter1_3l; - device_t *filter1_3r; - device_t *msm5205_l; - device_t *msm5205_r; + device_t *m_filter0_0l; + device_t *m_filter0_0r; + device_t *m_filter0_1l; + device_t *m_filter0_1r; + device_t *m_filter0_2l; + device_t *m_filter0_2r; + device_t *m_filter0_3l; + device_t *m_filter0_3r; + device_t *m_filter1_0l; + device_t *m_filter1_0r; + device_t *m_filter1_1l; + device_t *m_filter1_1r; + device_t *m_filter1_2l; + device_t *m_filter1_2r; + device_t *m_filter1_3l; + device_t *m_filter1_3r; + device_t *m_msm5205_l; + device_t *m_msm5205_r; }; diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 18ff45d312c..409a39afdff 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -4,16 +4,16 @@ public: darkmist_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *workram; - int hw; - UINT8 *scroll; - UINT8 *spritebank; - tilemap_t *bgtilemap; - tilemap_t *fgtilemap; - tilemap_t *txtilemap; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_videoram; + UINT8 *m_workram; + int m_hw; + UINT8 *m_scroll; + UINT8 *m_spritebank; + tilemap_t *m_bgtilemap; + tilemap_t *m_fgtilemap; + tilemap_t *m_txtilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index f0d6422b373..4c402e0b8dd 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -5,19 +5,19 @@ class darkseal_state : public driver_device public: darkseal_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - deco_tilegen1(*this, "tilegen1"), - deco_tilegen2(*this, "tilegen2") { } + m_deco_tilegen1(*this, "tilegen1"), + m_deco_tilegen2(*this, "tilegen2") { } - UINT16 *ram; - UINT16 *pf1_rowscroll; - //UINT16 *pf2_rowscroll; - UINT16 *pf3_rowscroll; - //UINT16 *pf4_rowscroll; + UINT16 *m_ram; + UINT16 *m_pf1_rowscroll; + //UINT16 *m_pf2_rowscroll; + UINT16 *m_pf3_rowscroll; + //UINT16 *m_pf4_rowscroll; - required_device<deco16ic_device> deco_tilegen1; - required_device<deco16ic_device> deco_tilegen2; + required_device<deco16ic_device> m_deco_tilegen1; + required_device<deco16ic_device> m_deco_tilegen2; - int flipscreen; + int m_flipscreen; }; diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h index 943bc1314bc..bcaf7bdf8b7 100644 --- a/src/mame/includes/dassault.h +++ b/src/mame/includes/dassault.h @@ -13,29 +13,29 @@ class dassault_state : public driver_device public: dassault_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - audiocpu(*this, "audiocpu"), - subcpu(*this, "sub"), - decocomn(*this, "deco_common"), - deco_tilegen1(*this, "tilegen1"), - deco_tilegen2(*this, "tilegen2"), - oki2(*this, "oki2") { } + m_maincpu(*this, "maincpu"), + m_audiocpu(*this, "audiocpu"), + m_subcpu(*this, "sub"), + m_decocomn(*this, "deco_common"), + m_deco_tilegen1(*this, "tilegen1"), + m_deco_tilegen2(*this, "tilegen2"), + m_oki2(*this, "oki2") { } /* memory pointers */ - UINT16 * pf2_rowscroll; - UINT16 * pf4_rowscroll; - UINT16 * ram; - UINT16 * ram2; - UINT16 * shared_ram; + UINT16 * m_pf2_rowscroll; + UINT16 * m_pf4_rowscroll; + UINT16 * m_ram; + UINT16 * m_ram2; + UINT16 * m_shared_ram; /* devices */ - required_device<cpu_device> maincpu; - required_device<cpu_device> audiocpu; - required_device<cpu_device> subcpu; - required_device<decocomn_device> decocomn; - required_device<deco16ic_device> deco_tilegen1; - required_device<deco16ic_device> deco_tilegen2; - required_device<okim6295_device> oki2; + required_device<cpu_device> m_maincpu; + required_device<cpu_device> m_audiocpu; + required_device<cpu_device> m_subcpu; + required_device<decocomn_device> m_decocomn; + required_device<deco16ic_device> m_deco_tilegen1; + required_device<deco16ic_device> m_deco_tilegen2; + required_device<okim6295_device> m_oki2; }; diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index 0dcb62c2ddc..343d7cefbea 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -11,25 +11,28 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bg1_videoram; - UINT16 * bg2_videoram; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_bg1_videoram; + UINT16 * m_bg2_videoram; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *bg1_tilemap, *bg2_tilemap; - int layer_colorbase[6], layerpri[5], sprite_colorbase; + tilemap_t *m_bg1_tilemap; + tilemap_t *m_bg2_tilemap; + int m_layer_colorbase[6]; + int m_layerpri[5]; + int m_sprite_colorbase; /* misc */ - int control; + int m_control; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k053246; - device_t *k053251; - device_t *k056832; - device_t *k053936_1; - device_t *k053936_2; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k053246; + device_t *m_k053251; + device_t *m_k056832; + device_t *m_k053936_1; + device_t *m_k053936_2; }; diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index c7eb1d4e1d7..a1f0f853ee4 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -12,24 +12,24 @@ public: : driver_device(machine, config) { } /* video-related */ - UINT16 blitter_color[2]; - UINT16 blitter_xparam[16]; - UINT16 blitter_yparam[16]; - UINT16 blitter_vidparam[32]; + UINT16 m_blitter_color[2]; + UINT16 m_blitter_xparam[16]; + UINT16 m_blitter_yparam[16]; + UINT16 m_blitter_vidparam[32]; - bitmap_t *dstbitmap; - emu_timer *blitter_timer; + bitmap_t *m_dstbitmap; + emu_timer *m_blitter_timer; /* misc */ - UINT8 irq_state[5]; - UINT8 soundlatch_full; - UINT8 sound_control; - UINT8 sound_msb_latch; + UINT8 m_irq_state[5]; + UINT8 m_soundlatch_full; + UINT8 m_sound_control; + UINT8 m_sound_msb_latch; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *bsmt; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_bsmt; }; diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index ffbda5c3d93..ffae06be7fe 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -4,20 +4,20 @@ public: dcon_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *back_data; - UINT16 *fore_data; - UINT16 *mid_data; - UINT16 *scroll_ram; - UINT16 *textram; - tilemap_t *background_layer; - tilemap_t *foreground_layer; - tilemap_t *midground_layer; - tilemap_t *text_layer; - UINT16 enable; - int gfx_bank_select; - int last_gfx_bank; - UINT16 *spriteram; - size_t spriteram_size; + UINT16 *m_back_data; + UINT16 *m_fore_data; + UINT16 *m_mid_data; + UINT16 *m_scroll_ram; + UINT16 *m_textram; + tilemap_t *m_background_layer; + tilemap_t *m_foreground_layer; + tilemap_t *m_midground_layer; + tilemap_t *m_text_layer; + UINT16 m_enable; + int m_gfx_bank_select; + int m_last_gfx_bank; + UINT16 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index 0df5498d3c8..4c50ac89323 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -12,21 +12,24 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bgvideoram; - UINT8 * fgvideoram; - UINT8 * textvideoram; - UINT8 * colorram; + UINT8 * m_bgvideoram; + UINT8 * m_fgvideoram; + UINT8 * m_textvideoram; + UINT8 * m_colorram; /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap, *text_tilemap, *sl_tilemap; - bitmap_t *main_bitmap; - int control; - int sl_image; - int sl_enable; - int timer_value; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_text_tilemap; + tilemap_t *m_sl_tilemap; + bitmap_t *m_main_bitmap; + int m_control; + int m_sl_image; + int m_sl_enable; + int m_timer_value; /* devices */ - device_t *ay1; + device_t *m_ay1; }; diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 7d60b23ff48..d82909fc3a6 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -12,47 +12,52 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * rambase; - UINT8 * bgvideoram; - UINT8 * fgvideoram; - UINT8 * spriteram; - UINT8 * scrollx_lo; - UINT8 * scrolly_lo; - UINT8 * darktowr_mcu_ports; -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram_2; // currently this uses generic palette handling - size_t spriteram_size; // FIXME: this appears in chinagat.c, but is it really used? + UINT8 * m_rambase; + UINT8 * m_bgvideoram; + UINT8 * m_fgvideoram; + UINT8 * m_spriteram; + UINT8 * m_scrollx_lo; + UINT8 * m_scrolly_lo; + UINT8 * m_darktowr_mcu_ports; +// UINT8 * m_paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram_2; // currently this uses generic palette handling + size_t m_spriteram_size; // FIXME: this appears in chinagat.c, but is it really used? /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - UINT8 technos_video_hw; - UINT8 scrollx_hi; - UINT8 scrolly_hi; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + UINT8 m_technos_video_hw; + UINT8 m_scrollx_hi; + UINT8 m_scrolly_hi; /* misc */ - UINT8 dd_sub_cpu_busy; - UINT8 sprite_irq, sound_irq, ym_irq, adpcm_sound_irq; - UINT32 adpcm_pos[2], adpcm_end[2]; - UINT8 adpcm_idle[2]; - int adpcm_data[2]; + UINT8 m_dd_sub_cpu_busy; + UINT8 m_sprite_irq; + UINT8 m_sound_irq; + UINT8 m_ym_irq; + UINT8 m_adpcm_sound_irq; + UINT32 m_adpcm_pos[2]; + UINT32 m_adpcm_end[2]; + UINT8 m_adpcm_idle[2]; + int m_adpcm_data[2]; /* for Sai Yu Gou Ma Roku */ - int adpcm_addr; - int i8748_P1; - int i8748_P2; - int pcm_shift; - int pcm_nibble; - int mcu_command; + int m_adpcm_addr; + int m_i8748_P1; + int m_i8748_P2; + int m_pcm_shift; + int m_pcm_nibble; + int m_mcu_command; #if 0 - int m5205_clk; + int m_m5205_clk; #endif /* devices */ - device_t *maincpu; - device_t *snd_cpu; - device_t *sub_cpu; - device_t *adpcm_1; - device_t *adpcm_2; + device_t *m_maincpu; + device_t *m_snd_cpu; + device_t *m_sub_cpu; + device_t *m_adpcm_1; + device_t *m_adpcm_2; }; diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index d881b501c0c..2d8905510b6 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -12,26 +12,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bg_videoram; - UINT16 * fg_videoram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_bg_videoram; + UINT16 * m_fg_videoram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - UINT16 vreg; - UINT16 bg_scrollx; - UINT16 bg_scrolly; - UINT16 fg_scrollx; - UINT16 fg_scrolly; - UINT16 bg_tilebase; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + UINT16 m_vreg; + UINT16 m_bg_scrollx; + UINT16 m_bg_scrolly; + UINT16 m_fg_scrollx; + UINT16 m_fg_scrolly; + UINT16 m_bg_tilebase; /* misc */ - UINT16 io_reg[8]; + UINT16 m_io_reg[8]; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 0ba29ef0bda..8f64c8d141c 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -11,26 +11,28 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * sharedram; - UINT8 * snd_sharedram; - UINT8 * spriteram_1; - UINT8 * spriteram_2; - UINT8 * bg_videoram; - UINT8 * fg_videoram; - UINT8 * paletteram; + UINT8 * m_sharedram; + UINT8 * m_snd_sharedram; + UINT8 * m_spriteram_1; + UINT8 * m_spriteram_2; + UINT8 * m_bg_videoram; + UINT8 * m_fg_videoram; + UINT8 * m_paletteram; /* video-related */ - tilemap_t *fg_tilemap,*bg_tilemap; - int vregs[2][5]; - int charbank[2]; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_vregs[2][5]; + int m_charbank[2]; /* misc */ - int int_enable_0, int_enable_1; + int m_int_enable_0; + int m_int_enable_1; /* devices */ - device_t *filter1; - device_t *filter2; - device_t *filter3; + device_t *m_filter1; + device_t *m_filter2; + device_t *m_filter3; }; /*----------- defined in video/ddribble.c -----------*/ diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index 1b8500fde4c..3486d589d8e 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -4,16 +4,16 @@ public: deadang_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT16 *video_data; - UINT16 *scroll_ram; - tilemap_t *pf3_layer; - tilemap_t *pf2_layer; - tilemap_t *pf1_layer; - tilemap_t *text_layer; - int deadangle_tilebank; - int deadangle_oldtilebank; - UINT16 *spriteram; + UINT16 *m_videoram; + UINT16 *m_video_data; + UINT16 *m_scroll_ram; + tilemap_t *m_pf3_layer; + tilemap_t *m_pf2_layer; + tilemap_t *m_pf1_layer; + tilemap_t *m_text_layer; + int m_deadangle_tilebank; + int m_deadangle_oldtilebank; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 01a242b8384..2a826dc17a3 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -4,23 +4,23 @@ public: dec0_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 automat_adpcm_byte; - int automat_msm5205_vclk_toggle; - UINT16 *ram; - UINT8 *robocop_shared_ram; + UINT8 m_automat_adpcm_byte; + int m_automat_msm5205_vclk_toggle; + UINT16 *m_ram; + UINT8 *m_robocop_shared_ram; - int GAME; - int i8751_return; - int i8751_command; - int slyspy_state; - int share[0xff]; - int hippodrm_msb; - int hippodrm_lsb; - UINT8 i8751_ports[4]; + int m_GAME; + int m_i8751_return; + int m_i8751_command; + int m_slyspy_state; + int m_share[0xff]; + int m_hippodrm_msb; + int m_hippodrm_lsb; + UINT8 m_i8751_ports[4]; - UINT16 *spriteram; - UINT16 *buffered_spriteram; - UINT16 pri; + UINT16 *m_spriteram; + UINT16 *m_buffered_spriteram; + UINT16 m_pri; }; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 187fa351859..f678cfb2003 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -6,36 +6,44 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * bg_data; - UINT8 * pf1_data; - UINT8 * row; -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram_2; // currently this uses generic palette handling -// UINT8 * spriteram; // currently this uses buffered_spriteram in some games - size_t videoram_size; - UINT16 buffered_spriteram16[0x800/2]; // for the mxc06 sprite chip emulation (oscar, cobra) + UINT8 * m_videoram; + UINT8 * m_bg_data; + UINT8 * m_pf1_data; + UINT8 * m_row; +// UINT8 * m_paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram_2; // currently this uses generic palette handling +// UINT8 * m_spriteram; // currently this uses buffered_spriteram in some games + size_t m_videoram_size; + UINT16 m_buffered_spriteram16[0x800/2]; // for the mxc06 sprite chip emulation (oscar, cobra) /* video-related */ - tilemap_t *bg_tilemap, *pf1_tilemap, *fix_tilemap; - //int scroll1[4]; - int scroll2[4]; - int bg_control[0x20], pf1_control[0x20]; - int game_uses_priority; + tilemap_t *m_bg_tilemap; + tilemap_t *m_pf1_tilemap; + tilemap_t *m_fix_tilemap; + //int m_scroll1[4]; + int m_scroll2[4]; + int m_bg_control[0x20]; + int m_pf1_control[0x20]; + int m_game_uses_priority; /* misc */ - int i8751_port0, i8751_port1; - int nmi_enable; - int i8751_return, i8751_value; - int coin1, coin2, latch, snd; - int msm5205next; - int toggle; + int m_i8751_port0; + int m_i8751_port1; + int m_nmi_enable; + int m_i8751_return; + int m_i8751_value; + int m_coin1; + int m_coin2; + int m_latch; + int m_snd; + int m_msm5205next; + int m_toggle; /* devices */ - device_t *maincpu; - device_t *subcpu; - device_t *audiocpu; - device_t *mcu; + device_t *m_maincpu; + device_t *m_subcpu; + device_t *m_audiocpu; + device_t *m_mcu; }; /*----------- defined in video/dec8.c -----------*/ diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index f324f63a483..9768ca4aed6 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -4,47 +4,47 @@ public: deco32_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 *ram; - int raster_enable; - timer_device *raster_irq_timer; - UINT8 nslasher_sound_irq; - int strobe; - int tattass_eprom_bit; - int lastClock; - char buffer[32]; - int bufPtr; - int pendingCommand; - int readBitCount; - int byteAddr; - UINT8 bsmt_latch; - UINT8 bsmt_reset; - - int ace_ram_dirty; - int has_ace_ram; - UINT32 *ace_ram; + UINT32 *m_ram; + int m_raster_enable; + timer_device *m_raster_irq_timer; + UINT8 m_nslasher_sound_irq; + int m_strobe; + int m_tattass_eprom_bit; + int m_lastClock; + char m_buffer[32]; + int m_bufPtr; + int m_pendingCommand; + int m_readBitCount; + int m_byteAddr; + UINT8 m_bsmt_latch; + UINT8 m_bsmt_reset; + + int m_ace_ram_dirty; + int m_has_ace_ram; + UINT32 *m_ace_ram; - UINT8 *dirty_palette; + UINT8 *m_dirty_palette; - int pri; - bitmap_t *tilemap_alpha_bitmap; + int m_pri; + bitmap_t *m_tilemap_alpha_bitmap; - UINT16 spriteram16[0x1000]; - UINT16 spriteram16_buffered[0x1000]; - UINT16 spriteram16_2[0x1000]; - UINT16 spriteram16_2_buffered[0x1000]; - UINT16 pf1_rowscroll[0x1000]; - UINT16 pf2_rowscroll[0x1000]; - UINT16 pf3_rowscroll[0x1000]; - UINT16 pf4_rowscroll[0x1000]; + UINT16 m_spriteram16[0x1000]; + UINT16 m_spriteram16_buffered[0x1000]; + UINT16 m_spriteram16_2[0x1000]; + UINT16 m_spriteram16_2_buffered[0x1000]; + UINT16 m_pf1_rowscroll[0x1000]; + UINT16 m_pf2_rowscroll[0x1000]; + UINT16 m_pf3_rowscroll[0x1000]; + UINT16 m_pf4_rowscroll[0x1000]; // we use the pointers below to store a 32-bit copy.. - UINT32 *pf1_rowscroll32; - UINT32 *pf2_rowscroll32; - UINT32 *pf3_rowscroll32; - UINT32 *pf4_rowscroll32; + UINT32 *m_pf1_rowscroll32; + UINT32 *m_pf2_rowscroll32; + UINT32 *m_pf3_rowscroll32; + UINT32 *m_pf4_rowscroll32; - device_t *deco_tilegen1; - device_t *deco_tilegen2; + device_t *m_deco_tilegen1; + device_t *m_deco_tilegen2; }; class dragngun_state : public deco32_state @@ -53,12 +53,12 @@ public: dragngun_state(running_machine &machine, const driver_device_config_base &config) : deco32_state(machine, config) { } - UINT32 *dragngun_sprite_layout_0_ram; - UINT32 *dragngun_sprite_layout_1_ram; - UINT32 *dragngun_sprite_lookup_0_ram; - UINT32 *dragngun_sprite_lookup_1_ram; - UINT32 dragngun_sprite_ctrl; - int dragngun_lightgun_port; + UINT32 *m_dragngun_sprite_layout_0_ram; + UINT32 *m_dragngun_sprite_layout_1_ram; + UINT32 *m_dragngun_sprite_lookup_0_ram; + UINT32 *m_dragngun_sprite_lookup_1_ram; + UINT32 m_dragngun_sprite_ctrl; + int m_dragngun_lightgun_port; }; diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index 1dbbe97a35f..8c8cc2e2f2b 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -4,19 +4,19 @@ public: deco_mlc_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 *mlc_ram; - UINT32 *irq_ram; - timer_device *raster_irq_timer; - int mainCpuIsArm; - int mlc_raster_table[9][256]; - UINT32 vbl_i; - int lastScanline[9]; - UINT32 *mlc_vram; - UINT32 *mlc_clip_ram; - UINT32 colour_mask; - UINT32 *mlc_buffered_spriteram; - UINT32 *spriteram; - size_t spriteram_size; + UINT32 *m_mlc_ram; + UINT32 *m_irq_ram; + timer_device *m_raster_irq_timer; + int m_mainCpuIsArm; + int m_mlc_raster_table[9][256]; + UINT32 m_vbl_i; + int m_lastScanline[9]; + UINT32 *m_mlc_vram; + UINT32 *m_mlc_clip_ram; + UINT32 m_colour_mask; + UINT32 *m_mlc_buffered_spriteram; + UINT32 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index e917cc5de8e..55dc84759f6 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -12,24 +12,33 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; - UINT16 * textram; - UINT16 * spriteram; - UINT16 * paletteram; - size_t spriteram_size; + UINT16 * m_videoram; + UINT16 * m_textram; + UINT16 * m_spriteram; + UINT16 * m_paletteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap, *tx_tilemap; - int display_enable; - int bg_scrollx_offs, bg_scrolly_offs; - int fg_scrollx_offs, fg_scrolly_offs; - int bg_scrollx_reg, bg_scrolly_reg, bg_page_reg; - int fg_scrollx_reg, fg_scrolly_reg, fg_page_reg; - int bg_page[4], fg_page[4]; - UINT16 coinctrl; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_tx_tilemap; + int m_display_enable; + int m_bg_scrollx_offs; + int m_bg_scrolly_offs; + int m_fg_scrollx_offs; + int m_fg_scrolly_offs; + int m_bg_scrollx_reg; + int m_bg_scrolly_reg; + int m_bg_page_reg; + int m_fg_scrollx_reg; + int m_fg_scrolly_reg; + int m_fg_page_reg; + int m_bg_page[4]; + int m_fg_page[4]; + UINT16 m_coinctrl; /* devices */ - device_t *audio_cpu; // system 16c does not have sound CPU + device_t *m_audio_cpu; // system 16c does not have sound CPU }; diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h index 5bbb1817b11..70319b422ed 100644 --- a/src/mame/includes/dietgo.h +++ b/src/mame/includes/dietgo.h @@ -11,16 +11,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling (in decocomn.c) - size_t spriteram_size; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling (in decocomn.c) + size_t m_spriteram_size; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *deco_tilegen1; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_deco_tilegen1; }; diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 6dde642ad8a..82cf7970b5c 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -13,33 +13,35 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 *videoram; - UINT8 *paletteram; + UINT8 *m_videoram; + UINT8 *m_paletteram; /* ROM banking */ - UINT8 bankxor; + UINT8 m_bankxor; /* video-related */ - tilemap_t *background; - UINT8 videoreg, scrollx, scrolly; + tilemap_t *m_background; + UINT8 m_videoreg; + UINT8 m_scrollx; + UINT8 m_scrolly; /* Kaneko BEAST state */ - UINT8 data_to_beast; - UINT8 data_to_z80; - UINT8 beast_to_z80_full; - UINT8 z80_to_beast_full; - UINT8 beast_int0_l; - UINT8 beast_p0; - UINT8 beast_p1; - UINT8 beast_p2; - UINT8 beast_p3; + UINT8 m_data_to_beast; + UINT8 m_data_to_z80; + UINT8 m_beast_to_z80_full; + UINT8 m_z80_to_beast_full; + UINT8 m_beast_int0_l; + UINT8 m_beast_p0; + UINT8 m_beast_p1; + UINT8 m_beast_p2; + UINT8 m_beast_p3; /* devices */ - device_t *maincpu; - device_t *cpu1; - device_t *cpu2; - device_t *pandora; - device_t *beast; + device_t *m_maincpu; + device_t *m_cpu1; + device_t *m_cpu2; + device_t *m_pandora; + device_t *m_beast; }; diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index 6a286228f62..3a3179a846b 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -4,17 +4,17 @@ public: djmain_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int sndram_bank; - UINT8 *sndram; - int turntable_select; - UINT8 turntable_last_pos[2]; - UINT16 turntable_pos[2]; - UINT8 pending_vb_int; - UINT16 v_ctrl; - UINT32 obj_regs[0xa0/4]; - const UINT8 *ide_user_password; - const UINT8 *ide_master_password; - UINT32 *obj_ram; + int m_sndram_bank; + UINT8 *m_sndram; + int m_turntable_select; + UINT8 m_turntable_last_pos[2]; + UINT16 m_turntable_pos[2]; + UINT8 m_pending_vb_int; + UINT16 m_v_ctrl; + UINT32 m_obj_regs[0xa0/4]; + const UINT8 *m_ide_user_password; + const UINT8 *m_ide_master_password; + UINT32 *m_obj_ram; }; diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 6f8fae6016e..5ccd2a2a287 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -76,125 +76,127 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * video_ram; - UINT8 * sprite_ram; - size_t sprite_ram_size; + UINT8 * m_video_ram; + UINT8 * m_sprite_ram; + size_t m_sprite_ram_size; /* devices */ - device_t *dev_n2a03a; - device_t *dev_n2a03b; - device_t *dev_vp2; /* virtual port 2 */ - device_t *dev_6h; + device_t *m_dev_n2a03a; + device_t *m_dev_n2a03b; + device_t *m_dev_vp2; /* virtual port 2 */ + device_t *m_dev_6h; #if 0 /* machine states */ - UINT8 hardware_type; + UINT8 m_hardware_type; /* sound state */ - const UINT8 * snd_rom; + const UINT8 * m_snd_rom; /* video state */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; - bitmap_t * bg_bits; - const UINT8 * color_codes; - emu_timer * scanline_timer; - INT8 vidhw; /* Selected video hardware RS Conversion / TKG04 */ + bitmap_t * m_bg_bits; + const UINT8 * m_color_codes; + emu_timer * m_scanline_timer; + INT8 m_vidhw; /* Selected video hardware RS Conversion / TKG04 */ /* radar scope */ - UINT8 * gfx4; - UINT8 * gfx3; - int gfx3_len; + UINT8 * m_gfx4; + UINT8 * m_gfx3; + int m_gfx3_len; - UINT8 sig30Hz; - UINT8 grid_sig; - UINT8 rflip_sig; - UINT8 star_ff; - UINT8 blue_level; - double cd4049_a; - double cd4049_b; + UINT8 m_sig30Hz; + UINT8 m_grid_sig; + UINT8 m_rflip_sig; + UINT8 m_star_ff; + UINT8 m_blue_level; + double m_cd4049_a; + double m_cd4049_b; /* Specific states */ - INT8 decrypt_counter; + INT8 m_decrypt_counter; /* 2650 protection */ - UINT8 protect_type; - UINT8 hunchloopback; - UINT8 prot_cnt; - UINT8 main_fo; + UINT8 m_protect_type; + UINT8 m_hunchloopback; + UINT8 m_prot_cnt; + UINT8 m_main_fo; /* Save state relevant */ - UINT8 gfx_bank, palette_bank; - UINT8 grid_on; - UINT16 grid_col; - UINT8 sprite_bank; - UINT8 dma_latch; - UINT8 flip; + UINT8 m_gfx_bank; + UINT8 m_palette_bank; + UINT8 m_grid_on; + UINT16 m_grid_col; + UINT8 m_sprite_bank; + UINT8 m_dma_latch; + UINT8 m_flip; /* reverse address lookup map - hunchbkd */ - INT16 rev_map[0x200]; + INT16 m_rev_map[0x200]; #endif /* machine states */ - UINT8 hardware_type; + UINT8 m_hardware_type; /* sound state */ - const UINT8 *snd_rom; + const UINT8 *m_snd_rom; /* video state */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; - bitmap_t *bg_bits; - const UINT8 * color_codes; - emu_timer * scanline_timer; - INT8 vidhw; /* Selected video hardware RS Conversion / TKG04 */ + bitmap_t *m_bg_bits; + const UINT8 * m_color_codes; + emu_timer * m_scanline_timer; + INT8 m_vidhw; /* Selected video hardware RS Conversion / TKG04 */ /* radar scope */ - UINT8 * gfx4; - UINT8 * gfx3; - int gfx3_len; + UINT8 * m_gfx4; + UINT8 * m_gfx3; + int m_gfx3_len; - UINT8 sig30Hz; - UINT8 grid_sig; - UINT8 rflip_sig; - UINT8 star_ff; - UINT8 blue_level; - double cd4049_a; - double cd4049_b; + UINT8 m_sig30Hz; + UINT8 m_grid_sig; + UINT8 m_rflip_sig; + UINT8 m_star_ff; + UINT8 m_blue_level; + double m_cd4049_a; + double m_cd4049_b; /* Specific states */ - INT8 decrypt_counter; + INT8 m_decrypt_counter; /* 2650 protection */ - UINT8 protect_type; - UINT8 hunchloopback; - UINT8 prot_cnt; - UINT8 main_fo; + UINT8 m_protect_type; + UINT8 m_hunchloopback; + UINT8 m_prot_cnt; + UINT8 m_main_fo; /* Save state relevant */ - UINT8 gfx_bank, palette_bank; - UINT8 grid_on; - UINT16 grid_col; - UINT8 sprite_bank; - UINT8 dma_latch; - UINT8 flip; + UINT8 m_gfx_bank; + UINT8 m_palette_bank; + UINT8 m_grid_on; + UINT16 m_grid_col; + UINT8 m_sprite_bank; + UINT8 m_dma_latch; + UINT8 m_flip; /* radarscp_step */ - double cv1; - double cv2; - double vg1; - double vg2; - double vg3; - double cv3; - double cv4; - int pixelcnt; + double m_cv1; + double m_cv2; + double m_vg1; + double m_vg2; + double m_vg3; + double m_cv3; + double m_cv4; + int m_pixelcnt; /* radarscp_scanline */ - int counter; + int m_counter; /* reverse address lookup map - hunchbkd */ - INT16 rev_map[0x200]; + INT16 m_rev_map[0x200]; }; /*----------- defined in video/dkong.c -----------*/ diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 0d778df2b98..1b11c7ef607 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -7,23 +7,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *do_tilemap; + tilemap_t *m_do_tilemap; /* misc */ - int adpcm_pos, adpcm_idle; - int adpcm_data; - int adpcm_status; - UINT8 buffer0[9], buffer1[9]; + int m_adpcm_pos; + int m_adpcm_idle; + int m_adpcm_data; + int m_adpcm_status; + UINT8 m_buffer0[9]; + UINT8 m_buffer1[9]; /* devices */ - cpu_device *maincpu; - cpu_device *slave; + cpu_device *m_maincpu; + cpu_device *m_slave; }; diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index b900218508b..981300d0665 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -10,25 +10,28 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bgvideoram; - UINT8 * spriteram; - UINT8 * sharedram; -// UINT8 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT8 * m_bgvideoram; + UINT8 * m_spriteram; + UINT8 * m_sharedram; +// UINT8 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - bitmap_t *pixbitmap; - tilemap_t *bg_tilemap; - UINT8 *bitmapram; - int bm_plane, pixcolor; - int scroll[4]; - int lastflip, lastpixcolor; + bitmap_t *m_pixbitmap; + tilemap_t *m_bg_tilemap; + UINT8 *m_bitmapram; + int m_bm_plane; + int m_pixcolor; + int m_scroll[4]; + int m_lastflip; + int m_lastpixcolor; /* sound-related */ - int soundlatch, last_snd_ctrl; + int m_soundlatch; + int m_last_snd_ctrl; /* devices */ - device_t *subcpu; + device_t *m_subcpu; }; diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index c8322490042..ac68e616efc 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -4,37 +4,38 @@ public: dooyong_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *txvideoram; - UINT8 *paletteram_flytiger; - UINT8 sprites_disabled; - UINT8 flytiger_palette_bank; - UINT8 flytiger_pri; - UINT8 tx_pri; - UINT16 rshark_pri; - tilemap_t *bg_tilemap; - tilemap_t *bg2_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *fg2_tilemap; - tilemap_t *tx_tilemap; - UINT8 bgscroll8[0x10]; - UINT8 bg2scroll8[0x10]; - UINT8 fgscroll8[0x10]; - UINT8 fg2scroll8[0x10]; - UINT8 *bg_tilerom; - UINT8 *bg2_tilerom; - UINT8 *fg_tilerom; - UINT8 *fg2_tilerom; - UINT8 *bg_tilerom2; - UINT8 *bg2_tilerom2; - UINT8 *fg_tilerom2; - UINT8 *fg2_tilerom2; - int bg_gfx; - int bg2_gfx; - int fg_gfx; - int fg2_gfx; - int tx_tilemap_mode; + UINT8 *m_txvideoram; + UINT8 *m_paletteram_flytiger; + UINT8 m_sprites_disabled; + UINT8 m_flytiger_palette_bank; + UINT8 m_flytiger_pri; + UINT8 m_tx_pri; + UINT16 m_rshark_pri; + tilemap_t *m_bg_tilemap; + tilemap_t *m_bg2_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_fg2_tilemap; + tilemap_t *m_tx_tilemap; + UINT8 m_bgscroll8[0x10]; + UINT8 m_bg2scroll8[0x10]; + UINT8 m_fgscroll8[0x10]; + UINT8 m_fg2scroll8[0x10]; + UINT8 *m_bg_tilerom; + UINT8 *m_bg2_tilerom; + UINT8 *m_fg_tilerom; + UINT8 *m_fg2_tilerom; + UINT8 *m_bg_tilerom2; + UINT8 *m_bg2_tilerom2; + UINT8 *m_fg_tilerom2; + UINT8 *m_fg2_tilerom2; + int m_bg_gfx; + int m_bg2_gfx; + int m_fg_gfx; + int m_fg2_gfx; + int m_tx_tilemap_mode; - int interrupt_line_1, interrupt_line_2; + int m_interrupt_line_1; + int m_interrupt_line_2; }; diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index ebf71f0a143..b069affd4df 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -29,18 +29,18 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * playfield_ram; - UINT8 * position_ram; + UINT8 * m_playfield_ram; + UINT8 * m_position_ram; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* misc */ - unsigned misc_flags; - int gear[2]; + unsigned m_misc_flags; + int m_gear[2]; /* devices */ - device_t *discrete; + device_t *m_discrete; }; diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index b5704b43243..fd002471c15 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -6,35 +6,37 @@ class drgnmst_state : public driver_device public: drgnmst_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - oki_1(*this, "oki1"), - oki_2(*this, "oki2") { } + m_oki_1(*this, "oki1"), + m_oki_2(*this, "oki2") { } /* memory pointers */ - UINT16 * vidregs; - UINT16 * fg_videoram; - UINT16 * bg_videoram; - UINT16 * md_videoram; - UINT16 * rowscrollram; - UINT16 * vidregs2; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_vidregs; + UINT16 * m_fg_videoram; + UINT16 * m_bg_videoram; + UINT16 * m_md_videoram; + UINT16 * m_rowscrollram; + UINT16 * m_vidregs2; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap,*fg_tilemap, *md_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_md_tilemap; /* misc */ - UINT16 snd_command; - UINT16 snd_flag; - UINT8 oki_control; - UINT8 oki_command; - UINT8 pic16c5x_port0; - UINT8 oki0_bank; - UINT8 oki1_bank; + UINT16 m_snd_command; + UINT16 m_snd_flag; + UINT8 m_oki_control; + UINT8 m_oki_command; + UINT8 m_pic16c5x_port0; + UINT8 m_oki0_bank; + UINT8 m_oki1_bank; /* devices */ - required_device<okim6295_device> oki_1; - required_device<okim6295_device> oki_2; + required_device<okim6295_device> m_oki_1; + required_device<okim6295_device> m_oki_2; }; diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h index ec9c70a41af..ff0cf9dc43e 100644 --- a/src/mame/includes/dribling.h +++ b/src/mame/includes/dribling.h @@ -13,19 +13,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; + UINT8 * m_videoram; + UINT8 * m_colorram; /* misc */ - UINT8 abca; - UINT8 dr, ds, sh; - UINT8 input_mux; - UINT8 di; + UINT8 m_abca; + UINT8 m_dr; + UINT8 m_ds; + UINT8 m_sh; + UINT8 m_input_mux; + UINT8 m_di; /* devices */ - device_t *maincpu; - device_t *ppi_0; - device_t *ppi_1; + device_t *m_maincpu; + device_t *m_ppi_0; + device_t *m_ppi_1; }; diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index 70d4e2e7440..71bc6800d35 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -12,18 +12,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; + UINT8 * m_videoram; /* video-related */ - tilemap_t *bg1, *bg2; - int flipscreen; + tilemap_t *m_bg1; + tilemap_t *m_bg2; + int m_flipscreen; /* misc */ - int nmi_enable; - int pcm_adr; + int m_nmi_enable; + int m_pcm_adr; /* devices */ - device_t *msm; + device_t *m_msm; }; diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index 8198f988dfb..44ef2485905 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -13,118 +13,150 @@ public: : driver_device(machine, config) { } // up to 8 layers, 2 images per layer (interleaved on screen) - UINT8 * pixmap[8][2]; - UINT8 * ddenlovr_pixmap[8]; + UINT8 * m_pixmap[8][2]; + UINT8 * m_ddenlovr_pixmap[8]; /* irq */ - void (*update_irq_func)(running_machine &machine); // some games trigger IRQ at blitter end, some don't - UINT8 sound_irq; - UINT8 vblank_irq; - UINT8 blitter_irq, blitter2_irq; - UINT8 soundlatch_irq; - UINT8 sound_vblank_irq; + void (*m_update_irq_func)(running_machine &machine); // some games trigger IRQ at blitter end, some don't + UINT8 m_sound_irq; + UINT8 m_vblank_irq; + UINT8 m_blitter_irq; + UINT8 m_blitter2_irq; + UINT8 m_soundlatch_irq; + UINT8 m_sound_vblank_irq; /* blitters */ - int blit_scroll_x, blit2_scroll_x; - int blit_scroll_y, blit2_scroll_y; - int blit_wrap_enable, blit2_wrap_enable; - int blit_x, blit_y, blit2_x, blit2_y; - int blit_src, blit2_src; - int blit_romregion, blit2_romregion; - int blit_dest, blit2_dest; - int blit_pen, blit2_pen; - int blit_palbank, blit2_palbank; - int blit_palettes, blit2_palettes; - int layer_enable; - int blit_backpen; - - int hanamai_layer_half; - int hnoridur_layer_half2; - - int extra_scroll_x, extra_scroll_y; - int flipscreen; - - int layer_layout; - - const int *priority_table; - int hanamai_priority; + int m_blit_scroll_x; + int m_blit2_scroll_x; + int m_blit_scroll_y; + int m_blit2_scroll_y; + int m_blit_wrap_enable; + int m_blit2_wrap_enable; + int m_blit_x; + int m_blit_y; + int m_blit2_x; + int m_blit2_y; + int m_blit_src; + int m_blit2_src; + int m_blit_romregion; + int m_blit2_romregion; + int m_blit_dest; + int m_blit2_dest; + int m_blit_pen; + int m_blit2_pen; + int m_blit_palbank; + int m_blit2_palbank; + int m_blit_palettes; + int m_blit2_palettes; + int m_layer_enable; + int m_blit_backpen; + + int m_hanamai_layer_half; + int m_hnoridur_layer_half2; + + int m_extra_scroll_x; + int m_extra_scroll_y; + int m_flipscreen; + + int m_layer_layout; + + const int *m_priority_table; + int m_hanamai_priority; /* ddenlovr blitter (TODO: merge with the above, where possible) */ - int extra_layers; - int ddenlovr_dest_layer; - int ddenlovr_blit_flip; - int ddenlovr_blit_x; - int ddenlovr_blit_y; - int ddenlovr_blit_address; - int ddenlovr_blit_pen,ddenlovr_blit_pen_mode; - int ddenlovr_blitter_irq_flag,ddenlovr_blitter_irq_enable; - int ddenlovr_rect_width, ddenlovr_rect_height; - int ddenlovr_clip_width, ddenlovr_clip_height; - int ddenlovr_line_length; - int ddenlovr_clip_ctrl,ddenlovr_clip_x,ddenlovr_clip_y; - int ddenlovr_scroll[8*2]; - int ddenlovr_priority, ddenlovr_priority2; - int ddenlovr_bgcolor, ddenlovr_bgcolor2; - int ddenlovr_layer_enable, ddenlovr_layer_enable2; - int ddenlovr_palette_base[8], ddenlovr_palette_mask[8]; - int ddenlovr_transparency_pen[8], ddenlovr_transparency_mask[8]; - int ddenlovr_blit_latch; - int ddenlovr_blit_pen_mask; // not implemented - int ddenlovr_blit_rom_bits; // usually 8, 16 in hanakanz - const int *ddenlovr_blit_commands; - int ddenlovr_blit_regs[2]; + int m_extra_layers; + int m_ddenlovr_dest_layer; + int m_ddenlovr_blit_flip; + int m_ddenlovr_blit_x; + int m_ddenlovr_blit_y; + int m_ddenlovr_blit_address; + int m_ddenlovr_blit_pen; + int m_ddenlovr_blit_pen_mode; + int m_ddenlovr_blitter_irq_flag; + int m_ddenlovr_blitter_irq_enable; + int m_ddenlovr_rect_width; + int m_ddenlovr_rect_height; + int m_ddenlovr_clip_width; + int m_ddenlovr_clip_height; + int m_ddenlovr_line_length; + int m_ddenlovr_clip_ctrl; + int m_ddenlovr_clip_x; + int m_ddenlovr_clip_y; + int m_ddenlovr_scroll[8*2]; + int m_ddenlovr_priority; + int m_ddenlovr_priority2; + int m_ddenlovr_bgcolor; + int m_ddenlovr_bgcolor2; + int m_ddenlovr_layer_enable; + int m_ddenlovr_layer_enable2; + int m_ddenlovr_palette_base[8]; + int m_ddenlovr_palette_mask[8]; + int m_ddenlovr_transparency_pen[8]; + int m_ddenlovr_transparency_mask[8]; + int m_ddenlovr_blit_latch; + int m_ddenlovr_blit_pen_mask; // not implemented + int m_ddenlovr_blit_rom_bits; // usually 8, 16 in hanakanz + const int *m_ddenlovr_blit_commands; + int m_ddenlovr_blit_regs[2]; /* input */ - UINT8 input_sel, dsw_sel, keyb, coins, hopper; + UINT8 m_input_sel; + UINT8 m_dsw_sel; + UINT8 m_keyb; + UINT8 m_coins; + UINT8 m_hopper; /* misc */ - int hnoridur_bank; - UINT8 palette_ram[16*256*2]; - int palbank; - int msm5205next; - int resetkludge; - int toggle, toggle_cpu1; - int yarunara_clk_toggle; - UINT8 soundlatch_ack; - UINT8 soundlatch_full; - UINT8 latch; - int rombank; - UINT8 tenkai_p5_val; - int tenkai_6c, tenkai_70; - UINT8 gekisha_val[2]; - UINT8 gekisha_rom_enable; - UINT8 *romptr; + int m_hnoridur_bank; + UINT8 m_palette_ram[16*256*2]; + int m_palbank; + int m_msm5205next; + int m_resetkludge; + int m_toggle; + int m_toggle_cpu1; + int m_yarunara_clk_toggle; + UINT8 m_soundlatch_ack; + UINT8 m_soundlatch_full; + UINT8 m_latch; + int m_rombank; + UINT8 m_tenkai_p5_val; + int m_tenkai_6c; + int m_tenkai_70; + UINT8 m_gekisha_val[2]; + UINT8 m_gekisha_rom_enable; + UINT8 *m_romptr; /* ddenlovr misc (TODO: merge with the above, where possible) */ - UINT8 palram[0x200]; - int okibank; - UINT8 rongrong_blitter_busy_select; + UINT8 m_palram[0x200]; + int m_okibank; + UINT8 m_rongrong_blitter_busy_select; - UINT16 *dsw_sel16; - UINT16 *protection1, *protection2; - UINT8 prot_val; - UINT16 prot_16; - UINT16 quiz365_protection[2]; + UINT16 *m_dsw_sel16; + UINT16 *m_protection1; + UINT16 *m_protection2; + UINT8 m_prot_val; + UINT16 m_prot_16; + UINT16 m_quiz365_protection[2]; - UINT16 mmpanic_leds; /* A led for each of the 9 buttons */ - UINT8 funkyfig_lockout; - UINT8 romdata[2]; - int palette_index; - UINT8 hginga_rombank; - UINT8 mjflove_irq_cause; - UINT8 daimyojn_palette_sel; + UINT16 m_mmpanic_leds; /* A led for each of the 9 buttons */ + UINT8 m_funkyfig_lockout; + UINT8 m_romdata[2]; + int m_palette_index; + UINT8 m_hginga_rombank; + UINT8 m_mjflove_irq_cause; + UINT8 m_daimyojn_palette_sel; - int irq_count; + int m_irq_count; /* devices */ - device_t *maincpu; - device_t *soundcpu; - device_t *rtc; - device_t *ymsnd; - okim6295_device *oki; - device_t *top_scr; - device_t *bot_scr; + device_t *m_maincpu; + device_t *m_soundcpu; + device_t *m_rtc; + device_t *m_ymsnd; + okim6295_device *m_oki; + device_t *m_top_scr; + device_t *m_bot_scr; }; //----------- defined in drivers/dynax.c ----------- diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index 01c6e33c4b4..dd8dba352d8 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -4,21 +4,21 @@ public: dynduke_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT16 *back_data; - UINT16 *fore_data; - UINT16 *scroll_ram; - tilemap_t *bg_layer; - tilemap_t *fg_layer; - tilemap_t *tx_layer; - int back_bankbase; - int fore_bankbase; - int back_enable; - int fore_enable; - int sprite_enable; - int txt_enable; - int old_back; - int old_fore; + UINT16 *m_videoram; + UINT16 *m_back_data; + UINT16 *m_fore_data; + UINT16 *m_scroll_ram; + tilemap_t *m_bg_layer; + tilemap_t *m_fg_layer; + tilemap_t *m_tx_layer; + int m_back_bankbase; + int m_fore_bankbase; + int m_back_enable; + int m_fore_enable; + int m_sprite_enable; + int m_txt_enable; + int m_old_back; + int m_old_fore; }; diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index b7c966864cb..de6ef9de3c2 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -4,9 +4,9 @@ public: eolith_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int coin_counter_bit; - int buffer; - UINT32 *vram; + int m_coin_counter_bit; + int m_buffer; + UINT32 *m_vram; }; diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index 9c3b4b08a70..362d0968caf 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -11,14 +11,14 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - size_t videoram_size; + UINT8 * m_videoram; + size_t m_videoram_size; /* video-related */ - UINT8 palette; + UINT8 m_palette; /* misc */ - int counter; + int m_counter; }; diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 97277963a16..cd07a2d7e0f 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -12,10 +12,10 @@ public: eprom_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - int screen_intensity; - int video_disable; - UINT16 * sync_data; - int last_offset; + int m_screen_intensity; + int m_video_disable; + UINT16 * m_sync_data; + int m_last_offset; }; diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 744383d232e..a3cfd9e02bf 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -11,39 +11,48 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bg_videoram; - UINT8 * fg_videoram; // 8bits - UINT16 * spriteram; - UINT16 * spriteram_2; - UINT16 * workram; - UINT8 * mcu_ram; // 8bits -// UINT16 * nvram; // currently this uses generic nvram handling + UINT16 * m_bg_videoram; + UINT8 * m_fg_videoram; // 8bits + UINT16 * m_spriteram; + UINT16 * m_spriteram_2; + UINT16 * m_workram; + UINT8 * m_mcu_ram; // 8bits +// UINT16 * m_nvram; // currently this uses generic nvram handling /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - int fg_char_bank; - UINT8 bgcolor; - UINT16 splndrbt_bg_scrollx, splndrbt_bg_scrolly; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_fg_char_bank; + UINT8 m_bgcolor; + UINT16 m_splndrbt_bg_scrollx; + UINT16 m_splndrbt_bg_scrolly; /* misc */ - int sound_prom_address; - UINT8 dac_latch; - UINT8 eq8155_port_b; - UINT8 eq8155_port_a,eq8155_port_c,ay_port_a,ay_port_b,eq_cymbal_ctrl; - emu_timer *nmi_timer, *adjuster_timer; - float cymvol,hihatvol; - int timer_count; - int unknown_bit; // Gekisou special handling + int m_sound_prom_address; + UINT8 m_dac_latch; + UINT8 m_eq8155_port_b; + UINT8 m_eq8155_port_a; + UINT8 m_eq8155_port_c; + UINT8 m_ay_port_a; + UINT8 m_ay_port_b; + UINT8 m_eq_cymbal_ctrl; + emu_timer *m_nmi_timer; + emu_timer *m_adjuster_timer; + float m_cymvol; + float m_hihatvol; + int m_timer_count; + int m_unknown_bit; // Gekisou special handling #if POPDRUMKIT - int hihat,cymbal; + int m_hihat; + int m_cymbal; #endif /* devices */ - device_t *mcu; - device_t *audio_cpu; - msm5232_device *msm; - device_t *dac_1; - device_t *dac_2; + device_t *m_mcu; + device_t *m_audio_cpu; + msm5232_device *m_msm; + device_t *m_dac_1; + device_t *m_dac_2; }; diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index cbb04b5fb6e..94dce636444 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -11,25 +11,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * vram_0; - UINT16 * vram_1; - UINT16 * scroll_0; - UINT16 * scroll_1; - UINT16 * spriteram; - UINT16 * head_layersize; - UINT16 * headpanic_platform_x; - UINT16 * headpanic_platform_y; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_vram_0; + UINT16 * m_vram_1; + UINT16 * m_scroll_0; + UINT16 * m_scroll_1; + UINT16 * m_spriteram; + UINT16 * m_head_layersize; + UINT16 * m_headpanic_platform_x; + UINT16 * m_headpanic_platform_y; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *tilemap_0_16x16, *tilemap_1_16x16; - tilemap_t *tilemap_0, *tilemap_1; - int tilemap0_color; + tilemap_t *m_tilemap_0_16x16; + tilemap_t *m_tilemap_1_16x16; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; + int m_tilemap0_color; /* devices */ - device_t *audio_cpu; - device_t *eeprom; + device_t *m_audio_cpu; + device_t *m_eeprom; }; diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index d90c129ac04..9bf96399564 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -10,24 +10,25 @@ public: espial_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 * videoram; - UINT8 * colorram; - UINT8 * attributeram; - UINT8 * scrollram; - UINT8 * spriteram_1; - UINT8 * spriteram_2; - UINT8 * spriteram_3; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_attributeram; + UINT8 * m_scrollram; + UINT8 * m_spriteram_1; + UINT8 * m_spriteram_2; + UINT8 * m_spriteram_3; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - int flipscreen; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_flipscreen; /* sound-related */ - UINT8 sound_nmi_enabled; + UINT8 m_sound_nmi_enabled; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; /*----------- defined in video/espial.c -----------*/ diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index 3b701e350b3..7ac1624d3a0 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -29,41 +29,41 @@ public: esripsys_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 g_iodata; - UINT8 g_ioaddr; - UINT8 coin_latch; - UINT8 keypad_status; - UINT8 g_status; - UINT8 f_status; - int io_firq_status; - UINT8 cmos_ram_a2_0; - UINT8 cmos_ram_a10_3; - UINT8 *cmos_ram; - UINT8 u56a; - UINT8 u56b; - UINT8 g_to_s_latch1; - UINT8 g_to_s_latch2; - UINT8 s_to_g_latch1; - UINT8 s_to_g_latch2; - UINT8 dac_msb; - UINT8 dac_vol; - UINT8 tms_data; - UINT8 *fdt_a; - UINT8 *fdt_b; - struct line_buffer_t line_buffer[2]; - int _fasel; - int _fbsel; - int hblank; - UINT8 *pal_ram; - int frame_vbl; - int _12sel; - int video_firq_en; - emu_timer *hblank_end_timer; - emu_timer *hblank_start_timer; - UINT8 *fig_scale_table; - UINT8 *scale_table; - int video_firq; - UINT8 bg_intensity; + UINT8 m_g_iodata; + UINT8 m_g_ioaddr; + UINT8 m_coin_latch; + UINT8 m_keypad_status; + UINT8 m_g_status; + UINT8 m_f_status; + int m_io_firq_status; + UINT8 m_cmos_ram_a2_0; + UINT8 m_cmos_ram_a10_3; + UINT8 *m_cmos_ram; + UINT8 m_u56a; + UINT8 m_u56b; + UINT8 m_g_to_s_latch1; + UINT8 m_g_to_s_latch2; + UINT8 m_s_to_g_latch1; + UINT8 m_s_to_g_latch2; + UINT8 m_dac_msb; + UINT8 m_dac_vol; + UINT8 m_tms_data; + UINT8 *m_fdt_a; + UINT8 *m_fdt_b; + struct line_buffer_t m_line_buffer[2]; + int m_fasel; + int m_fbsel; + int m_hblank; + UINT8 *m_pal_ram; + int m_frame_vbl; + int m_12sel; + int m_video_firq_en; + emu_timer *m_hblank_end_timer; + emu_timer *m_hblank_start_timer; + UINT8 *m_fig_scale_table; + UINT8 *m_scale_table; + int m_video_firq; + UINT8 m_bg_intensity; }; diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index dc849d98a71..4df6a244a1e 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -12,16 +12,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * bg_scroll; - UINT8 * nbg_yscroll; - UINT8 * nbg_xscroll; -// UINT8 * spriteram; // currently this uses generic buffered_spriteram + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_bg_scroll; + UINT8 * m_nbg_yscroll; + UINT8 * m_nbg_xscroll; +// UINT8 * m_spriteram; // currently this uses generic buffered_spriteram /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; - int chon, objon, sc1on, sc2on; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_tx_tilemap; + int m_chon; + int m_objon; + int m_sc1on; + int m_sc2on; }; diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index 74a9daf6c77..56f21aa9e2c 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -25,26 +25,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * main_ram; - UINT8 * videoram; - UINT8 * spriteram; - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_main_ram; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - UINT8 cocktail_flip; - UINT8 char_palette, sprite_palette; - UINT8 char_bank; - UINT16 *background_gfx[4]; - UINT8 *background_mixer; - UINT8 background_latches[13]; + UINT8 m_cocktail_flip; + UINT8 m_char_palette; + UINT8 m_sprite_palette; + UINT8 m_char_bank; + UINT16 *m_background_gfx[4]; + UINT8 *m_background_mixer; + UINT8 m_background_latches[13]; /* protection? */ - UINT8 porta; - UINT8 portb; + UINT8 m_porta; + UINT8 m_portb; /* devices */ - device_t *maincpu; + device_t *m_maincpu; }; diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index d2a9059d89c..043b456b753 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -25,24 +25,24 @@ public: exidy_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 last_dial; - UINT8 *videoram; - UINT8 *characterram; - UINT8 *color_latch; - UINT8 *sprite1_xpos; - UINT8 *sprite1_ypos; - UINT8 *sprite2_xpos; - UINT8 *sprite2_ypos; - UINT8 *spriteno; - UINT8 *sprite_enable; - UINT8 collision_mask; - UINT8 collision_invert; - int is_2bpp; - UINT8 int_condition; - bitmap_t *background_bitmap; - bitmap_t *motion_object_1_vid; - bitmap_t *motion_object_2_vid; - bitmap_t *motion_object_2_clip; + UINT8 m_last_dial; + UINT8 *m_videoram; + UINT8 *m_characterram; + UINT8 *m_color_latch; + UINT8 *m_sprite1_xpos; + UINT8 *m_sprite1_ypos; + UINT8 *m_sprite2_xpos; + UINT8 *m_sprite2_ypos; + UINT8 *m_spriteno; + UINT8 *m_sprite_enable; + UINT8 m_collision_mask; + UINT8 m_collision_invert; + int m_is_2bpp; + UINT8 m_int_condition; + bitmap_t *m_background_bitmap; + bitmap_t *m_motion_object_1_vid; + bitmap_t *m_motion_object_2_vid; + bitmap_t *m_motion_object_2_clip; }; diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index 6c51899c706..b2b0224bd14 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -13,23 +13,23 @@ public: exidy440_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 bank; - const UINT8 *showdown_bank_data[2]; - INT8 showdown_bank_select; - UINT8 showdown_bank_offset; - UINT8 *imageram; - UINT8 *scanline; - UINT8 firq_vblank; - UINT8 firq_beam; - UINT8 *topsecex_yscroll; - UINT8 latched_x; - UINT8 *local_videoram; - UINT8 *local_paletteram; - UINT8 firq_enable; - UINT8 firq_select; - UINT8 palettebank_io; - UINT8 palettebank_vis; - UINT8 *spriteram; + UINT8 m_bank; + const UINT8 *m_showdown_bank_data[2]; + INT8 m_showdown_bank_select; + UINT8 m_showdown_bank_offset; + UINT8 *m_imageram; + UINT8 *m_scanline; + UINT8 m_firq_vblank; + UINT8 m_firq_beam; + UINT8 *m_topsecex_yscroll; + UINT8 m_latched_x; + UINT8 *m_local_videoram; + UINT8 *m_local_paletteram; + UINT8 m_firq_enable; + UINT8 m_firq_select; + UINT8 m_palettebank_io; + UINT8 m_palettebank_vis; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index d60df24da9f..fe6168b8b36 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -12,22 +12,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * main_ram; - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_main_ram; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - int bg_index[4]; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_bg_index[4]; /* misc */ - //int coin; // used in the commented out INTERRUPT_GEN - can this be removed? + //int m_coin; // used in the commented out INTERRUPT_GEN - can this be removed? /* devices */ - device_t *maincpu; - device_t *slave; + device_t *m_maincpu; + device_t *m_slave; }; diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h index 147fc294f1d..84bfa4817cb 100644 --- a/src/mame/includes/exterm.h +++ b/src/mame/includes/exterm.h @@ -10,15 +10,15 @@ public: exterm_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 aimpos[2]; - UINT8 trackball_old[2]; - UINT8 master_sound_latch; - UINT8 slave_sound_latch; - UINT8 sound_control; - UINT8 dac_value[2]; - UINT16 last; - UINT16 *master_videoram; - UINT16 *slave_videoram; + UINT8 m_aimpos[2]; + UINT8 m_trackball_old[2]; + UINT8 m_master_sound_latch; + UINT8 m_slave_sound_latch; + UINT8 m_sound_control; + UINT8 m_dac_value[2]; + UINT16 m_last; + UINT16 *m_master_videoram; + UINT16 *m_slave_videoram; }; diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h index 95148c0658a..952be3a0bd9 100644 --- a/src/mame/includes/exzisus.h +++ b/src/mame/includes/exzisus.h @@ -4,16 +4,16 @@ public: exzisus_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *sharedram_ab; - UINT8 *sharedram_ac; - int cpua_bank; - int cpub_bank; - UINT8 *videoram0; - UINT8 *videoram1; - UINT8 *objectram0; - UINT8 *objectram1; - size_t objectram_size0; - size_t objectram_size1; + UINT8 *m_sharedram_ab; + UINT8 *m_sharedram_ac; + int m_cpua_bank; + int m_cpub_bank; + UINT8 *m_videoram0; + UINT8 *m_videoram1; + UINT8 *m_objectram0; + UINT8 *m_objectram1; + size_t m_objectram_size0; + size_t m_objectram_size1; }; diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 7893cff57f0..9635833e308 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -6,34 +6,38 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * sharedram; - UINT16 * spr1vram; - UINT16 * spr2vram; - UINT16 * spr1cgram; - UINT16 * spr2cgram; - UINT16 * fgvideoram; - UINT16 * rozvideoram; - UINT16 * sprcgram; - UINT16 * spritelist; - UINT16 * spriteram; - UINT16 * fgregs; - UINT16 * rozregs; - UINT16 * zoomdata; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spr1cgram_size, spr2cgram_size; - size_t spriteram_size; + UINT16 * m_sharedram; + UINT16 * m_spr1vram; + UINT16 * m_spr2vram; + UINT16 * m_spr1cgram; + UINT16 * m_spr2cgram; + UINT16 * m_fgvideoram; + UINT16 * m_rozvideoram; + UINT16 * m_sprcgram; + UINT16 * m_spritelist; + UINT16 * m_spriteram; + UINT16 * m_fgregs; + UINT16 * m_rozregs; + UINT16 * m_zoomdata; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spr1cgram_size; + size_t m_spr2cgram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *fg_tilemap, *roz_tilemap; - int roz_bank, flipscreen, gfxctrl; - int scroll[2]; + tilemap_t *m_fg_tilemap; + tilemap_t *m_roz_tilemap; + int m_roz_bank; + int m_flipscreen; + int m_gfxctrl; + int m_scroll[2]; /* misc */ - int pending_command; + int m_pending_command; /* devices */ - device_t *audiocpu; - device_t *k053936; + device_t *m_audiocpu; + device_t *m_k053936; }; /*----------- defined in video/f1gp.c -----------*/ diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index 7fcd683c99d..c0212879615 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -7,26 +7,28 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT8 * spriteram; // currently directly used in a 16bit map... -// UINT8 * spriteram_2; // currently directly used in a 16bit map... -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * m_spriteram; // currently directly used in a 16bit map... +// UINT8 * m_spriteram_2; // currently directly used in a 16bit map... +// UINT8 * m_paletteram; // currently this uses generic palette handling /* misc */ - UINT8 nmi_enable; - int old_x[2], old_y[2], old_f[2]; - UINT8 input_ret[2]; - int adpcm_playing[4]; - int adpcm_addr[2][4]; - int adpcm_nibble[4]; + UINT8 m_nmi_enable; + int m_old_x[2]; + int m_old_y[2]; + int m_old_f[2]; + UINT8 m_input_ret[2]; + int m_adpcm_playing[4]; + int m_adpcm_addr[2][4]; + int m_adpcm_nibble[4]; /* devices */ - device_t *audio_cpu; - device_t *msm1; - device_t *msm2; - device_t *msm3; - device_t *msm4; - UINT8 *spriteram; - UINT8 *spriteram2; + device_t *m_audio_cpu; + device_t *m_msm1; + device_t *m_msm2; + device_t *m_msm3; + device_t *m_msm4; + UINT8 *m_spriteram; + UINT8 *m_spriteram2; }; diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index bdc4b49c0c8..ec8f48de1b8 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -11,21 +11,21 @@ public: fastfred_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 imago_sprites[0x800*3]; - UINT16 imago_sprites_address; - UINT8 imago_sprites_bank; - int hardware_type; - UINT8 *videoram; - UINT8 *spriteram; - size_t spriteram_size; - UINT8 *attributesram; - UINT8 *background_color; - UINT8 *imago_fg_videoram; - UINT16 charbank; - UINT8 colorbank; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *web_tilemap; + UINT8 m_imago_sprites[0x800*3]; + UINT16 m_imago_sprites_address; + UINT8 m_imago_sprites_bank; + int m_hardware_type; + UINT8 *m_videoram; + UINT8 *m_spriteram; + size_t m_spriteram_size; + UINT8 *m_attributesram; + UINT8 *m_background_color; + UINT8 *m_imago_fg_videoram; + UINT16 m_charbank; + UINT8 m_colorbank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_web_tilemap; }; diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index 871b7fe3383..b76e7296e01 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -11,19 +11,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram1; - UINT8 * videoram2; - UINT8 * paletteram; - UINT8 * spriteram; - UINT8 * k007121_regs; + UINT8 * m_videoram1; + UINT8 * m_videoram2; + UINT8 * m_paletteram; + UINT8 * m_spriteram; + UINT8 * m_k007121_regs; /* video-related */ - tilemap_t *layer0, *layer1; - rectangle clip0, clip1; + tilemap_t *m_layer0; + tilemap_t *m_layer1; + rectangle m_clip0; + rectangle m_clip1; /* devices */ - device_t *konami2; - device_t *k007121; + device_t *m_konami2; + device_t *m_k007121; }; diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index 0df35c16aaf..e056d15e82c 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -29,24 +29,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bgmap; - UINT8 cocktail_flip; - UINT8 char_palette, sprite_palette; - UINT8 char_bank; + tilemap_t *m_bgmap; + UINT8 m_cocktail_flip; + UINT8 m_char_palette; + UINT8 m_sprite_palette; + UINT8 m_char_bank; /* misc */ - int fcombat_sh; - int fcombat_sv; - int tx, ty; + int m_fcombat_sh; + int m_fcombat_sv; + int m_tx; + int m_ty; /* devices */ - device_t *maincpu; + device_t *m_maincpu; }; diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index 6ca87da05e4..168cc05870f 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -7,21 +7,24 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * video_ram; + UINT8 * m_video_ram; /* video-related */ - bitmap_t *bgbitmap, *fgbitmap; - UINT8 xpos, ypos; - int current_color; + bitmap_t *m_bgbitmap; + bitmap_t *m_fgbitmap; + UINT8 m_xpos; + UINT8 m_ypos; + int m_current_color; /* misc */ - int fgoal_player; - UINT8 row, col; - int prev_coin; + int m_fgoal_player; + UINT8 m_row; + UINT8 m_col; + int m_prev_coin; /* devices */ - device_t *maincpu; - device_t *mb14241; + device_t *m_maincpu; + device_t *m_mb14241; }; diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index cb463107ca7..2c761fb6da6 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -11,26 +11,29 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * videoram2; - UINT8 * colorram2; - UINT8 * scroll; - UINT8 * spriteram; - UINT8 * spriteram_2; - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_videoram2; + UINT8 * m_colorram2; + UINT8 * m_scroll; + UINT8 * m_spriteram; + UINT8 * m_spriteram_2; + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - int spriterambank, charbank; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_spriterambank; + int m_charbank; /* misc */ - int T1_line; - UINT8 nmi_enable, irq_enable; + int m_T1_line; + UINT8 m_nmi_enable; + UINT8 m_irq_enable; /* devices */ - device_t *audio_cpu; + device_t *m_audio_cpu; }; diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index 66091ee1de8..1e49fb40c29 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -11,30 +11,36 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bg1videoram; - UINT8 * bg2videoram; - UINT8 * fgvideoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_bg1videoram; + UINT8 * m_bg2videoram; + UINT8 * m_fgvideoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *fg_tilemap, *bg1_tilemap, *bg2_tilemap; - UINT8 scroll1_x[2], scroll1_y[2]; - UINT8 scroll2_x[2], scroll2_y[2]; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg1_tilemap; + tilemap_t *m_bg2_tilemap; + UINT8 m_scroll1_x[2]; + UINT8 m_scroll1_y[2]; + UINT8 m_scroll2_x[2]; + UINT8 m_scroll2_y[2]; /* misc */ - int irq_enable, nmi_enable; - int i8751_return, i8751_current_command; - int i8751_init_ptr; - int msm5205next; - int adpcm_toggle; - int int_latch; - int coin_command_pending; + int m_irq_enable; + int m_nmi_enable; + int m_i8751_return; + int m_i8751_current_command; + int m_i8751_init_ptr; + int m_msm5205next; + int m_adpcm_toggle; + int m_int_latch; + int m_coin_command_pending; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *msm; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_msm; }; diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 2a8d63ecaec..c40cf8e3895 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -36,29 +36,29 @@ public: firetrk_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 in_service_mode; - UINT32 dial[2]; - UINT8 steer_dir[2]; - UINT8 steer_flag[2]; - UINT8 gear; - UINT8 *alpha_num_ram; - UINT8 *playfield_ram; - UINT8 *scroll_x; - UINT8 *scroll_y; - UINT8 *car_rot; - UINT8 *drone_rot; - UINT8 *drone_x; - UINT8 *drone_y; - UINT8 *blink; - UINT8 flash; - UINT8 crash[2]; - UINT8 skid[2]; - bitmap_t *helper1; - bitmap_t *helper2; - UINT32 color1_mask; - UINT32 color2_mask; - tilemap_t *tilemap1; - tilemap_t *tilemap2; + UINT8 m_in_service_mode; + UINT32 m_dial[2]; + UINT8 m_steer_dir[2]; + UINT8 m_steer_flag[2]; + UINT8 m_gear; + UINT8 *m_alpha_num_ram; + UINT8 *m_playfield_ram; + UINT8 *m_scroll_x; + UINT8 *m_scroll_y; + UINT8 *m_car_rot; + UINT8 *m_drone_rot; + UINT8 *m_drone_x; + UINT8 *m_drone_y; + UINT8 *m_blink; + UINT8 m_flash; + UINT8 m_crash[2]; + UINT8 m_skid[2]; + bitmap_t *m_helper1; + bitmap_t *m_helper2; + UINT32 m_color1_mask; + UINT32 m_color2_mask; + tilemap_t *m_tilemap1; + tilemap_t *m_tilemap2; }; diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index b0bffcdcb1b..6e4749315ee 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -6,24 +6,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * fof_100000; - UINT16 * fof_600000; - UINT16 * fof_700000; - UINT16 * fof_800000; - UINT16 * fof_900000; - UINT16 * fof_a00000; - UINT16 * fof_bak_tileram; - UINT16 * fof_mid_tileram; - UINT16 * fof_txt_tileram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_fof_100000; + UINT16 * m_fof_600000; + UINT16 * m_fof_700000; + UINT16 * m_fof_800000; + UINT16 * m_fof_900000; + UINT16 * m_fof_a00000; + UINT16 * m_fof_bak_tileram; + UINT16 * m_fof_mid_tileram; + UINT16 * m_fof_txt_tileram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *fof_bak_tilemap, *fof_mid_tilemap, *fof_txt_tilemap; + tilemap_t *m_fof_bak_tilemap; + tilemap_t *m_fof_mid_tilemap; + tilemap_t *m_fof_txt_tilemap; /* misc */ - int bbprot_kludge; - UINT16 fof_700000_data; + int m_bbprot_kludge; + UINT16 m_fof_700000_data; }; diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index f8d90fb3a2a..cdebf1581da 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -11,20 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * k007121_ram; + UINT8 * m_k007121_ram; // UINT8 * paletteram; // this currently uses generic palette handling /* video-related */ - tilemap_t *k007121_tilemap[2]; - int flipscreen; + tilemap_t *m_k007121_tilemap[2]; + int m_flipscreen; /* misc */ - int irq_enabled; - int multiply_reg[2]; + int m_irq_enabled; + int m_multiply_reg[2]; /* devices */ - device_t *audiocpu; - device_t *k007121; + device_t *m_audiocpu; + device_t *m_k007121; }; diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h index 4cb9de8b3a2..55b8aeaf396 100644 --- a/src/mame/includes/flower.h +++ b/src/mame/includes/flower.h @@ -6,18 +6,18 @@ public: flower_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *spriteram; - UINT8 *sn_irq_enable; - UINT8 *sn_nmi_enable; - UINT8 *textram; - UINT8 *bg0ram; - UINT8 *bg1ram; - UINT8 *bg0_scroll; - UINT8 *bg1_scroll; - tilemap_t *bg0_tilemap; - tilemap_t *bg1_tilemap; - tilemap_t *text_tilemap; - tilemap_t *text_right_tilemap; + UINT8 *m_spriteram; + UINT8 *m_sn_irq_enable; + UINT8 *m_sn_nmi_enable; + UINT8 *m_textram; + UINT8 *m_bg0ram; + UINT8 *m_bg1ram; + UINT8 *m_bg0_scroll; + UINT8 *m_bg1_scroll; + tilemap_t *m_bg0_tilemap; + tilemap_t *m_bg1_tilemap; + tilemap_t *m_text_tilemap; + tilemap_t *m_text_right_tilemap; }; diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index f1ce8c0f11d..e8d134e7c89 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -6,52 +6,64 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * workram; - UINT8 * scrlram; - UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram_2; // currently this uses generic palette handling - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_workram; + UINT8 * m_scrlram; + UINT8 * m_spriteram; +// UINT8 * m_paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram_2; // currently this uses generic palette handling + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int char_bank, palette_bank, flipscreen, gfxctrl; + tilemap_t *m_bg_tilemap; + int m_char_bank; + int m_palette_bank; + int m_flipscreen; + int m_gfxctrl; /* sound-related */ - UINT8 snd_data; - UINT8 snd_flag; - int sound_nmi_enable, pending_nmi; - int vol_ctrl[16]; - UINT8 snd_ctrl0; - UINT8 snd_ctrl1; - UINT8 snd_ctrl2; - UINT8 snd_ctrl3; + UINT8 m_snd_data; + UINT8 m_snd_flag; + int m_sound_nmi_enable; + int m_pending_nmi; + int m_vol_ctrl[16]; + UINT8 m_snd_ctrl0; + UINT8 m_snd_ctrl1; + UINT8 m_snd_ctrl2; + UINT8 m_snd_ctrl3; /* protection */ - UINT8 from_main, from_mcu; - int mcu_sent, main_sent; - UINT8 port_a_in, port_a_out, ddr_a; - UINT8 port_b_in, port_b_out, ddr_b; - UINT8 port_c_in, port_c_out, ddr_c; - int mcu_select; + UINT8 m_from_main; + UINT8 m_from_mcu; + int m_mcu_sent; + int m_main_sent; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_b_in; + UINT8 m_port_b_out; + UINT8 m_ddr_b; + UINT8 m_port_c_in; + UINT8 m_port_c_out; + UINT8 m_ddr_c; + int m_mcu_select; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *mcu; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_mcu; /* mcu */ - UINT8 mcu_cmd; - UINT8 mcu_counter; - UINT8 mcu_b4_cmd; - UINT8 mcu_param; - UINT8 mcu_b2_res; - UINT8 mcu_b1_res; - UINT8 mcu_bb_res; - UINT8 mcu_b5_res; - UINT8 mcu_b6_res; + UINT8 m_mcu_cmd; + UINT8 m_mcu_counter; + UINT8 m_mcu_b4_cmd; + UINT8 m_mcu_param; + UINT8 m_mcu_b2_res; + UINT8 m_mcu_b1_res; + UINT8 m_mcu_bb_res; + UINT8 m_mcu_b5_res; + UINT8 m_mcu_b6_res; }; diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h index aee4cc0a00f..3b7f556291f 100644 --- a/src/mame/includes/foodf.h +++ b/src/mame/includes/foodf.h @@ -16,13 +16,13 @@ public: required_device<x2212_device> m_nvram; - double rweights[3]; - double gweights[3]; - double bweights[2]; - UINT8 playfield_flip; + double m_rweights[3]; + double m_gweights[3]; + double m_bweights[2]; + UINT8 m_playfield_flip; - UINT8 whichport; - UINT16 *spriteram; + UINT8 m_whichport; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index c074768d68e..956a81fed8e 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -7,19 +7,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *freek_tilemap; + tilemap_t *m_freek_tilemap; /* misc */ - int inval, outval, cnt; // used by oigas - int romaddr; - int spinner; - int nmi_en; - int ff_data; + int m_inval; + int m_outval; + int m_cnt; // used by oigas + int m_romaddr; + int m_spinner; + int m_nmi_en; + int m_ff_data; }; diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 0f746f55582..f1caf4bd96f 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -6,26 +6,30 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 *paletteram[2]; - UINT16 *videoram[2][4]; + UINT16 *m_paletteram[2]; + UINT16 *m_videoram[2][4]; /* video-related */ - tilemap_t *tilemap[2][4]; - int scrollx[2][4], scrolly[2][4]; - int gfxbank[2][4]; + tilemap_t *m_tilemap[2][4]; + int m_scrollx[2][4]; + int m_scrolly[2][4]; + int m_gfxbank[2][4]; /* misc */ - int portselect; - UINT8 subcpu_int_flag, subcpu_nmi_flag, sndcpu_nmi_flag; - UINT16 datalatch1; - UINT8 datalatch_2h, datalatch_2l; + int m_portselect; + UINT8 m_subcpu_int_flag; + UINT8 m_subcpu_nmi_flag; + UINT8 m_sndcpu_nmi_flag; + UINT16 m_datalatch1; + UINT8 m_datalatch_2h; + UINT8 m_datalatch_2l; /* devices */ - device_t *audiocpu; - device_t *subcpu; - device_t *eeprom; - device_t *left_screen; - device_t *right_screen; + device_t *m_audiocpu; + device_t *m_subcpu; + device_t *m_eeprom; + device_t *m_left_screen; + device_t *m_right_screen; }; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index e496a53ef57..a95ee62bada 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -14,33 +14,43 @@ public: : driver_device(machine, config) { } /* memory pointers (used by pipedrm) */ - UINT8 * videoram; - UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; +// UINT8 * m_paletteram; // currently this uses generic palette handling + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap,*fg_tilemap; - UINT8 *local_videoram[2]; - UINT8 *local_paletteram; - UINT8 selected_videoram, selected_paletteram; - UINT32 scrollx[2], scrolly[2]; - UINT8 gfxreg; - UINT8 flipscreen, flipscreen_old; - UINT32 scrolly_ofs, scrollx_ofs; - - UINT8 crtc_register; - UINT8 crtc_data[0x10]; - emu_timer *crtc_timer; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 *m_local_videoram[2]; + UINT8 *m_local_paletteram; + UINT8 m_selected_videoram; + UINT8 m_selected_paletteram; + UINT32 m_scrollx[2]; + UINT32 m_scrolly[2]; + UINT8 m_gfxreg; + UINT8 m_flipscreen; + UINT8 m_flipscreen_old; + UINT32 m_scrolly_ofs; + UINT32 m_scrollx_ofs; + + UINT8 m_crtc_register; + UINT8 m_crtc_data[0x10]; + emu_timer *m_crtc_timer; /* misc */ - UINT8 directionflag, commanddata, portselect; - UINT8 adpcm_reset, adpcm_data, vclk_left; - UINT8 pending_command, sound_command; + UINT8 m_directionflag; + UINT8 m_commanddata; + UINT8 m_portselect; + UINT8 m_adpcm_reset; + UINT8 m_adpcm_data; + UINT8 m_vclk_left; + UINT8 m_pending_command; + UINT8 m_sound_command; /* devices */ - device_t *subcpu; + device_t *m_subcpu; }; diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index 51dc876ef7d..adfacf23a04 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -7,12 +7,12 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; + UINT8 * m_videoram; + UINT8 * m_colorram; /* video-related */ - tilemap_t *bg_tilemap; - int gfx_bank; + tilemap_t *m_bg_tilemap; + int m_gfx_bank; }; diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h index 983bd2e1f2c..25fab8bb58c 100644 --- a/src/mame/includes/funkyjet.h +++ b/src/mame/includes/funkyjet.h @@ -11,16 +11,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT16 * spriteram; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT16 * m_spriteram; // UINT16 * paletteram; // currently this uses generic palette handling (in decocomn.c) - size_t spriteram_size; + size_t m_spriteram_size; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *deco_tilegen1; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_deco_tilegen1; }; diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index 33435c2e3ff..4350b32d033 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -4,9 +4,9 @@ public: funworld_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8* videoram; - UINT8* colorram; - tilemap_t *bg_tilemap; + UINT8* m_videoram; + UINT8* m_colorram; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index e81a0b56b6a..fc56105f7d5 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -7,13 +7,13 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * paletteram; + UINT8 * m_paletteram; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; /* memory */ - UINT8 banked_vram[0x2000]; + UINT8 m_banked_vram[0x2000]; }; diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index babe489b440..040050792ed 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -7,26 +7,29 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * vram_0; - UINT16 * vram_1; - UINT16 * vram_2; - UINT16 * vram_3; - UINT16 * vregs; - UINT16 * priority; - UINT16 * unknown; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_vram_0; + UINT16 * m_vram_1; + UINT16 * m_vram_2; + UINT16 * m_vram_3; + UINT16 * m_vregs; + UINT16 * m_priority; + UINT16 * m_unknown; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *tilemap_0, *tilemap_1, *tilemap_2, *tilemap_3; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; + tilemap_t *m_tilemap_2; + tilemap_t *m_tilemap_3; /* misc */ - emu_timer *raster_interrupt_timer; + emu_timer *m_raster_interrupt_timer; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 88ce7a2ee1a..3bc19b9a080 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -16,30 +16,33 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT32 * vram_0; - UINT32 * vram_1; - UINT32 * vram_2; - UINT32 * vram_3; - UINT32 * vregs; - UINT32 * priority; - UINT32 * tilebank; - UINT32 * spriteram; - UINT32 * buf_spriteram; - UINT32 * buf_spriteram2; - UINT32 * paletteram; - size_t spriteram_size; + UINT32 * m_vram_0; + UINT32 * m_vram_1; + UINT32 * m_vram_2; + UINT32 * m_vram_3; + UINT32 * m_vregs; + UINT32 * m_priority; + UINT32 * m_tilebank; + UINT32 * m_spriteram; + UINT32 * m_buf_spriteram; + UINT32 * m_buf_spriteram2; + UINT32 * m_paletteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *tilemap_0, *tilemap_1, *tilemap_2, *tilemap_3; - UINT32 spr_buffered_tilebank[2]; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; + tilemap_t *m_tilemap_2; + tilemap_t *m_tilemap_3; + UINT32 m_spr_buffered_tilebank[2]; /* misc */ - emu_timer *raster_interrupt_timer; - UINT8 shared_ram[16]; + emu_timer *m_raster_interrupt_timer; + UINT8 m_shared_ram[16]; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index de61ad327b5..aec5c29efb9 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -11,17 +11,17 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; - UINT16 * spriteram; - UINT16 * vregs; - UINT16 * screen; + UINT16 * m_videoram; + UINT16 * m_spriteram; + UINT16 * m_vregs; + UINT16 * m_screen; // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *tilemap[2]; + tilemap_t *m_tilemap[2]; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 7934a737c99..f8bba3daed5 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -4,13 +4,13 @@ public: gaelco2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *snowboar_protection; - UINT16 *vregs; - int clr_gun_int; - UINT8 analog_ports[2]; - UINT16 *videoram; - tilemap_t *pant[2]; - int dual_monitor; + UINT16 *m_snowboar_protection; + UINT16 *m_vregs; + int m_clr_gun_int; + UINT8 m_analog_ports[2]; + UINT16 *m_videoram; + tilemap_t *m_pant[2]; + int m_dual_monitor; }; diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index 154730cd608..a9e0694675d 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -17,35 +17,35 @@ public: gaelco3d_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 *adsp_ram_base; - UINT16 *m68k_ram_base; - UINT16 *tms_comm_base; - UINT16 sound_data; - UINT8 sound_status; - offs_t tms_offset_xor; - UINT8 analog_ports[4]; - UINT8 framenum; - timer_device *adsp_autobuffer_timer; - UINT16 *adsp_control_regs; - UINT16 *adsp_fastram_base; - UINT8 adsp_ireg; - offs_t adsp_ireg_base; - offs_t adsp_incs; - offs_t adsp_size; - dmadac_sound_device *dmadac[SOUND_CHANNELS]; - UINT8 *texture; - UINT8 *texmask; - offs_t texture_size; - offs_t texmask_size; - bitmap_t *screenbits; - bitmap_t *zbuffer; - rgb_t *palette; - UINT32 *polydata_buffer; - UINT32 polydata_count; - int polygons; - int lastscan; - int video_changed; - poly_manager *poly; + UINT32 *m_adsp_ram_base; + UINT16 *m_m68k_ram_base; + UINT16 *m_tms_comm_base; + UINT16 m_sound_data; + UINT8 m_sound_status; + offs_t m_tms_offset_xor; + UINT8 m_analog_ports[4]; + UINT8 m_framenum; + timer_device *m_adsp_autobuffer_timer; + UINT16 *m_adsp_control_regs; + UINT16 *m_adsp_fastram_base; + UINT8 m_adsp_ireg; + offs_t m_adsp_ireg_base; + offs_t m_adsp_incs; + offs_t m_adsp_size; + dmadac_sound_device *m_dmadac[SOUND_CHANNELS]; + UINT8 *m_texture; + UINT8 *m_texmask; + offs_t m_texture_size; + offs_t m_texmask_size; + bitmap_t *m_screenbits; + bitmap_t *m_zbuffer; + rgb_t *m_palette; + UINT32 *m_polydata_buffer; + UINT32 m_polydata_count; + int m_polygons; + int m_lastscan; + int m_video_changed; + poly_manager *m_poly; }; diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 5aaccf16417..6de2885dd52 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -11,27 +11,38 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; - UINT16 * videoram2; - UINT16 * videoram3; - UINT16 * spriteram; - size_t spriteram_size; + UINT16 * m_videoram; + UINT16 * m_videoram2; + UINT16 * m_videoram3; + UINT16 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *text_layer,*foreground,*background; - bitmap_t *sprite_bitmap, *tile_bitmap_bg, *tile_bitmap_fg; - UINT16 tx_scroll_x, tx_scroll_y; - UINT16 bg_scroll_x, bg_scroll_y; - UINT16 fg_scroll_x, fg_scroll_y; - INT8 tx_offset_y, bg_offset_y, fg_offset_y, spr_offset_y; + tilemap_t *m_text_layer; + tilemap_t *m_foreground; + tilemap_t *m_background; + bitmap_t *m_sprite_bitmap; + bitmap_t *m_tile_bitmap_bg; + bitmap_t *m_tile_bitmap_fg; + UINT16 m_tx_scroll_x; + UINT16 m_tx_scroll_y; + UINT16 m_bg_scroll_x; + UINT16 m_bg_scroll_y; + UINT16 m_fg_scroll_x; + UINT16 m_fg_scroll_y; + INT8 m_tx_offset_y; + INT8 m_bg_offset_y; + INT8 m_fg_offset_y; + INT8 m_spr_offset_y; /* misc */ - int sprite_sizey; - int prot, jumpcode; - const int *raiga_jumppoints; + int m_sprite_sizey; + int m_prot; + int m_jumpcode; + const int *m_raiga_jumppoints; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 25a6cbefbd1..5796ddd0947 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -7,25 +7,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 *galaga_ram1,*galaga_ram2,*galaga_ram3; - UINT8 *galaga_starcontrol; // 6 addresses - emu_timer *cpu3_interrupt_timer; - UINT8 custom_mod; + UINT8 *m_galaga_ram1; + UINT8 *m_galaga_ram2; + UINT8 *m_galaga_ram3; + UINT8 *m_galaga_starcontrol; // 6 addresses + emu_timer *m_cpu3_interrupt_timer; + UINT8 m_custom_mod; /* machine state */ - UINT32 stars_scrollx; - UINT32 stars_scrolly; + UINT32 m_stars_scrollx; + UINT32 m_stars_scrolly; - UINT32 galaga_gfxbank; // used by catsbee + UINT32 m_galaga_gfxbank; // used by catsbee /* devices */ /* bank support */ /* shared */ - UINT8 *videoram; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; + UINT8 *m_videoram; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; }; class xevious_state : public galaga_state @@ -34,15 +36,15 @@ public: xevious_state(running_machine &machine, const driver_device_config_base &config) : galaga_state(machine, config) { } - UINT8 *xevious_fg_videoram; - UINT8 *xevious_fg_colorram; - UINT8 *xevious_bg_videoram; - UINT8 *xevious_bg_colorram; - UINT8 *xevious_sr1; - UINT8 *xevious_sr2; - UINT8 *xevious_sr3; + UINT8 *m_xevious_fg_videoram; + UINT8 *m_xevious_fg_colorram; + UINT8 *m_xevious_bg_videoram; + UINT8 *m_xevious_bg_colorram; + UINT8 *m_xevious_sr1; + UINT8 *m_xevious_sr2; + UINT8 *m_xevious_sr3; - INT32 xevious_bs[2]; + INT32 m_xevious_bs[2]; }; @@ -52,13 +54,13 @@ public: bosco_state(running_machine &machine, const driver_device_config_base &config) : galaga_state(machine, config) { } - UINT8 *bosco_radarattr; + UINT8 *m_bosco_radarattr; - UINT8 *bosco_starcontrol; - UINT8 *bosco_starblink; + UINT8 *m_bosco_starcontrol; + UINT8 *m_bosco_starblink; - UINT8 *bosco_radarx; - UINT8 *bosco_radary; + UINT8 *m_bosco_radarx; + UINT8 *m_bosco_radary; }; class digdug_state : public galaga_state @@ -67,14 +69,14 @@ public: digdug_state(running_machine &machine, const driver_device_config_base &config) : galaga_state(machine, config) { } - UINT8 *digdug_objram; - UINT8 *digdug_posram; - UINT8 *digdug_flpram; + UINT8 *m_digdug_objram; + UINT8 *m_digdug_posram; + UINT8 *m_digdug_flpram; - UINT8 bg_select; - UINT8 tx_color_mode; - UINT8 bg_disable; - UINT8 bg_color_bank; + UINT8 m_bg_select; + UINT8 m_tx_color_mode; + UINT8 m_bg_disable; + UINT8 m_bg_color_bank; }; diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index b938224a420..4dd6019188d 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -16,25 +16,25 @@ public: galastrm_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 coin_word; - UINT16 frame_counter; - UINT32 *ram; - int tc0110pcr_addr; - int tc0610_0_addr; - int tc0610_1_addr; - UINT32 mem[2]; - INT16 tc0610_ctrl_reg[2][8]; - struct tempsprite *spritelist; - struct tempsprite *sprite_ptr_pre; - bitmap_t *tmpbitmaps; - bitmap_t *polybitmap; - poly_manager *poly; - int rsxb; - int rsyb; - int rsxoffs; - int rsyoffs; - UINT32 *spriteram; - size_t spriteram_size; + UINT16 m_coin_word; + UINT16 m_frame_counter; + UINT32 *m_ram; + int m_tc0110pcr_addr; + int m_tc0610_0_addr; + 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; + bitmap_t *m_tmpbitmaps; + bitmap_t *m_polybitmap; + poly_manager *m_poly; + int m_rsxb; + int m_rsyb; + int m_rsxoffs; + int m_rsyoffs; + UINT32 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index f31b344947a..ba67a02dd32 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -31,7 +31,7 @@ public: galaxian_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; + UINT8 *m_videoram; }; diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 7913ddcdcc4..28f86912d1e 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -11,18 +11,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *tx_tilemap; - UINT8 scrollx[2], scrolly[2]; - UINT8 flipscreen; - UINT8 write_layers, layers; - UINT8 ninjemak_dispdisable; + tilemap_t *m_bg_tilemap; + tilemap_t *m_tx_tilemap; + UINT8 m_scrollx[2]; + UINT8 m_scrolly[2]; + UINT8 m_flipscreen; + UINT8 m_write_layers; + UINT8 m_layers; + UINT8 m_ninjemak_dispdisable; }; diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h index 2409e6c68e1..0fb08f03956 100644 --- a/src/mame/includes/galpani2.h +++ b/src/mame/includes/galpani2.h @@ -4,24 +4,24 @@ public: galpani2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *bg8_0; - UINT16 *bg8_1; - UINT16 *palette_0; - UINT16 *palette_1; - UINT16 *bg8_0_scrollx; - UINT16 *bg8_1_scrollx; - UINT16 *bg8_0_scrolly; - UINT16 *bg8_1_scrolly; - UINT16 *bg15; - UINT16 eeprom_word; - UINT16 *ram; - UINT16 *ram2; - UINT16 old_mcu_nmi1; - UINT16 old_mcu_nmi2; - UINT16 *rombank; - bitmap_t *bg8_bitmap_0; - bitmap_t *bg8_bitmap_1; - bitmap_t *bg15_bitmap; + UINT16 *m_bg8_0; + UINT16 *m_bg8_1; + UINT16 *m_palette_0; + UINT16 *m_palette_1; + UINT16 *m_bg8_0_scrollx; + UINT16 *m_bg8_1_scrollx; + UINT16 *m_bg8_0_scrolly; + UINT16 *m_bg8_1_scrolly; + UINT16 *m_bg15; + UINT16 m_eeprom_word; + UINT16 *m_ram; + UINT16 *m_ram2; + UINT16 m_old_mcu_nmi1; + UINT16 m_old_mcu_nmi2; + UINT16 *m_rombank; + bitmap_t *m_bg8_bitmap_0; + bitmap_t *m_bg8_bitmap_1; + bitmap_t *m_bg15_bitmap; }; diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index 8307a9dcf03..3f6abfd77e3 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -4,12 +4,12 @@ public: galpanic_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *bgvideoram; - UINT16 *fgvideoram; - size_t fgvideoram_size; - bitmap_t *sprites_bitmap; - UINT16 *spriteram; - size_t spriteram_size; + UINT16 *m_bgvideoram; + UINT16 *m_fgvideoram; + size_t m_fgvideoram_size; + bitmap_t *m_sprites_bitmap; + UINT16 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 524925d325c..c7eef830f87 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -12,16 +12,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; - UINT16 * bgvideoram; - UINT16 * colorram; - UINT16 * scroll; - UINT16 * spriteram; + UINT16 * m_videoram; + UINT16 * m_bgvideoram; + UINT16 * m_colorram; + UINT16 * m_scroll; + UINT16 * m_spriteram; // UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + size_t m_spriteram_size; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index f83d4bca17e..59fd5e9bed1 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -26,30 +26,30 @@ class gameplan_state : public driver_device public: gameplan_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - via_0(*this, "via6522_0"), - via_1(*this, "via6522_1"), - via_2(*this, "via6522_2") { } + m_via_0(*this, "via6522_0"), + m_via_1(*this, "via6522_1"), + m_via_2(*this, "via6522_2") { } /* machine state */ - UINT8 current_port; - UINT8 *trvquest_question; + UINT8 m_current_port; + UINT8 *m_trvquest_question; /* video state */ - UINT8 *videoram; - size_t videoram_size; - UINT8 video_x; - UINT8 video_y; - UINT8 video_command; - UINT8 video_data; - emu_timer *via_0_ca1_timer; + UINT8 *m_videoram; + size_t m_videoram_size; + UINT8 m_video_x; + UINT8 m_video_y; + UINT8 m_video_command; + UINT8 m_video_data; + emu_timer *m_via_0_ca1_timer; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *riot; - required_device<via6522_device> via_0; - required_device<via6522_device> via_1; - required_device<via6522_device> via_2; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_riot; + required_device<via6522_device> m_via_0; + required_device<via6522_device> m_via_1; + required_device<via6522_device> m_via_2; }; diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index ceb380d07f1..f52b288e07b 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -12,13 +12,13 @@ public: gaplus_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *customio_3; - UINT8 *videoram; - UINT8 *spriteram; - tilemap_t *bg_tilemap; - UINT8 starfield_control[4]; - int total_stars; - struct star stars[MAX_STARS]; + UINT8 *m_customio_3; + UINT8 *m_videoram; + UINT8 *m_spriteram; + tilemap_t *m_bg_tilemap; + UINT8 m_starfield_control[4]; + int m_total_stars; + struct star m_stars[MAX_STARS]; }; diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index b3a6788e8ce..f9e3315d67b 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -4,8 +4,8 @@ public: gatron_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - tilemap_t *bg_tilemap; + UINT8 *m_videoram; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h index 6a3d81da743..ea0652e1e54 100644 --- a/src/mame/includes/gauntlet.h +++ b/src/mame/includes/gauntlet.h @@ -12,10 +12,10 @@ public: gauntlet_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 sound_reset_val; - UINT8 vindctr2_screen_refresh; - UINT8 playfield_tile_bank; - UINT8 playfield_color_bank; + UINT16 m_sound_reset_val; + UINT8 m_vindctr2_screen_refresh; + UINT8 m_playfield_tile_bank; + UINT8 m_playfield_color_bank; }; diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index d8a5d1f070a..0537fb006b5 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -11,19 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * spriteram2; - UINT8 * scrollram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; + UINT8 * m_scrollram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - UINT8 spritebank; + tilemap_t *m_bg_tilemap; + UINT8 m_spritebank; /* misc */ - UINT8 nmi_enable, irq_enable; + UINT8 m_nmi_enable; + UINT8 m_irq_enable; }; diff --git a/src/mame/includes/gbusters.h b/src/mame/includes/gbusters.h index 40471f933a0..2c236c6957e 100644 --- a/src/mame/includes/gbusters.h +++ b/src/mame/includes/gbusters.h @@ -11,22 +11,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; + int m_layer_colorbase[3]; + int m_sprite_colorbase; /* misc */ - int palette_selected; - int priority; + int m_palette_selected; + int m_priority; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k007232; - device_t *k052109; - device_t *k051960; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k007232; + device_t *m_k052109; + device_t *m_k051960; }; /*----------- defined in video/gbusters.c -----------*/ diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index de7c3c4c93a..202d01ca873 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -7,34 +7,41 @@ class gcpinbal_state : public driver_device public: gcpinbal_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - oki(*this, "oki"), - msm(*this, "msm") { } + m_maincpu(*this, "maincpu"), + m_oki(*this, "oki"), + m_msm(*this, "msm") { } /* memory pointers */ - UINT16 * tilemapram; - UINT16 * ioc_ram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_tilemapram; + UINT16 * m_ioc_ram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *tilemap[3]; - UINT16 scrollx[3], scrolly[3]; - UINT16 bg0_gfxset, bg1_gfxset; + tilemap_t *m_tilemap[3]; + UINT16 m_scrollx[3]; + UINT16 m_scrolly[3]; + UINT16 m_bg0_gfxset; + UINT16 m_bg1_gfxset; #ifdef MAME_DEBUG - UINT8 dislayer[4]; + UINT8 m_dislayer[4]; #endif /* sound-related */ - UINT32 msm_start, msm_end, msm_bank; - UINT32 adpcm_start, adpcm_end, adpcm_idle; - UINT8 adpcm_trigger, adpcm_data; + UINT32 m_msm_start; + UINT32 m_msm_end; + UINT32 m_msm_bank; + UINT32 m_adpcm_start; + UINT32 m_adpcm_end; + UINT32 m_adpcm_idle; + UINT8 m_adpcm_trigger; + UINT8 m_adpcm_data; /* devices */ - required_device<cpu_device> maincpu; - required_device<okim6295_device> oki; - required_device<msm5205_device> msm; + required_device<cpu_device> m_maincpu; + required_device<okim6295_device> m_oki; + required_device<msm5205_device> m_msm; }; diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h index 02618168b74..602195f3722 100644 --- a/src/mame/includes/gijoe.h +++ b/src/mame/includes/gijoe.h @@ -11,26 +11,29 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * workram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_workram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int avac_bits[4], avac_occupancy[4]; - int layer_colorbase[4], layer_pri[4]; - int avac_vrc, sprite_colorbase; + int m_avac_bits[4]; + int m_avac_occupancy[4]; + int m_layer_colorbase[4]; + int m_layer_pri[4]; + int m_avac_vrc; + int m_sprite_colorbase; /* misc */ - UINT16 cur_control2; - emu_timer *dmadelay_timer; + UINT16 m_cur_control2; + emu_timer *m_dmadelay_timer; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k054539; - device_t *k056832; - device_t *k053246; - device_t *k053251; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k054539; + device_t *m_k056832; + device_t *m_k053246; + device_t *m_k053251; }; /*----------- defined in video/gijoe.c -----------*/ diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index dea51b79fe2..637868912d8 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -11,31 +11,35 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * fgram; - UINT16 * txtram; - UINT16 * vregs; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_fgram; + UINT16 * m_txtram; + UINT16 * m_vregs; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; - int layers_ctrl, flipscreen; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_tx_tilemap; + int m_layers_ctrl; + int m_flipscreen; #ifdef MAME_DEBUG - int posx, posy; + int m_posx; + int m_posy; #endif /* sound-related */ - UINT8 MC6840_index0; - UINT8 MC6840_register0; - UINT8 MC6840_index1; - UINT8 MC6840_register1; - int S_TEMPO; - int S_TEMPO_OLD; - int MC6809_CTR; - int MC6809_FLAG; + UINT8 m_MC6840_index0; + UINT8 m_MC6840_register0; + UINT8 m_MC6840_index1; + UINT8 m_MC6840_register1; + int m_S_TEMPO; + int m_S_TEMPO_OLD; + int m_MC6809_CTR; + int m_MC6809_FLAG; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 0fa343e366e..44ff4a1ac81 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -6,25 +6,25 @@ public: m_nvram(*this, "nvram") { } required_shared_ptr<UINT8> m_nvram; - int data1; - int data2; - int flag1; - int flag2; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *textram; - int video_attributes; - int fg_scrollx; - int fg_scrolly; - int bg_scrollx; - int bg_scrolly; - int sprite_bank; - int sprite_buffer; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - int fg_tile_bank; - int bg_tile_bank; - UINT8 *spriteram; + int m_data1; + int m_data2; + int m_flag1; + int m_flag2; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_textram; + int m_video_attributes; + int m_fg_scrollx; + int m_fg_scrolly; + int m_bg_scrollx; + int m_bg_scrolly; + int m_sprite_bank; + int m_sprite_buffer; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_fg_tile_bank; + int m_bg_tile_bank; + UINT8 *m_spriteram; }; /*----------- defined in video/gladiatr.c -----------*/ diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index 5343dd85018..984452fe94d 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -11,18 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; - UINT16 * vregs; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_videoram; + UINT16 * m_vregs; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *pant[2]; - bitmap_t *screen_bitmap; + tilemap_t *m_pant[2]; + bitmap_t *m_screen_bitmap; /* misc */ - int current_bit, current_command, cause_interrupt; - int blitter_serial_buffer[5]; + int m_current_bit; + int m_current_command; + int m_cause_interrupt; + int m_blitter_serial_buffer[5]; }; diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index fe6588c42fb..63b3da32461 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -11,16 +11,17 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bgvideoram; - UINT8 * fgvideoram; -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram2; // currently this uses generic palette handling -// UINT8 * spriteram; // currently this uses generic buffered spriteram + UINT8 * m_bgvideoram; + UINT8 * m_fgvideoram; +// UINT8 * m_paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram2; // currently this uses generic palette handling +// UINT8 * m_spriteram; // currently this uses generic buffered spriteram /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - UINT8 scrollx[2]; - UINT8 scrolly[2]; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 m_scrollx[2]; + UINT8 m_scrolly[2]; }; diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index 248aecec579..d4c1c21974c 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -11,24 +11,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bg_data; - UINT16 * fg_data; - UINT16 * tx_data; - UINT16 * scrollram; -// UINT16 * paletteram; // this currently use generic palette handling - UINT16 * spriteram; - UINT16 * buffered_spriteram; + UINT16 * m_bg_data; + UINT16 * m_fg_data; + UINT16 * m_tx_data; + UINT16 * m_scrollram; +// UINT16 * m_paletteram; // this currently use generic palette handling + UINT16 * m_spriteram; + UINT16 * m_buffered_spriteram; /* video-related */ - tilemap_t *bg_layer, *fg_layer, *tx_layer; - UINT16 fg_bank; + tilemap_t *m_bg_layer; + tilemap_t *m_fg_layer; + tilemap_t *m_tx_layer; + UINT16 m_fg_bank; /* misc */ - int msm5205next; - int adpcm_toggle; + int m_msm5205next; + int m_adpcm_toggle; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index a5f031921c8..99e2b811661 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -11,23 +11,24 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bg_videoram; - UINT8 * fg_videoram; - UINT8 * fg_scrollx; - UINT8 * fg_scrolly; - UINT8 * ram; - UINT8 * spriteram; - UINT8 * spriteram2; - size_t fg_videoram_size; - size_t bg_videoram_size; - size_t spriteram_size; + UINT8 * m_bg_videoram; + UINT8 * m_fg_videoram; + UINT8 * m_fg_scrollx; + UINT8 * m_fg_scrolly; + UINT8 * m_ram; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; + size_t m_fg_videoram_size; + size_t m_bg_videoram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - UINT16 char_bank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT16 m_char_bank; /* misc */ - int prot_toggle; + int m_prot_toggle; }; diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index be5dfaa2123..f6725f745b3 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -4,38 +4,38 @@ public: goldstar_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int dataoffset; + int m_dataoffset; - UINT8 *atrram; - UINT8 *fg_atrram; - UINT8 *fg_vidram; + UINT8 *m_atrram; + UINT8 *m_fg_atrram; + UINT8 *m_fg_vidram; - UINT8 *reel1_scroll; - UINT8 *reel2_scroll; - UINT8 *reel3_scroll; + UINT8 *m_reel1_scroll; + UINT8 *m_reel2_scroll; + UINT8 *m_reel3_scroll; - UINT8 *reel1_ram; - UINT8 *reel2_ram; - UINT8 *reel3_ram; + UINT8 *m_reel1_ram; + UINT8 *m_reel2_ram; + UINT8 *m_reel3_ram; /* reelx_attrram for unkch sets */ - UINT8 *reel1_attrram; - UINT8 *reel2_attrram; - UINT8 *reel3_attrram; - UINT8 unkch_vidreg; + UINT8 *m_reel1_attrram; + UINT8 *m_reel2_attrram; + UINT8 *m_reel3_attrram; + UINT8 m_unkch_vidreg; - tilemap_t *reel1_tilemap; - tilemap_t *reel2_tilemap; - tilemap_t *reel3_tilemap; + tilemap_t *m_reel1_tilemap; + tilemap_t *m_reel2_tilemap; + tilemap_t *m_reel3_tilemap; - int bgcolor; - tilemap_t *fg_tilemap; - UINT8 cmaster_girl_num; - UINT8 cmaster_girl_pal; - UINT8 cm_enable_reg; - UINT8 cm_girl_scroll; - UINT8 lucky8_nmi_enable; - int tile_bank; + int m_bgcolor; + tilemap_t *m_fg_tilemap; + UINT8 m_cmaster_girl_num; + UINT8 m_cmaster_girl_pal; + UINT8 m_cm_enable_reg; + UINT8 m_cm_girl_scroll; + UINT8 m_lucky8_nmi_enable; + int m_tile_bank; }; diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index 145199ab1d4..4b878ec1a9b 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -6,13 +6,13 @@ public: gomoku_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *colorram; - UINT8 *bgram; - int flipscreen; - int bg_dispsw; - tilemap_t *fg_tilemap; - bitmap_t *bg_bitmap; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_bgram; + int m_flipscreen; + int m_bg_dispsw; + tilemap_t *m_fg_tilemap; + bitmap_t *m_bg_bitmap; }; diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index 7d7dbed1416..3dc655cc97f 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -11,19 +11,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * fgvideoram; - UINT16 * bgvideoram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_fgvideoram; + UINT16 * m_bgvideoram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - int banksel, gfxbank[4]; - UINT16 scroll[4]; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_banksel; + int m_gfxbank[4]; + UINT16 m_scroll[4]; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 01c83be3b8c..222cd81cb4c 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -19,45 +19,45 @@ public: gottlieb_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 votrax_queue[100]; - UINT8 votrax_queuepos; - emu_timer *nmi_timer; - UINT8 nmi_rate; - UINT8 nmi_state; - UINT8 speech_control; - UINT8 last_command; - UINT8 *dac_data; - UINT8 *psg_latch; - UINT8 *sp0250_latch; - int score_sample; - int random_offset; - int last; - UINT8 joystick_select; - UINT8 track[2]; - device_t *laserdisc; - emu_timer *laserdisc_bit_timer; - emu_timer *laserdisc_philips_timer; - UINT8 laserdisc_select; - UINT8 laserdisc_status; - UINT16 laserdisc_philips_code; - UINT8 *laserdisc_audio_buffer; - UINT16 laserdisc_audio_address; - INT16 laserdisc_last_samples[2]; - attotime laserdisc_last_time; - attotime laserdisc_last_clock; - UINT8 laserdisc_zero_seen; - UINT8 laserdisc_audio_bits; - UINT8 laserdisc_audio_bit_count; - UINT8 gfxcharlo; - UINT8 gfxcharhi; - UINT8 *charram; - UINT8 background_priority; - UINT8 spritebank; - UINT8 transparent0; - tilemap_t *bg_tilemap; - double weights[4]; - UINT8 *spriteram; + UINT8 *m_videoram; + UINT8 m_votrax_queue[100]; + UINT8 m_votrax_queuepos; + emu_timer *m_nmi_timer; + UINT8 m_nmi_rate; + UINT8 m_nmi_state; + UINT8 m_speech_control; + UINT8 m_last_command; + UINT8 *m_dac_data; + UINT8 *m_psg_latch; + UINT8 *m_sp0250_latch; + int m_score_sample; + int m_random_offset; + int m_last; + UINT8 m_joystick_select; + UINT8 m_track[2]; + device_t *m_laserdisc; + emu_timer *m_laserdisc_bit_timer; + emu_timer *m_laserdisc_philips_timer; + UINT8 m_laserdisc_select; + UINT8 m_laserdisc_status; + UINT16 m_laserdisc_philips_code; + UINT8 *m_laserdisc_audio_buffer; + UINT16 m_laserdisc_audio_address; + INT16 m_laserdisc_last_samples[2]; + attotime m_laserdisc_last_time; + attotime m_laserdisc_last_clock; + UINT8 m_laserdisc_zero_seen; + UINT8 m_laserdisc_audio_bits; + UINT8 m_laserdisc_audio_bit_count; + UINT8 m_gfxcharlo; + UINT8 m_gfxcharhi; + UINT8 *m_charram; + UINT8 m_background_priority; + UINT8 m_spritebank; + UINT8 m_transparent0; + tilemap_t *m_bg_tilemap; + double m_weights[4]; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index e402ce1d9b3..c5a4d41672f 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -6,21 +6,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * videoram2; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * scroll; + UINT8 * m_videoram; + UINT8 * m_videoram2; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_scroll; /* video-related */ - tilemap_t *bg_tilemap; - int scroll_bit_8; + tilemap_t *m_bg_tilemap; + int m_scroll_bit_8; /* sound-related */ - int theme_playing; + int m_theme_playing; /* devices */ - device_t *samples; + device_t *m_samples; }; diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index 5626462d11d..ca57d28ed1a 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -11,23 +11,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * gfxram; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_gfxram; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; + int m_layer_colorbase[3]; + int m_sprite_colorbase; /* misc */ - int priority; - int irqAen, irqBmask; + int m_priority; + int m_irqAen; + int m_irqBmask; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *subcpu; - device_t *k007232; - device_t *k052109; - device_t *k051960; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_subcpu; + device_t *m_k007232; + device_t *m_k052109; + device_t *m_k051960; }; /*----------- defined in video/gradius3.c -----------*/ diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index e260ced5c7d..1c825bb85d4 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -12,33 +12,33 @@ public: grchamp_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 cpu0_out[16]; - UINT8 cpu1_out[16]; + UINT8 m_cpu0_out[16]; + UINT8 m_cpu1_out[16]; - UINT8 comm_latch; - UINT8 comm_latch2[4]; + UINT8 m_comm_latch; + UINT8 m_comm_latch2[4]; - UINT16 ledlatch; - UINT8 ledaddr; - UINT16 ledram[8]; + UINT16 m_ledlatch; + UINT8 m_ledaddr; + UINT16 m_ledram[8]; - UINT16 collide; - UINT8 collmode; + UINT16 m_collide; + UINT8 m_collmode; - UINT8 * radarram; - UINT8 * videoram; - UINT8 * leftram; - UINT8 * centerram; - UINT8 * rightram; - UINT8 * spriteram; + UINT8 * m_radarram; + UINT8 * m_videoram; + UINT8 * m_leftram; + UINT8 * m_centerram; + UINT8 * m_rightram; + UINT8 * m_spriteram; - bitmap_t * work_bitmap; - tilemap_t * text_tilemap; - tilemap_t * left_tilemap; - tilemap_t * center_tilemap; - tilemap_t * right_tilemap; + bitmap_t * m_work_bitmap; + tilemap_t * m_text_tilemap; + tilemap_t * m_left_tilemap; + tilemap_t * m_center_tilemap; + tilemap_t * m_right_tilemap; - rgb_t bgcolor[0x20]; + rgb_t m_bgcolor[0x20]; }; /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index ee2345ffa3f..7cdf4c991d7 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -26,20 +26,20 @@ public: gridlee_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - cpu_device *maincpu; - UINT8 last_analog_input[2]; - UINT8 last_analog_output[2]; - UINT8 *poly17; - UINT8 *rand17; - emu_timer *irq_off; - emu_timer *irq_timer; - emu_timer *firq_off; - emu_timer *firq_timer; - UINT8 cocktail_flip; - UINT8 *local_videoram; - UINT8 palettebank_vis; - UINT8 *spriteram; + UINT8 *m_videoram; + cpu_device *m_maincpu; + UINT8 m_last_analog_input[2]; + UINT8 m_last_analog_output[2]; + UINT8 *m_poly17; + UINT8 *m_rand17; + emu_timer *m_irq_off; + emu_timer *m_irq_timer; + emu_timer *m_firq_off; + emu_timer *m_firq_timer; + UINT8 m_cocktail_flip; + UINT8 *m_local_videoram; + UINT8 m_palettebank_vis; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index fd9938e45b3..ecf5341448c 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -14,15 +14,15 @@ public: groundfx_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 coin_word; - UINT16 frame_counter; - UINT16 port_sel; - UINT32 *ram; - struct tempsprite *spritelist; - UINT16 rotate_ctrl[8]; - rectangle hack_cliprect; - UINT32 *spriteram; - size_t spriteram_size; + UINT16 m_coin_word; + UINT16 m_frame_counter; + UINT16 m_port_sel; + UINT32 *m_ram; + struct tempsprite *m_spritelist; + UINT16 m_rotate_ctrl[8]; + rectangle m_hack_cliprect; + UINT32 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index e87e7af8a4c..b43bd7577d0 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -48,19 +48,19 @@ public: gstriker_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 dmmy_8f_ret; - int pending_command; - UINT16 *work_ram; - int gametype; - UINT16 mcu_data; - UINT16 prot_reg[2]; - UINT16 *lineram; - sVS920A VS920A[MAX_VS920A]; - tMB60553 MB60553[MAX_MB60553]; - tCG10103 CG10103[MAX_CG10103]; - sVS920A* VS920A_cur_chip; - tMB60553 *MB60553_cur_chip; - tCG10103* CG10103_cur_chip; + UINT16 m_dmmy_8f_ret; + int m_pending_command; + UINT16 *m_work_ram; + int m_gametype; + UINT16 m_mcu_data; + UINT16 m_prot_reg[2]; + UINT16 *m_lineram; + sVS920A m_VS920A[MAX_VS920A]; + tMB60553 m_MB60553[MAX_MB60553]; + tCG10103 m_CG10103[MAX_CG10103]; + sVS920A* m_VS920A_cur_chip; + tMB60553 *m_MB60553_cur_chip; + tCG10103* m_CG10103_cur_chip; }; diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index 6371cd64a85..55de4d96055 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -4,21 +4,21 @@ public: gsword_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - int coins; - int fake8910_0; - int fake8910_1; - int nmi_enable; - UINT8 *cpu2_ram; - int protect_hack; - size_t spritexy_size; - UINT8 *spritexy_ram; - UINT8 *spritetile_ram; - UINT8 *spriteattrib_ram; - int charbank; - int charpalbank; - int flipscreen; - tilemap_t *bg_tilemap; + UINT8 *m_videoram; + int m_coins; + int m_fake8910_0; + int m_fake8910_1; + int m_nmi_enable; + UINT8 *m_cpu2_ram; + int m_protect_hack; + size_t m_spritexy_size; + UINT8 *m_spritexy_ram; + UINT8 *m_spritetile_ram; + UINT8 *m_spriteattrib_ram; + int m_charbank; + int m_charpalbank; + int m_flipscreen; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index 36a45311a80..080ccf3ec44 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -11,13 +11,13 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bg_videoram; - UINT16 * fg_videoram; + UINT16 * m_bg_videoram; + UINT16 * m_fg_videoram; // UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; }; diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index d1ea9734b01..661baf21ce4 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -14,12 +14,12 @@ public: gunbustr_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 coin_word; - UINT32 *ram; - struct tempsprite *spritelist; - UINT32 mem[2]; - UINT32 *spriteram; - size_t spriteram_size; + UINT16 m_coin_word; + UINT32 *m_ram; + struct tempsprite *m_spritelist; + UINT32 m_mem[2]; + UINT32 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index 65f0e6ef424..5c7c031fb6e 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -11,19 +11,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bg_videoram; - UINT8 * fg_videoram; - UINT8 * rambase; - UINT8 * paletteram; + UINT8 * m_bg_videoram; + UINT8 * m_fg_videoram; + UINT8 * m_rambase; + UINT8 * m_paletteram; /* video-related */ - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - int flipscreen; - UINT8 scroll[4]; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_flipscreen; + UINT8 m_scroll[4]; /* misc */ - int input_ports_hack; + int m_input_ports_hack; }; diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index e8e19567ce1..9e3aa23b25c 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -11,17 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * scrollx; - UINT8 * scrolly; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_scrollx; + UINT8 * m_scrolly; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - UINT8 chon, objon, bgon; - UINT8 sprite3bank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 m_chon; + UINT8 m_objon; + UINT8 m_bgon; + UINT8 m_sprite3bank; }; diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index dca9342d589..eb70ee94cba 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -11,17 +11,17 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * flipscreen; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_flipscreen; /* video-related */ - tilemap_t *tilemap; + tilemap_t *m_tilemap; /* devices */ - cpu_device *audiocpu; - cpu_device *audiocpu_2; + cpu_device *m_audiocpu; + cpu_device *m_audiocpu_2; }; diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index 6c5a4795c41..e0e9425b15d 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -11,14 +11,14 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; + UINT8 * m_videoram; + UINT8 * m_colorram; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* misc */ - int mux; + int m_mux; }; diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index 985b961feec..604a04e0545 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -16,159 +16,159 @@ class harddriv_state : public atarigen_state public: harddriv_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config), - maincpu(*this, "maincpu"), - gsp(*this, "gsp"), - msp(*this, "msp"), - adsp(*this, "adsp"), - soundcpu(*this, "soundcpu"), - sounddsp(*this, "sounddsp"), - jsacpu(*this, "jsacpu"), - dsp32(*this, "dsp32"), - ds4cpu1(*this, "ds4cpu1"), - ds4cpu2(*this, "ds4cpu2"), - duart_timer(*this, "duart_timer") { } - - required_device<cpu_device> maincpu; - required_device<tms34010_device> gsp; - optional_device<cpu_device> msp; - required_device<adsp21xx_device> adsp; - optional_device<cpu_device> soundcpu; - optional_device<cpu_device> sounddsp; - optional_device<cpu_device> jsacpu; - optional_device<dsp32c_device> dsp32; - optional_device<adsp2105_device> ds4cpu1; - optional_device<adsp2105_device> ds4cpu2; - - UINT8 hd34010_host_access; - UINT8 dsk_pio_access; - - UINT16 * msp_ram; - UINT16 * dsk_ram; - UINT16 * dsk_rom; - UINT16 * dsk_zram; - UINT16 * m68k_slapstic_base; - UINT16 * m68k_sloop_alt_base; - - UINT16 * adsp_data_memory; - UINT32 * adsp_pgm_memory; - - UINT16 * gsp_protection; - UINT16 * stmsp_sync[3]; - - UINT16 * gsp_speedup_addr[2]; - offs_t gsp_speedup_pc; - - UINT16 * msp_speedup_addr; - offs_t msp_speedup_pc; - - UINT16 * ds3_speedup_addr; - offs_t ds3_speedup_pc; - offs_t ds3_transfer_pc; - - UINT32 * rddsp32_sync[2]; - - UINT32 gsp_speedup_count[4]; - UINT32 msp_speedup_count[4]; - UINT32 adsp_speedup_count[4]; - - UINT16 * sounddsp_ram; - - UINT8 gsp_multisync; - UINT8 * gsp_vram; - UINT16 * gsp_control_lo; - UINT16 * gsp_control_hi; - UINT16 * gsp_paletteram_lo; - UINT16 * gsp_paletteram_hi; - size_t gsp_vram_size; + m_maincpu(*this, "maincpu"), + m_gsp(*this, "gsp"), + m_msp(*this, "msp"), + m_adsp(*this, "adsp"), + m_soundcpu(*this, "soundcpu"), + m_sounddsp(*this, "sounddsp"), + m_jsacpu(*this, "jsacpu"), + m_dsp32(*this, "dsp32"), + m_ds4cpu1(*this, "ds4cpu1"), + m_ds4cpu2(*this, "ds4cpu2"), + m_duart_timer(*this, "duart_timer") { } + + required_device<cpu_device> m_maincpu; + required_device<tms34010_device> m_gsp; + optional_device<cpu_device> m_msp; + required_device<adsp21xx_device> m_adsp; + optional_device<cpu_device> m_soundcpu; + optional_device<cpu_device> m_sounddsp; + optional_device<cpu_device> m_jsacpu; + optional_device<dsp32c_device> m_dsp32; + optional_device<adsp2105_device> m_ds4cpu1; + optional_device<adsp2105_device> m_ds4cpu2; + + UINT8 m_hd34010_host_access; + UINT8 m_dsk_pio_access; + + UINT16 * m_msp_ram; + UINT16 * m_dsk_ram; + UINT16 * m_dsk_rom; + UINT16 * m_dsk_zram; + UINT16 * m_m68k_slapstic_base; + UINT16 * m_m68k_sloop_alt_base; + + UINT16 * m_adsp_data_memory; + UINT32 * m_adsp_pgm_memory; + + UINT16 * m_gsp_protection; + UINT16 * m_stmsp_sync[3]; + + UINT16 * m_gsp_speedup_addr[2]; + offs_t m_gsp_speedup_pc; + + UINT16 * m_msp_speedup_addr; + offs_t m_msp_speedup_pc; + + UINT16 * m_ds3_speedup_addr; + offs_t m_ds3_speedup_pc; + offs_t m_ds3_transfer_pc; + + UINT32 * m_rddsp32_sync[2]; + + UINT32 m_gsp_speedup_count[4]; + UINT32 m_msp_speedup_count[4]; + UINT32 m_adsp_speedup_count[4]; + + UINT16 * m_sounddsp_ram; + + UINT8 m_gsp_multisync; + UINT8 * m_gsp_vram; + UINT16 * m_gsp_control_lo; + UINT16 * m_gsp_control_hi; + UINT16 * m_gsp_paletteram_lo; + UINT16 * m_gsp_paletteram_hi; + size_t m_gsp_vram_size; /* machine state */ - UINT8 irq_state; - UINT8 gsp_irq_state; - UINT8 msp_irq_state; - UINT8 adsp_irq_state; - UINT8 duart_irq_state; - - UINT8 duart_read_data[16]; - UINT8 duart_write_data[16]; - UINT8 duart_output_port; - optional_device<timer_device> duart_timer; - - UINT8 last_gsp_shiftreg; - - UINT8 m68k_zp1; - UINT8 m68k_zp2; - UINT8 m68k_adsp_buffer_bank; - - UINT8 adsp_halt; - UINT8 adsp_br; - UINT8 adsp_xflag; - UINT16 adsp_sim_address; - UINT16 adsp_som_address; - UINT32 adsp_eprom_base; - - UINT16 * sim_memory; - UINT32 sim_memory_size; - UINT16 som_memory[0x8000/2]; - UINT16 * adsp_pgm_memory_word; - - UINT8 ds3_gcmd; - UINT8 ds3_gflag; - UINT8 ds3_g68irqs; - UINT8 ds3_gfirqs; - UINT8 ds3_g68flag; - UINT8 ds3_send; - UINT8 ds3_reset; - UINT16 ds3_gdata; - UINT16 ds3_g68data; - UINT32 ds3_sim_address; - - UINT16 adc_control; - UINT8 adc8_select; - UINT8 adc8_data; - UINT8 adc12_select; - UINT8 adc12_byte; - UINT16 adc12_data; - - UINT16 hdc68k_last_wheel; - UINT16 hdc68k_last_port1; - UINT8 hdc68k_wheel_edge; - UINT8 hdc68k_shifter_state; - - UINT8 st68k_sloop_bank; - offs_t st68k_last_alt_sloop_offset; + UINT8 m_irq_state; + UINT8 m_gsp_irq_state; + UINT8 m_msp_irq_state; + UINT8 m_adsp_irq_state; + UINT8 m_duart_irq_state; + + UINT8 m_duart_read_data[16]; + UINT8 m_duart_write_data[16]; + UINT8 m_duart_output_port; + optional_device<timer_device> m_duart_timer; + + UINT8 m_last_gsp_shiftreg; + + UINT8 m_m68k_zp1; + UINT8 m_m68k_zp2; + UINT8 m_m68k_adsp_buffer_bank; + + UINT8 m_adsp_halt; + UINT8 m_adsp_br; + UINT8 m_adsp_xflag; + UINT16 m_adsp_sim_address; + UINT16 m_adsp_som_address; + UINT32 m_adsp_eprom_base; + + UINT16 * m_sim_memory; + UINT32 m_sim_memory_size; + UINT16 m_som_memory[0x8000/2]; + UINT16 * m_adsp_pgm_memory_word; + + UINT8 m_ds3_gcmd; + UINT8 m_ds3_gflag; + UINT8 m_ds3_g68irqs; + UINT8 m_ds3_gfirqs; + UINT8 m_ds3_g68flag; + UINT8 m_ds3_send; + UINT8 m_ds3_reset; + UINT16 m_ds3_gdata; + UINT16 m_ds3_g68data; + UINT32 m_ds3_sim_address; + + UINT16 m_adc_control; + UINT8 m_adc8_select; + UINT8 m_adc8_data; + UINT8 m_adc12_select; + UINT8 m_adc12_byte; + UINT16 m_adc12_data; + + UINT16 m_hdc68k_last_wheel; + UINT16 m_hdc68k_last_port1; + UINT8 m_hdc68k_wheel_edge; + UINT8 m_hdc68k_shifter_state; + + UINT8 m_st68k_sloop_bank; + offs_t m_st68k_last_alt_sloop_offset; #define MAX_MSP_SYNC 16 - UINT32 * dataptr[MAX_MSP_SYNC]; - UINT32 dataval[MAX_MSP_SYNC]; - int next_msp_sync; + UINT32 * m_dataptr[MAX_MSP_SYNC]; + UINT32 m_dataval[MAX_MSP_SYNC]; + int m_next_msp_sync; /* audio state */ - UINT8 soundflag; - UINT8 mainflag; - UINT16 sounddata; - UINT16 maindata; + UINT8 m_soundflag; + UINT8 m_mainflag; + UINT16 m_sounddata; + UINT16 m_maindata; - UINT8 dacmute; - UINT8 cramen; - UINT8 irq68k; + UINT8 m_dacmute; + UINT8 m_cramen; + UINT8 m_irq68k; - offs_t sound_rom_offs; + offs_t m_sound_rom_offs; - UINT8 * rombase; - UINT32 romsize; - UINT16 comram[0x400/2]; - UINT64 last_bio_cycles; + UINT8 * m_rombase; + UINT32 m_romsize; + UINT16 m_comram[0x400/2]; + UINT64 m_last_bio_cycles; /* video state */ - offs_t vram_mask; + offs_t m_vram_mask; - UINT8 shiftreg_enable; + UINT8 m_shiftreg_enable; - UINT32 mask_table[65536 * 4]; - UINT8 * gsp_shiftreg_source; + UINT32 m_mask_table[65536 * 4]; + UINT8 * m_gsp_shiftreg_source; - INT8 gfx_finescroll; - UINT8 gfx_palettebank; + INT8 m_gfx_finescroll; + UINT8 m_gfx_palettebank; }; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 8601a61d481..61ae2b560c8 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -11,22 +11,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * pf1_videoram; - UINT8 * pf2_videoram; - UINT8 * paletteram; -// UINT8 * spriteram; -// UINT8 * spriteram2; + UINT8 * m_pf1_videoram; + UINT8 * m_pf2_videoram; + UINT8 * m_paletteram; +// UINT8 * m_spriteram; +// UINT8 * m_spriteram2; /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - int pf2_bankbase, pf1_bankbase; - int old_pf1, old_pf2; - int gfx_bank; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_pf2_bankbase; + int m_pf1_bankbase; + int m_old_pf1; + int m_old_pf2; + int m_gfx_bank; /* devices */ - device_t *audiocpu; - device_t *k007121_1; - device_t *k007121_2; + device_t *m_audiocpu; + device_t *m_k007121_1; + device_t *m_k007121_2; }; diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index 3a702e495e9..0dda735fe3d 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -4,13 +4,13 @@ public: hexion_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *vram[2]; - UINT8 *unkram; - int bankctrl; - int rambank; - int pmcbank; - int gfxrom_select; - tilemap_t *bg_tilemap[2]; + UINT8 *m_vram[2]; + UINT8 *m_unkram; + int m_bankctrl; + int m_rambank; + int m_pmcbank; + int m_gfxrom_select; + tilemap_t *m_bg_tilemap[2]; }; diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 6aa7e94f102..e256cdeaba0 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -11,13 +11,13 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 4bbee9dbf6a..abe2a05a7dc 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -11,17 +11,17 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bg_ram; - UINT8 * spriteram; + UINT8 * m_bg_ram; + UINT8 * m_spriteram; // UINT8 * paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *bg_tilemap; - int scrollx[2]; - int flipscreen; + tilemap_t *m_bg_tilemap; + int m_scrollx[2]; + int m_flipscreen; /* devices */ - device_t *subcpu; + device_t *m_subcpu; }; diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index e99a8af527a..3c236b42d37 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -19,13 +19,13 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; + UINT8 * m_videoram; /* video-related */ - tilemap_t *tilemap; + tilemap_t *m_tilemap; /* misc */ - attotime timeout_time; + attotime m_timeout_time; }; diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index 0f56ed955e4..a9a7489db6d 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -11,15 +11,15 @@ public: : driver_device(machine, config) { } /* video-related */ - UINT8 *pixmap[8]; - int palbank; - int total_pixmaps; - UINT8 blit_layer; - UINT16 blit_dest; - UINT32 blit_src; + UINT8 *m_pixmap[8]; + int m_palbank; + int m_total_pixmaps; + UINT8 m_blit_layer; + UINT16 m_blit_dest; + UINT32 m_blit_src; /* misc */ - int keyb; + int m_keyb; }; diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 350b68e5330..84bd6190074 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -9,90 +9,90 @@ public: hng64_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int mcu_type; - UINT32 *mainram; - UINT32 *cart; - UINT32 *rombase; + int m_mcu_type; + UINT32 *m_mainram; + UINT32 *m_cart; + UINT32 *m_rombase; - UINT32 *dualport; - UINT16 *soundram; - UINT32 *sysregs; + UINT32 *m_dualport; + UINT16 *m_soundram; + UINT32 *m_sysregs; /* Communications stuff */ - UINT32 *com_ram; - UINT8 *com_op_base; - UINT8 *com_mmu_mem; - UINT8 *com_virtual_mem; - UINT32 com_shared_a; - UINT32 com_shared_b; + UINT32 *m_com_ram; + UINT8 *m_com_op_base; + UINT8 *m_com_mmu_mem; + UINT8 *m_com_virtual_mem; + UINT32 m_com_shared_a; + UINT32 m_com_shared_b; - INT32 dma_start; - INT32 dma_dst; - INT32 dma_len; + INT32 m_dma_start; + INT32 m_dma_dst; + INT32 m_dma_len; - UINT32 mcu_fake_time; - UINT16 mcu_en; + UINT32 m_mcu_fake_time; + UINT16 m_mcu_en; - UINT32 activeBuffer; - UINT32 no_machine_error_code; - int interrupt_level_request; + UINT32 m_activeBuffer; + UINT32 m_no_machine_error_code; + int m_interrupt_level_request; - UINT32 unk_vreg_toggle; - UINT32 p1_trig; + UINT32 m_unk_vreg_toggle; + UINT32 m_p1_trig; /* 3D stuff */ - UINT32 *_3d_1; - UINT32 *_3d_2; - UINT32 *dl; + UINT32 *m_3d_1; + UINT32 *m_3d_2; + UINT32 *m_dl; //UINT32 *q2; - UINT32 *spriteram; - UINT32 *videoregs; - UINT32 *spriteregs; - UINT32 *videoram; - UINT32 *tcram; - UINT32 *_3dregs; - UINT8 screen_dis; + UINT32 *m_spriteram; + UINT32 *m_videoregs; + UINT32 *m_spriteregs; + UINT32 *m_videoram; + UINT32 *m_tcram; + UINT32 *m_3dregs; + UINT8 m_screen_dis; - tilemap_t *tilemap0_8x8; - tilemap_t *tilemap1_8x8; - tilemap_t *tilemap2_8x8; - tilemap_t *tilemap3_8x8; + tilemap_t *m_tilemap0_8x8; + tilemap_t *m_tilemap1_8x8; + tilemap_t *m_tilemap2_8x8; + tilemap_t *m_tilemap3_8x8; - tilemap_t *tilemap0_16x16; - tilemap_t *tilemap1_16x16; - tilemap_t *tilemap2_16x16; - tilemap_t *tilemap3_16x16; + tilemap_t *m_tilemap0_16x16; + tilemap_t *m_tilemap1_16x16; + tilemap_t *m_tilemap2_16x16; + tilemap_t *m_tilemap3_16x16; - tilemap_t *tilemap0_16x16_alt; - tilemap_t *tilemap1_16x16_alt; - tilemap_t *tilemap2_16x16_alt; - tilemap_t *tilemap3_16x16_alt; + tilemap_t *m_tilemap0_16x16_alt; + tilemap_t *m_tilemap1_16x16_alt; + tilemap_t *m_tilemap2_16x16_alt; + tilemap_t *m_tilemap3_16x16_alt; - UINT8 additive_tilemap_debug; + UINT8 m_additive_tilemap_debug; // 3d display buffers // (Temporarily global - someday they will live with the proper bit-depth in the memory map) - float *depthBuffer3d; - UINT32 *colorBuffer3d; + float *m_depthBuffer3d; + UINT32 *m_colorBuffer3d; - UINT32 old_animmask; - UINT32 old_animbits; - UINT16 old_tileflags0; - UINT16 old_tileflags1; - UINT16 old_tileflags2; - UINT16 old_tileflags3; + UINT32 m_old_animmask; + UINT32 m_old_animbits; + UINT16 m_old_tileflags0; + UINT16 m_old_tileflags1; + UINT16 m_old_tileflags2; + UINT16 m_old_tileflags3; - UINT32 dls[2][0x81]; + UINT32 m_dls[2][0x81]; // 3d State - int paletteState3d; - float projectionMatrix[16]; - float modelViewMatrix[16]; - float cameraMatrix[16]; + int m_paletteState3d; + float m_projectionMatrix[16]; + float m_modelViewMatrix[16]; + float m_cameraMatrix[16]; - float lightStrength; - float lightVector[3]; + float m_lightStrength; + float m_lightVector[3]; }; diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index e7fced3c66f..8d229bd9f3e 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -11,16 +11,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int palette_offset; - int po[2]; + tilemap_t *m_bg_tilemap; + int m_palette_offset; + int m_po[2]; }; diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 51fc1da58a6..3e323014586 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -6,36 +6,38 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * vreg; - UINT8 * videoram; + UINT8 * m_vreg; + UINT8 * m_videoram; /* video-related */ - tilemap_t *bg_tilemap[2][4]; - int visible_page; - int priority; - UINT8 reikaids_which; - int flipscreen; - UINT8 gfx_bank[2]; // pteacher only uses the first one - UINT8 blitter_bank; - int blitter_param_count; - UINT8 blitter_param[4]; /* buffers last 4 writes to 0x8006 */ + tilemap_t *m_bg_tilemap[2][4]; + int m_visible_page; + int m_priority; + UINT8 m_reikaids_which; + int m_flipscreen; + UINT8 m_gfx_bank[2]; // pteacher only uses the first one + UINT8 m_blitter_bank; + int m_blitter_param_count; + UINT8 m_blitter_param[4]; /* buffers last 4 writes to 0x8006 */ /* misc */ - int vblank; - int sndbank; - int keyb; - int snd_command; - int upd7807_porta, upd7807_portc; - int to_cpu, from_cpu; + int m_vblank; + int m_sndbank; + int m_keyb; + int m_snd_command; + int m_upd7807_porta; + int m_upd7807_portc; + int m_to_cpu; + int m_from_cpu; /* device */ - device_t *maincpu; - device_t *audiocpu; - device_t *dac; - device_t *ym; - device_t *sn; - UINT8 prot_data; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_dac; + device_t *m_ym; + device_t *m_sn; + UINT8 m_prot_data; }; diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index f9be211f45f..754de8e9511 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -11,17 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *tilemap; - int gfx_ctrl; + tilemap_t *m_tilemap; + int m_gfx_ctrl; /* misc */ - int xpa, xpb, xpc; - int gc_up, gc_down; + int m_xpa; + int m_xpb; + int m_xpc; + int m_gc_up; + int m_gc_down; }; diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index 51c0414b37f..d4b644eb338 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -4,19 +4,19 @@ public: hyhoo_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *clut; - int blitter_destx; - int blitter_desty; - int blitter_sizex; - int blitter_sizey; - int blitter_src_addr; - int blitter_direction_x; - int blitter_direction_y; - int gfxrom; - int dispflag; - int highcolorflag; - int flipscreen; - bitmap_t *tmpbitmap; + UINT8 *m_clut; + int m_blitter_destx; + int m_blitter_desty; + int m_blitter_sizex; + int m_blitter_sizey; + int m_blitter_src_addr; + int m_blitter_direction_x; + int m_blitter_direction_y; + int m_gfxrom; + int m_dispflag; + int m_highcolorflag; + int m_flipscreen; + bitmap_t *m_tmpbitmap; }; diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index 5fcb9bf6136..d964e29c8bc 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -5,17 +5,17 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * scroll; - UINT8 * scroll2; - UINT8 * spriteram; - UINT8 * spriteram2; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_scroll; + UINT8 * m_scroll2; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int sprites_gfx_banked; + tilemap_t *m_bg_tilemap; + int m_sprites_gfx_banked; }; /*----------- defined in video/hyperspt.c -----------*/ diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 134644341e3..00b30cc466c 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -9,42 +9,44 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoregs; - UINT16 * screenctrl; - UINT16 * tiletable_old; - UINT16 * tiletable; - UINT16 * vram_0; - UINT16 * vram_1; - UINT16 * vram_2; - UINT16 * window; - UINT16 * scroll; - UINT16 * rombank; - UINT16 * blitter_regs; - UINT16 * irq_enable; - UINT16 * sharedram1; - UINT16 * sharedram3; - UINT16 * spriteram; - UINT16 * paletteram; - size_t tiletable_size; - size_t spriteram_size; + UINT16 * m_videoregs; + UINT16 * m_screenctrl; + UINT16 * m_tiletable_old; + UINT16 * m_tiletable; + UINT16 * m_vram_0; + UINT16 * m_vram_1; + UINT16 * m_vram_2; + UINT16 * m_window; + UINT16 * m_scroll; + UINT16 * m_rombank; + UINT16 * m_blitter_regs; + UINT16 * m_irq_enable; + UINT16 * m_sharedram1; + UINT16 * m_sharedram3; + UINT16 * m_spriteram; + UINT16 * m_paletteram; + size_t m_tiletable_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap[3]; - UINT8 *empty_tiles; - UINT8 *dirtyindex; - int sprite_xoffs, sprite_yoffs, sprite_yoffs_sub; + tilemap_t *m_bg_tilemap[3]; + UINT8 *m_empty_tiles; + UINT8 *m_dirtyindex; + int m_sprite_xoffs; + int m_sprite_yoffs; + int m_sprite_yoffs_sub; /* misc */ - emu_timer *magerror_irq_timer; - int blitter_bit; - int requested_int; - int subcpu_resetline; - int cpu_trigger; - int int_num; + emu_timer *m_magerror_irq_timer; + int m_blitter_bit; + int m_requested_int; + int m_subcpu_resetline; + int m_cpu_trigger; + int m_int_num; /* devices */ - device_t *maincpu; - device_t *subcpu; + device_t *m_maincpu; + device_t *m_subcpu; }; diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index 341d4150ffe..95d88eb0151 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -11,16 +11,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * scroll; - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_scroll; + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - bitmap_t *sprite_bitmap; - UINT8 flipscreen; - int punch_through_pen; + bitmap_t *m_sprite_bitmap; + UINT8 m_flipscreen; + int m_punch_through_pen; }; diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index 932c3a610b3..12c8a71c6e4 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -6,26 +6,30 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bg_videoram; - UINT16 * bg_rasterram; - UINT16 * tx_videoram; - UINT16 * spriteram1; - UINT16 * spriteram2; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram1_size; + UINT16 * m_bg_videoram; + UINT16 * m_bg_rasterram; + UINT16 * m_tx_videoram; + UINT16 * m_spriteram1; + UINT16 * m_spriteram2; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram1_size; /* video-related */ - tilemap_t *bg_tilemap,*tx_tilemap; - int bg_scrollx, bg_scrolly; - int tx_scrollx, tx_scrolly; - int bg_raster; - int bg_palettebank, tx_palettebank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_tx_tilemap; + int m_bg_scrollx; + int m_bg_scrolly; + int m_tx_scrollx; + int m_tx_scrolly; + int m_bg_raster; + int m_bg_palettebank; + int m_tx_palettebank; /* misc */ - UINT16 pending_command; + UINT16 m_pending_command; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index 1188f88df92..1ff6886c78b 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -4,13 +4,13 @@ public: iqblock_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *rambase; - UINT8 *bgvideoram; - UINT8 *fgvideoram; - int videoenable; - int video_type; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + UINT8 *m_rambase; + UINT8 *m_bgvideoram; + UINT8 *m_fgvideoram; + int m_videoenable; + int m_video_type; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; }; diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 87fb21565a2..5980fab1869 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -29,37 +29,37 @@ public: m_nvram(*this, "nvram") { } required_shared_ptr<UINT8> m_nvram; - UINT8 *videoram; - UINT8 vg_clear; - UINT8 bufsel; - UINT8 alphamap; - UINT8 *combase; - UINT8 irvg_vblank; - UINT8 irvg_running; - UINT8 irmb_running; + UINT8 *m_videoram; + UINT8 m_vg_clear; + UINT8 m_bufsel; + UINT8 m_alphamap; + UINT8 *m_combase; + UINT8 m_irvg_vblank; + UINT8 m_irvg_running; + UINT8 m_irmb_running; #if IR_TIMING - timer_device *irvg_timer; - timer_device *irmb_timer; + timer_device *m_irvg_timer; + timer_device *m_irmb_timer; #endif - UINT8 *comRAM[2]; - UINT8 *mbRAM; - UINT8 *mbROM; - UINT8 control_num; - UINT8 statwr; - UINT8 out0; - UINT8 outx; - UINT8 mpage; - UINT8 *combase_mb; - irmb_ops *mbops; - const irmb_ops *irmb_stack[16]; - UINT32 irmb_regs[16]; - UINT32 irmb_latch; - UINT8 *polybitmap1; - UINT8 *polybitmap2; - int ir_xmin; - int ir_ymin; - int ir_xmax; - int ir_ymax; + UINT8 *m_comRAM[2]; + UINT8 *m_mbRAM; + UINT8 *m_mbROM; + UINT8 m_control_num; + UINT8 m_statwr; + UINT8 m_out0; + UINT8 m_outx; + UINT8 m_mpage; + UINT8 *m_combase_mb; + irmb_ops *m_mbops; + const irmb_ops *m_irmb_stack[16]; + UINT32 m_irmb_regs[16]; + UINT32 m_irmb_latch; + UINT8 *m_polybitmap1; + UINT8 *m_polybitmap2; + int m_ir_xmin; + int m_ir_ymin; + int m_ir_xmax; + int m_ir_ymax; }; /*----------- defined in machine/irobot.c -----------*/ diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index f4c30d03396..5a3a2726852 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -11,20 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * spriteram2; - UINT8 * scroll; - UINT8 * interrupt_enable; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; + UINT8 * m_scroll; + UINT8 * m_interrupt_enable; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int palettebank, charbank, spriterambank; + tilemap_t *m_bg_tilemap; + int m_palettebank; + int m_charbank; + int m_spriterambank; /* devices */ - device_t *soundcpu; + device_t *m_soundcpu; }; diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 34bc1deaea6..7f84dd03da4 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -22,53 +22,53 @@ public: void nvram_init(nvram_device &nvram, void *base, size_t length); - UINT16 *videoram; - UINT8 vint_state; - UINT8 xint_state; - UINT8 qint_state; - UINT8 sound_data; - UINT8 sound_return; - UINT8 sound_int_state; - UINT16 *main_rom; - UINT16 *main_ram; - offs_t itech020_prot_address; - UINT32 *tms1_ram; - UINT32 *tms2_ram; - UINT32 *tms1_boot; - UINT8 tms_spinning[2]; - int special_result; - int p1_effx; - int p1_effy; - int p1_lastresult; - attotime p1_lasttime; - int p2_effx; - int p2_effy; - int p2_lastresult; - attotime p2_lasttime; - UINT8 written[0x8000]; - int is_drivedge; - UINT16 *video; - UINT32 *drivedge_zbuf_control; - UINT8 planes; - UINT16 vram_height; - UINT16 xfer_xcount; - UINT16 xfer_ycount; - UINT16 xfer_xcur; - UINT16 xfer_ycur; - rectangle clip_rect; - rectangle scaled_clip_rect; - rectangle clip_save; - emu_timer *scanline_timer; - UINT8 *grom_base; - UINT32 grom_size; - UINT32 grom_bank; - UINT32 grom_bank_mask; - UINT16 color_latch[2]; - UINT8 enable_latch[2]; - UINT16 *videoplane[2]; - UINT32 vram_mask; - UINT32 vram_xmask; - UINT32 vram_ymask; + UINT16 *m_videoram; + UINT8 m_vint_state; + UINT8 m_xint_state; + UINT8 m_qint_state; + UINT8 m_sound_data; + UINT8 m_sound_return; + UINT8 m_sound_int_state; + UINT16 *m_main_rom; + UINT16 *m_main_ram; + offs_t m_itech020_prot_address; + UINT32 *m_tms1_ram; + UINT32 *m_tms2_ram; + UINT32 *m_tms1_boot; + UINT8 m_tms_spinning[2]; + int m_special_result; + int m_p1_effx; + int m_p1_effy; + int m_p1_lastresult; + attotime m_p1_lasttime; + int m_p2_effx; + int m_p2_effy; + int m_p2_lastresult; + attotime m_p2_lasttime; + UINT8 m_written[0x8000]; + int m_is_drivedge; + UINT16 *m_video; + UINT32 *m_drivedge_zbuf_control; + UINT8 m_planes; + UINT16 m_vram_height; + UINT16 m_xfer_xcount; + UINT16 m_xfer_ycount; + UINT16 m_xfer_xcur; + UINT16 m_xfer_ycur; + rectangle m_clip_rect; + rectangle m_scaled_clip_rect; + rectangle m_clip_save; + emu_timer *m_scanline_timer; + UINT8 *m_grom_base; + UINT32 m_grom_size; + UINT32 m_grom_bank; + UINT32 m_grom_bank_mask; + UINT16 m_color_latch[2]; + UINT8 m_enable_latch[2]; + UINT16 *m_videoplane[2]; + UINT32 m_vram_mask; + UINT32 m_vram_xmask; + UINT32 m_vram_ymask; }; diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index 93233c358b9..25f7b9ede48 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -15,43 +15,43 @@ public: itech8_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *grom_bank; - UINT8 blitter_int; - UINT8 tms34061_int; - UINT8 periodic_int; - UINT8 sound_data; - UINT8 pia_porta_data; - UINT8 pia_portb_data; - const rectangle *visarea; - UINT8 z80_ctrl; - UINT8 z80_port_val; - UINT8 z80_clear_to_send; - UINT16 sensor0; - UINT16 sensor1; - UINT16 sensor2; - UINT16 sensor3; - UINT8 curvx; - UINT8 curvy; - UINT8 curx; - INT8 xbuffer[YBUFFER_COUNT]; - INT8 ybuffer[YBUFFER_COUNT]; - int ybuffer_next; - int curxpos; - int last_ytotal; - UINT8 crosshair_vis; - UINT8 blitter_data[16]; - UINT8 blit_in_progress; - UINT8 page_select; - offs_t fetch_offset; - UINT8 fetch_rle_count; - UINT8 fetch_rle_value; - UINT8 fetch_rle_literal; - struct tms34061_display tms_state; - UINT8 *grom_base; - UINT32 grom_size; - UINT8 grmatch_palcontrol; - UINT8 grmatch_xscroll; - rgb_t grmatch_palette[2][16]; + UINT8 *m_grom_bank; + UINT8 m_blitter_int; + UINT8 m_tms34061_int; + UINT8 m_periodic_int; + UINT8 m_sound_data; + UINT8 m_pia_porta_data; + UINT8 m_pia_portb_data; + const rectangle *m_visarea; + UINT8 m_z80_ctrl; + UINT8 m_z80_port_val; + UINT8 m_z80_clear_to_send; + UINT16 m_sensor0; + UINT16 m_sensor1; + UINT16 m_sensor2; + UINT16 m_sensor3; + UINT8 m_curvx; + UINT8 m_curvy; + UINT8 m_curx; + INT8 m_xbuffer[YBUFFER_COUNT]; + INT8 m_ybuffer[YBUFFER_COUNT]; + int m_ybuffer_next; + int m_curxpos; + int m_last_ytotal; + UINT8 m_crosshair_vis; + UINT8 m_blitter_data[16]; + UINT8 m_blit_in_progress; + UINT8 m_page_select; + offs_t m_fetch_offset; + UINT8 m_fetch_rle_count; + UINT8 m_fetch_rle_value; + UINT8 m_fetch_rle_literal; + struct tms34061_display m_tms_state; + UINT8 *m_grom_base; + UINT32 m_grom_size; + UINT8 m_grmatch_palcontrol; + UINT8 m_grmatch_xscroll; + rgb_t m_grmatch_palette[2][16]; }; diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index c88e3c2c3e0..f8d677f8a8a 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -11,25 +11,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; // UINT8 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* misc */ - int timer_rate; - int joinem_snd_bit; - int question_address; - int question_rom; - int remap_address[16]; + int m_timer_rate; + int m_joinem_snd_bit; + int m_question_address; + int m_question_rom; + int m_remap_address[16]; /* devices */ - cpu_device *audiocpu; + cpu_device *m_audiocpu; }; diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 1648a192aa2..b939f3a40a0 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -11,21 +11,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoctrl; - UINT8 * scrollram; - UINT8 * paletteram; + UINT8 * m_videoctrl; + UINT8 * m_scrollram; + UINT8 * m_paletteram; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* misc */ - int irq_enable; - UINT8 *rambank; - UINT8 *spritebank; + int m_irq_enable; + UINT8 *m_rambank; + UINT8 *m_spritebank; /* devices */ - device_t *mastercpu; - device_t *slavecpu; + device_t *m_mastercpu; + device_t *m_slavecpu; }; diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index ca477a2f281..8ceaaba486c 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -14,18 +14,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * scroll_x; - UINT8 * scroll_dir; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_scroll_x; + UINT8 * m_scroll_dir; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* misc */ - UINT8 irq_enable, nmi_enable; + UINT8 m_irq_enable; + UINT8 m_nmi_enable; }; diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index b1f72f24ba2..a32a08bdc87 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -24,27 +24,27 @@ public: required_shared_ptr<UINT8> m_nvram; /* machine state */ - UINT8 a2d_select; - UINT8 nvram_enabled; - emu_timer *interrupt_timer; + UINT8 m_a2d_select; + UINT8 m_nvram_enabled; + emu_timer *m_interrupt_timer; /* video state */ - UINT8 *foregroundram; - UINT8 *backgroundram; - UINT8 *spriteram; - UINT8 *paletteram; - UINT8 *foreground_bank; - UINT8 *video_off; - UINT8 *smoothing_table; - UINT32 vscroll; - UINT32 hscroll; + UINT8 *m_foregroundram; + UINT8 *m_backgroundram; + UINT8 *m_spriteram; + UINT8 *m_paletteram; + UINT8 *m_foreground_bank; + UINT8 *m_video_off; + UINT8 *m_smoothing_table; + UINT32 m_vscroll; + UINT32 m_hscroll; /* audio state */ - UINT8 audio_latch; - UINT8 audio_ack_latch; - UINT8 *audio_comm_stat; - UINT8 *speech_data; - UINT8 speech_strobe_state; + UINT8 m_audio_latch; + UINT8 m_audio_ack_latch; + UINT8 *m_audio_comm_stat; + UINT8 *m_speech_data; + UINT8 m_speech_strobe_state; }; diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index 385e7c84938..1fe3d2e6ea5 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -55,17 +55,17 @@ public: jpmimpct_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 tms_irq; - UINT8 duart_1_irq; - struct duart_t duart_1; - UINT8 touch_cnt; - UINT8 touch_data[3]; - int lamp_strobe; - UINT8 Lamps[256]; - int optic_pattern; - int payen; - UINT16 *vram; - struct bt477_t bt477; + UINT8 m_tms_irq; + UINT8 m_duart_1_irq; + struct duart_t m_duart_1; + UINT8 m_touch_cnt; + UINT8 m_touch_data[3]; + int m_lamp_strobe; + UINT8 m_Lamps[256]; + int m_optic_pattern; + int m_payen; + UINT16 *m_vram; + struct bt477_t m_bt477; }; diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index a620577c5d1..572136a344b 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -13,13 +13,13 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * video_control; + UINT8 * m_video_control; /* video-related */ - UINT32 *videoram; + UINT32 *m_videoram; /* misc */ - UINT8 clock; + UINT8 m_clock; }; diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 6bdc4063e78..2fe80088c08 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -11,26 +11,30 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; - UINT16 * ram; - UINT16 * pf_data; -// UINT16 * spriteram; // currently this uses generic buffered spriteram + UINT16 * m_videoram; + UINT16 * m_ram; + UINT16 * m_pf_data; +// UINT16 * m_spriteram; // currently this uses generic buffered spriteram /* video-related */ - bitmap_t *bitmap_f; - tilemap_t *fix_tilemap; - int flipscreen; - UINT16 scroll[2]; + bitmap_t *m_bitmap_f; + tilemap_t *m_fix_tilemap; + int m_flipscreen; + UINT16 m_scroll[2]; /* misc */ - UINT16 i8751_return, i8751_needs_ack, i8751_coin_pending, i8751_command_queue; - int i8751_level; // needed by chelnov - int microcontroller_id, coin_mask; - int latch; + UINT16 m_i8751_return; + UINT16 m_i8751_needs_ack; + UINT16 m_i8751_coin_pending; + UINT16 m_i8751_command_queue; + int m_i8751_level; // needed by chelnov + int m_microcontroller_id; + int m_coin_mask; + int m_latch; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; enum { diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index fdd93d02040..3f978551e91 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -11,23 +11,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* misc */ - int nmi_enable; - int sound_nmi_enable; - int msm_data; - int msm_play_lo_nibble; - int counter; + int m_nmi_enable; + int m_sound_nmi_enable; + int m_msm_data; + int m_msm_play_lo_nibble; + int m_counter; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 9a821fa34bb..286e1287dd4 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -12,30 +12,34 @@ class kickgoal_state : public driver_device public: kickgoal_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - adpcm(*this, "oki"), - eeprom(*this, "eeprom") { } + m_adpcm(*this, "oki"), + m_eeprom(*this, "eeprom") { } /* memory pointers */ - UINT16 * fgram; - UINT16 * bgram; - UINT16 * bg2ram; - UINT16 * scrram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_fgram; + UINT16 * m_bgram; + UINT16 * m_bg2ram; + UINT16 * m_scrram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *fgtm, *bgtm, *bg2tm; + tilemap_t *m_fgtm; + tilemap_t *m_bgtm; + tilemap_t *m_bg2tm; /* misc */ - int melody_loop; - int snd_new, snd_sam[4]; - int m6295_comm, m6295_bank; - UINT16 m6295_key_delay; + int m_melody_loop; + int m_snd_new; + int m_snd_sam[4]; + int m_m6295_comm; + int m_m6295_bank; + UINT16 m_m6295_key_delay; /* devices */ - required_device<okim6295_device> adpcm; - required_device<eeprom_device> eeprom; + required_device<okim6295_device> m_adpcm; + required_device<eeprom_device> m_eeprom; }; diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index 807567907b6..c9157f540c5 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -11,25 +11,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * videoram2; - UINT8 * colorram; - UINT8 * colorram2; - UINT8 * spriteram; - UINT8 * scroll_y; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_videoram2; + UINT8 * m_colorram; + UINT8 * m_colorram2; + UINT8 * m_spriteram; + UINT8 * m_scroll_y; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - int palette_bank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_palette_bank; /* misc */ - int nmi_enable; + int m_nmi_enable; /* devices */ - device_t *video_cpu; - device_t *sprite_cpu; - device_t *audio_cpu; + device_t *m_video_cpu; + device_t *m_sprite_cpu; + device_t *m_audio_cpu; }; diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index 1ac9ccaa102..b6893d79fa0 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -11,21 +11,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * scrollregs; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_scrollregs; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int tile_bank, sprite_bank; - int flipscreen; + tilemap_t *m_bg_tilemap; + int m_tile_bank; + int m_sprite_bank; + int m_flipscreen; /* misc */ - UINT8 port1, port2; + UINT8 m_port1; + UINT8 m_port2; /* devices */ - device_t *soundcpu; + device_t *m_soundcpu; }; diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index d30393d3e3f..9a20ad12ef1 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -11,18 +11,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * videoram2; - UINT8 * colorram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_videoram2; + UINT8 * m_colorram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - int gfxbank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_gfxbank; /* devices */ - device_t *maincpu; + device_t *m_maincpu; }; /*----------- defined in video/kopunch.c -----------*/ diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index 0eafb47cc1c..f47de06a6a9 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -11,16 +11,18 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *tilemap, *textmap; - int video_ctrl, flipscreen; + tilemap_t *m_tilemap; + tilemap_t *m_textmap; + int m_video_ctrl; + int m_flipscreen; /* misc */ - int sound_status; + int m_sound_status; }; diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index 8bfb8268e49..3da13d15fc6 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -11,23 +11,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * fgvideoram; - UINT8 * bgvideoram; - UINT8 * bgattribram; - UINT8 * spriteram_1; - UINT8 * spriteram_2; - UINT8 * shared_ram; + UINT8 * m_fgvideoram; + UINT8 * m_bgvideoram; + UINT8 * m_bgattribram; + UINT8 * m_spriteram_1; + UINT8 * m_spriteram_2; + UINT8 * m_shared_ram; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - UINT8 scroll_x_lo, scroll_x_hi, scroll_y; - int bgpalbank, fgcolor; - int flipscreen; - const UINT8 *color_codes; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 m_scroll_x_lo; + UINT8 m_scroll_x_hi; + UINT8 m_scroll_y; + int m_bgpalbank; + int m_fgcolor; + int m_flipscreen; + const UINT8 *m_color_codes; /* devices */ - device_t *maincpu; - device_t *subcpu; + device_t *m_maincpu; + device_t *m_subcpu; }; diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index 45a1e700e8f..1a54f1227c0 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -11,18 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram1; - UINT8 * videoram2; - UINT8 * scrollram; - UINT8 * spriteram; - UINT8 * paletteram; + UINT8 * m_videoram1; + UINT8 * m_videoram2; + UINT8 * m_scrollram; + UINT8 * m_spriteram; + UINT8 * m_paletteram; /* video-related */ - tilemap_t *layer0, *layer1; - rectangle clip0, clip1; + tilemap_t *m_layer0; + tilemap_t *m_layer1; + rectangle m_clip0; + rectangle m_clip1; /* devices */ - device_t *k007121; + device_t *m_k007121; }; diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 4048ddcf1db..606adb7004c 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -13,32 +13,34 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * grid_data; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_grid_data; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *grid_tilemap; // ladybug - tilemap_t *fg_tilemap; // redclash - UINT8 grid_color; - int star_speed; - int gfxbank; // redclash only - UINT8 stars_enable; - UINT8 stars_speed; - UINT32 stars_state; - UINT16 stars_offset; - UINT8 stars_count; + tilemap_t *m_bg_tilemap; + tilemap_t *m_grid_tilemap; // ladybug + tilemap_t *m_fg_tilemap; // redclash + UINT8 m_grid_color; + int m_star_speed; + int m_gfxbank; // redclash only + UINT8 m_stars_enable; + UINT8 m_stars_speed; + UINT32 m_stars_state; + UINT16 m_stars_offset; + UINT8 m_stars_count; /* misc */ - UINT8 sound_low; - UINT8 sound_high; - UINT8 weird_value[8]; - UINT8 sraider_0x30, sraider_0x38; + UINT8 m_sound_low; + UINT8 m_sound_high; + UINT8 m_weird_value[8]; + UINT8 m_sraider_0x30; + UINT8 m_sraider_0x38; /* devices */ - device_t *maincpu; + device_t *m_maincpu; }; diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index 52b067bfbab..1a411cd93e6 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -11,25 +11,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * scrlram; -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram2; // currently this uses generic palette handling - size_t videoram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_scrlram; +// UINT8 * m_paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram2; // currently this uses generic palette handling + size_t m_videoram_size; /* video-related */ - tilemap_t *bg_tilemap; - int tilebank, palette_bank; - int spritetilebase; + tilemap_t *m_bg_tilemap; + int m_tilebank; + int m_palette_bank; + int m_spritetilebase; /* misc */ - int sound_nmi_enable, pending_nmi; - int snd_flag; - UINT8 snd_data; + int m_sound_nmi_enable; + int m_pending_nmi; + int m_snd_flag; + UINT8 m_snd_data; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index 4e24ad2a46d..5a41b42ad54 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -11,41 +11,49 @@ public: : driver_device(machine, config) { } /* video-related */ - tilemap_t *bg_tilemap; - int video_page; + tilemap_t *m_bg_tilemap; + int m_video_page; /* misc */ - int input_mux; - int active_8910, port0a, last_port0b; - int cb1_toggle; + int m_input_mux; + int m_active_8910; + int m_port0a; + int m_last_port0b; + int m_cb1_toggle; /* information for the single 32x32 sprite displayed */ - int sprite_x; - int sprite_y; - int sprite_code; - int sprite_color; - int sprite_enable; + int m_sprite_x; + int m_sprite_y; + int m_sprite_code; + int m_sprite_color; + int m_sprite_enable; /* sound-related */ - int csound1; - int ksound1, ksound2, ksound3; - int degr, filt, a, us, bit14; + int m_csound1; + int m_ksound1; + int m_ksound2; + int m_ksound3; + int m_degr; + int m_filt; + int m_a; + int m_us; + int m_bit14; /* device */ - device_t *audiocpu; - device_t *s2636_1; - device_t *s2636_2; - device_t *s2636_3; - device_t *pia; - device_t *sn; - device_t *tms1; - device_t *tms2; - device_t *ay1; - device_t *ay2; + device_t *m_audiocpu; + device_t *m_s2636_1; + device_t *m_s2636_2; + device_t *m_s2636_3; + device_t *m_pia; + device_t *m_sn; + device_t *m_tms1; + device_t *m_tms2; + device_t *m_ay1; + device_t *m_ay2; // memory - UINT8 videoram[0x400]; - UINT8 colorram[0x400]; + UINT8 m_videoram[0x400]; + UINT8 m_colorram[0x400]; }; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 41e2f5b785a..c61e31bc6ad 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -11,26 +11,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * bitmap_ram; /* 0x2000 bytes for a 256 x 256 x 1 bitmap */ - UINT8 * back_color; - UINT8 * chip_data; - UINT8 * track_scroll; - UINT8 * last_colors; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_bitmap_ram; /* 0x2000 bytes for a 256 x 256 x 1 bitmap */ + UINT8 * m_back_color; + UINT8 * m_chip_data; + UINT8 * m_track_scroll; + UINT8 * m_last_colors; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *track_tilemap; - UINT8 gfxbank; /* used by lasso, chameleo, wwjgtin and pinbo */ - UINT8 track_enable; /* used by wwjgtin */ + tilemap_t *m_bg_tilemap; + tilemap_t *m_track_tilemap; + UINT8 m_gfxbank; /* used by lasso, chameleo, wwjgtin and pinbo */ + UINT8 m_track_enable; /* used by wwjgtin */ /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *sn_1; - device_t *sn_2; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_sn_1; + device_t *m_sn_2; }; diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index 2a6a00b9a5b..f2db954ae9b 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -11,19 +11,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * vram; - UINT16 * scroll1; - UINT16 * scroll2; -// UINT16 * spriteram; // this currently uses generic buffered spriteram - UINT16 * paletteram; + UINT16 * m_vram; + UINT16 * m_scroll1; + UINT16 * m_scroll2; +// UINT16 * m_spriteram; // this currently uses generic buffered spriteram + UINT16 * m_paletteram; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; - UINT16 scroll[8]; - int sprite_flipy_mask, sprite_pri_mask, tilemap_priority; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_tx_tilemap; + UINT16 m_scroll[8]; + int m_sprite_flipy_mask; + int m_sprite_pri_mask; + int m_tilemap_priority; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; /*----------- defined in video/lastduel.c -----------*/ diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index 3f5d6e6af84..c210decb26b 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -24,17 +24,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - size_t videoram_size; + UINT8 * m_videoram; + size_t m_videoram_size; /* video-related */ - int marker_x, marker_y; + int m_marker_x; + int m_marker_y; /* misc */ - int timer_count, sense_state, dac_data; + int m_timer_count; + int m_sense_state; + int m_dac_data; /* device */ - device_t *dac; + device_t *m_dac; }; diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index 8a1889f8846..f42844aa44f 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -4,23 +4,23 @@ public: legionna_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *back_data; - UINT16 *fore_data; - UINT16 *mid_data; - UINT16 *scrollram16; - UINT16 *textram; - UINT16 layer_disable; - int sprite_xoffs; - int sprite_yoffs; - tilemap_t *background_layer; - tilemap_t *foreground_layer; - tilemap_t *midground_layer; - tilemap_t *text_layer; - int has_extended_banking; - int has_extended_priority; - UINT16 back_gfx_bank; - UINT16 fore_gfx_bank; - UINT16 mid_gfx_bank; + UINT16 *m_back_data; + UINT16 *m_fore_data; + UINT16 *m_mid_data; + UINT16 *m_scrollram16; + UINT16 *m_textram; + UINT16 m_layer_disable; + int m_sprite_xoffs; + int m_sprite_yoffs; + tilemap_t *m_background_layer; + tilemap_t *m_foreground_layer; + tilemap_t *m_midground_layer; + tilemap_t *m_text_layer; + int m_has_extended_banking; + int m_has_extended_priority; + UINT16 m_back_gfx_bank; + UINT16 m_fore_gfx_bank; + UINT16 m_mid_gfx_bank; }; diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index 033e05cf869..26642ef6047 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -12,8 +12,8 @@ struct vram_state_data { - UINT16 addr; - UINT8 latch[2]; + UINT16 m_addr; + UINT8 m_latch[2]; }; @@ -24,45 +24,45 @@ public: leland_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 dac_control; - UINT8 *alleymas_kludge_mem; - UINT8 *ataxx_qram; - UINT8 gfx_control; - UINT8 wcol_enable; - emu_timer *master_int_timer; - UINT8 *master_base; - UINT8 *slave_base; - UINT8 *xrom_base; - UINT32 master_length; - UINT32 slave_length; - UINT32 xrom_length; - int dangerz_x; - int dangerz_y; - UINT8 analog_result; - UINT8 dial_last_input[4]; - UINT8 dial_last_result[4]; - UINT8 keycard_shift; - UINT8 keycard_bit; - UINT8 keycard_state; - UINT8 keycard_clock; - UINT8 keycard_command[3]; - UINT8 top_board_bank; - UINT8 sound_port_bank; - UINT8 alternate_bank; - UINT8 master_bank; - void (*update_master_bank)(running_machine &machine); - UINT32 xrom1_addr; - UINT32 xrom2_addr; - UINT8 battery_ram_enable; - UINT8 *battery_ram; - UINT8 *extra_tram; - UINT8 *video_ram; - struct vram_state_data vram_state[2]; - UINT16 xscroll; - UINT16 yscroll; - UINT8 gfxbank; - UINT16 last_scanline; - emu_timer *scanline_timer; + UINT8 m_dac_control; + UINT8 *m_alleymas_kludge_mem; + UINT8 *m_ataxx_qram; + UINT8 m_gfx_control; + UINT8 m_wcol_enable; + emu_timer *m_master_int_timer; + UINT8 *m_master_base; + UINT8 *m_slave_base; + UINT8 *m_xrom_base; + UINT32 m_master_length; + UINT32 m_slave_length; + UINT32 m_xrom_length; + int m_dangerz_x; + int m_dangerz_y; + UINT8 m_analog_result; + UINT8 m_dial_last_input[4]; + UINT8 m_dial_last_result[4]; + UINT8 m_keycard_shift; + UINT8 m_keycard_bit; + UINT8 m_keycard_state; + UINT8 m_keycard_clock; + UINT8 m_keycard_command[3]; + UINT8 m_top_board_bank; + UINT8 m_sound_port_bank; + UINT8 m_alternate_bank; + UINT8 m_master_bank; + void (*m_update_master_bank)(running_machine &machine); + UINT32 m_xrom1_addr; + UINT32 m_xrom2_addr; + UINT8 m_battery_ram_enable; + UINT8 *m_battery_ram; + UINT8 *m_extra_tram; + UINT8 *m_video_ram; + struct vram_state_data m_vram_state[2]; + UINT16 m_xscroll; + UINT16 m_yscroll; + UINT8 m_gfxbank; + UINT16 m_last_scanline; + emu_timer *m_scanline_timer; }; diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index 7e9d9230dd1..e47f40cdff7 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -6,22 +6,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * pixel_0_data; - UINT16 * pixel_1_data; - UINT16 * vram_data; - UINT16 * control_data; - UINT16 * paletteram; -// UINT16 * spriteram; // this currently uses generic buffered spriteram -// UINT16 * spriteram2; // this currently uses generic buffered spriteram + UINT16 * m_pixel_0_data; + UINT16 * m_pixel_1_data; + UINT16 * m_vram_data; + UINT16 * m_control_data; + UINT16 * m_paletteram; +// UINT16 * m_spriteram; // this currently uses generic buffered spriteram +// UINT16 * m_spriteram2; // this currently uses generic buffered spriteram /* video-related */ - bitmap_t *bitmap0; - tilemap_t *vram_tilemap; - UINT16 *sprite_triple_buffer_0,*sprite_triple_buffer_1; - UINT8 *vram_buffer; + bitmap_t *m_bitmap0; + tilemap_t *m_vram_tilemap; + UINT16 *m_sprite_triple_buffer_0; + UINT16 *m_sprite_triple_buffer_1; + UINT8 *m_vram_buffer; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index a1146ecdd55..d7543820ac5 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -11,21 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[4], sprite_colorbase; + int m_layer_colorbase[4]; + int m_sprite_colorbase; /* misc */ - UINT8 cur_control2; + UINT8 m_cur_control2; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k054539; - device_t *k056832; - device_t *k053244; - device_t *k054000; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k054539; + device_t *m_k056832; + device_t *m_k053244; + device_t *m_k054000; }; /*----------- defined in video/lethal.c -----------*/ diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index 50a885332d7..a18af214b9a 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -10,14 +10,14 @@ public: lethalj_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 blitter_data[8]; - UINT16 *screenram; - UINT8 vispage; - UINT16 *blitter_base; - int blitter_rows; - UINT16 gunx; - UINT16 guny; - UINT8 blank_palette; + UINT16 m_blitter_data[8]; + UINT16 *m_screenram; + UINT8 m_vispage; + UINT16 *m_blitter_base; + int m_blitter_rows; + UINT16 m_gunx; + UINT16 m_guny; + UINT8 m_blank_palette; }; diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index 8cc6d62d7df..a45301a26ac 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -4,27 +4,27 @@ public: liberate_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *colorram; - UINT8 *paletteram; - UINT8 *spriteram; - UINT8 *scratchram; - UINT8 *charram; /* prosoccr */ - UINT8 *bg_vram; /* prosport */ - - UINT8 io_ram[16]; - - int bank; - int latch; - UINT8 gfx_rom_readback; - int background_color; - int background_disable; - - tilemap_t *back_tilemap; - tilemap_t *fix_tilemap; - - device_t *maincpu; - device_t *audiocpu; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_paletteram; + UINT8 *m_spriteram; + UINT8 *m_scratchram; + UINT8 *m_charram; /* prosoccr */ + UINT8 *m_bg_vram; /* prosport */ + + UINT8 m_io_ram[16]; + + int m_bank; + int m_latch; + UINT8 m_gfx_rom_readback; + int m_background_color; + int m_background_disable; + + tilemap_t *m_back_tilemap; + tilemap_t *m_fix_tilemap; + + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index f3170c5ca6f..8ea34030656 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -5,36 +5,49 @@ public: lkage_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 * scroll; - UINT8 * vreg; - UINT8 * videoram; - UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_scroll; + UINT8 * m_vreg; + UINT8 * m_videoram; + UINT8 * m_spriteram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; - UINT8 bg_tile_bank, fg_tile_bank, tx_tile_bank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_tx_tilemap; + UINT8 m_bg_tile_bank; + UINT8 m_fg_tile_bank; + UINT8 m_tx_tile_bank; - int sprite_dx; + int m_sprite_dx; /* misc */ - int sound_nmi_enable, pending_nmi; + int m_sound_nmi_enable; + int m_pending_nmi; /* mcu */ - UINT8 from_main, from_mcu; - int mcu_sent, main_sent; - UINT8 port_a_in, port_a_out, ddr_a; - UINT8 port_b_in, port_b_out, ddr_b; - UINT8 port_c_in, port_c_out, ddr_c; + UINT8 m_from_main; + UINT8 m_from_mcu; + int m_mcu_sent; + int m_main_sent; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_b_in; + UINT8 m_port_b_out; + UINT8 m_ddr_b; + UINT8 m_port_c_in; + UINT8 m_port_c_out; + UINT8 m_ddr_c; /* lkageb fake mcu */ - UINT8 mcu_val; - int mcu_ready; /* cpu data/mcu ready status */ + UINT8 m_mcu_val; + int m_mcu_ready; /* cpu data/mcu ready status */ /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *mcu; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_mcu; }; /*----------- defined in machine/lkage.c -----------*/ diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index c8e7044c17a..19f8d1efc98 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -22,57 +22,57 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 *char_ram; - UINT16 *hud_ram; - UINT16 *scene_ram; - UINT16 *ground_ram; - UINT16 *object_ram; + UINT16 *m_char_ram; + UINT16 *m_hud_ram; + UINT16 *m_scene_ram; + UINT16 *m_ground_ram; + UINT16 *m_object_ram; - size_t hudram_size; - size_t objectram_size; - size_t groundram_size; + size_t m_hudram_size; + size_t m_objectram_size; + size_t m_groundram_size; /* video-related */ - tilemap_t *tilemap; - UINT8 ground_ctrl; - UINT16 scroll_h; - UINT16 scroll_v; - bitmap_t *front_buffer; - bitmap_t *back_buffer; - emu_timer *bufend_timer; - emu_timer *cursor_timer; + tilemap_t *m_tilemap; + UINT8 m_ground_ctrl; + UINT16 m_scroll_h; + UINT16 m_scroll_v; + bitmap_t *m_front_buffer; + bitmap_t *m_back_buffer; + emu_timer *m_bufend_timer; + emu_timer *m_cursor_timer; /* Rotation Control */ - UINT16 xsal; - UINT16 x0ll; - UINT16 dx0ll; - UINT16 dxll; - UINT16 ysal; - UINT16 y0ll; - UINT16 dy0ll; - UINT16 dyll; + UINT16 m_xsal; + UINT16 m_x0ll; + UINT16 m_dx0ll; + UINT16 m_dxll; + UINT16 m_ysal; + UINT16 m_y0ll; + UINT16 m_dy0ll; + UINT16 m_dyll; /* Object palette RAM control */ - UINT32 iden; - UINT8 * obj_pal_ram; - UINT32 obj_pal_latch; - UINT32 obj_pal_addr; + UINT32 m_iden; + UINT8 * m_obj_pal_ram; + UINT32 m_obj_pal_latch; + UINT32 m_obj_pal_addr; /* misc */ - UINT8 ctrl_reg; - UINT32 main_inten; + UINT8 m_ctrl_reg; + UINT32 m_main_inten; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *ground; - device_t *object; - device_t *f2203_1l; - device_t *f2203_2l; - device_t *f2203_3l; - device_t *f2203_1r; - device_t *f2203_2r; - device_t *f2203_3r; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_ground; + device_t *m_object; + device_t *m_f2203_1l; + device_t *m_f2203_2l; + device_t *m_f2203_3l; + device_t *m_f2203_1r; + device_t *m_f2203_2r; + device_t *m_f2203_3r; }; diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 0dbe2f2163d..74736b707b5 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -17,32 +17,32 @@ public: lordgun_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 old; - UINT8 aliencha_dip_sel; - UINT16 *priority_ram; - UINT16 priority; - UINT16 *vram_0; - UINT16 *scroll_x_0; - UINT16 *scroll_y_0; - UINT16 *vram_1; - UINT16 *scroll_x_1; - UINT16 *scroll_y_1; - UINT16 *vram_2; - UINT16 *scroll_x_2; - UINT16 *scroll_y_2; - UINT16 *vram_3; - UINT16 *scroll_x_3; - UINT16 *scroll_y_3; - UINT16 *scrollram; - int whitescreen; - lordgun_gun_data gun[2]; - tilemap_t *tilemap_0; - tilemap_t *tilemap_1; - tilemap_t *tilemap_2; - tilemap_t *tilemap_3; - bitmap_t *bitmaps[5]; - UINT16 *spriteram; - size_t spriteram_size; + UINT8 m_old; + UINT8 m_aliencha_dip_sel; + UINT16 *m_priority_ram; + UINT16 m_priority; + UINT16 *m_vram_0; + UINT16 *m_scroll_x_0; + UINT16 *m_scroll_y_0; + UINT16 *m_vram_1; + UINT16 *m_scroll_x_1; + UINT16 *m_scroll_y_1; + UINT16 *m_vram_2; + UINT16 *m_scroll_x_2; + UINT16 *m_scroll_y_2; + UINT16 *m_vram_3; + UINT16 *m_scroll_x_3; + UINT16 *m_scroll_y_3; + UINT16 *m_scrollram; + int m_whitescreen; + lordgun_gun_data m_gun[2]; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; + tilemap_t *m_tilemap_2; + tilemap_t *m_tilemap_3; + bitmap_t *m_bitmaps[5]; + UINT16 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index ac688b88af9..64698a3f802 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -6,26 +6,35 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * scrollram; - UINT8 * videoram; - UINT8 * spriteram; - size_t spriteram_size; - size_t videoram_size; + UINT8 * m_scrollram; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; + size_t m_videoram_size; /* misc */ - int sound_pending; - int sound_nmi_enable, pending_nmi, sound_cmd, sound_result; + int m_sound_pending; + int m_sound_nmi_enable; + int m_pending_nmi; + int m_sound_cmd; + int m_sound_result; /* mcu */ - UINT8 from_main, from_mcu; - int mcu_sent, main_sent; - UINT8 port_a_in, port_a_out, ddr_a; - UINT8 port_b_in, port_b_out, ddr_b; + UINT8 m_from_main; + UINT8 m_from_mcu; + int m_mcu_sent; + int m_main_sent; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_b_in; + UINT8 m_port_b_out; + UINT8 m_ddr_b; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *mcu; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_mcu; }; /*----------- defined in machine/lsasquad.c -----------*/ diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h index d58beee789d..395084d8646 100644 --- a/src/mame/includes/lucky74.h +++ b/src/mame/includes/lucky74.h @@ -4,20 +4,20 @@ public: lucky74_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 ym2149_portb; - UINT8 usart_8251; - UINT8 copro_sm7831; - int adpcm_pos; - int adpcm_end; - int adpcm_data; - UINT8 adpcm_reg[6]; - UINT8 adpcm_busy_line; - UINT8 *fg_videoram; - UINT8 *fg_colorram; - UINT8 *bg_videoram; - UINT8 *bg_colorram; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; + UINT8 m_ym2149_portb; + UINT8 m_usart_8251; + UINT8 m_copro_sm7831; + int m_adpcm_pos; + int m_adpcm_end; + int m_adpcm_data; + UINT8 m_adpcm_reg[6]; + UINT8 m_adpcm_busy_line; + UINT8 *m_fg_videoram; + UINT8 *m_fg_colorram; + UINT8 *m_bg_videoram; + UINT8 *m_bg_colorram; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index 6dd6f452247..ca42d87cd4d 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -4,12 +4,12 @@ public: lvcards_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 payout; - UINT8 pulse; - UINT8 result; - UINT8 *videoram; - UINT8 *colorram; - tilemap_t *bg_tilemap; + UINT8 m_payout; + UINT8 m_pulse; + UINT8 m_result; + UINT8 *m_videoram; + UINT8 *m_colorram; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 3b0c5521c3f..2d5445f04a6 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -6,24 +6,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * fgvideoram; - UINT8 * bg1videoram; - UINT8 * soundlatch2; -// UINT8 * spriteram; // currently this uses generic buffered spriteram -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram2; // currently this uses generic palette handling + UINT8 * m_fgvideoram; + UINT8 * m_bg1videoram; + UINT8 * m_soundlatch2; +// UINT8 * m_spriteram; // currently this uses generic buffered spriteram +// UINT8 * m_paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram2; // currently this uses generic palette handling /* video-related */ - tilemap_t *fg_tilemap, *bg1_tilemap, *bg2_tilemap; - UINT8 bg2_image; - int bg2_avenger_hw; - UINT8 scroll_x[2], scroll_y[2]; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg1_tilemap; + tilemap_t *m_bg2_tilemap; + UINT8 m_bg2_image; + int m_bg2_avenger_hw; + UINT8 m_scroll_x[2]; + UINT8 m_scroll_y[2]; /* misc */ - UINT8 param[4]; - int palette_pen; - UINT8 soundstate; - UINT8 adpcm; + UINT8 m_param[4]; + int m_palette_pen; + UINT8 m_soundstate; + UINT8 m_adpcm; }; diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 0c942f88934..9c3ab489475 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -34,32 +34,32 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * chargen; - UINT8 * memory; - UINT8 * rom; - UINT8 * videoram; - UINT8 * colorram; - size_t videoram_size; + UINT8 * m_chargen; + UINT8 * m_memory; + UINT8 * m_rom; + UINT8 * m_videoram; + UINT8 * m_colorram; + size_t m_videoram_size; /* video-related */ - tilemap_t * tx_tilemap; - gfx_element * back_gfx; + tilemap_t * m_tx_tilemap; + gfx_element * m_back_gfx; /* this is currently unused, because it is needed by gfx_layout (which has no machine) */ UINT32 extyoffs[32 * 8]; /* video state */ - UINT8 bottomline; - UINT8 flip; + UINT8 m_bottomline; + UINT8 m_flip; /* misc */ - int last; + int m_last; /* devices */ - device_t *maincpu; - device_t *ic8j1; - device_t *ic8j2; - device_t *samples; + device_t *m_maincpu; + device_t *m_ic8j1; + device_t *m_ic8j2; + device_t *m_samples; }; diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index 45724c1b24d..e5e1f8fba7c 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -19,18 +19,18 @@ public: m107_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - emu_timer *scanline_timer; - UINT8 irq_vectorbase; - int irqvector; - int sound_status; - UINT16 *vram_data; - UINT8 spritesystem; - UINT8 sprite_display; - UINT16 raster_irq_position; - pf_layer_info pf_layer[4]; - UINT16 control[0x10]; - UINT16 *spriteram; - UINT16 *buffered_spriteram; + emu_timer *m_scanline_timer; + UINT8 m_irq_vectorbase; + int m_irqvector; + int m_sound_status; + UINT16 *m_vram_data; + UINT8 m_spritesystem; + UINT8 m_sprite_display; + UINT16 m_raster_irq_position; + pf_layer_info m_pf_layer[4]; + UINT16 m_control[0x10]; + UINT16 *m_spriteram; + UINT16 *m_buffered_spriteram; }; diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index 18bea207ab2..689d6f3896a 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -5,17 +5,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; - UINT8 * colorram; + UINT8 * m_colorram; /* video-related */ - tilemap_t* bg_tilemap; - UINT8 bg1xpos, bg1ypos; - UINT8 bg2xpos, bg2ypos; - UINT8 bgcontrol; + tilemap_t* m_bg_tilemap; + UINT8 m_bg1xpos; + UINT8 m_bg1ypos; + UINT8 m_bg2xpos; + UINT8 m_bg2ypos; + UINT8 m_bgcontrol; }; /*----------- defined in video/m52.c -----------*/ diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index 9a4f69906b8..6a3a74e57c4 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -5,15 +5,15 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; - UINT8 * scrollram; + UINT8 * m_scrollram; /* video-related */ - tilemap_t* bg_tilemap; - int flipscreen; + tilemap_t* m_bg_tilemap; + int m_flipscreen; }; /*----------- defined in video/m57.c -----------*/ diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index 79f3a5d2912..955025d91cc 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -5,18 +5,18 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t* bg_tilemap; + tilemap_t* m_bg_tilemap; - UINT8 *yard_scroll_x_low; - UINT8 *yard_scroll_x_high; - UINT8 *yard_scroll_y_low; - UINT8 *yard_score_panel_disabled; - bitmap_t *scroll_panel_bitmap; + UINT8 *m_yard_scroll_x_low; + UINT8 *m_yard_scroll_x_high; + UINT8 *m_yard_scroll_y_low; + UINT8 *m_yard_score_panel_disabled; + bitmap_t *m_scroll_panel_bitmap; }; /*----------- defined in video/m58.c -----------*/ diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index b251bbebb51..5d0f8634de4 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -5,29 +5,29 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_spriteram; + size_t m_spriteram_size; - UINT8 * m62_tileram; - UINT8 * m62_textram; - UINT8 * scrollram; + UINT8 * m_m62_tileram; + UINT8 * m_m62_textram; + UINT8 * m_scrollram; /* video-related */ - tilemap_t* bg_tilemap; - tilemap_t* fg_tilemap; - int flipscreen; + tilemap_t* m_bg_tilemap; + tilemap_t* m_fg_tilemap; + int m_flipscreen; - const UINT8 *sprite_height_prom; - INT32 m62_background_hscroll; - INT32 m62_background_vscroll; - UINT8 kidniki_background_bank; - INT32 kidniki_text_vscroll; - int ldrun3_topbottom_mask; - INT32 spelunkr_palbank; + const UINT8 *m_sprite_height_prom; + INT32 m_m62_background_hscroll; + INT32 m_m62_background_vscroll; + UINT8 m_kidniki_background_bank; + INT32 m_kidniki_text_vscroll; + int m_ldrun3_topbottom_mask; + INT32 m_spelunkr_palbank; /* misc */ - int ldrun2_bankswap; //ldrun2 - int bankcontrol[2]; //ldrun2 + int m_ldrun2_bankswap; //ldrun2 + int m_bankcontrol[2]; //ldrun2 }; diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 827695434df..c04f04039a1 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -10,33 +10,33 @@ public: m72_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *protection_ram; - emu_timer *scanline_timer; - UINT8 irq_base; - UINT8 mcu_snd_cmd_latch; - UINT8 mcu_sample_latch; - UINT32 mcu_sample_addr; - const UINT8 *protection_code; - const UINT8 *protection_crc; - UINT8 *soundram; - int prev[4]; - int diff[4]; - UINT16 *videoram1; - UINT16 *videoram2; - UINT16 *majtitle_rowscrollram; - UINT32 raster_irq_position; - UINT16 *spriteram; - UINT16 *spriteram2; - UINT16 *buffered_spriteram; - size_t spriteram_size; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - INT32 scrollx1; - INT32 scrolly1; - INT32 scrollx2; - INT32 scrolly2; - INT32 video_off; - int majtitle_rowscroll; + UINT16 *m_protection_ram; + emu_timer *m_scanline_timer; + UINT8 m_irq_base; + UINT8 m_mcu_snd_cmd_latch; + UINT8 m_mcu_sample_latch; + UINT32 m_mcu_sample_addr; + const UINT8 *m_protection_code; + const UINT8 *m_protection_crc; + UINT8 *m_soundram; + int m_prev[4]; + int m_diff[4]; + UINT16 *m_videoram1; + UINT16 *m_videoram2; + UINT16 *m_majtitle_rowscrollram; + UINT32 m_raster_irq_position; + UINT16 *m_spriteram; + UINT16 *m_spriteram2; + UINT16 *m_buffered_spriteram; + size_t m_spriteram_size; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + INT32 m_scrollx1; + INT32 m_scrolly1; + INT32 m_scrollx2; + INT32 m_scrolly2; + INT32 m_video_off; + int m_majtitle_rowscroll; }; diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index 0ff901b23a0..afae63644c1 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -4,17 +4,17 @@ public: m90_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 bankaddress; - UINT16 *video_data; - UINT16 *spriteram; - size_t spriteram_size; - UINT16 video_control_data[8]; - tilemap_t *pf1_layer; - tilemap_t *pf2_layer; - tilemap_t *pf1_wide_layer; - tilemap_t *pf2_wide_layer; - int last_pf1; - int last_pf2; + UINT32 m_bankaddress; + UINT16 *m_video_data; + UINT16 *m_spriteram; + size_t m_spriteram_size; + UINT16 m_video_control_data[8]; + tilemap_t *m_pf1_layer; + tilemap_t *m_pf2_layer; + tilemap_t *m_pf1_wide_layer; + tilemap_t *m_pf2_wide_layer; + int m_last_pf1; + int m_last_pf2; }; diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index 1797e2248e5..d602a960bfa 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -19,20 +19,20 @@ public: m92_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 irqvector; - UINT16 sound_status; - UINT32 bankaddress; - emu_timer *scanline_timer; - UINT8 irq_vectorbase; - UINT32 raster_irq_position; - UINT16 *vram_data; - UINT16 *spritecontrol; - UINT8 sprite_buffer_busy; - UINT8 game_kludge; - pf_layer_info pf_layer[3]; - UINT16 pf_master_control[4]; - INT32 sprite_list; - int palette_bank; + UINT8 m_irqvector; + UINT16 m_sound_status; + UINT32 m_bankaddress; + emu_timer *m_scanline_timer; + UINT8 m_irq_vectorbase; + UINT32 m_raster_irq_position; + UINT16 *m_vram_data; + UINT16 *m_spritecontrol; + UINT8 m_sprite_buffer_busy; + UINT8 m_game_kludge; + pf_layer_info m_pf_layer[3]; + UINT16 m_pf_master_control[4]; + INT32 m_sprite_list; + int m_palette_bank; }; diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index f785a193f3e..6739df0ec67 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -11,32 +11,36 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT32 * mainram; - UINT32 * scra_videoram; - UINT32 * scra_videoregs; - UINT32 * scrb_videoram; - UINT32 * scrb_videoregs; - UINT32 * scrc_videoram; - UINT32 * scrc_videoregs; - UINT32 * text_videoram; - UINT32 * text_videoregs; - UINT32 * spriteram; - UINT32 * spriteram_old; - UINT32 * spriteram_old2; - UINT32 * paletteram; - size_t spriteram_size; + UINT32 * m_mainram; + UINT32 * m_scra_videoram; + UINT32 * m_scra_videoregs; + UINT32 * m_scrb_videoram; + UINT32 * m_scrb_videoregs; + UINT32 * m_scrc_videoram; + UINT32 * m_scrc_videoregs; + UINT32 * m_text_videoram; + UINT32 * m_text_videoregs; + UINT32 * m_spriteram; + UINT32 * m_spriteram_old; + UINT32 * m_spriteram_old2; + UINT32 * m_paletteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *scra_tilemap, *scrb_tilemap, *scrc_tilemap, *text_tilemap; + tilemap_t *m_scra_tilemap; + tilemap_t *m_scrb_tilemap; + tilemap_t *m_scrc_tilemap; + tilemap_t *m_text_tilemap; /* misc */ - int sndpending; - int snd_toggle; - INT32 fade_effect, old_fade; + int m_sndpending; + int m_snd_toggle; + INT32 m_fade_effect; + INT32 m_old_fade; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; /*----------- defined in video/macrossp.c -----------*/ diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index e90b3f6a8e2..1e5df150c58 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -18,20 +18,20 @@ public: madalien_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *shift_hi; - UINT8 *shift_lo; - UINT8 *videoram; - UINT8 *charram; - UINT8 *video_flags; - UINT8 *video_control; - UINT8 *scroll; - UINT8 *edge1_pos; - UINT8 *edge2_pos; - UINT8 *headlight_pos; - tilemap_t *tilemap_fg; - tilemap_t *tilemap_edge1[4]; - tilemap_t *tilemap_edge2[4]; - bitmap_t *headlight_bitmap; + UINT8 *m_shift_hi; + UINT8 *m_shift_lo; + UINT8 *m_videoram; + UINT8 *m_charram; + UINT8 *m_video_flags; + UINT8 *m_video_control; + UINT8 *m_scroll; + UINT8 *m_edge1_pos; + UINT8 *m_edge2_pos; + UINT8 *m_headlight_pos; + tilemap_t *m_tilemap_fg; + tilemap_t *m_tilemap_edge1[4]; + tilemap_t *m_tilemap_edge2[4]; + bitmap_t *m_headlight_bitmap; }; diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h index 57216f7a360..2d4c8a891e2 100644 --- a/src/mame/includes/madmotor.h +++ b/src/mame/includes/madmotor.h @@ -11,16 +11,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * spriteram; -// UINT16 * paletteram; // this currently uses generic palette handlers - size_t spriteram_size; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // this currently uses generic palette handlers + size_t m_spriteram_size; /* video-related */ - int flipscreen; + int m_flipscreen; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index 8d14d9ea0b8..9c5e292f39f 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -4,19 +4,19 @@ public: magmax_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT8 sound_latch; - UINT8 LS74_clr; - UINT8 LS74_q; - UINT8 gain_control; - emu_timer *interrupt_timer; - UINT16 *vreg; - UINT16 *scroll_x; - UINT16 *scroll_y; - int flipscreen; - UINT32 *prom_tab; - UINT16 *spriteram; - size_t spriteram_size; + UINT16 *m_videoram; + UINT8 m_sound_latch; + UINT8 m_LS74_clr; + UINT8 m_LS74_q; + UINT8 m_gain_control; + emu_timer *m_interrupt_timer; + UINT16 *m_vreg; + UINT16 *m_scroll_x; + UINT16 *m_scroll_y; + int m_flipscreen; + UINT32 *m_prom_tab; + UINT16 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h index 10cc4c8bca4..633d126efcc 100644 --- a/src/mame/includes/mainevt.h +++ b/src/mame/includes/mainevt.h @@ -11,21 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; + int m_layer_colorbase[3]; + int m_sprite_colorbase; /* misc */ - int nmi_enable; + int m_nmi_enable; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *upd; - device_t *k007232; - device_t *k052109; - device_t *k051960; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_upd; + device_t *m_k007232; + device_t *m_k052109; + device_t *m_k051960; }; /*----------- defined in video/mainevt.c -----------*/ diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index c59f7188dd8..f8f65583342 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -4,14 +4,14 @@ public: mainsnk_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - tilemap_t *tx_tilemap; - tilemap_t *bg_tilemap; - UINT8 *spriteram; - UINT8 *fgram; - UINT8 *bgram; + tilemap_t *m_tx_tilemap; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; + UINT8 *m_fgram; + UINT8 *m_bgram; - int sound_cpu_busy; - UINT32 bg_tile_offset; + int m_sound_cpu_busy; + UINT32 m_bg_tile_offset; }; diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index 964f9dfc665..9ff28aa9757 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -14,15 +14,15 @@ public: /* misc */ // int playfield_x[256]; // int playfield_y[256]; - int playfield_code[256]; - int malzak_x; - int malzak_y; - int collision_counter; + int m_playfield_code[256]; + int m_malzak_x; + int m_malzak_y; + int m_collision_counter; /* devices */ - device_t *s2636_0; - device_t *s2636_1; - device_t *saa5050; + device_t *m_s2636_0; + device_t *m_s2636_1; + device_t *m_saa5050; }; diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index 19e92360ca9..1253c33daeb 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -4,13 +4,13 @@ public: mappy_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *spriteram; - tilemap_t *bg_tilemap; - bitmap_t *sprite_bitmap; + UINT8 *m_videoram; + UINT8 *m_spriteram; + tilemap_t *m_bg_tilemap; + bitmap_t *m_sprite_bitmap; - UINT8 scroll; - int mux; + UINT8 m_scroll; + int m_mux; }; diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h index 5ae9c02533c..d64669e421e 100644 --- a/src/mame/includes/marineb.h +++ b/src/mame/includes/marineb.h @@ -4,20 +4,22 @@ public: marineb_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - UINT8 palette_bank; - UINT8 column_scroll; - UINT8 flipscreen_x, flipscreen_y; - UINT8 marineb_active_low_flipscreen; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 m_palette_bank; + UINT8 m_column_scroll; + UINT8 m_flipscreen_x; + UINT8 m_flipscreen_y; + UINT8 m_marineb_active_low_flipscreen; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index ca66984aa43..7914c064f1b 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -41,23 +41,23 @@ public: /* machine states */ /* sound state */ - UINT8 last; - UINT8 portT; - const char *eabank; + UINT8 m_last; + UINT8 m_portT; + const char *m_eabank; /* video state */ - UINT8 gfx_bank; - UINT8 palette_bank; - UINT16 gfx_scroll; - UINT8 flip; + UINT8 m_gfx_bank; + UINT8 m_palette_bank; + UINT16 m_gfx_scroll; + UINT8 m_flip; /* driver general */ - UINT8 *spriteram; - UINT8 *videoram; - size_t spriteram_size; - tilemap_t *bg_tilemap; - int monitor; + UINT8 *m_spriteram; + UINT8 *m_videoram; + size_t m_spriteram_size; + tilemap_t *m_bg_tilemap; + int m_monitor; }; /*----------- defined in video/mario.c -----------*/ diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index a38d60dc6c6..0df178d507f 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -11,13 +11,13 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * xscroll; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_xscroll; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index 3ed0d6a5402..01e8f4666da 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -6,37 +6,45 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * videoram2; - UINT8 * videoram3; - UINT8 * colorram; - UINT8 * colorram2; - UINT8 * colorram3; - UINT8 * scroll; - UINT8 * pageselect; - UINT8 * spriteram; - UINT8 * paletteram; - size_t videoram_size; - size_t videoram2_size; - size_t videoram3_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_videoram2; + UINT8 * m_videoram3; + UINT8 * m_colorram; + UINT8 * m_colorram2; + UINT8 * m_colorram3; + UINT8 * m_scroll; + UINT8 * m_pageselect; + UINT8 * m_spriteram; + UINT8 * m_paletteram; + size_t m_videoram_size; + size_t m_videoram2_size; + size_t m_videoram3_size; + size_t m_spriteram_size; /* video-related */ - bitmap_t *tmpbitmap; - bitmap_t *tmpbitmap2; + bitmap_t *m_tmpbitmap; + bitmap_t *m_tmpbitmap2; /* mcu */ /* maniach 68705 protection */ - UINT8 port_a_in, port_a_out, ddr_a; - UINT8 port_b_in, port_b_out, ddr_b; - UINT8 port_c_in, port_c_out, ddr_c; - UINT8 from_main, from_mcu; - int mcu_sent, main_sent; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_b_in; + UINT8 m_port_b_out; + UINT8 m_ddr_b; + UINT8 m_port_c_in; + UINT8 m_port_c_out; + UINT8 m_ddr_c; + UINT8 m_from_main; + UINT8 m_from_mcu; + int m_mcu_sent; + int m_main_sent; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *mcu; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_mcu; }; /*----------- defined in machine/maniach.c -----------*/ diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index fa077e7a789..736c6cf32ba 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -6,24 +6,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram1; - UINT16 * videoram2; - UINT16 * scroll1; - UINT16 * scroll2; - UINT16 * spriteram; - UINT16 * spriteram_old; - UINT16 * vidregs; - UINT16 * vidregs_old; -// UINT16 * paletteram; // this currently uses generic palette handlers - size_t spriteram_size; + UINT16 * m_videoram1; + UINT16 * m_videoram2; + UINT16 * m_scroll1; + UINT16 * m_scroll2; + UINT16 * m_spriteram; + UINT16 * m_spriteram_old; + UINT16 * m_vidregs; + UINT16 * m_vidregs_old; +// UINT16 * m_paletteram; // this currently uses generic palette handlers + size_t m_spriteram_size; /* video-related */ - tilemap_t *tilemap1, *tilemap2; - int palette_bank1, palette_bank2; + tilemap_t *m_tilemap1; + tilemap_t *m_tilemap2; + int m_palette_bank1; + int m_palette_bank2; /* devices */ - device_t *maincpu; - device_t *soundcpu; + device_t *m_maincpu; + device_t *m_soundcpu; }; /*----------- defined in video/mcatadv.c -----------*/ diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index ea60af857b4..a5cad9b710c 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -19,7 +19,7 @@ public: mcr_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; + UINT8 *m_videoram; }; diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index e572be89bca..cb97e62fddc 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -4,24 +4,24 @@ public: mcr3_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *spriteram; - size_t spriteram_size; - UINT8 input_mux; - UINT8 latched_input; - UINT8 last_op4; - UINT8 maxrpm_adc_control; - UINT8 maxrpm_adc_select; - UINT8 maxrpm_last_shift; - INT8 maxrpm_p1_shift; - INT8 maxrpm_p2_shift; - UINT8 spyhunt_sprite_color_mask; - INT16 spyhunt_scroll_offset; - UINT8 *spyhunt_alpharam; - INT16 spyhunt_scrollx; - INT16 spyhunt_scrolly; - tilemap_t *bg_tilemap; - tilemap_t *alpha_tilemap; + UINT8 *m_videoram; + UINT8 *m_spriteram; + size_t m_spriteram_size; + UINT8 m_input_mux; + UINT8 m_latched_input; + UINT8 m_last_op4; + UINT8 m_maxrpm_adc_control; + UINT8 m_maxrpm_adc_select; + UINT8 m_maxrpm_last_shift; + INT8 m_maxrpm_p1_shift; + INT8 m_maxrpm_p2_shift; + UINT8 m_spyhunt_sprite_color_mask; + INT16 m_spyhunt_scroll_offset; + UINT8 *m_spyhunt_alpharam; + INT16 m_spyhunt_scrollx; + INT16 m_spyhunt_scrolly; + tilemap_t *m_bg_tilemap; + tilemap_t *m_alpha_tilemap; }; diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 586ea44789d..6e06c9f28cc 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -5,7 +5,7 @@ struct counter_state UINT8 control; UINT16 latch; UINT16 count; - emu_timer * timer; + emu_timer * timer; UINT8 timer_active; attotime period; }; @@ -16,29 +16,29 @@ public: mcr68_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT16 control_word; - UINT8 protection_data[5]; - attotime timing_factor; - UINT8 sprite_clip; - INT8 sprite_xoffset; - UINT8 m6840_status; - UINT8 m6840_status_read_since_int; - UINT8 m6840_msb_buffer; - UINT8 m6840_lsb_buffer; - UINT8 m6840_irq_state; - UINT8 m6840_irq_vector; - struct counter_state m6840_state[3]; - UINT8 v493_irq_state; - UINT8 v493_irq_vector; - timer_expired_func v493_callback; - UINT8 zwackery_sound_data; - attotime m6840_counter_periods[3]; - attotime m6840_internal_counter_period; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - UINT16 *spriteram; - size_t spriteram_size; + UINT16 *m_videoram; + UINT16 m_control_word; + UINT8 m_protection_data[5]; + attotime m_timing_factor; + UINT8 m_sprite_clip; + INT8 m_sprite_xoffset; + UINT8 m_m6840_status; + UINT8 m_m6840_status_read_since_int; + UINT8 m_m6840_msb_buffer; + UINT8 m_m6840_lsb_buffer; + UINT8 m_m6840_irq_state; + UINT8 m_m6840_irq_vector; + struct counter_state m_m6840_state[3]; + UINT8 m_v493_irq_state; + UINT8 m_v493_irq_vector; + timer_expired_func m_v493_callback; + UINT8 m_zwackery_sound_data; + attotime m_m6840_counter_periods[3]; + attotime m_m6840_internal_counter_period; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT16 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index cc755a7c74b..207fbd720ed 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -12,23 +12,23 @@ public: meadows_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 dac; - int dac_enable; - int channel; - int freq1; - int freq2; - UINT8 latched_0c01; - UINT8 latched_0c02; - UINT8 latched_0c03; - UINT8 main_sense_state; - UINT8 audio_sense_state; - UINT8 _0c00; - UINT8 _0c01; - UINT8 _0c02; - UINT8 _0c03; - tilemap_t *bg_tilemap; - UINT8 *spriteram; + UINT8 *m_videoram; + UINT8 m_dac; + int m_dac_enable; + int m_channel; + int m_freq1; + int m_freq2; + UINT8 m_latched_0c01; + UINT8 m_latched_0c02; + UINT8 m_latched_0c03; + UINT8 m_main_sense_state; + UINT8 m_audio_sense_state; + UINT8 m_0c00; + UINT8 m_0c01; + UINT8 m_0c02; + UINT8 m_0c03; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index 802c121e64e..f6d4ef05364 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -106,7 +106,7 @@ public: : md_base_state(machine, config) { } // bootleg specific - int aladmdb_mcu_port; + int m_aladmdb_mcu_port; }; class segac2_state : public md_base_state @@ -116,28 +116,28 @@ public: : md_base_state(machine, config) { } // for Print Club only - int cam_data; + int m_cam_data; - int segac2_enable_display; + int m_segac2_enable_display; - UINT16* paletteram; + UINT16* m_paletteram; /* internal states */ - UINT8 misc_io_data[0x10]; /* holds values written to the I/O chip */ + UINT8 m_misc_io_data[0x10]; /* holds values written to the I/O chip */ /* protection-related tracking */ - int (*prot_func)(int in); /* emulation of protection chip */ - UINT8 prot_write_buf; /* remembers what was written */ - UINT8 prot_read_buf; /* remembers what was returned */ + int (*m_prot_func)(int in); /* emulation of protection chip */ + UINT8 m_prot_write_buf; /* remembers what was written */ + UINT8 m_prot_read_buf; /* remembers what was returned */ /* palette-related variables */ - UINT8 segac2_alt_palette_mode; - UINT8 palbank; - UINT8 bg_palbase; - UINT8 sp_palbase; + UINT8 m_segac2_alt_palette_mode; + UINT8 m_palbank; + UINT8 m_bg_palbase; + UINT8 m_sp_palbase; /* sound-related variables */ - UINT8 sound_banks; /* number of sound banks */ + UINT8 m_sound_banks; /* number of sound banks */ }; class mplay_state : public md_base_state @@ -146,24 +146,24 @@ public: mplay_state(running_machine &machine, const driver_device_config_base &config) : md_base_state(machine, config) { } - UINT32 bios_mode; // determines whether ROM banks or Game data + UINT32 m_bios_mode; // determines whether ROM banks or Game data // is to read from 0x8000-0xffff - UINT32 bios_bank; // ROM bank selection - UINT16 game_banksel; // Game bank selection - UINT32 readpos; // serial bank selection position (9-bit) - UINT32 mp_bios_bank_addr; - - UINT32 bios_width; // determines the way the game info ROM is read - UINT8 bios_ctrl[6]; - UINT8 bios_6600; - UINT8 bios_6403; - UINT8 bios_6404; - - UINT16 *genesis_io_ram; - UINT8* ic3_ram; - UINT8* ic37_ram; - UINT16 *ic36_ram; + UINT32 m_bios_bank; // ROM bank selection + UINT16 m_game_banksel; // Game bank selection + UINT32 m_readpos; // serial bank selection position (9-bit) + UINT32 m_mp_bios_bank_addr; + + UINT32 m_bios_width; // determines the way the game info ROM is read + UINT8 m_bios_ctrl[6]; + UINT8 m_bios_6600; + UINT8 m_bios_6403; + UINT8 m_bios_6404; + + UINT16 *m_genesis_io_ram; + UINT8* m_ic3_ram; + UINT8* m_ic37_ram; + UINT16 *m_ic36_ram; }; class mtech_state : public md_base_state @@ -172,18 +172,18 @@ public: mtech_state(running_machine &machine, const driver_device_config_base &config) : md_base_state(machine, config) { } - UINT8 mt_cart_select_reg; - UINT32 bios_port_ctrl; - int current_game_is_sms; // is the current game SMS based (running on genesis z80, in VDP compatibility mode) - UINT32 bios_ctrl_inputs; - UINT8 bios_ctrl[6]; + UINT8 m_mt_cart_select_reg; + UINT32 m_bios_port_ctrl; + int m_current_game_is_sms; // is the current game SMS based (running on genesis z80, in VDP compatibility mode) + UINT32 m_bios_ctrl_inputs; + UINT8 m_bios_ctrl[6]; - int mt_bank_addr; + int m_mt_bank_addr; - int cart_is_genesis[8]; + int m_cart_is_genesis[8]; /* Megatech BIOS specific */ - UINT8* megatech_banked_ram; + UINT8* m_megatech_banked_ram; }; typedef struct _megadriv_cart megadriv_cart; @@ -219,11 +219,11 @@ public: md_cons_state(running_machine &machine, const driver_device_config_base &config) : md_base_state(machine, config) { } - emu_timer *mess_io_timeout[3]; - int mess_io_stage[3]; - UINT8 jcart_io_data[2]; + emu_timer *m_mess_io_timeout[3]; + int m_mess_io_stage[3]; + UINT8 m_jcart_io_data[2]; - megadriv_cart md_cart; + megadriv_cart m_md_cart; }; class pico_state : public md_cons_state @@ -232,7 +232,7 @@ public: pico_state(running_machine &machine, const driver_device_config_base &config) : md_cons_state(machine, config) { } - UINT8 page_register; + UINT8 m_page_register; }; class mdsvp_state : public md_cons_state @@ -241,14 +241,14 @@ public: mdsvp_state(running_machine &machine, const driver_device_config_base &config) : md_cons_state(machine, config) { } - UINT8 *iram; // IRAM (0-0x7ff) - UINT8 *dram; // [0x20000]; - UINT32 pmac_read[6]; // read modes/addrs for PM0-PM5 - UINT32 pmac_write[6]; // write ... - PAIR pmc; - UINT32 emu_status; - UINT16 XST; // external status, mapped at a15000 and a15002 on 68k side. - UINT16 XST2; // status of XST (bit1 set when 68k writes to XST) + UINT8 *m_iram; // IRAM (0-0x7ff) + UINT8 *m_dram; // [0x20000]; + UINT32 m_pmac_read[6]; // read modes/addrs for PM0-PM5 + UINT32 m_pmac_write[6]; // write ... + PAIR m_pmc; + UINT32 m_emu_status; + UINT16 m_XST; // external status, mapped at a15000 and a15002 on 68k side. + UINT16 m_XST2; // status of XST (bit1 set when 68k writes to XST) }; class _32x_state : public md_base_state diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index c0139bd0c4d..9aa01aa6b29 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -20,34 +20,34 @@ public: megasys1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *spriteram; - UINT16 ip_select; - UINT16 ip_select_values[5]; - UINT8 ignore_oki_status; - UINT16 protection_val; - int bank; - UINT16 *scrollram[3]; - UINT16 *objectram; - UINT16 *vregs; - UINT16 *ram; - int scrollx[3]; - int scrolly[3]; - int active_layers; - int bits_per_color_code; - int scroll_flag[3]; - int sprite_bank; - int screen_flag; - int sprite_flag; - int _8x8_scroll_factor[3]; - int _16x16_scroll_factor[3]; - tilemap_t *tmap[3]; - tilemap_t *tilemap[3][2][4]; - int hardware_type_z; - UINT16 *buffer_objectram; - UINT16 *buffer2_objectram; - UINT16 *buffer_spriteram16; - UINT16 *buffer2_spriteram16; - int layers_order[16]; + UINT16 *m_spriteram; + UINT16 m_ip_select; + UINT16 m_ip_select_values[5]; + UINT8 m_ignore_oki_status; + UINT16 m_protection_val; + int m_bank; + UINT16 *m_scrollram[3]; + UINT16 *m_objectram; + UINT16 *m_vregs; + UINT16 *m_ram; + int m_scrollx[3]; + int m_scrolly[3]; + int m_active_layers; + int m_bits_per_color_code; + int m_scroll_flag[3]; + int m_sprite_bank; + int m_screen_flag; + int m_sprite_flag; + int m_8x8_scroll_factor[3]; + int m_16x16_scroll_factor[3]; + tilemap_t *m_tmap[3]; + tilemap_t *m_tilemap[3][2][4]; + int m_hardware_type_z; + UINT16 *m_buffer_objectram; + UINT16 *m_buffer2_objectram; + UINT16 *m_buffer_spriteram16; + UINT16 *m_buffer2_spriteram16; + int m_layers_order[16]; }; diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index 881ba733a0f..febd019d3f3 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -11,28 +11,28 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * scrollx; - UINT8 * scrolly; - UINT8 * videoram; - UINT8 * colorram; - UINT8 * videoram2; - UINT8 * colorram2; - UINT8 * spriteram; - size_t spriteram_size; - size_t videoram_size; - size_t videoram2_size; + UINT8 * m_scrollx; + UINT8 * m_scrolly; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_videoram2; + UINT8 * m_colorram2; + UINT8 * m_spriteram; + size_t m_spriteram_size; + size_t m_videoram_size; + size_t m_videoram2_size; /* video-related */ - bitmap_t *tmpbitmap; - int flipscreen; + bitmap_t *m_tmpbitmap; + int m_flipscreen; /* misc */ - int i8039_status; + int m_i8039_status; /* devices */ - cpu_device *maincpu; - cpu_device *audiocpu; - cpu_device *daccpu; + cpu_device *m_maincpu; + cpu_device *m_audiocpu; + cpu_device *m_daccpu; }; diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index 6b787e139b2..865c3ead679 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -11,35 +11,41 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * videoram2; - UINT8 * spriteram; - UINT8 * bg_scrollram; - UINT8 * fg_scrollram; - UINT8 * ay8910_enable; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_videoram2; + UINT8 * m_spriteram; + UINT8 * m_bg_scrollram; + UINT8 * m_fg_scrollram; + UINT8 * m_ay8910_enable; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - bitmap_t* helper; - bitmap_t* helper2; - int coll_bit0, coll_bit1, coll_bit2, coll_bit3, coll_bit6; - int rougien_gfxbank1, rougien_gfxbank2; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + bitmap_t* m_helper; + bitmap_t* m_helper2; + int m_coll_bit0; + int m_coll_bit1; + int m_coll_bit2; + int m_coll_bit3; + int m_coll_bit6; + int m_rougien_gfxbank1; + int m_rougien_gfxbank2; /* sound-related */ - UINT32 adpcm_pos; - UINT32 adpcm_end; - UINT8 adpcm_idle; - int adpcm_data; - UINT8 adpcm_trigger; - UINT8 adpcm_rom_sel; - UINT8 adpcm_play_reg; + UINT32 m_adpcm_pos; + UINT32 m_adpcm_end; + UINT8 m_adpcm_idle; + int m_adpcm_data; + UINT8 m_adpcm_trigger; + UINT8 m_adpcm_rom_sel; + UINT8 m_adpcm_play_reg; /* devices */ - device_t *maincpu; - device_t *ay1; - device_t *ay2; + device_t *m_maincpu; + device_t *m_ay1; + device_t *m_ay2; }; diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h index 69369afea4f..6e5170125a2 100644 --- a/src/mame/includes/metalmx.h +++ b/src/mame/includes/metalmx.h @@ -8,20 +8,20 @@ class metalmx_state : public driver_device public: metalmx_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - gsp(*this, "gsp"), - adsp(*this, "adsp"), - dsp32c_1(*this, "dsp32c_1"), - dsp32c_2(*this, "dsp32c_2") { } + m_maincpu(*this, "maincpu"), + m_gsp(*this, "gsp"), + m_adsp(*this, "adsp"), + m_dsp32c_1(*this, "dsp32c_1"), + m_dsp32c_2(*this, "dsp32c_2") { } - required_device<m68ec020_device> maincpu; - required_device<tms34020_device> gsp; - required_device<adsp2105_device> adsp; - required_device<dsp32c_device> dsp32c_1; - required_device<dsp32c_device> dsp32c_2; + required_device<m68ec020_device> m_maincpu; + required_device<tms34020_device> m_gsp; + required_device<adsp2105_device> m_adsp; + required_device<dsp32c_device> m_dsp32c_1; + required_device<dsp32c_device> m_dsp32c_2; - UINT16 *gsp_dram; - UINT16 *gsp_vram; + UINT16 *m_gsp_dram; + UINT16 *m_gsp_vram; - UINT32 *adsp_internal_program_ram; + UINT32 *m_adsp_internal_program_ram; }; diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index cda4364bd31..f73a6883411 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -11,22 +11,24 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bgram; - UINT8 * fgram; - UINT8 * scrollx; - UINT8 * otherram; -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram2; // currently this uses generic palette handling - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_bgram; + UINT8 * m_fgram; + UINT8 * m_scrollx; + UINT8 * m_otherram; +// UINT8 * m_paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram2; // currently this uses generic palette handling + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap,*fg_tilemap; - UINT8 write_mask, gfxbank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 m_write_mask; + UINT8 m_gfxbank; /* devices */ - device_t *maincpu; - device_t *subcpu; + device_t *m_maincpu; + device_t *m_subcpu; }; diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 802e2b54557..e517022a1bc 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -13,67 +13,72 @@ class metro_state : public driver_device public: metro_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - audiocpu(*this, "audiocpu"), - oki(*this, "oki"), - ymsnd(*this, "ymsnd"), - k053936(*this, "k053936") { } + m_maincpu(*this, "maincpu"), + m_audiocpu(*this, "audiocpu"), + m_oki(*this, "oki"), + m_ymsnd(*this, "ymsnd"), + m_k053936(*this, "k053936") { } /* memory pointers */ - UINT16 * vram_0; - UINT16 * vram_1; - UINT16 * vram_2; - UINT16 * spriteram; - UINT16 * tiletable; - UINT16 * tiletable_old; - UINT16 * blitter_regs; - UINT16 * scroll; - UINT16 * window; - UINT16 * irq_enable; - UINT16 * irq_levels; - UINT16 * irq_vectors; - UINT16 * rombank; - UINT16 * videoregs; - UINT16 * screenctrl; - UINT16 * input_sel; - UINT16 * k053936_ram; - - size_t spriteram_size; - size_t tiletable_size; - - int flip_screen; + UINT16 * m_vram_0; + UINT16 * m_vram_1; + UINT16 * m_vram_2; + UINT16 * m_spriteram; + UINT16 * m_tiletable; + UINT16 * m_tiletable_old; + UINT16 * m_blitter_regs; + UINT16 * m_scroll; + UINT16 * m_window; + UINT16 * m_irq_enable; + UINT16 * m_irq_levels; + UINT16 * m_irq_vectors; + UINT16 * m_rombank; + UINT16 * m_videoregs; + UINT16 * m_screenctrl; + UINT16 * m_input_sel; + UINT16 * m_k053936_ram; + + size_t m_spriteram_size; + size_t m_tiletable_size; + + int m_flip_screen; /* video-related */ - tilemap_t *k053936_tilemap; - int bg_tilemap_enable[3]; - int bg_tilemap_enable16[3]; - int bg_tilemap_scrolldx[3]; + tilemap_t *m_k053936_tilemap; + int m_bg_tilemap_enable[3]; + int m_bg_tilemap_enable16[3]; + int m_bg_tilemap_scrolldx[3]; - int support_8bpp, support_16x16; - int has_zoom; - int sprite_xoffs, sprite_yoffs; + int m_support_8bpp; + int m_support_16x16; + int m_has_zoom; + int m_sprite_xoffs; + int m_sprite_yoffs; /* blitter */ - int blitter_bit; + int m_blitter_bit; /* irq_related */ - int irq_line; - UINT8 requested_int[8]; - emu_timer *mouja_irq_timer; + int m_irq_line; + UINT8 m_requested_int[8]; + emu_timer *m_mouja_irq_timer; /* sound related */ - UINT16 soundstatus; - int porta, portb, busy_sndcpu; + UINT16 m_soundstatus; + int m_porta; + int m_portb; + int m_busy_sndcpu; /* misc */ - int gakusai_oki_bank_lo, gakusai_oki_bank_hi; + int m_gakusai_oki_bank_lo; + int m_gakusai_oki_bank_hi; /* devices */ - required_device<cpu_device> maincpu; - optional_device<cpu_device> audiocpu; - optional_device<okim6295_device> oki; - optional_device<device_t> ymsnd; - optional_device<k053936_device> k053936; + required_device<cpu_device> m_maincpu; + optional_device<cpu_device> m_audiocpu; + optional_device<okim6295_device> m_oki; + optional_device<device_t> m_ymsnd; + optional_device<k053936_device> m_k053936; }; diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index 66c484214c6..eec13203cdb 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -6,33 +6,39 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * protection_ram; - UINT8 * videoram; - UINT8 * objectram; - size_t objectram_size; + UINT8 * m_protection_ram; + UINT8 * m_videoram; + UINT8 * m_objectram; + size_t m_objectram_size; /* video-related */ - int charbank; + int m_charbank; /* mcu */ /* mexico86 68705 protection */ - UINT8 port_a_in, port_a_out, ddr_a; - UINT8 port_b_in, port_b_out, ddr_b; - int address, latch; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_b_in; + UINT8 m_port_b_out; + UINT8 m_ddr_b; + int m_address; + int m_latch; /* kikikai mcu simulation */ - int mcu_running, mcu_initialised; - int coin_last; + int m_mcu_running; + int m_mcu_initialised; + int m_coin_last; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *subcpu; - device_t *mcu; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_subcpu; + device_t *m_mcu; /* queue */ - UINT8 queue[64]; - int qfront; - int qstate; + UINT8 m_queue[64]; + int m_qfront; + int m_qstate; }; diff --git a/src/mame/includes/mhavoc.h b/src/mame/includes/mhavoc.h index 379982c3838..147d0aab736 100644 --- a/src/mame/includes/mhavoc.h +++ b/src/mame/includes/mhavoc.h @@ -21,20 +21,20 @@ public: mhavoc_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *zram0; - UINT8 *zram1; - UINT8 alpha_data; - UINT8 alpha_rcvd; - UINT8 alpha_xmtd; - UINT8 gamma_data; - UINT8 gamma_rcvd; - UINT8 gamma_xmtd; - UINT8 player_1; - UINT8 alpha_irq_clock; - UINT8 alpha_irq_clock_enable; - UINT8 gamma_irq_clock; - UINT8 has_gamma_cpu; - UINT8 speech_write_buffer; + UINT8 *m_zram0; + UINT8 *m_zram1; + UINT8 m_alpha_data; + UINT8 m_alpha_rcvd; + UINT8 m_alpha_xmtd; + UINT8 m_gamma_data; + UINT8 m_gamma_rcvd; + UINT8 m_gamma_xmtd; + UINT8 m_player_1; + UINT8 m_alpha_irq_clock; + UINT8 m_alpha_irq_clock_enable; + UINT8 m_gamma_irq_clock; + UINT8 m_has_gamma_cpu; + UINT8 m_speech_write_buffer; }; diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index f5655f0842e..18413a38748 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -18,60 +18,60 @@ public: micro3d_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *shared_ram; - device_t *duart68681; - UINT8 m68681_tx0; + UINT16 *m_shared_ram; + device_t *m_duart68681; + UINT8 m_m68681_tx0; /* Sound */ - UINT8 sound_port_latch[4]; - UINT8 dac_data; + UINT8 m_sound_port_latch[4]; + UINT8 m_dac_data; /* TI UART */ - UINT8 ti_uart[9]; - int ti_uart_mode_cycle; - int ti_uart_sync_cycle; + UINT8 m_ti_uart[9]; + int m_ti_uart_mode_cycle; + int m_ti_uart_sync_cycle; /* ADC */ - UINT8 adc_val; + UINT8 m_adc_val; /* Hardware version-check latch for BOTSS 1.1a */ - UINT8 botssa_latch; + UINT8 m_botssa_latch; /* MAC */ - UINT32 *mac_sram; - UINT32 sram_r_addr; - UINT32 sram_w_addr; - UINT32 vtx_addr; - UINT32 mrab11; - UINT32 mac_stat; - UINT32 mac_inst; + UINT32 *m_mac_sram; + UINT32 m_sram_r_addr; + UINT32 m_sram_w_addr; + UINT32 m_vtx_addr; + UINT32 m_mrab11; + UINT32 m_mac_stat; + UINT32 m_mac_inst; /* 2D video */ - UINT16 *micro3d_sprite_vram; - UINT16 creg; - UINT16 xfer3dk; + UINT16 *m_micro3d_sprite_vram; + UINT16 m_creg; + UINT16 m_xfer3dk; /* 3D pipeline */ - UINT32 pipe_data; - UINT32 pipeline_state; - INT32 vtx_fifo[512]; - UINT32 fifo_idx; - UINT32 draw_cmd; - int draw_state; - INT32 x_min; - INT32 x_max; - INT32 y_min; - INT32 y_max; - INT32 z_min; - INT32 z_max; - INT32 x_mid; - INT32 y_mid; - int dpram_bank; - UINT32 draw_dpram[1024]; - UINT16 *frame_buffers[2]; - UINT16 *tmp_buffer; - int drawing_buffer; - int display_buffer; + UINT32 m_pipe_data; + UINT32 m_pipeline_state; + INT32 m_vtx_fifo[512]; + UINT32 m_fifo_idx; + UINT32 m_draw_cmd; + int m_draw_state; + INT32 m_x_min; + INT32 m_x_max; + INT32 m_y_min; + INT32 m_y_max; + INT32 m_z_min; + INT32 m_z_max; + INT32 m_x_mid; + INT32 m_y_mid; + int m_dpram_bank; + UINT32 m_draw_dpram[1024]; + UINT16 *m_frame_buffers[2]; + UINT16 *m_tmp_buffer; + int m_drawing_buffer; + int m_display_buffer; }; typedef struct _micro3d_vtx_ diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index 1be8f984121..a16ca6b14c1 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -16,30 +16,30 @@ public: m_nvram(*this, "nvram") { } optional_shared_ptr<UINT32> m_nvram; - UINT32 *ram_base; - UINT32 *fastram_base; - UINT8 cmos_protected; - UINT16 control_data; - UINT8 adc_data; - UINT8 adc_shift; - UINT16 last_port0; - UINT8 shifter_state; - timer_device *timer[2]; - double timer_rate; - UINT32 *tms32031_control; - UINT32 *midvplus_misc; - UINT16 bit_index; - int lastval; - UINT32 *generic_speedup; - UINT16 *videoram; - UINT32 *textureram; - UINT16 video_regs[16]; - UINT16 dma_data[16]; - UINT8 dma_data_index; - UINT16 page_control; - UINT8 video_changed; - emu_timer *scanline_timer; - poly_manager *poly; + UINT32 *m_ram_base; + UINT32 *m_fastram_base; + UINT8 m_cmos_protected; + UINT16 m_control_data; + UINT8 m_adc_data; + UINT8 m_adc_shift; + UINT16 m_last_port0; + UINT8 m_shifter_state; + timer_device *m_timer[2]; + double m_timer_rate; + UINT32 *m_tms32031_control; + UINT32 *m_midvplus_misc; + UINT16 m_bit_index; + int m_lastval; + UINT32 *m_generic_speedup; + UINT16 *m_videoram; + UINT32 *m_textureram; + UINT16 m_video_regs[16]; + UINT16 m_dma_data[16]; + UINT8 m_dma_data_index; + UINT16 m_page_control; + UINT8 m_video_changed; + emu_timer *m_scanline_timer; + poly_manager *m_poly; }; diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h index 4dd18608056..4956cecfbde 100644 --- a/src/mame/includes/midwunit.h +++ b/src/mame/includes/midwunit.h @@ -12,13 +12,13 @@ public: m_nvram(*this, "nvram") { } required_shared_ptr<UINT16> m_nvram; - UINT8 *decode_memory; - UINT8 cmos_write_enable; - UINT16 iodata[8]; - UINT8 ioshuffle[16]; - UINT8 uart[8]; - UINT8 security_bits; - UINT16 *umk3_palette; + UINT8 *m_decode_memory; + UINT8 m_cmos_write_enable; + UINT16 m_iodata[8]; + UINT8 m_ioshuffle[16]; + UINT8 m_uart[8]; + UINT8 m_security_bits; + UINT16 *m_umk3_palette; }; /*----------- defined in machine/midwunit.c -----------*/ diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h index fed04851a24..e4cd52db175 100644 --- a/src/mame/includes/midxunit.h +++ b/src/mame/includes/midxunit.h @@ -12,13 +12,13 @@ public: m_nvram(*this, "nvram") { } required_shared_ptr<UINT16> m_nvram; - UINT8 *decode_memory; - UINT8 cmos_write_enable; - UINT16 iodata[8]; - UINT8 ioshuffle[16]; - UINT8 analog_port; - UINT8 uart[8]; - UINT8 security_bits; + UINT8 *m_decode_memory; + UINT8 m_cmos_write_enable; + UINT16 m_iodata[8]; + UINT8 m_ioshuffle[16]; + UINT8 m_analog_port; + UINT8 m_uart[8]; + UINT8 m_security_bits; }; diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index 20fdb5e8309..1e8745af07a 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -33,27 +33,27 @@ public: midyunit_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *cmos_ram; - UINT32 cmos_page; - UINT8 * gfx_rom; - size_t gfx_rom_size; - UINT16 prot_result; - UINT16 prot_sequence[3]; - UINT8 prot_index; - UINT8 term2_analog_select; - const struct protection_data *prot_data; - UINT8 cmos_w_enable; - UINT8 chip_type; - UINT16 *t2_hack_mem; - UINT8 *cvsd_protection_base; - UINT8 autoerase_enable; - UINT32 palette_mask; - pen_t * pen_map; - UINT16 * local_videoram; - UINT8 videobank_select; - UINT8 yawdim_dma; - UINT16 dma_register[16]; - dma_state_t dma_state; + UINT16 *m_cmos_ram; + UINT32 m_cmos_page; + UINT8 * m_gfx_rom; + size_t m_gfx_rom_size; + UINT16 m_prot_result; + UINT16 m_prot_sequence[3]; + UINT8 m_prot_index; + UINT8 m_term2_analog_select; + const struct protection_data *m_prot_data; + UINT8 m_cmos_w_enable; + UINT8 m_chip_type; + UINT16 *m_t2_hack_mem; + UINT8 *m_cvsd_protection_base; + UINT8 m_autoerase_enable; + UINT32 m_palette_mask; + pen_t * m_pen_map; + UINT16 * m_local_videoram; + UINT8 m_videobank_select; + UINT8 m_yawdim_dma; + UINT16 m_dma_register[16]; + dma_state_t m_dma_state; }; diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index a8e12b09ed9..83609652fcd 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -11,21 +11,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int palettebank; + tilemap_t *m_bg_tilemap; + int m_palettebank; /* misc */ - int last_irq; + int m_last_irq; /* devices */ - cpu_device *maincpu; - cpu_device *audiocpu; + cpu_device *m_maincpu; + cpu_device *m_audiocpu; }; diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index 74b68f0d4e1..ae3f459fb7a 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -11,36 +11,37 @@ class mitchell_state : public driver_device public: mitchell_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - audiocpu(*this, "audiocpu"), - oki(*this, "oki") { } + m_audiocpu(*this, "audiocpu"), + m_oki(*this, "oki") { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - size_t videoram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + size_t m_videoram_size; /* video-related */ - tilemap_t *bg_tilemap; - UINT8 *objram; /* Sprite RAM */ - int flipscreen; - int video_bank; - int paletteram_bank; + tilemap_t *m_bg_tilemap; + UINT8 *m_objram; /* Sprite RAM */ + int m_flipscreen; + int m_video_bank; + int m_paletteram_bank; /* sound-related */ - int sample_buffer; - int sample_select; + int m_sample_buffer; + int m_sample_select; /* misc */ - int input_type; - int dial[2], dial_selected; - int dir[2]; - int keymatrix; + int m_input_type; + int m_dial[2]; + int m_dial_selected; + int m_dir[2]; + int m_keymatrix; /* devices */ - optional_device<cpu_device> audiocpu; - optional_device<okim6295_device> oki; - UINT8 *nvram; - size_t nvram_size; + optional_device<cpu_device> m_audiocpu; + optional_device<okim6295_device> m_oki; + UINT8 *m_nvram; + size_t m_nvram_size; }; diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index b9f3ab5cc3d..ac9be177417 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -4,17 +4,17 @@ public: mjkjidai_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *spriteram1; - UINT8 *spriteram2; - UINT8 *spriteram3; + UINT8 *m_videoram; + UINT8 *m_spriteram1; + UINT8 *m_spriteram2; + UINT8 *m_spriteram3; - int keyb; - int nvram_init_count; - UINT8 *nvram; - size_t nvram_size; - int display_enable; - tilemap_t *bg_tilemap; + int m_keyb; + int m_nvram_init_count; + UINT8 *m_nvram; + size_t m_nvram_size; + int m_display_enable; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index 8ae6a99f78e..42781604410 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -9,75 +9,77 @@ public: model1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - struct view *view; - struct point *pointdb, *pointpt; - struct quad_m1 *quaddb, *quadpt; - struct quad_m1 **quadind; - int sound_irq; - int to_68k[8]; - int fifo_wptr; - int fifo_rptr; - int last_irq; - UINT16 *mr; - UINT16 *mr2; - int dump; - UINT16 *display_list0; - UINT16 *display_list1; - UINT16 *color_xlat; - offs_t pushpc; - int fifoin_rpos; - int fifoin_wpos; - UINT32 fifoin_data[FIFO_SIZE]; - int swa; - int fifoin_cbcount; - tgp_func fifoin_cb; - INT32 fifoout_rpos; - INT32 fifoout_wpos; - UINT32 fifoout_data[FIFO_SIZE]; - UINT32 list_length; - float cmat[12]; - float mat_stack[MAT_STACK_SIZE][12]; - float mat_vector[21][12]; - INT32 mat_stack_pos; - float acc; - float tgp_vf_xmin; - float tgp_vf_xmax; - float tgp_vf_zmin; - float tgp_vf_zmax; - float tgp_vf_ygnd; - float tgp_vf_yflr; - float tgp_vf_yjmp; - float tgp_vr_circx; - float tgp_vr_circy; - float tgp_vr_circrad; - float tgp_vr_cbox[12]; - int tgp_vr_select; - UINT16 ram_adr; - UINT16 ram_latch[2]; - UINT16 ram_scanadr; - UINT32 *ram_data; - float tgp_vr_base[4]; - int puuu; - int ccount; - UINT32 copro_r; - UINT32 copro_w; - int copro_fifoout_rpos; - int copro_fifoout_wpos; - UINT32 copro_fifoout_data[FIFO_SIZE]; - int copro_fifoout_num; - int copro_fifoin_rpos; - int copro_fifoin_wpos; - UINT32 copro_fifoin_data[FIFO_SIZE]; - int copro_fifoin_num; - UINT32 vr_r; - UINT32 vr_w; - UINT16 listctl[2]; - UINT16 *glist; - int render_done; - UINT16 *tgp_ram; - UINT16 *paletteram16; - UINT32 *poly_rom; - UINT32 *poly_ram; + struct view *m_view; + struct point *m_pointdb; + struct point *m_pointpt; + struct quad_m1 *m_quaddb; + struct quad_m1 *m_quadpt; + struct quad_m1 **m_quadind; + int m_sound_irq; + int m_to_68k[8]; + int m_fifo_wptr; + int m_fifo_rptr; + int m_last_irq; + UINT16 *m_mr; + UINT16 *m_mr2; + int m_dump; + UINT16 *m_display_list0; + UINT16 *m_display_list1; + UINT16 *m_color_xlat; + offs_t m_pushpc; + int m_fifoin_rpos; + int m_fifoin_wpos; + UINT32 m_fifoin_data[FIFO_SIZE]; + int m_swa; + int m_fifoin_cbcount; + tgp_func m_fifoin_cb; + INT32 m_fifoout_rpos; + INT32 m_fifoout_wpos; + UINT32 m_fifoout_data[FIFO_SIZE]; + UINT32 m_list_length; + float m_cmat[12]; + float m_mat_stack[MAT_STACK_SIZE][12]; + float m_mat_vector[21][12]; + INT32 m_mat_stack_pos; + float m_acc; + float m_tgp_vf_xmin; + float m_tgp_vf_xmax; + float m_tgp_vf_zmin; + float m_tgp_vf_zmax; + float m_tgp_vf_ygnd; + float m_tgp_vf_yflr; + float m_tgp_vf_yjmp; + float m_tgp_vr_circx; + float m_tgp_vr_circy; + float m_tgp_vr_circrad; + float m_tgp_vr_cbox[12]; + int m_tgp_vr_select; + UINT16 m_ram_adr; + UINT16 m_ram_latch[2]; + UINT16 m_ram_scanadr; + UINT32 *m_ram_data; + float m_tgp_vr_base[4]; + int m_puuu; + int m_ccount; + UINT32 m_copro_r; + UINT32 m_copro_w; + int m_copro_fifoout_rpos; + int m_copro_fifoout_wpos; + UINT32 m_copro_fifoout_data[FIFO_SIZE]; + int m_copro_fifoout_num; + int m_copro_fifoin_rpos; + int m_copro_fifoin_wpos; + UINT32 m_copro_fifoin_data[FIFO_SIZE]; + int m_copro_fifoin_num; + UINT32 m_vr_r; + UINT32 m_vr_w; + UINT16 m_listctl[2]; + UINT16 *m_glist; + int m_render_done; + UINT16 *m_tgp_ram; + UINT16 *m_paletteram16; + UINT32 *m_poly_rom; + UINT32 *m_poly_ram; }; diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 3966a1faf64..2f3e7c45e43 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -11,60 +11,60 @@ public: model2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 *workram; - UINT32 intreq; - UINT32 intena; - UINT32 coproctl; - UINT32 coprocnt; - UINT32 geoctl; - UINT32 geocnt; - UINT16 *soundram; - UINT32 timervals[4]; - UINT32 timerorig[4]; - int timerrun[4]; - timer_device *timers[4]; - int ctrlmode; - int analog_channel; - UINT32 *tgp_program; - int dsp_type; - int copro_fifoin_rpos; - int copro_fifoin_wpos; - UINT32 *copro_fifoin_data; - int copro_fifoin_num; - int copro_fifoout_rpos; - int copro_fifoout_wpos; - UINT32 *copro_fifoout_data; - int copro_fifoout_num; - UINT16 cmd_data; - UINT8 driveio_comm_data; - int iop_write_num; - UINT32 iop_data; - int geo_iop_write_num; - UINT32 geo_iop_data; - int to_68k; - int protstate; - int protpos; - UINT8 protram[256]; - int prot_a; - int maxxstate; - UINT32 netram[0x8000/4]; - int zflagi; - int zflag; - int sysres; - int scsp_last_line; - int jnet_time_out; - UINT32 geo_read_start_address; - UINT32 geo_write_start_address; - UINT32 *bufferram; - UINT32 *colorxlat; - UINT32 *textureram0; - UINT32 *textureram1; - UINT32 *lumaram; - UINT32 *paletteram32; - poly_manager *poly; - raster_state *raster; - geo_state *geo; - bitmap_t *sys24_bitmap; + UINT32 *m_workram; + UINT32 m_intreq; + UINT32 m_intena; + UINT32 m_coproctl; + UINT32 m_coprocnt; + UINT32 m_geoctl; + UINT32 m_geocnt; + UINT16 *m_soundram; + UINT32 m_timervals[4]; + UINT32 m_timerorig[4]; + int m_timerrun[4]; + timer_device *m_timers[4]; + int m_ctrlmode; + int m_analog_channel; + UINT32 *m_tgp_program; + int m_dsp_type; + int m_copro_fifoin_rpos; + int m_copro_fifoin_wpos; + UINT32 *m_copro_fifoin_data; + int m_copro_fifoin_num; + int m_copro_fifoout_rpos; + int m_copro_fifoout_wpos; + UINT32 *m_copro_fifoout_data; + int m_copro_fifoout_num; + UINT16 m_cmd_data; + UINT8 m_driveio_comm_data; + int m_iop_write_num; + UINT32 m_iop_data; + int m_geo_iop_write_num; + UINT32 m_geo_iop_data; + int m_to_68k; + int m_protstate; + int m_protpos; + UINT8 m_protram[256]; + int m_prot_a; + int m_maxxstate; + UINT32 m_netram[0x8000/4]; + int m_zflagi; + int m_zflag; + int m_sysres; + int m_scsp_last_line; + int m_jnet_time_out; + UINT32 m_geo_read_start_address; + UINT32 m_geo_write_start_address; + UINT32 *m_bufferram; + UINT32 *m_colorxlat; + UINT32 *m_textureram0; + UINT32 *m_textureram1; + UINT32 *m_lumaram; + UINT32 *m_paletteram32; + poly_manager *m_poly; + raster_state *m_raster; + geo_state *m_geo; + bitmap_t *m_sys24_bitmap; }; diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index f688dde7136..b2f93643f82 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -16,88 +16,88 @@ public: model3_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 irq_enable; - UINT8 irq_state; - UINT8 scsi_irq_state; - UINT64 *work_ram; - int crom_bank; - int controls_bank; - UINT32 real3d_device_id; - UINT16 *soundram; - UINT32 mpc105_regs[0x40]; - UINT32 mpc105_addr; - int pci_bus; - int pci_device; - int pci_function; - int pci_reg; - UINT32 mpc106_regs[0x40]; - UINT32 mpc106_addr; - UINT32 dma_data; - UINT32 dma_status; - UINT32 dma_source; - UINT32 dma_dest; - UINT32 dma_endian; - UINT32 dma_irq; - UINT64 controls_2; - UINT64 controls_3; - UINT8 serial_fifo1; - UINT8 serial_fifo2; - int lightgun_reg_sel; - int adc_channel; - UINT64 real3d_status; - UINT64 *network_ram; - int prot_data_ptr; - int scsp_last_line; - int vblank; - UINT32 *vrom; - int step; - UINT64 *paletteram64; - int m3_step; - INT32 tap_state; - UINT64 ir; - UINT8 id_data[32]; - INT32 id_size; - int tdo; - UINT8 layer_enable; - UINT32 layer_modulate_r; - UINT32 layer_modulate_g; - UINT32 layer_modulate_b; - UINT32 layer_modulate1; - UINT32 layer_modulate2; - UINT64 layer_scroll[2]; - UINT64 *m3_char_ram; - UINT64 *m3_tile_ram; - UINT32 *texture_fifo; - int texture_fifo_pos; - UINT16 *texture_ram[2]; - UINT32 *display_list_ram; - UINT32 *culling_ram; - UINT32 *polygon_ram; - UINT16 *pal_lookup; - int real3d_display_list; - bitmap_t *bitmap3d; - bitmap_t *zbuffer; - rectangle clip3d; - rectangle *screen_clip; - VECTOR3 parallel_light; - float parallel_light_intensity; - float ambient_light_intensity; - poly_manager *poly; - int list_depth; - int tick; - int debug_layer_disable; - UINT64 vid_reg0; - int matrix_stack_ptr; - MATRIX *matrix_stack; - MATRIX coordinate_system; - float viewport_focal_length; - int viewport_region_x; - int viewport_region_y; - int viewport_region_width; - int viewport_region_height; - PLANE clip_plane[5]; - UINT32 matrix_base_address; - cached_texture *texcache[2][1024/32][2048/32]; + UINT8 m_irq_enable; + UINT8 m_irq_state; + UINT8 m_scsi_irq_state; + UINT64 *m_work_ram; + int m_crom_bank; + int m_controls_bank; + UINT32 m_real3d_device_id; + UINT16 *m_soundram; + UINT32 m_mpc105_regs[0x40]; + UINT32 m_mpc105_addr; + int m_pci_bus; + int m_pci_device; + int m_pci_function; + int m_pci_reg; + UINT32 m_mpc106_regs[0x40]; + UINT32 m_mpc106_addr; + UINT32 m_dma_data; + UINT32 m_dma_status; + UINT32 m_dma_source; + UINT32 m_dma_dest; + UINT32 m_dma_endian; + UINT32 m_dma_irq; + UINT64 m_controls_2; + UINT64 m_controls_3; + UINT8 m_serial_fifo1; + UINT8 m_serial_fifo2; + int m_lightgun_reg_sel; + int m_adc_channel; + UINT64 m_real3d_status; + UINT64 *m_network_ram; + int m_prot_data_ptr; + int m_scsp_last_line; + int m_vblank; + UINT32 *m_vrom; + int m_step; + UINT64 *m_paletteram64; + int m_m3_step; + INT32 m_tap_state; + UINT64 m_ir; + UINT8 m_id_data[32]; + INT32 m_id_size; + int m_tdo; + UINT8 m_layer_enable; + UINT32 m_layer_modulate_r; + UINT32 m_layer_modulate_g; + UINT32 m_layer_modulate_b; + UINT32 m_layer_modulate1; + UINT32 m_layer_modulate2; + UINT64 m_layer_scroll[2]; + UINT64 *m_m3_char_ram; + UINT64 *m_m3_tile_ram; + UINT32 *m_texture_fifo; + int m_texture_fifo_pos; + UINT16 *m_texture_ram[2]; + UINT32 *m_display_list_ram; + UINT32 *m_culling_ram; + UINT32 *m_polygon_ram; + UINT16 *m_pal_lookup; + int m_real3d_display_list; + bitmap_t *m_bitmap3d; + bitmap_t *m_zbuffer; + rectangle m_clip3d; + rectangle *m_screen_clip; + VECTOR3 m_parallel_light; + float m_parallel_light_intensity; + float m_ambient_light_intensity; + poly_manager *m_poly; + int m_list_depth; + int m_tick; + int m_debug_layer_disable; + UINT64 m_vid_reg0; + int m_matrix_stack_ptr; + MATRIX *m_matrix_stack; + MATRIX m_coordinate_system; + float m_viewport_focal_length; + int m_viewport_region_x; + int m_viewport_region_y; + int m_viewport_region_width; + int m_viewport_region_height; + PLANE m_clip_plane[5]; + UINT32 m_matrix_base_address; + cached_texture *m_texcache[2][1024/32][2048/32]; }; diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index ccdc598a97b..618c6088afc 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -11,25 +11,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bg_scrollx; - UINT8 * bg_scrolly; - UINT8 * videoram; - UINT8 * spriteram; + UINT8 * m_bg_scrollx; + UINT8 * m_bg_scrolly; + UINT8 * m_videoram; + UINT8 * m_spriteram; // UINT8 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; - size_t videoram_size; + size_t m_spriteram_size; + size_t m_videoram_size; /* video-related */ - UINT8 fg_scrollx; - UINT8 fg_scrolly; - UINT8 fg_select; - UINT8 text_scrolly; - UINT8 text_mode; - UINT8 bg_select; - UINT8 bg_priority; - UINT8 bg_mask; - UINT8 fg_mask; - UINT8 flipscreen; + UINT8 m_fg_scrollx; + UINT8 m_fg_scrolly; + UINT8 m_fg_select; + UINT8 m_text_scrolly; + UINT8 m_text_mode; + UINT8 m_bg_select; + UINT8 m_bg_priority; + UINT8 m_bg_mask; + UINT8 m_fg_mask; + UINT8 m_flipscreen; }; diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index eb5bbf7f1ab..4a160c69cec 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -11,30 +11,31 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * workram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_workram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int sprite_colorbase; - int layer_colorbase[4], layerpri[3]; - int alpha_enabled; + int m_sprite_colorbase; + int m_layer_colorbase[4]; + int m_layerpri[3]; + int m_alpha_enabled; /* misc */ - int game_type; - UINT16 protram[16]; - UINT16 cur_control2; + int m_game_type; + UINT16 m_protram[16]; + UINT16 m_cur_control2; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k054539; - device_t *k053246; - device_t *k053251; - device_t *k056832; - device_t *k054338; - - emu_timer *dmaend_timer; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k054539; + device_t *m_k053246; + device_t *m_k053251; + device_t *m_k056832; + device_t *m_k054338; + + emu_timer *m_dmaend_timer; }; diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index ae5effea262..900051f471f 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -11,15 +11,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * fgvideoram; - UINT8 * bgvideoram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_fgvideoram; + UINT8 * m_bgvideoram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *bg_tilemap,*fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; /* misc */ - int prot_val; + int m_prot_val; }; diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index cdee6709477..bd3839a2bef 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -11,18 +11,18 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* misc */ - UINT8 sound_byte; - UINT8 nmi_enable; + UINT8 m_sound_byte; + UINT8 m_nmi_enable; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; /*----------- defined in video/mouser.c -----------*/ diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index bc34ef36f83..c3abb083e1c 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -11,14 +11,15 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bgvideoram; - UINT8 * fgvideoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_bgvideoram; + UINT8 * m_fgvideoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - int flipscreen; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_flipscreen; }; diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index cafbd6548f0..b594e848285 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -11,22 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; + UINT8 * m_videoram; + UINT8 * m_spriteram; // UINT8 * paletteram; // currently this uses generic palette handling /* video-related */ - int gfx_bank; + int m_gfx_bank; /* misc */ - int io; - int main; - int status; - int select1; + int m_io; + int m_main; + int m_status; + int m_select1; /* devices */ - device_t *maincpu; - device_t *subcpu; + device_t *m_maincpu; + device_t *m_subcpu; }; diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 95fc7a8b851..fe6ae0b25ca 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -11,11 +11,11 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; + UINT8 * m_videoram; + UINT8 * m_colorram; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index 3c8e7e9192b..e08628c59b0 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -4,37 +4,37 @@ public: ms32_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *nvram_8; - UINT32 *mahjong_input_select; - UINT32 to_main; - UINT16 irqreq; - tilemap_t *tx_tilemap; - tilemap_t *roz_tilemap; - tilemap_t *bg_tilemap; - tilemap_t *bg_tilemap_alt; - UINT8* priram_8; - UINT16* palram_16; - UINT16* rozram_16; - UINT16* lineram_16; - UINT16* sprram_16; - UINT16* txram_16; - UINT16* bgram_16; - UINT32 tilemaplayoutcontrol; - UINT16* f1superb_extraram_16; - tilemap_t* extra_tilemap; - UINT32 *roz_ctrl; - UINT32 *tx_scroll; - UINT32 *bg_scroll; - UINT32 *mainram; - bitmap_t* temp_bitmap_tilemaps; - bitmap_t* temp_bitmap_sprites; - bitmap_t* temp_bitmap_sprites_pri; - int reverse_sprite_order; - int flipscreen; - UINT32 brt[4]; - int brt_r; - int brt_g; - int brt_b; + UINT8 *m_nvram_8; + UINT32 *m_mahjong_input_select; + UINT32 m_to_main; + UINT16 m_irqreq; + tilemap_t *m_tx_tilemap; + tilemap_t *m_roz_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_bg_tilemap_alt; + UINT8* m_priram_8; + UINT16* m_palram_16; + UINT16* m_rozram_16; + UINT16* m_lineram_16; + UINT16* m_sprram_16; + UINT16* m_txram_16; + UINT16* m_bgram_16; + UINT32 m_tilemaplayoutcontrol; + UINT16* m_f1superb_extraram_16; + tilemap_t* m_extra_tilemap; + UINT32 *m_roz_ctrl; + UINT32 *m_tx_scroll; + UINT32 *m_bg_scroll; + UINT32 *m_mainram; + bitmap_t* m_temp_bitmap_tilemaps; + bitmap_t* m_temp_bitmap_sprites; + bitmap_t* m_temp_bitmap_sprites_pri; + int m_reverse_sprite_order; + int m_flipscreen; + UINT32 m_brt[4]; + int m_brt_r; + int m_brt_g; + int m_brt_b; }; diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index 23c028ded1e..ea0fc1d0406 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -8,34 +8,40 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * videoram2; - UINT8 * videoram3; - UINT8 * spriteram; - size_t videoram_size; - size_t spriteram_size; - size_t spriteram2_size; + UINT8 * m_videoram; + UINT8 * m_videoram2; + UINT8 * m_videoram3; + UINT8 * m_spriteram; + size_t m_videoram_size; + size_t m_spriteram_size; + size_t m_spriteram2_size; /* video-related */ - bitmap_t *tmp_bitmap1, *tmp_bitmap2; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap, *bg2_tilemap; - int bg2_textbank; + bitmap_t *m_tmp_bitmap1; + bitmap_t *m_tmp_bitmap2; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg2_tilemap; + int m_bg2_textbank; /* sound-related */ - int sound_nmi_enable, pending_nmi; + int m_sound_nmi_enable; + int m_pending_nmi; /* fake mcu (in msisaac.c) */ #ifndef USE_MCU - UINT8 mcu_val; - UINT8 direction; + UINT8 m_mcu_val; + UINT8 m_direction; #endif - int vol_ctrl[16]; - UINT8 snd_ctrl0, snd_ctrl1, snd_ctrl2, snd_ctrl3; + int m_vol_ctrl[16]; + UINT8 m_snd_ctrl0; + UINT8 m_snd_ctrl1; + UINT8 m_snd_ctrl2; + UINT8 m_snd_ctrl3; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index 3f4fec0cb3c..3e9dcc4e380 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -5,17 +5,17 @@ public: mugsmash_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram1; - UINT16 *videoram2; - UINT16 *spriteram; - UINT16 *regs1; - UINT16 *regs2; + UINT16 *m_videoram1; + UINT16 *m_videoram2; + UINT16 *m_spriteram; + UINT16 *m_regs1; + UINT16 *m_regs2; - tilemap_t *tilemap1; - tilemap_t *tilemap2; + tilemap_t *m_tilemap1; + tilemap_t *m_tilemap2; - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h index e0d0908cdec..07bc6002b9d 100644 --- a/src/mame/includes/multfish.h +++ b/src/mame/includes/multfish.h @@ -12,20 +12,20 @@ public: /* Video related */ - UINT8* vid; + UINT8* m_vid; - int disp_enable; - int xor_paltype; - int xor_palette; + int m_disp_enable; + int m_xor_paltype; + int m_xor_palette; - tilemap_t *tilemap; - tilemap_t *reel_tilemap; + tilemap_t *m_tilemap; + tilemap_t *m_reel_tilemap; /* Misc related */ - UINT8 rambk; + UINT8 m_rambk; - UINT8 hopper_motor; - UINT8 hopper; + UINT8 m_hopper_motor; + UINT8 m_hopper; }; diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index 67030e51c42..f71c12a6a5f 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -11,26 +11,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * vreg; - UINT8 * status_vram; - UINT8 * sprite_xpos; - UINT8 * sprite_attr; - UINT8 * sprite_tile; - UINT8 * videoram; + UINT8 * m_vreg; + UINT8 * m_status_vram; + UINT8 * m_sprite_xpos; + UINT8 * m_sprite_attr; + UINT8 * m_sprite_tile; + UINT8 * m_videoram; /* video-related */ - bitmap_t *tmpbitmap; - int palette_bank; - int flipscreen; + bitmap_t *m_tmpbitmap; + int m_palette_bank; + int m_flipscreen; /* misc */ - int nmi_enable; - int which; - UINT8 sound_nmi_enable; + int m_nmi_enable; + int m_which; + UINT8 m_sound_nmi_enable; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index 2ecb9d0b560..ce1c54bf9da 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -4,12 +4,12 @@ public: mustache_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - emu_timer *clear_irq_timer; - tilemap_t *bg_tilemap; - int control_byte; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_videoram; + emu_timer *m_clear_irq_timer; + tilemap_t *m_bg_tilemap; + int m_control_byte; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index 5f3dfef2157..9333631d319 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -37,43 +37,43 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * main_ram; - UINT8 * colorram; - size_t main_ram_size; + UINT8 * m_main_ram; + UINT8 * m_colorram; + size_t m_main_ram_size; /* sound-related */ - UINT8 port_1_last; - UINT8 port_2_last; - UINT8 port_1_last_extra; - UINT8 port_2_last_extra; - UINT8 port_3_last_extra; + UINT8 m_port_1_last; + UINT8 m_port_2_last; + UINT8 m_port_1_last_extra; + UINT8 m_port_2_last_extra; + UINT8 m_port_3_last_extra; /* misc game specific */ - UINT16 phantom2_cloud_counter; - UINT8 invaders_flip_screen; - UINT8 rev_shift_res; - UINT8 maze_tone_timing_state; /* output of IC C1, pin 5 */ - UINT8 desertgun_controller_select; - UINT8 clowns_controller_select; - - UINT8 spcenctr_strobe_state; - UINT8 spcenctr_trench_width; - UINT8 spcenctr_trench_center; - UINT8 spcenctr_trench_slope[16]; /* 16x4 bit RAM */ + UINT16 m_phantom2_cloud_counter; + UINT8 m_invaders_flip_screen; + UINT8 m_rev_shift_res; + UINT8 m_maze_tone_timing_state; /* output of IC C1, pin 5 */ + UINT8 m_desertgun_controller_select; + UINT8 m_clowns_controller_select; + + UINT8 m_spcenctr_strobe_state; + UINT8 m_spcenctr_trench_width; + UINT8 m_spcenctr_trench_center; + UINT8 m_spcenctr_trench_slope[16]; /* 16x4 bit RAM */ /* timer */ - emu_timer *interrupt_timer; + emu_timer *m_interrupt_timer; /* devices */ - device_t *maincpu; - device_t *mb14241; - device_t *samples; - device_t *samples1; - device_t *samples2; - device_t *sn1; - device_t *sn2; - device_t *sn; - device_t *discrete; + device_t *m_maincpu; + device_t *m_mb14241; + device_t *m_samples; + device_t *m_samples1; + device_t *m_samples2; + device_t *m_sn1; + device_t *m_sn2; + device_t *m_sn; + device_t *m_discrete; }; diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index e19dacb9b82..99256f23914 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -17,19 +17,19 @@ public: : driver_device(machine, config) { } /* machine state */ - UINT8 *ay8910_data; - UINT8 *ay8910_select; + UINT8 *m_ay8910_data; + UINT8 *m_ay8910_select; /* video state */ - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - emu_timer *interrupt_timer; - UINT8 *bg_videoram; - UINT8 *fg_videoram; - UINT8 *spriteram; - UINT8 *paletteram; - UINT8 *scroll; - UINT8 *video_control; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + emu_timer *m_interrupt_timer; + UINT8 *m_bg_videoram; + UINT8 *m_fg_videoram; + UINT8 *m_spriteram; + UINT8 *m_paletteram; + UINT8 *m_scroll; + UINT8 *m_video_control; }; diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index 92bb13ed901..bb21c8bda08 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -4,21 +4,21 @@ public: mystwarr_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *gx_workram; - UINT8 mw_irq_control; - int cur_sound_region; - int layer_colorbase[6]; - int oinprion; - int cbparam; - int sprite_colorbase; - int sub1_colorbase; - int last_psac_colorbase; - int gametype; - int roz_enable; - int roz_rombank; - tilemap_t *ult_936_tilemap; - UINT16 clip; - UINT16 *spriteram; + UINT16 *m_gx_workram; + UINT8 m_mw_irq_control; + int m_cur_sound_region; + int m_layer_colorbase[6]; + int m_oinprion; + int m_cbparam; + int m_sprite_colorbase; + int m_sub1_colorbase; + int m_last_psac_colorbase; + int m_gametype; + int m_roz_enable; + int m_roz_rombank; + tilemap_t *m_ult_936_tilemap; + UINT16 m_clip; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index c86c001f53c..b0d5bd24b03 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -6,38 +6,38 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; // for helifire + UINT8 * m_videoram; + UINT8 * m_colorram; // for helifire /* video-related */ - emu_timer* cannon_timer; - int spacefev_red_screen; - int spacefev_red_cannon; - int sheriff_color_mode; - int sheriff_color_data; - int helifire_flash; - UINT8 helifire_LSFR[63]; - unsigned helifire_mv; - unsigned helifire_sc; /* IC56 */ + emu_timer* m_cannon_timer; + int m_spacefev_red_screen; + int m_spacefev_red_cannon; + int m_sheriff_color_mode; + int m_sheriff_color_data; + int m_helifire_flash; + UINT8 m_helifire_LSFR[63]; + unsigned m_helifire_mv; + unsigned m_helifire_sc; /* IC56 */ /* sound-related */ - int n8080_hardware; - emu_timer* sound_timer[3]; - int helifire_dac_phase; - double helifire_dac_volume; - double helifire_dac_timing; - UINT16 prev_sound_pins; - UINT16 curr_sound_pins; - int mono_flop[3]; - UINT8 prev_snd_data; + int m_n8080_hardware; + emu_timer* m_sound_timer[3]; + int m_helifire_dac_phase; + double m_helifire_dac_volume; + double m_helifire_dac_timing; + UINT16 m_prev_sound_pins; + UINT16 m_curr_sound_pins; + int m_mono_flop[3]; + UINT8 m_prev_snd_data; /* other */ - unsigned shift_data; - unsigned shift_bits; - int inte; + unsigned m_shift_data; + unsigned m_shift_bits; + int m_inte; /* devices */ - device_t *maincpu; + device_t *m_maincpu; }; diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h index 4c11daa7a85..5b3243c1d45 100644 --- a/src/mame/includes/namcofl.h +++ b/src/mame/includes/namcofl.h @@ -19,11 +19,11 @@ public: namcofl_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - emu_timer *raster_interrupt_timer; - UINT32 *workram; - UINT16 *shareram; - UINT8 mcu_port6; - UINT32 sprbank; + emu_timer *m_raster_interrupt_timer; + UINT32 *m_workram; + UINT16 *m_shareram; + UINT8 m_mcu_port6; + UINT32 m_sprbank; }; diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index 880b2cd34c6..0d11558d6c3 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -22,32 +22,32 @@ public: namcona1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT16 *spriteram; - UINT16 *mpBank0; - UINT16 *mpBank1; - int mEnableInterrupts; - int gametype; - UINT8 nvmem[NA1_NVRAM_SIZE]; - UINT16 count; - UINT32 keyval; - UINT16 mcu_mailbox[8]; - UINT8 mcu_port4; - UINT8 mcu_port5; - UINT8 mcu_port6; - UINT8 mcu_port8; - UINT16 *workram; - UINT16 *vreg; - UINT16 *scroll; - UINT16 *shaperam; - UINT16 *cgram; - tilemap_t *roz_tilemap; - int roz_palette; - tilemap_t *bg_tilemap[NAMCONA1_NUM_TILEMAPS]; - int tilemap_palette_bank[NAMCONA1_NUM_TILEMAPS]; - int palette_is_dirty; - UINT8 mask_data[8]; - UINT8 conv_data[9]; + UINT16 *m_videoram; + UINT16 *m_spriteram; + UINT16 *m_mpBank0; + UINT16 *m_mpBank1; + int m_mEnableInterrupts; + int m_gametype; + UINT8 m_nvmem[NA1_NVRAM_SIZE]; + UINT16 m_count; + UINT32 m_keyval; + UINT16 m_mcu_mailbox[8]; + UINT8 m_mcu_port4; + UINT8 m_mcu_port5; + UINT8 m_mcu_port6; + UINT8 m_mcu_port8; + UINT16 *m_workram; + UINT16 *m_vreg; + UINT16 *m_scroll; + UINT16 *m_shaperam; + UINT16 *m_cgram; + tilemap_t *m_roz_tilemap; + int m_roz_palette; + tilemap_t *m_bg_tilemap[NAMCONA1_NUM_TILEMAPS]; + int m_tilemap_palette_bank[NAMCONA1_NUM_TILEMAPS]; + int m_palette_is_dirty; + UINT8 m_mask_data[8]; + UINT8 m_conv_data[9]; }; diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index 18199bd3fa5..222936ac602 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -19,16 +19,16 @@ public: namconb1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 *nvmem32; - UINT16 *namconb_shareram; - UINT8 namconb_cpureg[32]; - int vblank_irq_active; - int pos_irq_active; - UINT16 count; - UINT8 nbx_port6; - UINT32 *spritebank32; - UINT32 *tilebank32; - UINT32 tilemap_tile_bank[4]; + UINT32 *m_nvmem32; + UINT16 *m_namconb_shareram; + UINT8 m_namconb_cpureg[32]; + int m_vblank_irq_active; + int m_pos_irq_active; + UINT16 m_count; + UINT8 m_nbx_port6; + UINT32 *m_spritebank32; + UINT32 *m_tilebank32; + UINT32 m_tilemap_tile_bank[4]; }; diff --git a/src/mame/includes/namcond1.h b/src/mame/includes/namcond1.h index 9c892c08ace..f8433babab5 100644 --- a/src/mame/includes/namcond1.h +++ b/src/mame/includes/namcond1.h @@ -12,9 +12,9 @@ public: namcond1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 h8_irq5_enabled; - UINT16 *shared_ram; - int p8; + UINT8 m_h8_irq5_enabled; + UINT16 *m_shared_ram; + int m_p8; }; diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index d21c0864a8a..8aa3d4099b6 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -15,38 +15,38 @@ public: namcos1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int dac0_value; - int dac1_value; - int dac0_gain; - int dac1_gain; - UINT8 *paletteram; - UINT8 *triram; - UINT8 *s1ram; - bankhandler bank_element[NAMCOS1_MAX_BANK]; - bankhandler active_bank[16]; - int key_id; - int key_reg; - int key_rng; - int key_swap4_arg; - int key_swap4; - int key_bottom4; - int key_top4; - unsigned int key_quotient; - unsigned int key_reminder; - unsigned int key_numerator_high_word; - UINT8 key[8]; - int mcu_patch_data; - int reset; - int wdog; - int chip[16]; - UINT8 *videoram; - UINT8 cus116[0x10]; - UINT8 *spriteram; - UINT8 playfield_control[0x20]; - tilemap_t *bg_tilemap[6]; - UINT8 *tilemap_maskdata; - int copy_sprites; - UINT8 drawmode_table[16]; + int m_dac0_value; + int m_dac1_value; + int m_dac0_gain; + int m_dac1_gain; + UINT8 *m_paletteram; + UINT8 *m_triram; + UINT8 *m_s1ram; + bankhandler m_bank_element[NAMCOS1_MAX_BANK]; + bankhandler m_active_bank[16]; + int m_key_id; + int m_key_reg; + int m_key_rng; + int m_key_swap4_arg; + int m_key_swap4; + int m_key_bottom4; + int m_key_top4; + unsigned int m_key_quotient; + unsigned int m_key_reminder; + unsigned int m_key_numerator_high_word; + UINT8 m_key[8]; + int m_mcu_patch_data; + int m_reset; + int m_wdog; + int m_chip[16]; + UINT8 *m_videoram; + UINT8 m_cus116[0x10]; + UINT8 *m_spriteram; + UINT8 m_playfield_control[0x20]; + tilemap_t *m_bg_tilemap[6]; + UINT8 *m_tilemap_maskdata; + int m_copy_sprites; + UINT8 m_drawmode_table[16]; }; diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index 65bd5ee7c89..bb922bb046f 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -11,7 +11,7 @@ public: namcos21_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; + UINT8 *m_videoram; }; diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index bbb8a6f9871..df08b67aaf6 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -35,7 +35,7 @@ public: namcos22_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 *spriteram; + UINT32 *m_spriteram; }; diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index fce83a16f5a..10843ccdc46 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -4,18 +4,18 @@ public: namcos86_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *spriteram; - int wdog; - UINT8 *rthunder_videoram1; - UINT8 *rthunder_videoram2; - UINT8 *rthunder_spriteram; - int tilebank; - int xscroll[4]; - int yscroll[4]; - tilemap_t *bg_tilemap[4]; - int backcolor; - const UINT8 *tile_address_prom; - int copy_sprites; + UINT8 *m_spriteram; + int m_wdog; + UINT8 *m_rthunder_videoram1; + UINT8 *m_rthunder_videoram2; + UINT8 *m_rthunder_spriteram; + int m_tilebank; + int m_xscroll[4]; + int m_yscroll[4]; + tilemap_t *m_bg_tilemap[4]; + int m_backcolor; + const UINT8 *m_tile_address_prom; + int m_copy_sprites; }; diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index 8b49235c6dc..c9813bd93f3 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -4,16 +4,16 @@ public: naughtyb_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 popflame_prot_seed; - int r_index; - int prot_count; - int question_offset; - UINT8 *videoram2; - UINT8 *scrollreg; - int cocktail; - UINT8 palreg; - int bankreg; + UINT8 *m_videoram; + UINT8 m_popflame_prot_seed; + int m_r_index; + int m_prot_count; + int m_question_offset; + UINT8 *m_videoram2; + UINT8 *m_scrollreg; + int m_cocktail; + UINT8 m_palreg; + int m_bankreg; }; diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index 6da87bfb9ac..741251e5190 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -4,28 +4,28 @@ public: nbmj8688_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int mjsikaku_scrolly; - int blitter_destx; - int blitter_desty; - int blitter_sizex; - int blitter_sizey; - int blitter_direction_x; - int blitter_direction_y; - int blitter_src_addr; - int mjsikaku_gfxrom; - int mjsikaku_dispflag; - int mjsikaku_gfxflag2; - int mjsikaku_gfxflag3; - int mjsikaku_flipscreen; - int mjsikaku_screen_refresh; - int mjsikaku_gfxmode; - bitmap_t *mjsikaku_tmpbitmap; - UINT16 *mjsikaku_videoram; - UINT8 *clut; - UINT8 *HD61830B_ram[2]; - int HD61830B_instr[2]; - int HD61830B_addr[2]; - int mjsikaku_flipscreen_old; + int m_mjsikaku_scrolly; + int m_blitter_destx; + int m_blitter_desty; + int m_blitter_sizex; + int m_blitter_sizey; + int m_blitter_direction_x; + int m_blitter_direction_y; + int m_blitter_src_addr; + int m_mjsikaku_gfxrom; + int m_mjsikaku_dispflag; + int m_mjsikaku_gfxflag2; + int m_mjsikaku_gfxflag3; + int m_mjsikaku_flipscreen; + int m_mjsikaku_screen_refresh; + int m_mjsikaku_gfxmode; + bitmap_t *m_mjsikaku_tmpbitmap; + UINT16 *m_mjsikaku_videoram; + UINT8 *m_clut; + UINT8 *m_HD61830B_ram[2]; + int m_HD61830B_instr[2]; + int m_HD61830B_addr[2]; + int m_mjsikaku_flipscreen_old; }; diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index aa567978924..8e8d8cd0e66 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -4,30 +4,30 @@ public: nbmj8891_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int scrolly; - int blitter_destx; - int blitter_desty; - int blitter_sizex; - int blitter_sizey; - int blitter_src_addr; - int blitter_direction_x; - int blitter_direction_y; - int vram; - int gfxrom; - int dispflag; - int flipscreen; - int clutsel; - int screen_refresh; - int gfxdraw_mode; - bitmap_t *tmpbitmap0; - bitmap_t *tmpbitmap1; - UINT8 *videoram0; - UINT8 *videoram1; - UINT8 *palette; - UINT8 *clut; - int param_old[0x10]; - int param_cnt; - int flipscreen_old; + int m_scrolly; + int m_blitter_destx; + int m_blitter_desty; + int m_blitter_sizex; + int m_blitter_sizey; + int m_blitter_src_addr; + int m_blitter_direction_x; + int m_blitter_direction_y; + int m_vram; + int m_gfxrom; + int m_dispflag; + int m_flipscreen; + int m_clutsel; + int m_screen_refresh; + int m_gfxdraw_mode; + bitmap_t *m_tmpbitmap0; + bitmap_t *m_tmpbitmap1; + UINT8 *m_videoram0; + UINT8 *m_videoram1; + UINT8 *m_palette; + UINT8 *m_clut; + int m_param_old[0x10]; + int m_param_cnt; + int m_flipscreen_old; }; diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index 223ae097392..bd82ab4d496 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -4,30 +4,30 @@ public: nbmj8900_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int scrolly; - int blitter_destx; - int blitter_desty; - int blitter_sizex; - int blitter_sizey; - int blitter_src_addr; - int blitter_direction_x; - int blitter_direction_y; - int vram; - int gfxrom; - int dispflag; - int flipscreen; - int clutsel; - int screen_refresh; - int gfxdraw_mode; - int screen_height; - int screen_width; - bitmap_t *tmpbitmap0; - bitmap_t *tmpbitmap1; - UINT8 *videoram0; - UINT8 *videoram1; - UINT8 *palette; - UINT8 *clut; - int flipscreen_old; + int m_scrolly; + int m_blitter_destx; + int m_blitter_desty; + int m_blitter_sizex; + int m_blitter_sizey; + int m_blitter_src_addr; + int m_blitter_direction_x; + int m_blitter_direction_y; + int m_vram; + int m_gfxrom; + int m_dispflag; + int m_flipscreen; + int m_clutsel; + int m_screen_refresh; + int m_gfxdraw_mode; + int m_screen_height; + int m_screen_width; + bitmap_t *m_tmpbitmap0; + bitmap_t *m_tmpbitmap1; + UINT8 *m_videoram0; + UINT8 *m_videoram1; + UINT8 *m_palette; + UINT8 *m_clut; + int m_flipscreen_old; }; diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index ca9b8773443..ea65cd9b2a0 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -4,24 +4,24 @@ public: nbmj8991_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int scrollx; - int scrolly; - int blitter_destx; - int blitter_desty; - int blitter_sizex; - int blitter_sizey; - int blitter_src_addr; - int blitter_direction_x; - int blitter_direction_y; - int gfxrom; - int dispflag; - int flipscreen; - int clutsel; - int screen_refresh; - bitmap_t *tmpbitmap; - UINT8 *videoram; - UINT8 *clut; - int flipscreen_old; + int m_scrollx; + int m_scrolly; + int m_blitter_destx; + int m_blitter_desty; + int m_blitter_sizex; + int m_blitter_sizey; + int m_blitter_src_addr; + int m_blitter_direction_x; + int m_blitter_direction_y; + int m_gfxrom; + int m_dispflag; + int m_flipscreen; + int m_clutsel; + int m_screen_refresh; + bitmap_t *m_tmpbitmap; + UINT8 *m_videoram; + UINT8 *m_clut; + int m_flipscreen_old; }; diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index 4c485a6f9b6..7ff463c8c2c 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -10,42 +10,42 @@ public: nbmj9195_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int inputport; - int dipswbitsel; - int outcoin_flag; - int mscoutm_inputport; - UINT8 *nvram; - size_t nvram_size; - UINT8 pio_dir[5 * 2]; - UINT8 pio_latch[5 * 2]; - int scrollx[VRAM_MAX]; - int scrolly[VRAM_MAX]; - int scrollx_raster[VRAM_MAX][SCANLINE_MAX]; - int scanline[VRAM_MAX]; - int blitter_destx[VRAM_MAX]; - int blitter_desty[VRAM_MAX]; - int blitter_sizex[VRAM_MAX]; - int blitter_sizey[VRAM_MAX]; - int blitter_src_addr[VRAM_MAX]; - int blitter_direction_x[VRAM_MAX]; - int blitter_direction_y[VRAM_MAX]; - int dispflag[VRAM_MAX]; - int flipscreen[VRAM_MAX]; - int clutmode[VRAM_MAX]; - int transparency[VRAM_MAX]; - int clutsel; - int screen_refresh; - int gfxflag2; - int gfxdraw_mode; - int nb19010_busyctr; - int nb19010_busyflag; - bitmap_t *tmpbitmap[VRAM_MAX]; - UINT16 *videoram[VRAM_MAX]; - UINT16 *videoworkram[VRAM_MAX]; - UINT8 *palette; - UINT8 *nb22090_palette; - UINT8 *clut[VRAM_MAX]; - int flipscreen_old[VRAM_MAX]; + int m_inputport; + int m_dipswbitsel; + int m_outcoin_flag; + int m_mscoutm_inputport; + UINT8 *m_nvram; + size_t m_nvram_size; + UINT8 m_pio_dir[5 * 2]; + UINT8 m_pio_latch[5 * 2]; + int m_scrollx[VRAM_MAX]; + int m_scrolly[VRAM_MAX]; + int m_scrollx_raster[VRAM_MAX][SCANLINE_MAX]; + int m_scanline[VRAM_MAX]; + int m_blitter_destx[VRAM_MAX]; + int m_blitter_desty[VRAM_MAX]; + int m_blitter_sizex[VRAM_MAX]; + int m_blitter_sizey[VRAM_MAX]; + int m_blitter_src_addr[VRAM_MAX]; + int m_blitter_direction_x[VRAM_MAX]; + int m_blitter_direction_y[VRAM_MAX]; + int m_dispflag[VRAM_MAX]; + int m_flipscreen[VRAM_MAX]; + int m_clutmode[VRAM_MAX]; + int m_transparency[VRAM_MAX]; + int m_clutsel; + int m_screen_refresh; + int m_gfxflag2; + int m_gfxdraw_mode; + int m_nb19010_busyctr; + int m_nb19010_busyflag; + bitmap_t *m_tmpbitmap[VRAM_MAX]; + UINT16 *m_videoram[VRAM_MAX]; + UINT16 *m_videoworkram[VRAM_MAX]; + UINT8 *m_palette; + UINT8 *m_nb22090_palette; + UINT8 *m_clut[VRAM_MAX]; + int m_flipscreen_old[VRAM_MAX]; }; diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index 34b418d4351..7ad94bda874 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -5,43 +5,44 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram1; - UINT16 * videoram2; - UINT16 * colorram1; - UINT16 * colorram2; - UINT16 * charram; - UINT16 * spriteram; - UINT16 * paletteram; - UINT16 * xscroll1; - UINT16 * xscroll2; - UINT16 * yscroll1; - UINT16 * yscroll2; - UINT8 * gx400_shared_ram; - - size_t charram_size; - size_t spriteram_size; + UINT16 * m_videoram1; + UINT16 * m_videoram2; + UINT16 * m_colorram1; + UINT16 * m_colorram2; + UINT16 * m_charram; + UINT16 * m_spriteram; + UINT16 * m_paletteram; + UINT16 * m_xscroll1; + UINT16 * m_xscroll2; + UINT16 * m_yscroll1; + UINT16 * m_yscroll2; + UINT8 * m_gx400_shared_ram; + + size_t m_charram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *background, *foreground; - int spriteram_words; - int tilemap_flip; - int flipscreen; - UINT8 irq_port_last; - UINT8 blank_tile[8*8]; + tilemap_t *m_background; + tilemap_t *m_foreground; + int m_spriteram_words; + int m_tilemap_flip; + int m_flipscreen; + UINT8 m_irq_port_last; + UINT8 m_blank_tile[8*8]; /* misc */ - int irq_on; - int irq1_on; - int irq2_on; - int irq4_on; - UINT16 selected_ip; /* Copied from WEC Le Mans 24 driver, explicity needed for Hyper Crash */ - int gx400_irq1_cnt; - UINT8 frame_counter; + int m_irq_on; + int m_irq1_on; + int m_irq2_on; + int m_irq4_on; + UINT16 m_selected_ip; /* Copied from WEC Le Mans 24 driver, explicity needed for Hyper Crash */ + int m_gx400_irq1_cnt; + UINT8 m_frame_counter; /* devices */ - cpu_device *maincpu; - cpu_device *audiocpu; - device_t *vlm; + cpu_device *m_maincpu; + cpu_device *m_audiocpu; + device_t *m_vlm; }; diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index f18604131b0..c394a226446 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -39,75 +39,75 @@ public: // UINT16 *save_ram; // this currently uses generic handlers /* video-related */ - UINT8 *sprite_gfx; - UINT32 sprite_gfx_address_mask; - UINT16 *videoram; - UINT16 *palettes[2]; /* 0x100*16 2 byte palette entries */ - pen_t *pens; - UINT8 palette_bank; - UINT8 screen_dark; - UINT16 videoram_read_buffer; - UINT16 videoram_modulo; - UINT16 videoram_offset; + UINT8 *m_sprite_gfx; + UINT32 m_sprite_gfx_address_mask; + UINT16 *m_videoram; + UINT16 *m_palettes[2]; /* 0x100*16 2 byte palette entries */ + pen_t *m_pens; + UINT8 m_palette_bank; + UINT8 m_screen_dark; + UINT16 m_videoram_read_buffer; + UINT16 m_videoram_modulo; + UINT16 m_videoram_offset; - UINT8 fixed_layer_source; + UINT8 m_fixed_layer_source; - UINT8 auto_animation_speed; - UINT8 auto_animation_disabled; - UINT8 auto_animation_counter; - UINT8 auto_animation_frame_counter; + UINT8 m_auto_animation_speed; + UINT8 m_auto_animation_disabled; + UINT8 m_auto_animation_counter; + UINT8 m_auto_animation_frame_counter; - const UINT8 *region_zoomy; + const UINT8 *m_region_zoomy; /* palette */ - double rgb_weights_normal[5]; - double rgb_weights_normal_bit15[5]; - double rgb_weights_dark[5]; - double rgb_weights_dark_bit15[5]; + double m_rgb_weights_normal[5]; + double m_rgb_weights_normal_bit15[5]; + double m_rgb_weights_dark[5]; + double m_rgb_weights_dark_bit15[5]; /* timers */ - emu_timer *display_position_interrupt_timer; - emu_timer *display_position_vblank_timer; - emu_timer *vblank_interrupt_timer; - emu_timer *auto_animation_timer; - emu_timer *sprite_line_timer; - UINT8 display_position_interrupt_control; - UINT32 display_counter; - UINT32 vblank_interrupt_pending; - UINT32 display_position_interrupt_pending; - UINT32 irq3_pending; + emu_timer *m_display_position_interrupt_timer; + emu_timer *m_display_position_vblank_timer; + emu_timer *m_vblank_interrupt_timer; + emu_timer *m_auto_animation_timer; + emu_timer *m_sprite_line_timer; + UINT8 m_display_position_interrupt_control; + UINT32 m_display_counter; + UINT32 m_vblank_interrupt_pending; + UINT32 m_display_position_interrupt_pending; + UINT32 m_irq3_pending; /* misc */ - UINT8 controller_select; + UINT8 m_controller_select; - UINT32 main_cpu_bank_address; - UINT8 main_cpu_vector_table_source; + UINT32 m_main_cpu_bank_address; + UINT8 m_main_cpu_vector_table_source; - UINT8 audio_result; - UINT8 audio_cpu_banks[4]; - UINT8 audio_cpu_rom_source; - UINT8 audio_cpu_rom_source_last; + UINT8 m_audio_result; + UINT8 m_audio_cpu_banks[4]; + UINT8 m_audio_cpu_rom_source; + UINT8 m_audio_cpu_rom_source_last; - UINT8 save_ram_unlocked; + UINT8 m_save_ram_unlocked; - UINT8 output_data; - UINT8 output_latch; - UINT8 el_value; - UINT8 led1_value; - UINT8 led2_value; - UINT8 recurse; + UINT8 m_output_data; + UINT8 m_output_latch; + UINT8 m_el_value; + UINT8 m_led1_value; + UINT8 m_led2_value; + UINT8 m_recurse; /* protection */ - UINT32 fatfury2_prot_data; - UINT16 neogeo_rng; - UINT16 *pvc_cartridge_ram; - int fixed_layer_bank_type; + UINT32 m_fatfury2_prot_data; + UINT16 m_neogeo_rng; + UINT16 *m_pvc_cartridge_ram; + int m_fixed_layer_bank_type; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *upd4990a; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_upd4990a; }; diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index 15523126818..c6d05995750 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -6,13 +6,14 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * bgram; - UINT8 * fgram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_bgram; + UINT8 * m_fgram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *fg_tilemap, *bg_tilemap; - int bgpic; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_bgpic; }; diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index 263af5afa8b..311e2311952 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -4,30 +4,30 @@ public: ninjakd2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - const INT16* sampledata; - UINT8 omegaf_io_protection[3]; - UINT8 omegaf_io_protection_input; - int omegaf_io_protection_tic; - UINT8* bg_videoram; - UINT8* fg_videoram; - int next_sprite_overdraw_enabled; - int (*stencil_compare_function) (UINT16 pal); - int sprites_updated; - bitmap_t *sp_bitmap; - int robokid_sprites; - tilemap_t* fg_tilemap; - tilemap_t* bg_tilemap; - tilemap_t* bg0_tilemap; - tilemap_t* bg1_tilemap; - tilemap_t* bg2_tilemap; - int bank_mask; - int robokid_bg0_bank; - int robokid_bg1_bank; - int robokid_bg2_bank; - UINT8* robokid_bg0_videoram; - UINT8* robokid_bg1_videoram; - UINT8* robokid_bg2_videoram; - UINT8 *spriteram; + const INT16* m_sampledata; + UINT8 m_omegaf_io_protection[3]; + UINT8 m_omegaf_io_protection_input; + int m_omegaf_io_protection_tic; + UINT8* m_bg_videoram; + UINT8* m_fg_videoram; + int m_next_sprite_overdraw_enabled; + int (*m_stencil_compare_function) (UINT16 pal); + int m_sprites_updated; + bitmap_t *m_sp_bitmap; + int m_robokid_sprites; + tilemap_t* m_fg_tilemap; + tilemap_t* m_bg_tilemap; + tilemap_t* m_bg0_tilemap; + tilemap_t* m_bg1_tilemap; + tilemap_t* m_bg2_tilemap; + int m_bank_mask; + int m_robokid_bg0_bank; + int m_robokid_bg1_bank; + int m_robokid_bg2_bank; + UINT8* m_robokid_bg0_videoram; + UINT8* m_robokid_bg1_videoram; + UINT8* m_robokid_bg2_videoram; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index 976bf4b43b3..77897965af3 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -11,29 +11,29 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * spriteram; - size_t spriteram_size; + UINT16 * m_spriteram; + size_t m_spriteram_size; /* misc */ - UINT16 cpua_ctrl; - INT32 banknum; - int pandata[4]; + UINT16 m_cpua_ctrl; + INT32 m_banknum; + int m_pandata[4]; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *subcpu; - device_t *tc0140syt; - device_t *tc0100scn_1; - device_t *tc0100scn_2; - device_t *tc0100scn_3; - device_t *lscreen; - device_t *mscreen; - device_t *rscreen; - device_t *_2610_1l; - device_t *_2610_1r; - device_t *_2610_2l; - device_t *_2610_2r; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_subcpu; + device_t *m_tc0140syt; + device_t *m_tc0100scn_1; + device_t *m_tc0100scn_2; + device_t *m_tc0100scn_3; + device_t *m_lscreen; + device_t *m_mscreen; + device_t *m_rscreen; + device_t *m_2610_1l; + device_t *m_2610_1r; + device_t *m_2610_2l; + device_t *m_2610_2r; }; diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index 530972d8749..16c11f089f1 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -22,26 +22,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * hvc; - UINT8 * videoram; + UINT8 * m_hvc; + UINT8 * m_videoram; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* input */ - UINT8 gear; - UINT8 track; - INT32 steering_buf; - INT32 steering_val; - UINT8 crash_en; - UINT8 crash_data; - UINT8 crash_data_en; // IC D8 - UINT8 ac_line; - INT32 last_steering_val; + UINT8 m_gear; + UINT8 m_track; + INT32 m_steering_buf; + INT32 m_steering_val; + UINT8 m_crash_en; + UINT8 m_crash_data; + UINT8 m_crash_data_en; // IC D8 + UINT8 m_ac_line; + INT32 m_last_steering_val; /* devices */ - device_t *maincpu; - device_t *discrete; + device_t *m_maincpu; + device_t *m_discrete; }; diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 6d127447681..3f9b6e81488 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -6,33 +6,33 @@ public: niyanpai_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int musobana_inputport; - int musobana_outcoin_flag; - UINT8 pio_dir[5]; - UINT8 pio_latch[5]; - int scrollx[VRAM_MAX]; - int scrolly[VRAM_MAX]; - int blitter_destx[VRAM_MAX]; - int blitter_desty[VRAM_MAX]; - int blitter_sizex[VRAM_MAX]; - int blitter_sizey[VRAM_MAX]; - int blitter_src_addr[VRAM_MAX]; - int blitter_direction_x[VRAM_MAX]; - int blitter_direction_y[VRAM_MAX]; - int dispflag[VRAM_MAX]; - int flipscreen[VRAM_MAX]; - int clutmode[VRAM_MAX]; - int transparency[VRAM_MAX]; - int clutsel[VRAM_MAX]; - int screen_refresh; - int nb19010_busyctr; - int nb19010_busyflag; - bitmap_t *tmpbitmap[VRAM_MAX]; - UINT16 *videoram[VRAM_MAX]; - UINT16 *videoworkram[VRAM_MAX]; - UINT16 *palette; - UINT8 *clut[VRAM_MAX]; - int flipscreen_old[VRAM_MAX]; + int m_musobana_inputport; + int m_musobana_outcoin_flag; + UINT8 m_pio_dir[5]; + UINT8 m_pio_latch[5]; + int m_scrollx[VRAM_MAX]; + int m_scrolly[VRAM_MAX]; + int m_blitter_destx[VRAM_MAX]; + int m_blitter_desty[VRAM_MAX]; + int m_blitter_sizex[VRAM_MAX]; + int m_blitter_sizey[VRAM_MAX]; + int m_blitter_src_addr[VRAM_MAX]; + int m_blitter_direction_x[VRAM_MAX]; + int m_blitter_direction_y[VRAM_MAX]; + int m_dispflag[VRAM_MAX]; + int m_flipscreen[VRAM_MAX]; + int m_clutmode[VRAM_MAX]; + int m_transparency[VRAM_MAX]; + int m_clutsel[VRAM_MAX]; + int m_screen_refresh; + int m_nb19010_busyctr; + int m_nb19010_busyflag; + bitmap_t *m_tmpbitmap[VRAM_MAX]; + UINT16 *m_videoram[VRAM_MAX]; + UINT16 *m_videoworkram[VRAM_MAX]; + UINT16 *m_palette; + UINT8 *m_clut[VRAM_MAX]; + int m_flipscreen_old[VRAM_MAX]; }; diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index 77e4204f915..41b3719846c 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -5,43 +5,43 @@ public: : driver_device(machine, config) { } int mask[4*2]; - UINT16* mainram; - UINT16 *nmk_bgvideoram0; - UINT16 *nmk_bgvideoram1; - UINT16 *nmk_bgvideoram2; - UINT16 *nmk_bgvideoram3; - UINT16 *nmk_fgvideoram; - UINT16 *nmk_txvideoram; - UINT16 *gunnail_scrollram; - UINT16 *gunnail_scrollramy; - UINT16 *afega_scroll_0; - UINT16 *afega_scroll_1; - int simple_scroll; - int redraw_bitmap; - UINT16 *spriteram_old; - UINT16 *spriteram_old2; - int bgbank; - int videoshift; - int bioship_background_bank; - UINT8 bioship_scroll[4]; - tilemap_t *bg_tilemap0; - tilemap_t *bg_tilemap1; - tilemap_t *bg_tilemap2; - tilemap_t *bg_tilemap3; - tilemap_t *tx_tilemap; - tilemap_t *fg_tilemap; - bitmap_t *background_bitmap; - int mustang_bg_xscroll; - UINT8 scroll[4]; - UINT8 scroll_2[4]; - UINT16 vscroll[4]; - UINT8 *spriteram; - size_t spriteram_size; - int prot_count; - UINT8 input_pressed; - UINT8 start_helper; - UINT8 coin_count[2]; - UINT8 coin_count_frac[2]; + UINT16* m_mainram; + UINT16 *m_nmk_bgvideoram0; + UINT16 *m_nmk_bgvideoram1; + UINT16 *m_nmk_bgvideoram2; + UINT16 *m_nmk_bgvideoram3; + UINT16 *m_nmk_fgvideoram; + UINT16 *m_nmk_txvideoram; + UINT16 *m_gunnail_scrollram; + UINT16 *m_gunnail_scrollramy; + UINT16 *m_afega_scroll_0; + UINT16 *m_afega_scroll_1; + int m_simple_scroll; + int m_redraw_bitmap; + UINT16 *m_spriteram_old; + UINT16 *m_spriteram_old2; + int m_bgbank; + int m_videoshift; + int m_bioship_background_bank; + UINT8 m_bioship_scroll[4]; + tilemap_t *m_bg_tilemap0; + tilemap_t *m_bg_tilemap1; + tilemap_t *m_bg_tilemap2; + tilemap_t *m_bg_tilemap3; + tilemap_t *m_tx_tilemap; + tilemap_t *m_fg_tilemap; + bitmap_t *m_background_bitmap; + int m_mustang_bg_xscroll; + UINT8 m_scroll[4]; + UINT8 m_scroll_2[4]; + UINT16 m_vscroll[4]; + UINT8 *m_spriteram; + size_t m_spriteram_size; + int m_prot_count; + UINT8 m_input_pressed; + UINT8 m_start_helper; + UINT8 m_coin_count[2]; + UINT8 m_coin_count_frac[2]; }; diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h index 629e83fb106..6cfb92a58b9 100644 --- a/src/mame/includes/norautp.h +++ b/src/mame/includes/norautp.h @@ -12,8 +12,8 @@ public: norautp_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *np_vram; - UINT16 np_addr; + UINT16 *m_np_vram; + UINT16 m_np_addr; }; diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index 3306068d7c2..8bc5af6e8a4 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -4,12 +4,12 @@ public: nova2001_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 ninjakun_io_a002_ctrl; - UINT8 *fg_videoram; - UINT8 *bg_videoram; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - UINT8 *spriteram; + UINT8 m_ninjakun_io_a002_ctrl; + UINT8 *m_fg_videoram; + UINT8 *m_bg_videoram; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index c48f6bf7c9b..e684728f28a 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -6,36 +6,47 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * sharedram; - UINT8 * scrlram; - UINT8 * videoram; - UINT8 * spriteram; - size_t videoram_size; + UINT8 * m_sharedram; + UINT8 * m_scrlram; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_videoram_size; /* video-related */ - tilemap_t *bg_tilemap; - int char_bank, palette_bank, gfxctrl; + tilemap_t *m_bg_tilemap; + int m_char_bank; + int m_palette_bank; + int m_gfxctrl; /* mcu */ - UINT8 from_main, from_mcu; - int mcu_sent, main_sent; - UINT8 port_a_in, port_a_out, ddr_a; - UINT8 port_b_in, port_b_out, ddr_b; - UINT8 port_c_in, port_c_out, ddr_c; + UINT8 m_from_main; + UINT8 m_from_mcu; + int m_mcu_sent; + int m_main_sent; + UINT8 m_port_a_in; + UINT8 m_port_a_out; + UINT8 m_ddr_a; + UINT8 m_port_b_in; + UINT8 m_port_b_out; + UINT8 m_ddr_b; + UINT8 m_port_c_in; + UINT8 m_port_c_out; + UINT8 m_ddr_c; /* misc */ - int generic_control_reg; - int sound_nmi_enable, pending_nmi; - UINT8 snd_data; - int vol_ctrl[16]; - int gametype; - int mask; + int m_generic_control_reg; + int m_sound_nmi_enable; + int m_pending_nmi; + UINT8 m_snd_data; + int m_vol_ctrl[16]; + int m_gametype; + int m_mask; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *subcpu; - device_t *mcu; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_subcpu; + device_t *m_mcu; }; diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h index 5bd6991f14c..4455d23d4f7 100644 --- a/src/mame/includes/offtwall.h +++ b/src/mame/includes/offtwall.h @@ -12,12 +12,12 @@ public: offtwall_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 *bankswitch_base; - UINT16 *bankrom_base; - UINT32 bank_offset; + UINT16 *m_bankswitch_base; + UINT16 *m_bankrom_base; + UINT32 m_bank_offset; - UINT16 *spritecache_count; - UINT16 *unknown_verify_base; + UINT16 *m_spritecache_count; + UINT16 *m_unknown_verify_base; }; diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index c3929a47d36..960083edf43 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -12,18 +12,19 @@ public: /* memory pointers */ - UINT16 * videoram; - UINT16 * spriteram; - size_t spriteram_size; + UINT16 * m_videoram; + UINT16 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int spritebank; - UINT16 scrollx, scrolly; + tilemap_t *m_bg_tilemap; + int m_spritebank; + UINT16 m_scrollx; + UINT16 m_scrolly; /* misc */ - int adpcm_bank_shift; - int sndbank; + int m_adpcm_bank_shift; + int m_sndbank; }; diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index ffd07a0357f..98d41f42cab 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -11,27 +11,29 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * paletteram; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_paletteram; /* video-related */ - tilemap_t *tilemap; - bitmap_t *tmpbitmap; - int gfxreg; - int flipscreen, flipscreen_old; - int scrollx, scrolly; - int screen_refresh; + tilemap_t *m_tilemap; + bitmap_t *m_tmpbitmap; + int m_gfxreg; + int m_flipscreen; + int m_flipscreen_old; + int m_scrollx; + int m_scrolly; + int m_screen_refresh; /* misc */ - int portselect; - int adpcm_reset; - int adpcm_data; - int vclk_left; + int m_portselect; + int m_adpcm_reset; + int m_adpcm_data; + int m_vclk_left; /* devices */ - device_t *maincpu; - device_t *msm; + device_t *m_maincpu; + device_t *m_msm; }; diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index 180ae2638bc..561f6472343 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -6,23 +6,29 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * sprites; - UINT16 * bg_videoram; - UINT16 * mid_videoram; - UINT16 * fg_videoram; - UINT16 * scroll; + UINT16 * m_sprites; + UINT16 * m_bg_videoram; + UINT16 * m_mid_videoram; + UINT16 * m_fg_videoram; + UINT16 * m_scroll; /* video-related */ - tilemap_t *bg_tilemap, *mid_tilemap, *fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_mid_tilemap; + tilemap_t *m_fg_tilemap; /* misc */ - int gun_x_p1, gun_y_p1, gun_x_p2, gun_y_p2; - int gun_x_shift; - int p1_wobble, p2_wobble; + int m_gun_x_p1; + int m_gun_y_p1; + int m_gun_x_p2; + int m_gun_y_p2; + int m_gun_x_shift; + int m_p1_wobble; + int m_p2_wobble; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; /*----------- defined in video/oneshot.c -----------*/ diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h index ff489003ebd..bce73fa57f8 100644 --- a/src/mame/includes/opwolf.h +++ b/src/mame/includes/opwolf.h @@ -11,40 +11,44 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * cchip_ram; + UINT8 * m_cchip_ram; /* video-related */ - UINT16 sprite_ctrl; - UINT16 sprites_flipscreen; + UINT16 m_sprite_ctrl; + UINT16 m_sprites_flipscreen; /* misc */ - UINT8 adpcm_b[0x08]; - UINT8 adpcm_c[0x08]; - UINT32 adpcm_pos[2], adpcm_end[2]; - int adpcm_data[2]; + UINT8 m_adpcm_b[0x08]; + UINT8 m_adpcm_c[0x08]; + UINT32 m_adpcm_pos[2]; + UINT32 m_adpcm_end[2]; + int m_adpcm_data[2]; - int opwolf_gun_xoffs, opwolf_gun_yoffs; + int m_opwolf_gun_xoffs; + int m_opwolf_gun_yoffs; /* c-chip */ - int opwolf_region; - - UINT8 current_bank; - UINT8 current_cmd; - UINT8 cchip_last_7a; - UINT8 cchip_last_04; - UINT8 cchip_last_05; - UINT8 cchip_coins_for_credit[2]; - UINT8 cchip_credits_for_coin[2]; - UINT8 cchip_coins[2]; - UINT8 c588, c589, c58a; // These variables derived from the bootleg + int m_opwolf_region; + + UINT8 m_current_bank; + UINT8 m_current_cmd; + UINT8 m_cchip_last_7a; + UINT8 m_cchip_last_04; + UINT8 m_cchip_last_05; + UINT8 m_cchip_coins_for_credit[2]; + UINT8 m_cchip_credits_for_coin[2]; + UINT8 m_cchip_coins[2]; + UINT8 m_c588; + UINT8 m_c589; + UINT8 m_c58a; // These variables derived from the bootleg /* devices */ - cpu_device *maincpu; - cpu_device *audiocpu; - device_t *pc080sn; - device_t *pc090oj; - device_t *msm1; - device_t *msm2; + cpu_device *m_maincpu; + cpu_device *m_audiocpu; + device_t *m_pc080sn; + device_t *m_pc090oj; + device_t *m_msm1; + device_t *m_msm2; }; diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index a33bcd4eba1..b5ca0fafc81 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -22,19 +22,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * playfield_ram; - UINT8 * sprite_ram; + UINT8 * m_playfield_ram; + UINT8 * m_sprite_ram; /* video-related */ - tilemap_t *bg_tilemap; - int flip_screen; + tilemap_t *m_bg_tilemap; + int m_flip_screen; /* misc */ - UINT8 misc_flags; + UINT8 m_misc_flags; /* devices */ - device_t *maincpu; - device_t *discrete; + device_t *m_maincpu; + device_t *m_discrete; }; diff --git a/src/mame/includes/othldrby.h b/src/mame/includes/othldrby.h index f890b38f192..277381af675 100644 --- a/src/mame/includes/othldrby.h +++ b/src/mame/includes/othldrby.h @@ -13,17 +13,18 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * vram; - UINT16 * buf_spriteram; - UINT16 * buf_spriteram2; + UINT16 * m_vram; + UINT16 * m_buf_spriteram; + UINT16 * m_buf_spriteram2; /* video-related */ - tilemap_t *bg_tilemap[3]; - UINT16 vreg[OTHLDRBY_VREG_SIZE]; - UINT32 vram_addr, vreg_addr; + tilemap_t *m_bg_tilemap[3]; + UINT16 m_vreg[OTHLDRBY_VREG_SIZE]; + UINT32 m_vram_addr; + UINT32 m_vreg_addr; /* misc */ - int toggle; + int m_toggle; }; diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 0d65a770185..e56072d91eb 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -22,31 +22,32 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * spriteram; - size_t spriteram_size; + UINT16 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - struct othunder_tempsprite *spritelist; + struct othunder_tempsprite *m_spritelist; /* misc */ - int vblank_irq, ad_irq; - INT32 banknum; - int pan[4]; + int m_vblank_irq; + int m_ad_irq; + INT32 m_banknum; + int m_pan[4]; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *eeprom; - device_t *tc0220ioc; - device_t *tc0100scn; - device_t *tc0110pcr; - device_t *tc0140syt; - device_t *_2610_0l; - device_t *_2610_0r; - device_t *_2610_1l; - device_t *_2610_1r; - device_t *_2610_2l; - device_t *_2610_2r; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_eeprom; + device_t *m_tc0220ioc; + device_t *m_tc0100scn; + device_t *m_tc0110pcr; + device_t *m_tc0140syt; + device_t *m_2610_0l; + device_t *m_2610_0r; + device_t *m_2610_1l; + device_t *m_2610_1r; + device_t *m_2610_2l; + device_t *m_2610_2r; }; diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index 2d48b509e22..8d8da6986cf 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -11,24 +11,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int zoom_colorbase[2], road_colorbase[2], sprite_colorbase; + int m_zoom_colorbase[2]; + int m_road_colorbase[2]; + int m_sprite_colorbase; /* misc */ - UINT16 cpuB_ctrl; + UINT16 m_cpuB_ctrl; /* devices */ - device_t *maincpu; - device_t *subcpu; - device_t *audiocpu; - device_t *k053260_1; - device_t *k053260_2; - device_t *k051316_1; - device_t *k051316_2; - device_t *k053246; - device_t *k053251; + device_t *m_maincpu; + device_t *m_subcpu; + device_t *m_audiocpu; + device_t *m_k053260_1; + device_t *m_k053260_2; + device_t *m_k051316_1; + device_t *m_k051316_2; + device_t *m_k053246; + device_t *m_k053251; }; /*----------- defined in video/overdriv.c -----------*/ diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 15415c2680e..5d7e375df01 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -4,17 +4,17 @@ public: pacland_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *videoram2; - UINT8 *spriteram; - UINT8 palette_bank; - const UINT8 *color_prom; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - bitmap_t *fg_bitmap; - UINT32 *transmask[3]; - UINT16 scroll0; - UINT16 scroll1; + UINT8 *m_videoram; + UINT8 *m_videoram2; + UINT8 *m_spriteram; + UINT8 m_palette_bank; + const UINT8 *m_color_prom; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + bitmap_t *m_fg_bitmap; + UINT32 *m_transmask[3]; + UINT16 m_scroll0; + UINT16 m_scroll1; }; diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index 03b91c9244c..d8ec3c0bc9c 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -10,24 +10,24 @@ public: pacman_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 cannonb_bit_to_read; - int mystery; - UINT8 counter; - int bigbucks_bank; - UINT8 *rocktrv2_prot_data; - UINT8 rocktrv2_question_bank; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *s2650games_spriteram; - UINT8 *s2650games_tileram; - tilemap_t *bg_tilemap; - UINT8 charbank; - UINT8 spritebank; - UINT8 palettebank; - UINT8 colortablebank; - UINT8 flipscreen; - UINT8 bgpriority; - int xoffsethack; + UINT8 m_cannonb_bit_to_read; + int m_mystery; + UINT8 m_counter; + int m_bigbucks_bank; + UINT8 *m_rocktrv2_prot_data; + UINT8 m_rocktrv2_question_bank; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_s2650games_spriteram; + UINT8 *m_s2650games_tileram; + tilemap_t *m_bg_tilemap; + UINT8 m_charbank; + UINT8 m_spritebank; + UINT8 m_palettebank; + UINT8 m_colortablebank; + UINT8 m_flipscreen; + UINT8 m_bgpriority; + int m_xoffsethack; }; diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 3ca40265dd4..39fcb1eb624 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -11,23 +11,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; /* video-related */ - tilemap_t *layer0; - int flipscreen; + tilemap_t *m_layer0; + int m_flipscreen; - int irq_enable_a, irq_enable_b; - int firq_old_data_a, firq_old_data_b; - int i8039_status; + int m_irq_enable_a; + int m_irq_enable_b; + int m_firq_old_data_a; + int m_firq_old_data_b; + int m_i8039_status; /* devices */ - cpu_device *maincpu; - cpu_device *subcpu; - cpu_device *audiocpu; - cpu_device *mcu; + cpu_device *m_maincpu; + cpu_device *m_subcpu; + cpu_device *m_audiocpu; + cpu_device *m_mcu; }; diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index f533dfc1a0e..18b9eea93e6 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -6,19 +6,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * vram_0; - UINT8 * vram_1; - UINT8 * vram_2; - UINT8 * videoram; - UINT8 * paletteram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_vram_0; + UINT8 * m_vram_1; + UINT8 * m_vram_2; + UINT8 * m_videoram; + UINT8 * m_paletteram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *tilemap_0, *tilemap_1, *tilemap_2; - bitmap_t *tmpbitmap; - UINT8 palbank, priority; - int sprite_inc; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; + tilemap_t *m_tilemap_2; + bitmap_t *m_tmpbitmap; + UINT8 m_palbank; + UINT8 m_priority; + int m_sprite_inc; }; /*----------- defined in video/paradise.c -----------*/ diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index c978c888654..10ae80c68df 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -11,24 +11,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; - int layerpri[3]; + int m_layer_colorbase[3]; + int m_sprite_colorbase; + int m_layerpri[3]; /* misc */ - int videobank; - //int nmi_enabled; + int m_videobank; + //int m_nmi_enabled; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k053260; - device_t *k052109; - device_t *k053245; - device_t *k053251; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k053260; + device_t *m_k052109; + device_t *m_k053245; + device_t *m_k053251; }; /*----------- defined in video/parodius.c -----------*/ diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index db0aa56056c..866c91b26ab 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -4,11 +4,11 @@ public: pass_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; - UINT16 *bg_videoram; - UINT16 *fg_videoram; + UINT16 *m_bg_videoram; + UINT16 *m_fg_videoram; }; diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index 9f318c74ccf..1b1a562d603 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -4,21 +4,21 @@ public: pastelg_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 mux_data; - int blitter_destx; - int blitter_desty; - int blitter_sizex; - int blitter_sizey; - int blitter_src_addr; - int gfxrom; - int dispflag; - int flipscreen; - int blitter_direction_x; - int blitter_direction_y; - int palbank; - UINT8 *videoram; - UINT8 *clut; - int flipscreen_old; + UINT8 m_mux_data; + int m_blitter_destx; + int m_blitter_desty; + int m_blitter_sizex; + int m_blitter_sizey; + int m_blitter_src_addr; + int m_gfxrom; + int m_dispflag; + int m_flipscreen; + int m_blitter_direction_x; + int m_blitter_direction_y; + int m_palbank; + UINT8 *m_videoram; + UINT8 *m_clut; + int m_flipscreen_old; }; diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index 8836720dc6c..0a3921ba9cd 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -11,22 +11,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * videoram2; - UINT8 * colorram; - UINT8 * colorram2; - UINT8 * work_ram; - UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_videoram2; + UINT8 * m_colorram; + UINT8 * m_colorram2; + UINT8 * m_work_ram; + UINT8 * m_spriteram; +// UINT8 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; - int scroll; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_scroll; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index bdd8fa2586f..6a69e5040fc 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -4,10 +4,10 @@ public: pcktgal_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int msm5205next; - int toggle; - UINT8 *spriteram; - size_t spriteram_size; + int m_msm5205next; + int m_toggle; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 808f8190f50..3dec690e776 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -6,68 +6,83 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT16 * mainram; // currently this is also used by nvram handler - UINT16 * bg_videoram; - UINT16 * tx_videoram; - UINT16 * videoregs; - UINT16 * rowscrollram; - UINT16 * videoram; - UINT8 * z80_mainram; - UINT32 * arm7_shareram; - UINT32 * svg_shareram[2]; //for 5585G MACHINE - UINT16 * sharedprotram; // killbld & olds - UINT8 * sprite_a_region; - size_t sprite_a_region_size; - UINT16 * spritebufferram; // buffered spriteram -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * m_mainram; // currently this is also used by nvram handler + UINT16 * m_bg_videoram; + UINT16 * m_tx_videoram; + UINT16 * m_videoregs; + UINT16 * m_rowscrollram; + UINT16 * m_videoram; + UINT8 * m_z80_mainram; + UINT32 * m_arm7_shareram; + UINT32 * m_svg_shareram[2]; //for 5585G MACHINE + UINT16 * m_sharedprotram; // killbld & olds + UINT8 * m_sprite_a_region; + size_t m_sprite_a_region_size; + UINT16 * m_spritebufferram; // buffered spriteram +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *bg_tilemap, *tx_tilemap; - UINT16 *sprite_temp_render; - bitmap_t *tmppgmbitmap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_tx_tilemap; + UINT16 *m_sprite_temp_render; + bitmap_t *m_tmppgmbitmap; /* misc */ // kov2 - UINT32 kov2_latchdata_68k_w; - UINT32 kov2_latchdata_arm_w; + UINT32 m_kov2_latchdata_68k_w; + UINT32 m_kov2_latchdata_arm_w; // kovsh - UINT16 kovsh_highlatch_arm_w, kovsh_lowlatch_arm_w; - UINT16 kovsh_highlatch_68k_w, kovsh_lowlatch_68k_w; - UINT32 kovsh_counter; + UINT16 m_kovsh_highlatch_arm_w; + UINT16 m_kovsh_lowlatch_arm_w; + UINT16 m_kovsh_highlatch_68k_w; + UINT16 m_kovsh_lowlatch_68k_w; + UINT32 m_kovsh_counter; // svg - int svg_ram_sel; + int m_svg_ram_sel; // killbld & olds - int kb_cmd; - int kb_reg; - int kb_ptr; - int kb_region_sequence_position; - UINT32 kb_regs[0x10]; - UINT16 olds_bs, olds_cmd3; + int m_kb_cmd; + int m_kb_reg; + int m_kb_ptr; + int m_kb_region_sequence_position; + UINT32 m_kb_regs[0x10]; + UINT16 m_olds_bs; + UINT16 m_olds_cmd3; // pstars - UINT16 pstars_key; - UINT16 pstars_int[2]; - UINT32 pstars_regs[16]; - UINT32 pstars_val; - UINT16 pstar_e7, pstar_b1, pstar_ce; - UINT16 pstar_ram[3]; + UINT16 m_pstars_key; + UINT16 m_pstars_int[2]; + UINT32 m_pstars_regs[16]; + UINT32 m_pstars_val; + UINT16 m_pstar_e7; + UINT16 m_pstar_b1; + UINT16 m_pstar_ce; + UINT16 m_pstar_ram[3]; // ASIC 3 (oriental legends protection) - UINT8 asic3_reg, asic3_latch[3], asic3_x, asic3_y, asic3_z, asic3_h1, asic3_h2; - UINT16 asic3_hold; + UINT8 m_asic3_reg; + UINT8 m_asic3_latch[3]; + UINT8 m_asic3_x; + UINT8 m_asic3_y; + UINT8 m_asic3_z; + UINT8 m_asic3_h1; + UINT8 m_asic3_h2; + UINT16 m_asic3_hold; // ASIC28 - UINT16 asic28_key; - UINT16 asic28_regs[10]; - UINT16 asic_params[256]; - UINT16 asic28_rcnt; - UINT32 eoregs[16]; + UINT16 m_asic28_key; + UINT16 m_asic28_regs[10]; + UINT16 m_asic_params[256]; + UINT16 m_asic28_rcnt; + UINT32 m_eoregs[16]; /* calendar */ - UINT8 cal_val, cal_mask, cal_com, cal_cnt; - system_time systime; + UINT8 m_cal_val; + UINT8 m_cal_mask; + UINT8 m_cal_com; + UINT8 m_cal_cnt; + system_time m_systime; /* devices */ - cpu_device *soundcpu; - cpu_device *prot; - device_t *ics; + cpu_device *m_soundcpu; + cpu_device *m_prot; + device_t *m_ics; }; extern UINT16 *pgm_mainram; // used by nvram handler, we cannot move it to driver data struct diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index b3250139697..8e22be61d92 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -9,17 +9,17 @@ public: phoenix_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram_pg[2]; - UINT8 videoram_pg_index; - UINT8 palette_bank; - UINT8 cocktail_mode; - UINT8 pleiads_protection_question; - UINT8 survival_protection_value; - int survival_sid_value; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - UINT8 survival_input_latches[2]; - UINT8 survival_input_readc; + UINT8 *m_videoram_pg[2]; + UINT8 m_videoram_pg_index; + UINT8 m_palette_bank; + UINT8 m_cocktail_mode; + UINT8 m_pleiads_protection_question; + UINT8 m_survival_protection_value; + int m_survival_sid_value; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + UINT8 m_survival_input_latches[2]; + UINT8 m_survival_input_readc; }; diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index 180411d5e44..6657139e755 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -4,13 +4,13 @@ public: pingpong_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int intenable; - int question_addr_high; - UINT8 *videoram; - UINT8 *colorram; - tilemap_t *bg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + int m_intenable; + int m_question_addr_high; + UINT8 *m_videoram; + UINT8 *m_colorram; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index 42411a33b9c..73f7ca60803 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -4,14 +4,14 @@ public: pirates_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *tx_tileram; - UINT16 *spriteram; - UINT16 *fg_tileram; - UINT16 *bg_tileram; - UINT16 *scroll; - tilemap_t *tx_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; + UINT16 *m_tx_tileram; + UINT16 *m_spriteram; + UINT16 *m_fg_tileram; + UINT16 *m_bg_tileram; + UINT16 *m_scroll; + tilemap_t *m_tx_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index 2ff11599812..808a1cda79e 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -4,27 +4,27 @@ public: pitnrun_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - int nmi; - UINT8* videoram2; - UINT8 fromz80; - UINT8 toz80; - int zaccept; - int zready; - UINT8 portA_in; - UINT8 portA_out; - int address; - int h_heed; - int v_heed; - int ha; - int scroll; - int char_bank; - int color_select; - bitmap_t *tmp_bitmap[4]; - tilemap_t *bg; - tilemap_t *fg; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_videoram; + int m_nmi; + UINT8* m_videoram2; + UINT8 m_fromz80; + UINT8 m_toz80; + int m_zaccept; + int m_zready; + UINT8 m_portA_in; + UINT8 m_portA_out; + int m_address; + int m_h_heed; + int m_v_heed; + int m_ha; + int m_scroll; + int m_char_bank; + int m_color_select; + bitmap_t *m_tmp_bitmap[4]; + tilemap_t *m_bg; + tilemap_t *m_fg; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h index c74a7546569..37072d9ed81 100644 --- a/src/mame/includes/pktgaldx.h +++ b/src/mame/includes/pktgaldx.h @@ -11,18 +11,18 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT16 * spriteram; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT16 * m_spriteram; // UINT16 * paletteram; // currently this uses generic palette handling (in decocomn.c) - size_t spriteram_size; + size_t m_spriteram_size; - UINT16* pktgaldb_fgram; - UINT16* pktgaldb_sprites; + UINT16* m_pktgaldb_fgram; + UINT16* m_pktgaldb_sprites; /* devices */ - device_t *maincpu; - device_t *deco_tilegen1; + device_t *m_maincpu; + device_t *m_deco_tilegen1; }; diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 46ce6280800..cfb52eff595 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -10,41 +10,41 @@ public: playch10_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *ram_8w; - UINT8 *work_ram; - int up_8w; - UINT8 *timedata; - int pc10_nmi_enable; - int pc10_dog_di; - int pc10_sdcs; - int pc10_dispmask; - int pc10_int_detect; - int pc10_game_mode; - int pc10_dispmask_old; - int pc10_gun_controller; - int cart_sel; - int cntrl_mask; - int input_latch[2]; - int mirroring; - int MMC2_bank[4]; - int MMC2_bank_latch[2]; - UINT8* vrom; - UINT8* vram; - UINT8* nametable[4]; - UINT8* nt_ram; - chr_bank chr_page[8]; - int mmc1_shiftreg; - int mmc1_shiftcount; - int mmc1_rom_mask; - int gboard_scanline_counter; - int gboard_scanline_latch; - int gboard_banks[2]; - int gboard_4screen; - int gboard_last_bank; - int gboard_command; - int pc10_bios; - tilemap_t *bg_tilemap; + UINT8 *m_videoram; + UINT8 *m_ram_8w; + UINT8 *m_work_ram; + int m_up_8w; + UINT8 *m_timedata; + int m_pc10_nmi_enable; + int m_pc10_dog_di; + int m_pc10_sdcs; + int m_pc10_dispmask; + int m_pc10_int_detect; + int m_pc10_game_mode; + int m_pc10_dispmask_old; + int m_pc10_gun_controller; + int m_cart_sel; + int m_cntrl_mask; + int m_input_latch[2]; + int m_mirroring; + int m_MMC2_bank[4]; + int m_MMC2_bank_latch[2]; + UINT8* m_vrom; + UINT8* m_vram; + UINT8* m_nametable[4]; + UINT8* m_nt_ram; + chr_bank m_chr_page[8]; + int m_mmc1_shiftreg; + int m_mmc1_shiftcount; + int m_mmc1_rom_mask; + int m_gboard_scanline_counter; + int m_gboard_scanline_latch; + int m_gboard_banks[2]; + int m_gboard_4screen; + int m_gboard_last_bank; + int m_gboard_command; + int m_pc10_bios; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index ea247508da3..38c425d00b4 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -7,40 +7,46 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bgvideoram; - UINT16 * videoram1; - UINT16 * videoram2; - UINT16 * videoram3; - UINT16 * rowscroll; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_bgvideoram; + UINT16 * m_videoram1; + UINT16 * m_videoram2; + UINT16 * m_videoram3; + UINT16 * m_rowscroll; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *tx_tilemap, *fg_tilemap, *bg_tilemap; - int bgscrollx, bgscrolly, bg_enable, bg_full_size; - int fgscrollx, fg_rowscroll_enable; + tilemap_t *m_tx_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_bgscrollx; + int m_bgscrolly; + int m_bg_enable; + int m_bg_full_size; + int m_fgscrollx; + int m_fg_rowscroll_enable; - int xoffset; - int yoffset; - int txt_tile_offset; - int pri_masks[3]; - UINT16 scroll[7]; + int m_xoffset; + int m_yoffset; + int m_txt_tile_offset; + int m_pri_masks[3]; + UINT16 m_scroll[7]; /* powerbal-specific */ - int tilebank; - int bg_yoffset; + int m_tilebank; + int m_bg_yoffset; /* misc */ - UINT16 snd_command; - UINT16 snd_flag; - UINT8 oki_control; - UINT8 oki_command; - int old_oki_bank; + UINT16 m_snd_command; + UINT16 m_snd_flag; + UINT8 m_oki_control; + UINT8 m_oki_command; + int m_old_oki_bank; /* devices */ - okim6295_device *oki; - device_t *eeprom; + okim6295_device *m_oki; + device_t *m_eeprom; }; /*----------- defined in video/playmark.c -----------*/ diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 8c7181ae845..d42deb8d4da 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -11,27 +11,27 @@ public: : driver_device(machine, config) { } /* 68k-side shared ram */ - UINT32* shared_ram; + UINT32* m_shared_ram; - UINT16* dsp56k_p_mirror; - UINT16* dsp56k_p_8000; - int cur_sound_region; + UINT16* m_dsp56k_p_mirror; + UINT16* m_dsp56k_p_8000; + int m_cur_sound_region; - direct_update_delegate dsp56k_update_handler; + direct_update_delegate m_dsp56k_update_handler; /* TTL text plane stuff */ - int ttl_gfx_index; - tilemap_t *ttl_tilemap; - tilemap_t *roz_tilemap; - UINT16 ttl_vram[0x800]; - UINT16 roz_vram[0x800]; + int m_ttl_gfx_index; + tilemap_t *m_ttl_tilemap; + tilemap_t *m_roz_tilemap; + UINT16 m_ttl_vram[0x800]; + UINT16 m_roz_vram[0x800]; /* memory buffers */ - UINT16 dsp56k_bank00_ram[2 * 8 * dsp56k_bank00_size]; /* 2 bank sets, 8 potential banks each */ - UINT16 dsp56k_bank01_ram[2 * 8 * dsp56k_bank01_size]; - UINT16 dsp56k_bank02_ram[2 * 8 * dsp56k_bank02_size]; - UINT16 dsp56k_shared_ram_16[2 * 8 * dsp56k_shared_ram_16_size]; - UINT16 dsp56k_bank04_ram[2 * 8 * dsp56k_bank04_size]; + UINT16 m_dsp56k_bank00_ram[2 * 8 * dsp56k_bank00_size]; /* 2 bank sets, 8 potential banks each */ + UINT16 m_dsp56k_bank01_ram[2 * 8 * dsp56k_bank01_size]; + UINT16 m_dsp56k_bank02_ram[2 * 8 * dsp56k_bank02_size]; + UINT16 m_dsp56k_shared_ram_16[2 * 8 * dsp56k_shared_ram_16_size]; + UINT16 m_dsp56k_bank04_ram[2 * 8 * dsp56k_bank04_size]; }; /*----------- defined in video/plygonet.c -----------*/ diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index 642025dd72e..e519dc33edb 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -4,10 +4,10 @@ public: pokechmp_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - tilemap_t *bg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_videoram; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index 001a8c9be3c..8c48e5f0921 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -14,24 +14,24 @@ public: polepos_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 steer_last; - UINT8 steer_delta; - INT16 steer_accum; - INT16 last_result; - INT8 last_signed; - UINT8 last_unsigned; - int adc_input; - int auto_start_mask; - UINT16 *view16_memory; - UINT16 *road16_memory; - UINT16 *alpha16_memory; - UINT16 *sprite16_memory; - UINT16 vertical_position_modifier[256]; - UINT16 road16_vscroll; - tilemap_t *bg_tilemap; - tilemap_t *tx_tilemap; - int chacl; - UINT16 scroll; + UINT8 m_steer_last; + UINT8 m_steer_delta; + INT16 m_steer_accum; + INT16 m_last_result; + INT8 m_last_signed; + UINT8 m_last_unsigned; + int m_adc_input; + int m_auto_start_mask; + UINT16 *m_view16_memory; + UINT16 *m_road16_memory; + UINT16 *m_alpha16_memory; + UINT16 *m_sprite16_memory; + UINT16 m_vertical_position_modifier[256]; + UINT16 m_road16_vscroll; + tilemap_t *m_bg_tilemap; + tilemap_t *m_tx_tilemap; + int m_chacl; + UINT16 m_scroll; }; diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index 1c7f57f81c9..6d5b86437d1 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -10,26 +10,26 @@ public: policetr_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 control_data; - UINT32 bsmt_data_bank; - UINT32 bsmt_data_offset; - UINT32 *speedup_data; - UINT64 last_cycles; - UINT32 loop_count; - offs_t speedup_pc; - UINT32 * rambase; - UINT32 palette_offset; - UINT8 palette_index; - UINT8 palette_data[3]; - rectangle render_clip; - UINT8 *srcbitmap; - UINT8 *dstbitmap; - UINT16 src_xoffs; - UINT16 src_yoffs; - UINT16 dst_xoffs; - UINT16 dst_yoffs; - UINT8 video_latch; - UINT32 srcbitmap_height_mask; + UINT32 m_control_data; + UINT32 m_bsmt_data_bank; + UINT32 m_bsmt_data_offset; + UINT32 *m_speedup_data; + UINT64 m_last_cycles; + UINT32 m_loop_count; + offs_t m_speedup_pc; + UINT32 * m_rambase; + UINT32 m_palette_offset; + UINT8 m_palette_index; + UINT8 m_palette_data[3]; + rectangle m_render_clip; + UINT8 *m_srcbitmap; + UINT8 *m_dstbitmap; + UINT16 m_src_xoffs; + UINT16 m_src_yoffs; + UINT16 m_dst_xoffs; + UINT16 m_dst_yoffs; + UINT8 m_video_latch; + UINT32 m_srcbitmap_height_mask; }; diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 37ec23524c6..e272ca15b7f 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -8,21 +8,21 @@ public: polyplay_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - int freq1; - int freq2; - int channel_playing1; - int channel_playing2; - INT16 backgroundwave[SAMPLE_LENGTH]; - int prescale1; - int prescale2; - int channel1_active; - int channel1_const; - int channel2_active; - int channel2_const; - timer_device* timer; - int last; - UINT8 *characterram; + UINT8 *m_videoram; + int m_freq1; + int m_freq2; + int m_channel_playing1; + int m_channel_playing2; + INT16 m_backgroundwave[SAMPLE_LENGTH]; + int m_prescale1; + int m_prescale2; + int m_channel1_active; + int m_channel1_const; + int m_channel2_active; + int m_channel2_const; + timer_device* m_timer; + int m_last; + UINT8 *m_characterram; }; diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h index 254526796f0..33972b1be4b 100644 --- a/src/mame/includes/poolshrk.h +++ b/src/mame/includes/poolshrk.h @@ -14,11 +14,11 @@ public: poolshrk_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int da_latch; - UINT8* playfield_ram; - UINT8* hpos_ram; - UINT8* vpos_ram; - tilemap_t* bg_tilemap; + int m_da_latch; + UINT8* m_playfield_ram; + UINT8* m_hpos_ram; + UINT8* m_vpos_ram; + tilemap_t* m_bg_tilemap; }; diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index 3ccb8e5d0c2..a89236077e4 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -5,19 +5,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * spriteram2; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* misc */ - UINT8 irq_toggle, irq_enable; + UINT8 m_irq_toggle; + UINT8 m_irq_enable; /* devices */ - cpu_device *maincpu; + cpu_device *m_maincpu; }; diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index 85b362d5fcc..c18f994f1a8 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -4,22 +4,22 @@ public: popeye_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 prot0; - UINT8 prot1; - UINT8 prot_shift; - int dswbit; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *background_pos; - UINT8 *palettebank; - UINT8 *bitmapram; - bitmap_t *tmpbitmap2; - UINT8 invertmask; - UINT8 bitmap_type; - tilemap_t *fg_tilemap; - UINT8 lastflip; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 m_prot0; + UINT8 m_prot1; + UINT8 m_prot_shift; + int m_dswbit; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_background_pos; + UINT8 *m_palettebank; + UINT8 *m_bitmapram; + bitmap_t *m_tmpbitmap2; + UINT8 m_invertmask; + UINT8 m_bitmap_type; + tilemap_t *m_fg_tilemap; + UINT8 m_lastflip; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index 7bcd013c119..88b310ebbff 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -11,21 +11,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * ol_videoram; - UINT8 * attribram; - UINT8 * ol_attribram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_ol_videoram; + UINT8 * m_attribram; + UINT8 * m_ol_attribram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t *p123_tilemap, *p0_tilemap; - tilemap_t *ol_p123_tilemap, *ol_p0_tilemap; - INT32 flipscreen, e002, gfx_bank; - rectangle tilemap_clip; + tilemap_t *m_p123_tilemap; + tilemap_t *m_p0_tilemap; + tilemap_t *m_ol_p123_tilemap; + tilemap_t *m_ol_p0_tilemap; + INT32 m_flipscreen; + INT32 m_e002; + INT32 m_gfx_bank; + rectangle m_tilemap_clip; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index 61ad92b9781..03b08a8c4da 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -4,13 +4,13 @@ public: portrait_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *bgvideoram; - UINT8 *fgvideoram; - int scroll; - tilemap_t *foreground; - tilemap_t *background; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_bgvideoram; + UINT8 *m_fgvideoram; + int m_scroll; + tilemap_t *m_foreground; + tilemap_t *m_background; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 76d370b07e6..68521f09a8f 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -4,15 +4,15 @@ public: powerins_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int oki_bank; - UINT16 *vram_0; - UINT16 *vctrl_0; - UINT16 *vram_1; - UINT16 *vctrl_1; - tilemap_t *tilemap_0; - tilemap_t *tilemap_1; - int tile_bank; - UINT16 *spriteram; + int m_oki_bank; + UINT16 *m_vram_0; + UINT16 *m_vctrl_0; + UINT16 *m_vram_1; + UINT16 *m_vctrl_1; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; + int m_tile_bank; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index 6a184ab6409..3b90984b23d 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -5,14 +5,14 @@ public: : driver_device(machine, config) { } - UINT16 *spriteram; - UINT16 *videoram; - UINT16 *bg_videoram16; - UINT16 invert_controls; + UINT16 *m_spriteram; + UINT16 *m_videoram; + UINT16 *m_bg_videoram16; + UINT16 m_invert_controls; - tilemap_t *bg2_tilemap; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + tilemap_t *m_bg2_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; }; diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 8e580f5d5e1..1ced0e3a3d3 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -11,36 +11,51 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT32 * vram_0; - UINT32 * vram_1; - UINT32 * vregs; - UINT32 * spritebuf1; - UINT32 * spritebuf2; - UINT32 * bootleg_spritebuffer; -// UINT32 * paletteram; // currently this uses generic palette handling -// UINT32 * spriteram; // currently this uses generic buffered spriteram -// size_t spriteram_size; + UINT32 * m_vram_0; + UINT32 * m_vram_1; + UINT32 * m_vregs; + UINT32 * m_spritebuf1; + UINT32 * m_spritebuf2; + UINT32 * m_bootleg_spritebuffer; +// UINT32 * m_paletteram; // currently this uses generic palette handling +// UINT32 * m_spriteram; // currently this uses generic buffered spriteram +// size_t m_spriteram_size; /* video-related */ - tilemap_t *tilemap_0_size0, *tilemap_0_size1, *tilemap_0_size2, *tilemap_0_size3; - tilemap_t *tilemap_1_size0, *tilemap_1_size1, *tilemap_1_size2, *tilemap_1_size3; - int tilemap_0_bank, tilemap_1_bank; - int ka302c_banking; - UINT32 *spriteram; - size_t spriteram_size; + tilemap_t *m_tilemap_0_size0; + tilemap_t *m_tilemap_0_size1; + tilemap_t *m_tilemap_0_size2; + tilemap_t *m_tilemap_0_size3; + tilemap_t *m_tilemap_1_size0; + tilemap_t *m_tilemap_1_size1; + tilemap_t *m_tilemap_1_size2; + tilemap_t *m_tilemap_1_size3; + int m_tilemap_0_bank; + int m_tilemap_1_bank; + int m_ka302c_banking; + UINT32 *m_spriteram; + size_t m_spriteram_size; /* misc */ - UINT8 soundlatch; - int z80_nmi, mcu_status; + UINT8 m_soundlatch; + int m_z80_nmi; + int m_mcu_status; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; /* game-specific */ // 1945 MCU - UINT8 s1945_mcu_direction, s1945_mcu_latch1, s1945_mcu_latch2, s1945_mcu_inlatch, s1945_mcu_index; - UINT8 s1945_mcu_latching, s1945_mcu_mode, s1945_mcu_control, s1945_mcu_bctrl; - const UINT8 *s1945_mcu_table; + UINT8 m_s1945_mcu_direction; + UINT8 m_s1945_mcu_latch1; + UINT8 m_s1945_mcu_latch2; + UINT8 m_s1945_mcu_inlatch; + UINT8 m_s1945_mcu_index; + UINT8 m_s1945_mcu_latching; + UINT8 m_s1945_mcu_mode; + UINT8 m_s1945_mcu_control; + UINT8 m_s1945_mcu_bctrl; + const UINT8 *m_s1945_mcu_table; }; diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index ebc82dfcea2..e1717a6a303 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -14,23 +14,24 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT32 * vidregs; - UINT32 * paletteram; - UINT32 * ram; - UINT32 * io_select; - UINT32 * bgpen_1; - UINT32 * bgpen_2; - UINT32 * spriteram; - size_t spriteram_size; + UINT32 * m_vidregs; + UINT32 * m_paletteram; + UINT32 * m_ram; + UINT32 * m_io_select; + UINT32 * m_bgpen_1; + UINT32 * m_bgpen_2; + UINT32 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - double oldbrt1, oldbrt2; + double m_oldbrt1; + double m_oldbrt2; /* misc */ - UINT32 sample_offs; // only used if ROMTEST = 1 + UINT32 m_sample_offs; // only used if ROMTEST = 1 /* devices */ - device_t *maincpu; + device_t *m_maincpu; }; diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index bc2c6c2c1ac..aeb2ee29070 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -2,18 +2,18 @@ #define MASTER_CLOCK 57272700 // main oscillator frequency /* Psikyo PS6406B */ -#define FLIPSCREEN (((state->vidregs[3] & 0x0000c000) == 0x0000c000) ? 1:0) -#define DISPLAY_DISABLE (((state->vidregs[2] & 0x0000000f) == 0x00000006) ? 1:0) -#define BG_LARGE(n) (((state->vidregs[7] << (4*n)) & 0x00001000 ) ? 1:0) -#define BG_DEPTH_8BPP(n) (((state->vidregs[7] << (4*n)) & 0x00004000 ) ? 1:0) -#define BG_LAYER_ENABLE(n) (((state->vidregs[7] << (4*n)) & 0x00008000 ) ? 1:0) +#define FLIPSCREEN (((state->m_vidregs[3] & 0x0000c000) == 0x0000c000) ? 1:0) +#define DISPLAY_DISABLE (((state->m_vidregs[2] & 0x0000000f) == 0x00000006) ? 1:0) +#define BG_LARGE(n) (((state->m_vidregs[7] << (4*n)) & 0x00001000 ) ? 1:0) +#define BG_DEPTH_8BPP(n) (((state->m_vidregs[7] << (4*n)) & 0x00004000 ) ? 1:0) +#define BG_LAYER_ENABLE(n) (((state->m_vidregs[7] << (4*n)) & 0x00008000 ) ? 1:0) -#define BG_TYPE(n) (((state->vidregs[6] << (8*n)) & 0x7f000000 ) >> 24) -#define BG_LINE(n) (((state->vidregs[6] << (8*n)) & 0x80000000 ) ? 1:0) +#define BG_TYPE(n) (((state->m_vidregs[6] << (8*n)) & 0x7f000000 ) >> 24) +#define BG_LINE(n) (((state->m_vidregs[6] << (8*n)) & 0x80000000 ) ? 1:0) #define BG_TRANSPEN MAKE_ARGB(0x00,0xff,0x00,0xff) // used for representing transparency in temporary bitmaps -#define SPRITE_PRI(n) (((state->vidregs[2] << (4*n)) & 0xf0000000 ) >> 28) +#define SPRITE_PRI(n) (((state->m_vidregs[2] << (4*n)) & 0xf0000000 ) >> 28) class psikyosh_state : public driver_device @@ -23,24 +23,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT32 * bgram; - UINT32 * zoomram; - UINT32 * vidregs; - UINT32 * ram; - UINT32 * paletteram; -// UINT32 * spriteram; // currently this uses generic buffered spriteram -// size_t spriteram_size; + UINT32 * m_bgram; + UINT32 * m_zoomram; + UINT32 * m_vidregs; + UINT32 * m_ram; + UINT32 * m_paletteram; +// UINT32 * m_spriteram; // currently this uses generic buffered spriteram +// size_t m_spriteram_size; /* video-related */ - bitmap_t *zoom_bitmap, *z_bitmap, *bg_bitmap; - UINT16 *bg_zoom; -// UINT8 *alphatable; + bitmap_t *m_zoom_bitmap; + bitmap_t *m_z_bitmap; + bitmap_t *m_bg_bitmap; + UINT16 *m_bg_zoom; +// UINT8 *m_alphatable; /* misc */ - UINT32 sample_offs; // only used if ROMTEST = 1 + UINT32 m_sample_offs; // only used if ROMTEST = 1 /* devices */ - device_t *maincpu; + device_t *m_maincpu; }; /*----------- defined in video/psikyosh.c -----------*/ diff --git a/src/mame/includes/psx.h b/src/mame/includes/psx.h index 8bcebced7c5..2704b3ebbef 100644 --- a/src/mame/includes/psx.h +++ b/src/mame/includes/psx.h @@ -48,11 +48,11 @@ public: psx_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - psx_machine *p_psx; - psx_gpu *p_psxgpu; + psx_machine *m_p_psx; + psx_gpu *m_p_psxgpu; - UINT32 *p_n_psxram; - size_t n_psxramsize; + UINT32 *m_p_n_psxram; + size_t m_n_psxramsize; }; diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index bef480936c1..793303b9d05 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -4,28 +4,28 @@ public: psychic5_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 bank_latch; - UINT8 ps5_vram_page; - UINT8 bg_clip_mode; - UINT8 title_screen; - UINT8 bg_status; - UINT8 *ps5_pagedram[2]; - UINT8 *bg_videoram; - UINT8 *ps5_dummy_bg_ram; - UINT8 *ps5_io_ram; - UINT8 *ps5_palette_ram; - UINT8 *fg_videoram; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - int bg_palette_ram_base; - int bg_palette_base; - UINT16 palette_intensity; - UINT8 bombsa_unknown; - int sx1; - int sy1; - int sy2; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 m_bank_latch; + UINT8 m_ps5_vram_page; + UINT8 m_bg_clip_mode; + UINT8 m_title_screen; + UINT8 m_bg_status; + UINT8 *m_ps5_pagedram[2]; + UINT8 *m_bg_videoram; + UINT8 *m_ps5_dummy_bg_ram; + UINT8 *m_ps5_io_ram; + UINT8 *m_ps5_palette_ram; + UINT8 *m_fg_videoram; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_bg_palette_ram_base; + int m_bg_palette_base; + UINT16 m_palette_intensity; + UINT8 m_bombsa_unknown; + int m_sx1; + int m_sy1; + int m_sy2; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index e691b4c5b0a..c635cb4ffb9 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -4,24 +4,24 @@ public: punchout_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int rp5c01_mode_sel; - int rp5c01_mem[16*4]; - UINT8 *bg_top_videoram; - UINT8 *bg_bot_videoram; - UINT8 *armwrest_fg_videoram; - UINT8 *spr1_videoram; - UINT8 *spr2_videoram; - UINT8 *spr1_ctrlram; - UINT8 *spr2_ctrlram; - UINT8 *palettebank; - tilemap_t *bg_top_tilemap; - tilemap_t *bg_bot_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *spr1_tilemap; - tilemap_t *spr1_tilemap_flipx; - tilemap_t *spr2_tilemap; - int palette_reverse_top; - int palette_reverse_bot; + int m_rp5c01_mode_sel; + int m_rp5c01_mem[16*4]; + UINT8 *m_bg_top_videoram; + UINT8 *m_bg_bot_videoram; + UINT8 *m_armwrest_fg_videoram; + UINT8 *m_spr1_videoram; + UINT8 *m_spr2_videoram; + UINT8 *m_spr1_ctrlram; + UINT8 *m_spr2_ctrlram; + UINT8 *m_palettebank; + tilemap_t *m_bg_top_tilemap; + tilemap_t *m_bg_bot_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_spr1_tilemap; + tilemap_t *m_spr1_tilemap_flipx; + tilemap_t *m_spr2_tilemap; + int m_palette_reverse_top; + int m_palette_reverse_bot; }; diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h index 38c68a91036..d2760e0ee8c 100644 --- a/src/mame/includes/pushman.h +++ b/src/mame/includes/pushman.h @@ -11,22 +11,24 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_videoram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *bg_tilemap, *tx_tilemap; - UINT16 control[2]; + tilemap_t *m_bg_tilemap; + tilemap_t *m_tx_tilemap; + UINT16 m_control[2]; /* misc */ - UINT8 shared_ram[8]; - UINT16 latch, new_latch; + UINT8 m_shared_ram[8]; + UINT16 m_latch; + UINT16 m_new_latch; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *mcu; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_mcu; }; diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index c68102bce1a..35822090051 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -6,11 +6,11 @@ public: m_nvram(*this, "nvram") { } required_shared_ptr<UINT8> m_nvram; - UINT8 *sndram; - UINT16 *workram; - UINT16 control; - INT32 gp2_irq_control; - INT32 pal; + UINT8 *m_sndram; + UINT16 *m_workram; + UINT16 m_control; + INT32 m_gp2_irq_control; + INT32 m_pal; }; /*----------- defined in video/qdrmfgp.c -----------*/ diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index 90a9eff0250..bbd5bb794ad 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -26,21 +26,21 @@ public: : driver_device(machine, config) { } /* machine state */ - UINT8 *_68705_port_out; - UINT8 *_68705_ddr; - UINT8 _68705_port_in[3]; - UINT8 coinctrl; + UINT8 *m_68705_port_out; + UINT8 *m_68705_ddr; + UINT8 m_68705_port_in[3]; + UINT8 m_coinctrl; /* video state */ - UINT8 *videoram; - UINT8 *videoram_address; - UINT8 *videoram_mask; - UINT8 *paletteram; - UINT8 flip; - UINT8 palette_bank; - UINT8 leds; - UINT8 *scanline_latch; - pen_t pens[NUM_PENS]; + UINT8 *m_videoram; + UINT8 *m_videoram_address; + UINT8 *m_videoram_mask; + UINT8 *m_paletteram; + UINT8 m_flip; + UINT8 m_palette_bank; + UINT8 m_leds; + UINT8 *m_scanline_latch; + pen_t m_pens[NUM_PENS]; }; diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index b2cd4a1bcc9..c80fd3bbe45 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -4,15 +4,15 @@ public: quizdna_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *bg_ram; - UINT8 *fg_ram; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - UINT8 bg_xscroll[2]; - int flipscreen; - int video_enable; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_bg_ram; + UINT8 *m_fg_ram; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 m_bg_xscroll[2]; + int m_flipscreen; + int m_video_enable; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h index f6fcae50a98..3ddc78c9254 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -4,13 +4,13 @@ public: quizpani_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *bg_videoram; - UINT16 *txt_videoram; - UINT16 *scrollreg; - tilemap_t *bg_tilemap; - tilemap_t *txt_tilemap; - int bgbank; - int txtbank; + UINT16 *m_bg_videoram; + UINT16 *m_txt_videoram; + UINT16 *m_scrollreg; + tilemap_t *m_bg_tilemap; + tilemap_t *m_txt_tilemap; + int m_bgbank; + int m_txtbank; }; diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index 825566b5ac2..3204332bea1 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -4,16 +4,16 @@ public: raiden_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT16 *shared_ram; - UINT16 *back_data; - UINT16 *fore_data; - UINT16 *scroll_ram; - tilemap_t *bg_layer; - tilemap_t *fg_layer; - tilemap_t *tx_layer; - int flipscreen; - int alternate; + UINT16 *m_videoram; + UINT16 *m_shared_ram; + UINT16 *m_back_data; + UINT16 *m_fore_data; + UINT16 *m_scroll_ram; + tilemap_t *m_bg_layer; + tilemap_t *m_fg_layer; + tilemap_t *m_tx_layer; + int m_flipscreen; + int m_alternate; }; diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index 05c87b63fcc..69c9158a89c 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -11,27 +11,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * spriteram; + UINT16 * m_spriteram; // UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + size_t m_spriteram_size; /* video-related */ - UINT16 sprite_ctrl; - UINT16 sprites_flipscreen; + UINT16 m_sprite_ctrl; + UINT16 m_sprites_flipscreen; /* misc */ - UINT8 jumping_latch; + UINT8 m_jumping_latch; /* c-chip */ - UINT8 *CRAM[8]; - int extra_version; - UINT8 current_bank; + UINT8 *m_CRAM[8]; + int m_extra_version; + UINT8 m_current_bank; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *pc080sn; - device_t *pc090oj; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_pc080sn; + device_t *m_pc090oj; }; diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index ea6810677a6..76c2da8b127 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -12,26 +12,28 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * spriteram2; - UINT8 * radarattr; - UINT8 * radarx; - UINT8 * radary; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; + UINT8 * m_radarattr; + UINT8 * m_radarx; + UINT8 * m_radary; /* video-related */ - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; /* misc */ - int last_bang; - int spriteram_base, stars_enable, total_stars; - UINT8 drawmode_table[4]; - struct jungler_star stars[JUNGLER_MAX_STARS]; + int m_last_bang; + int m_spriteram_base; + int m_stars_enable; + int m_total_stars; + UINT8 m_drawmode_table[4]; + struct jungler_star m_stars[JUNGLER_MAX_STARS]; /* devices */ - cpu_device *maincpu; - device_t *samples; + cpu_device *m_maincpu; + device_t *m_samples; }; diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h index 487f0c480bc..7c81b7ee041 100644 --- a/src/mame/includes/rampart.h +++ b/src/mame/includes/rampart.h @@ -12,8 +12,8 @@ public: rampart_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 * bitmap; - UINT8 has_mo; + UINT16 * m_bitmap; + UINT8 m_has_mo; }; diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h index 8309e3a2bc9..2e7aefae9eb 100644 --- a/src/mame/includes/rastan.h +++ b/src/mame/includes/rastan.h @@ -14,18 +14,18 @@ public: // UINT16 * paletteram; // this currently uses generic palette handlers /* video-related */ - UINT16 sprite_ctrl; - UINT16 sprites_flipscreen; + UINT16 m_sprite_ctrl; + UINT16 m_sprites_flipscreen; /* misc */ - int adpcm_pos; - int adpcm_data; + int m_adpcm_pos; + int m_adpcm_data; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *pc090oj; - device_t *pc080sn; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_pc090oj; + device_t *m_pc080sn; }; diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index ac0098b4505..0161c5b69cf 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -4,21 +4,21 @@ public: realbrk_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *dsw_select; - UINT16 *backup_ram; - UINT16 *vram_0; - UINT16 *vram_1; - UINT16 *vram_2; - UINT16 *vregs; - UINT16 *vram_0ras; - UINT16 *vram_1ras; - bitmap_t *tmpbitmap0; - bitmap_t *tmpbitmap1; - int disable_video; - tilemap_t *tilemap_0; - tilemap_t *tilemap_1; - tilemap_t *tilemap_2; - UINT16 *spriteram; + UINT16 *m_dsw_select; + UINT16 *m_backup_ram; + UINT16 *m_vram_0; + UINT16 *m_vram_1; + UINT16 *m_vram_2; + UINT16 *m_vregs; + UINT16 *m_vram_0ras; + UINT16 *m_vram_1ras; + bitmap_t *m_tmpbitmap0; + bitmap_t *m_tmpbitmap1; + int m_disable_video; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; + tilemap_t *m_tilemap_2; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index e6486f9a349..e0400898a1e 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -13,14 +13,14 @@ public: redalert_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 ay8910_latch_1; - UINT8 ay8910_latch_2; - UINT8 *bitmap_videoram; - UINT8 *bitmap_color; - UINT8 *charmap_videoram; - UINT8 *video_control; - UINT8 *bitmap_colorram; - UINT8 control_xor; + UINT8 m_ay8910_latch_1; + UINT8 m_ay8910_latch_2; + UINT8 *m_bitmap_videoram; + UINT8 *m_bitmap_color; + UINT8 *m_charmap_videoram; + UINT8 *m_video_control; + UINT8 *m_bitmap_colorram; + UINT8 m_control_xor; }; diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h index 93388858817..f97de5d3e78 100644 --- a/src/mame/includes/relief.h +++ b/src/mame/includes/relief.h @@ -12,9 +12,9 @@ public: relief_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT8 ym2413_volume; - UINT8 overall_volume; - UINT32 adpcm_bank_base; + UINT8 m_ym2413_volume; + UINT8 m_overall_volume; + UINT32 m_adpcm_bank_base; }; diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h index 6078b28384d..c18c6b8035f 100644 --- a/src/mame/includes/renegade.h +++ b/src/mame/includes/renegade.h @@ -6,35 +6,35 @@ public: renegade_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 bank; - int mcu_sim; - int from_main; - int from_mcu; - int main_sent; - int mcu_sent; - UINT8 ddr_a; - UINT8 ddr_b; - UINT8 ddr_c; - UINT8 port_a_out; - UINT8 port_b_out; - UINT8 port_c_out; - UINT8 port_a_in; - UINT8 port_b_in; - UINT8 port_c_in; - UINT8 mcu_buffer[MCU_BUFFER_MAX]; - UINT8 mcu_input_size; - UINT8 mcu_output_byte; - INT8 mcu_key; - int mcu_checksum; - const UINT8 *mcu_encrypt_table; - int mcu_encrypt_table_len; - int coin; - UINT8 *videoram; - UINT8 *videoram2; - INT32 scrollx; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - UINT8 *spriteram; + UINT8 m_bank; + int m_mcu_sim; + int m_from_main; + int m_from_mcu; + int m_main_sent; + int m_mcu_sent; + UINT8 m_ddr_a; + UINT8 m_ddr_b; + UINT8 m_ddr_c; + UINT8 m_port_a_out; + UINT8 m_port_b_out; + UINT8 m_port_c_out; + UINT8 m_port_a_in; + UINT8 m_port_b_in; + UINT8 m_port_c_in; + UINT8 m_mcu_buffer[MCU_BUFFER_MAX]; + UINT8 m_mcu_input_size; + UINT8 m_mcu_output_byte; + INT8 m_mcu_key; + int m_mcu_checksum; + const UINT8 *m_mcu_encrypt_table; + int m_mcu_encrypt_table_len; + int m_coin; + UINT8 *m_videoram; + UINT8 *m_videoram2; + INT32 m_scrollx; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index 90a32302d7c..9e3c91fa53f 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -4,27 +4,27 @@ public: retofinv_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 cpu2_m6000; - UINT8 *fg_videoram; - UINT8 *bg_videoram; - UINT8 *sharedram; - UINT8 from_main; - UINT8 from_mcu; - int mcu_sent; - int main_sent; - UINT8 portA_in; - UINT8 portA_out; - UINT8 ddrA; - UINT8 portB_in; - UINT8 portB_out; - UINT8 ddrB; - UINT8 portC_in; - UINT8 portC_out; - UINT8 ddrC; - int fg_bank; - int bg_bank; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + UINT8 m_cpu2_m6000; + UINT8 *m_fg_videoram; + UINT8 *m_bg_videoram; + UINT8 *m_sharedram; + UINT8 m_from_main; + UINT8 m_from_mcu; + int m_mcu_sent; + int m_main_sent; + UINT8 m_portA_in; + UINT8 m_portA_out; + UINT8 m_ddrA; + UINT8 m_portB_in; + UINT8 m_portB_out; + UINT8 m_ddrB; + UINT8 m_portC_in; + UINT8 m_portC_out; + UINT8 m_ddrC; + int m_fg_bank; + int m_bg_bank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; }; diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 70f6f353e03..14d81e80a48 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -11,16 +11,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * paletteram; + UINT8 * m_paletteram; /* video-related */ - int layer_colorbase[2]; - int vreg; + int m_layer_colorbase[2]; + int m_vreg; /* devices */ - device_t *audiocpu; - device_t *k007342; - device_t *k007420; + device_t *m_audiocpu; + device_t *m_k007342; + device_t *m_k007420; }; diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index 334d2899d43..2a0017ace16 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -5,14 +5,14 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * spriteram2; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; }; /*----------- defined in video/rocnrope.c -----------*/ diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index 534b1b8f26f..3d67543cd5b 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -13,29 +13,29 @@ class rohga_state : public driver_device public: rohga_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - audiocpu(*this, "audiocpu"), - decocomn(*this, "deco_common"), - deco_tilegen1(*this, "tilegen1"), - deco_tilegen2(*this, "tilegen2"), - oki1(*this, "oki1"), - oki2(*this, "oki2") { } + m_maincpu(*this, "maincpu"), + m_audiocpu(*this, "audiocpu"), + m_decocomn(*this, "deco_common"), + m_deco_tilegen1(*this, "tilegen1"), + m_deco_tilegen2(*this, "tilegen2"), + m_oki1(*this, "oki1"), + m_oki2(*this, "oki2") { } /* memory pointers */ - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT16 * pf3_rowscroll; - UINT16 * pf4_rowscroll; - UINT16 * spriteram; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT16 * m_pf3_rowscroll; + UINT16 * m_pf4_rowscroll; + UINT16 * m_spriteram; /* devices */ - required_device<cpu_device> maincpu; - required_device<cpu_device> audiocpu; - required_device<decocomn_device> decocomn; - required_device<deco16ic_device> deco_tilegen1; - required_device<deco16ic_device> deco_tilegen2; - required_device<okim6295_device> oki1; - required_device<okim6295_device> oki2; + required_device<cpu_device> m_maincpu; + required_device<cpu_device> m_audiocpu; + required_device<decocomn_device> m_decocomn; + required_device<deco16ic_device> m_deco_tilegen1; + required_device<deco16ic_device> m_deco_tilegen2; + required_device<okim6295_device> m_oki1; + required_device<okim6295_device> m_oki2; }; diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index 28a2736bfad..c60a4bc452b 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -11,20 +11,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int sprite_colorbase, zoom_colorbase; + int m_sprite_colorbase; + int m_zoom_colorbase; /* misc */ - int readzoomroms; + int m_readzoomroms; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k053260; - device_t *k053244; - device_t *k051316; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k053260; + device_t *m_k053244; + device_t *m_k051316; }; /*----------- defined in video/rollerg.c -----------*/ diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h index c131fa7e265..6d685f6d286 100644 --- a/src/mame/includes/rollrace.h +++ b/src/mame/includes/rollrace.h @@ -4,19 +4,19 @@ public: rollrace_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *colorram; - int ra_charbank[2]; - int ra_bkgpage; - int ra_bkgflip; - int ra_chrbank; - int ra_bkgpen; - int ra_bkgcol; - int ra_flipy; - int ra_flipx; - int ra_spritebank; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_videoram; + UINT8 *m_colorram; + int m_ra_charbank[2]; + int m_ra_bkgpage; + int m_ra_bkgflip; + int m_ra_chrbank; + int m_ra_bkgpen; + int m_ra_bkgcol; + int m_ra_flipy; + int m_ra_flipx; + int m_ra_spritebank; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h index 64ab66509c0..712bb899a1a 100644 --- a/src/mame/includes/route16.h +++ b/src/mame/includes/route16.h @@ -4,15 +4,15 @@ public: route16_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *sharedram; - UINT8 ttmahjng_port_select; - int speakres_vrx; - UINT8 *videoram1; - UINT8 *videoram2; - size_t videoram_size; - UINT8 flipscreen; - UINT8 palette_1; - UINT8 palette_2; + UINT8 *m_sharedram; + UINT8 m_ttmahjng_port_select; + int m_speakres_vrx; + UINT8 *m_videoram1; + UINT8 *m_videoram2; + size_t m_videoram_size; + UINT8 m_flipscreen; + UINT8 m_palette_1; + UINT8 m_palette_2; }; diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index 7f153fb565d..3706ef269a6 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -4,21 +4,21 @@ public: rpunch_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT8 sound_data; - UINT8 sound_busy; - UINT8 ym2151_irq; - UINT8 upd_rom_bank; - UINT16 *bitmapram; - size_t bitmapram_size; - int sprite_palette; - tilemap_t *background[2]; - UINT16 videoflags; - UINT8 crtc_register; - emu_timer *crtc_timer; - UINT8 bins; - UINT8 gins; - UINT16 *spriteram; + UINT16 *m_videoram; + UINT8 m_sound_data; + UINT8 m_sound_busy; + UINT8 m_ym2151_irq; + UINT8 m_upd_rom_bank; + UINT16 *m_bitmapram; + size_t m_bitmapram_size; + int m_sprite_palette; + tilemap_t *m_background[2]; + UINT16 m_videoflags; + UINT8 m_crtc_register; + emu_timer *m_crtc_timer; + UINT8 m_bins; + UINT8 m_gins; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 8d3386e486c..99d1533d937 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -4,11 +4,11 @@ public: runaway_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - emu_timer *interrupt_timer; - UINT8* video_ram; - UINT8* sprite_ram; - tilemap_t *bg_tilemap; - int tile_bank; + emu_timer *m_interrupt_timer; + UINT8* m_video_ram; + UINT8* m_sprite_ram; + tilemap_t *m_bg_tilemap; + int m_tile_bank; }; diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index 93d8bcf576f..31fca98cc4d 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -11,27 +11,29 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * _936_videoram; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_936_videoram; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - tilemap_t *ttl_tilemap, *_936_tilemap; - UINT16 ttl_vram[0x1000]; - int ttl_gfx_index, sprite_colorbase; + tilemap_t *m_ttl_tilemap; + tilemap_t *m_936_tilemap; + UINT16 m_ttl_vram[0x1000]; + int m_ttl_gfx_index; + int m_sprite_colorbase; /* misc */ - UINT16 sysreg[0x20]; - int z80_control; - int sound_status; + UINT16 m_sysreg[0x20]; + int m_z80_control; + int m_sound_status; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k054539_1; - device_t *k054539_2; - device_t *k053936; - device_t *k055673; - device_t *k053252; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k054539_1; + device_t *m_k054539_2; + device_t *m_k053936; + device_t *m_k055673; + device_t *m_k053252; }; diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index f3056bc4d34..3fbff6f07f8 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -4,15 +4,16 @@ public: sauro_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - size_t spriteram_size; - UINT8 *spriteram; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *videoram2; - UINT8 *colorram2; + size_t m_spriteram_size; + UINT8 *m_spriteram; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_videoram2; + UINT8 *m_colorram2; - tilemap_t *bg_tilemap, *fg_tilemap; - UINT8 palette_bank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 m_palette_bank; }; diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 9511bda9e27..9a56149eda8 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -5,15 +5,15 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * scroll; - UINT8 * spriteram; - UINT8 * palettebank; - UINT8 * spriteram_select; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_scroll; + UINT8 * m_spriteram; + UINT8 * m_palettebank; + UINT8 * m_spriteram_select; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; }; /*----------- defined in video/sbasketb.c -----------*/ diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index d32a0cd05f6..d8f3187c77e 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -4,10 +4,10 @@ public: sbugger_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *videoram_attr; + UINT8 *m_videoram; + UINT8 *m_videoram_attr; - tilemap_t *tilemap; + tilemap_t *m_tilemap; }; diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index b57ef736535..5f9ad2a264f 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -4,16 +4,16 @@ public: scotrsht_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int irq_enable; - UINT8 *scroll; + int m_irq_enable; + UINT8 *m_scroll; - size_t spriteram_size; - UINT8 *spriteram; - UINT8 *videoram; - UINT8 *colorram; - tilemap_t *bg_tilemap; - int charbank; - int palette_bank; + size_t m_spriteram_size; + UINT8 *m_spriteram; + UINT8 *m_videoram; + UINT8 *m_colorram; + tilemap_t *m_bg_tilemap; + int m_charbank; + int m_palette_bank; }; diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index fcea4a5c257..96ce4e3c60e 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -4,18 +4,18 @@ public: sderby_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *spriteram; - size_t spriteram_size; + UINT16 *m_spriteram; + size_t m_spriteram_size; - UINT16 *videoram; - UINT16 *md_videoram; - UINT16 *fg_videoram; + UINT16 *m_videoram; + UINT16 *m_md_videoram; + UINT16 *m_fg_videoram; - tilemap_t *tilemap; - tilemap_t *md_tilemap; - tilemap_t *fg_tilemap; + tilemap_t *m_tilemap; + tilemap_t *m_md_tilemap; + tilemap_t *m_fg_tilemap; - UINT16 scroll[6]; + UINT16 m_scroll[6]; }; diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index fea457ce4a5..329a686eb53 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -12,39 +12,39 @@ public: segag80r_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 sound_state[2]; - UINT8 sound_rate; - UINT16 sound_addr; - UINT8 sound_data; - UINT8 square_state; - UINT8 square_count; - emu_timer *sega005_sound_timer; - sound_stream *sega005_stream; - UINT8 n7751_command; - UINT8 n7751_busy; - UINT8 *videoram; - segag80_decrypt_func decrypt; - UINT8 *mainram; - UINT8 background_pcb; - double rweights[3]; - double gweights[3]; - double bweights[2]; - UINT8 video_control; - UINT8 video_flip; - UINT8 vblank_latch; - tilemap_t *spaceod_bg_htilemap; - tilemap_t *spaceod_bg_vtilemap; - UINT16 spaceod_hcounter; - UINT16 spaceod_vcounter; - UINT8 spaceod_fixed_color; - UINT8 spaceod_bg_control; - UINT8 spaceod_bg_detect; - tilemap_t *bg_tilemap; - UINT8 bg_enable; - UINT8 bg_char_bank; - UINT16 bg_scrollx; - UINT16 bg_scrolly; - UINT8 pignewt_bg_color_offset; + UINT8 m_sound_state[2]; + UINT8 m_sound_rate; + UINT16 m_sound_addr; + UINT8 m_sound_data; + UINT8 m_square_state; + UINT8 m_square_count; + emu_timer *m_sega005_sound_timer; + sound_stream *m_sega005_stream; + UINT8 m_n7751_command; + UINT8 m_n7751_busy; + UINT8 *m_videoram; + segag80_decrypt_func m_decrypt; + UINT8 *m_mainram; + UINT8 m_background_pcb; + double m_rweights[3]; + double m_gweights[3]; + double m_bweights[2]; + UINT8 m_video_control; + UINT8 m_video_flip; + UINT8 m_vblank_latch; + tilemap_t *m_spaceod_bg_htilemap; + tilemap_t *m_spaceod_bg_vtilemap; + UINT16 m_spaceod_hcounter; + UINT16 m_spaceod_vcounter; + UINT8 m_spaceod_fixed_color; + UINT8 m_spaceod_bg_control; + UINT8 m_spaceod_bg_detect; + tilemap_t *m_bg_tilemap; + UINT8 m_bg_enable; + UINT8 m_bg_char_bank; + UINT16 m_bg_scrollx; + UINT16 m_bg_scrolly; + UINT8 m_pignewt_bg_color_offset; }; diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index 2df92c9421c..a91c79e2f90 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -12,18 +12,18 @@ public: segag80v_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *mainram; - UINT8 has_usb; - UINT8 mult_data[2]; - UINT16 mult_result; - UINT8 spinner_select; - UINT8 spinner_sign; - UINT8 spinner_count; - segag80_decrypt_func decrypt; - UINT8 *vectorram; - size_t vectorram_size; - int min_x; - int min_y; + UINT8 *m_mainram; + UINT8 m_has_usb; + UINT8 m_mult_data[2]; + UINT16 m_mult_result; + UINT8 m_spinner_select; + UINT8 m_spinner_sign; + UINT8 m_spinner_count; + segag80_decrypt_func m_decrypt; + UINT8 *m_vectorram; + size_t m_vectorram_size; + int m_min_x; + int m_min_y; }; diff --git a/src/mame/includes/segas16.h b/src/mame/includes/segas16.h index da7bbac1ccc..fefc0497aae 100644 --- a/src/mame/includes/segas16.h +++ b/src/mame/includes/segas16.h @@ -4,98 +4,100 @@ class segas1x_state : public driver_device public: segas1x_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - interrupt_timer(*this, "int_timer") { } + m_interrupt_timer(*this, "int_timer") { } /* memory pointers */ -// UINT16 * workram; // this is used in the nvram handler, hence it cannot be added here -// UINT16 * paletteram; // this is used in the segaic16 mapper, hence it cannot be added here (yet) -// UINT16 * tileram_0; // this is used in the segaic16 mapper, hence it cannot be added here (yet) -// UINT16 * textram_0; // this is used in the segaic16 mapper, hence it cannot be added here (yet) -// UINT16 * spriteram_0; // this is used in the segaic16 mapper, hence it cannot be added here (yet) +// UINT16 * m_workram; // this is used in the nvram handler, hence it cannot be added here +// UINT16 * m_paletteram; // this is used in the segaic16 mapper, hence it cannot be added here (yet) +// UINT16 * m_tileram_0; // this is used in the segaic16 mapper, hence it cannot be added here (yet) +// UINT16 * m_textram_0; // this is used in the segaic16 mapper, hence it cannot be added here (yet) +// UINT16 * m_spriteram_0; // this is used in the segaic16 mapper, hence it cannot be added here (yet) /* misc video */ - UINT8 road_priority; // segaxbd - bitmap_t *tmp_bitmap; // segaybd & segas18 - UINT8 grayscale_enable; // segas18 - UINT8 vdp_enable; // segas18 - UINT8 vdp_mixing; // segas18 + UINT8 m_road_priority; // segaxbd + bitmap_t *m_tmp_bitmap; // segaybd & segas18 + UINT8 m_grayscale_enable; // segas18 + UINT8 m_vdp_enable; // segas18 + UINT8 m_vdp_mixing; // segas18 /* misc common */ - UINT8 rom_board; // segas16b - UINT8 mj_input_num; // segas16a & segas16b - UINT8 mj_last_val; // segas16b - UINT8 adc_select; // segahang & segaorun - UINT8 timer_irq_state; // segaxbd & segaybd - UINT8 vblank_irq_state; // segaorun, segaxbd & segaybd - UINT8 misc_io_data[0x10]; // system18 & segaybd + UINT8 m_rom_board; // segas16b + UINT8 m_mj_input_num; // segas16a & segas16b + UINT8 m_mj_last_val; // segas16b + UINT8 m_adc_select; // segahang & segaorun + UINT8 m_timer_irq_state; // segaxbd & segaybd + UINT8 m_vblank_irq_state; // segaorun, segaxbd & segaybd + UINT8 m_misc_io_data[0x10]; // system18 & segaybd - void (*i8751_vblank_hook)(running_machine &machine); - const UINT8 *i8751_initial_config; + void (*m_i8751_vblank_hook)(running_machine &machine); + const UINT8 *m_i8751_initial_config; - read16_space_func custom_io_r; - write16_space_func custom_io_w; + read16_space_func m_custom_io_r; + write16_space_func m_custom_io_w; /* misc system 16b */ - UINT8 atomicp_sound_divisor; - UINT8 atomicp_sound_count; - UINT8 disable_screen_blanking; - UINT8 hwc_input_value; + UINT8 m_atomicp_sound_divisor; + UINT8 m_atomicp_sound_count; + UINT8 m_disable_screen_blanking; + UINT8 m_hwc_input_value; /* misc system 16a */ - UINT8 video_control; - UINT8 mcu_control; - UINT8 n7751_command; - UINT32 n7751_rom_address; - UINT8 last_buttons1; - UINT8 last_buttons2; - int read_port; + UINT8 m_video_control; + UINT8 m_mcu_control; + UINT8 m_n7751_command; + UINT32 m_n7751_rom_address; + UINT8 m_last_buttons1; + UINT8 m_last_buttons2; + int m_read_port; - void (*lamp_changed_w)(running_machine &machine, UINT8 changed, UINT8 newval); + void (*m_lamp_changed_w)(running_machine &machine, UINT8 changed, UINT8 newval); /* misc system 18 */ - UINT8 mcu_data; + UINT8 m_mcu_data; - UINT8 wwally_last_x[3], wwally_last_y[3]; - UINT8 lghost_value, lghost_select; + UINT8 m_wwally_last_x[3]; + UINT8 m_wwally_last_y[3]; + UINT8 m_lghost_value; + UINT8 m_lghost_select; /* misc segaorun */ - UINT8 irq2_state; - const UINT8 *custom_map; + UINT8 m_irq2_state; + const UINT8 *m_custom_map; /* misc yboard */ - UINT8 analog_data[4]; - int irq2_scanline; + UINT8 m_analog_data[4]; + int m_irq2_scanline; /* misc xboard */ - UINT8 iochip_regs[2][8]; - UINT8 iochip_force_input; + UINT8 m_iochip_regs[2][8]; + UINT8 m_iochip_force_input; - UINT8 (*iochip_custom_io_r[2])(offs_t offset, UINT8 portdata); // currently unused - void (*iochip_custom_io_w[2])(offs_t offset, UINT8 data); // currently unused + UINT8 (*m_iochip_custom_io_r[2])(offs_t offset, UINT8 portdata); // currently unused + void (*m_iochip_custom_io_w[2])(offs_t offset, UINT8 data); // currently unused - UINT8 adc_reverse[8]; + UINT8 m_adc_reverse[8]; - UINT8 gprider_hack; - UINT16 *loffire_sync; + UINT8 m_gprider_hack; + UINT16 *m_loffire_sync; /* devices */ - device_t *maincpu; - device_t *soundcpu; - device_t *subcpu; - device_t *subx; - device_t *suby; - device_t *mcu; - device_t *ymsnd; - device_t *ppi8255; - device_t *n7751; - device_t *ppi8255_1; - device_t *ppi8255_2; - optional_device<timer_device> interrupt_timer; - device_t *_315_5248_1; - device_t *_315_5250_1; - device_t *_315_5250_2; + device_t *m_maincpu; + device_t *m_soundcpu; + device_t *m_subcpu; + device_t *m_subx; + device_t *m_suby; + device_t *m_mcu; + device_t *m_ymsnd; + device_t *m_ppi8255; + device_t *m_n7751; + device_t *m_ppi8255_1; + device_t *m_ppi8255_2; + optional_device<timer_device> m_interrupt_timer; + device_t *m_315_5248_1; + device_t *m_315_5250_1; + device_t *m_315_5250_2; }; diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index ddcb9b73d64..b0b58bcd170 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -4,44 +4,44 @@ public: segas24_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int fdc_status; - int fdc_track; - int fdc_sector; - int fdc_data; - int fdc_phys_track; - int fdc_irq; - int fdc_drq; - int fdc_span; - int fdc_index_count; - UINT8 *fdc_pt; - int track_size; - int cur_input_line; - UINT8 hotrod_ctrl_cur; - UINT8 resetcontrol; - UINT8 prev_resetcontrol; - UINT8 curbank; - UINT8 mlatch; - const UINT8 *mlatch_table; - UINT16 irq_timera; - UINT8 irq_timerb; - UINT8 irq_allow0; - UINT8 irq_allow1; - int irq_timer_pend0; - int irq_timer_pend1; - int irq_yms; - int irq_vblank; - int irq_sprite; - timer_device *irq_timer; - timer_device *irq_timer_clear; - int turns; - UINT16 *system24temp_sys16_shared_ram; - UINT8 (*system24temp_sys16_io_io_r)(running_machine &machine, int port); - void (*system24temp_sys16_io_io_w)(running_machine &machine, int port, UINT8 data); - void (*system24temp_sys16_io_cnt_w)(address_space *space, UINT8 data); - read16_space_func system24temp_sys16_io_iod_r; - write16_space_func system24temp_sys16_io_iod_w; - UINT8 system24temp_sys16_io_cnt; - UINT8 system24temp_sys16_io_dir; + int m_fdc_status; + int m_fdc_track; + int m_fdc_sector; + int m_fdc_data; + int m_fdc_phys_track; + int m_fdc_irq; + int m_fdc_drq; + int m_fdc_span; + int m_fdc_index_count; + UINT8 *m_fdc_pt; + int m_track_size; + int m_cur_input_line; + UINT8 m_hotrod_ctrl_cur; + UINT8 m_resetcontrol; + UINT8 m_prev_resetcontrol; + UINT8 m_curbank; + UINT8 m_mlatch; + const UINT8 *m_mlatch_table; + UINT16 m_irq_timera; + UINT8 m_irq_timerb; + UINT8 m_irq_allow0; + UINT8 m_irq_allow1; + int m_irq_timer_pend0; + int m_irq_timer_pend1; + int m_irq_yms; + int m_irq_vblank; + int m_irq_sprite; + timer_device *m_irq_timer; + timer_device *m_irq_timer_clear; + int m_turns; + UINT16 *m_system24temp_sys16_shared_ram; + UINT8 (*m_system24temp_sys16_io_io_r)(running_machine &machine, int port); + void (*m_system24temp_sys16_io_io_w)(running_machine &machine, int port, UINT8 data); + void (*m_system24temp_sys16_io_cnt_w)(address_space *space, UINT8 data); + read16_space_func m_system24temp_sys16_io_iod_r; + write16_space_func m_system24temp_sys16_io_iod_w; + UINT8 m_system24temp_sys16_io_cnt; + UINT8 m_system24temp_sys16_io_dir; }; diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index e136e229bd1..9403db443b5 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -9,7 +9,7 @@ typedef void (*sys32_output_callback)(int which, UINT16 data); struct layer_info { bitmap_t * bitmap; - UINT8 * transparent; + UINT8 * transparent; }; @@ -19,44 +19,44 @@ public: segas32_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *z80_shared_ram; - UINT8 v60_irq_control[0x10]; - timer_device *v60_irq_timer[2]; - UINT8 sound_irq_control[4]; - UINT8 sound_irq_input; - UINT8 sound_dummy_value; - UINT16 sound_bank; - UINT8 misc_io_data[2][0x10]; - read16_space_func custom_io_r[2]; - write16_space_func custom_io_w[2]; - UINT8 analog_bank; - UINT8 analog_value[4]; - UINT8 sonic_last[6]; - sys32_output_callback sw1_output; - sys32_output_callback sw2_output; - sys32_output_callback sw3_output; - UINT16* dual_pcb_comms; - UINT8 *ga2_dpram; - UINT16 *system32_workram; - UINT16 *system32_protram; - UINT16 *system32_videoram; - UINT16 *system32_spriteram; - UINT16 *system32_paletteram[2]; - UINT16 system32_displayenable[2]; - UINT16 system32_tilebank_external; - UINT16 arescue_dsp_io[6]; - UINT8 is_multi32; - struct cache_entry *cache_head; - struct layer_info layer_data[11]; - UINT16 mixer_control[2][0x40]; - UINT16 *solid_0000; - UINT16 *solid_ffff; - UINT8 sprite_render_count; - UINT8 sprite_control_latched[8]; - UINT8 sprite_control[8]; - UINT32 *spriteram_32bit; - void (*system32_prot_vblank)(device_t *device); - int print_count; + UINT8 *m_z80_shared_ram; + UINT8 m_v60_irq_control[0x10]; + timer_device *m_v60_irq_timer[2]; + UINT8 m_sound_irq_control[4]; + UINT8 m_sound_irq_input; + UINT8 m_sound_dummy_value; + UINT16 m_sound_bank; + UINT8 m_misc_io_data[2][0x10]; + read16_space_func m_custom_io_r[2]; + write16_space_func m_custom_io_w[2]; + UINT8 m_analog_bank; + UINT8 m_analog_value[4]; + UINT8 m_sonic_last[6]; + sys32_output_callback m_sw1_output; + sys32_output_callback m_sw2_output; + sys32_output_callback m_sw3_output; + UINT16* m_dual_pcb_comms; + UINT8 *m_ga2_dpram; + UINT16 *m_system32_workram; + UINT16 *m_system32_protram; + UINT16 *m_system32_videoram; + UINT16 *m_system32_spriteram; + UINT16 *m_system32_paletteram[2]; + UINT16 m_system32_displayenable[2]; + UINT16 m_system32_tilebank_external; + UINT16 m_arescue_dsp_io[6]; + UINT8 m_is_multi32; + struct cache_entry *m_cache_head; + struct layer_info m_layer_data[11]; + UINT16 m_mixer_control[2][0x40]; + UINT16 *m_solid_0000; + UINT16 *m_solid_ffff; + UINT8 m_sprite_render_count; + UINT8 m_sprite_control_latched[8]; + UINT8 m_sprite_control[8]; + UINT32 *m_spriteram_32bit; + void (*m_system32_prot_vblank)(device_t *device); + int m_print_count; }; diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index b37e82c7504..31d1f4403cd 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -8,41 +8,41 @@ public: seibuspi_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 *spimainram; - UINT32 *spi_scrollram; - intel_e28f008sa_device *flash[2]; - UINT8 *z80_rom; - int z80_prg_fifo_pos; - int z80_lastbank; - int fifoin_rpos; - int fifoin_wpos; - UINT8 fifoin_data[FIFO_SIZE]; - int fifoin_read_request; - int fifoout_rpos; - int fifoout_wpos; - UINT8 fifoout_data[FIFO_SIZE]; - int fifoout_read_request; - UINT8 sb_coin_latch; - UINT8 ejsakura_input_port; - tilemap_t *text_layer; - tilemap_t *back_layer; - tilemap_t *mid_layer; - tilemap_t *fore_layer; - UINT32 layer_bank; - UINT32 layer_enable; - UINT32 video_dma_length; - UINT32 video_dma_address; - UINT32 sprite_dma_length; - int rf2_layer_bank[3]; - UINT32 *tilemap_ram; - UINT32 *palette_ram; - UINT32 *sprite_ram; - int mid_layer_offset; - int fore_layer_offset; - int text_layer_offset; - UINT32 bg_fore_layer_position; - UINT8 alpha_table[8192]; - UINT8 sprite_bpp; + UINT32 *m_spimainram; + UINT32 *m_spi_scrollram; + intel_e28f008sa_device *m_flash[2]; + UINT8 *m_z80_rom; + int m_z80_prg_fifo_pos; + int m_z80_lastbank; + int m_fifoin_rpos; + int m_fifoin_wpos; + UINT8 m_fifoin_data[FIFO_SIZE]; + int m_fifoin_read_request; + int m_fifoout_rpos; + int m_fifoout_wpos; + UINT8 m_fifoout_data[FIFO_SIZE]; + int m_fifoout_read_request; + UINT8 m_sb_coin_latch; + UINT8 m_ejsakura_input_port; + tilemap_t *m_text_layer; + tilemap_t *m_back_layer; + tilemap_t *m_mid_layer; + tilemap_t *m_fore_layer; + UINT32 m_layer_bank; + UINT32 m_layer_enable; + UINT32 m_video_dma_length; + UINT32 m_video_dma_address; + UINT32 m_sprite_dma_length; + int m_rf2_layer_bank[3]; + UINT32 *m_tilemap_ram; + UINT32 *m_palette_ram; + UINT32 *m_sprite_ram; + int m_mid_layer_offset; + int m_fore_layer_offset; + int m_text_layer_offset; + UINT32 m_bg_fore_layer_position; + UINT8 m_alpha_table[8192]; + UINT8 m_sprite_bpp; }; diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index 7784905c04e..d72d794c005 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -4,19 +4,19 @@ public: seicross_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *nvram; - size_t nvram_size; + UINT8 *m_nvram; + size_t m_nvram_size; - UINT8 portb; + UINT8 m_portb; - size_t spriteram_size; - size_t spriteram2_size; - UINT8 *spriteram; - UINT8 *spriteram2; - UINT8 *videoram; - UINT8 *colorram; - tilemap_t *bg_tilemap; - UINT8 *row_scroll; + size_t m_spriteram_size; + size_t m_spriteram2_size; + UINT8 *m_spriteram; + UINT8 *m_spriteram2; + UINT8 *m_videoram; + UINT8 *m_colorram; + tilemap_t *m_bg_tilemap; + UINT8 *m_row_scroll; }; diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index 727d791f95a..da264d32d97 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -9,36 +9,36 @@ public: senjyo_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int int_delay_kludge; - UINT8 sound_cmd; - INT16 *single_data; - int single_rate; - int single_volume; + int m_int_delay_kludge; + UINT8 m_sound_cmd; + INT16 *m_single_data; + int m_single_rate; + int m_single_volume; - size_t spriteram_size; - UINT8 *spriteram; - UINT8 *fgscroll; - UINT8 *scrollx1; - UINT8 *scrolly1; - UINT8 *scrollx2; - UINT8 *scrolly2; - UINT8 *scrollx3; - UINT8 *scrolly3; - UINT8 *fgvideoram; - UINT8 *fgcolorram; - UINT8 *bg1videoram; - UINT8 *bg2videoram; - UINT8 *bg3videoram; - UINT8 *radarram; - UINT8 *bgstripesram; - int is_senjyo; - int scrollhack; - tilemap_t *fg_tilemap; - tilemap_t *bg1_tilemap; - tilemap_t *bg2_tilemap; - tilemap_t *bg3_tilemap; + size_t m_spriteram_size; + UINT8 *m_spriteram; + UINT8 *m_fgscroll; + UINT8 *m_scrollx1; + UINT8 *m_scrolly1; + UINT8 *m_scrollx2; + UINT8 *m_scrolly2; + UINT8 *m_scrollx3; + UINT8 *m_scrolly3; + UINT8 *m_fgvideoram; + UINT8 *m_fgcolorram; + UINT8 *m_bg1videoram; + UINT8 *m_bg2videoram; + UINT8 *m_bg3videoram; + UINT8 *m_radarram; + UINT8 *m_bgstripesram; + int m_is_senjyo; + int m_scrollhack; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg1_tilemap; + tilemap_t *m_bg2_tilemap; + tilemap_t *m_bg3_tilemap; - int bgstripes; + int m_bgstripes; }; diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index 63df77f42ed..78db6f71447 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -30,60 +30,60 @@ public: seta_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *sharedram; - UINT16 *workram; - UINT16 *vregs; - UINT16 *vram_0; - UINT16 *vctrl_0; - UINT16 *vram_2; - UINT16 *vctrl_2; - UINT16 *spriteram; - UINT16 *spriteram2; - UINT16 *paletteram; - size_t paletteram_size; - UINT16 *paletteram2; - size_t paletteram2_size; - - int tiles_offset; - tilemap_t *tilemap_0; - tilemap_t *tilemap_1; // Layer 0 - tilemap_t *tilemap_2; - tilemap_t *tilemap_3; // Layer 1 - int tilemaps_flip; - int samples_bank; - int color_mode_shift; - int current_tilemap_mode[2]; - - uPD71054_state uPD71054; - const game_offset *global_offsets; - - bool coin_lockout_initialized; - int coin_lockout; - - int sub_ctrl_data; - - int gun_input_bit; - int gun_input_src; - int gun_bit_count; - int gun_old_clock; - - UINT8 usclssic_port_select; - int keroppi_prize_hop; - int keroppi_protection_count; - UINT16 *kiwame_nvram; - - int wiggie_soundlatch; - - UINT16 *inttoote_key_select; - UINT16 *inttoote_700000; - UINT8 jockeyc_key_select; - - UINT8 twineagl_xram[8]; - int twineagl_tilebank[4]; - - UINT16 pairslove_protram[0x200]; - UINT16 pairslove_protram_old[0x200]; - UINT16 downtown_protection[0x200/2]; + UINT8 *m_sharedram; + UINT16 *m_workram; + UINT16 *m_vregs; + UINT16 *m_vram_0; + UINT16 *m_vctrl_0; + UINT16 *m_vram_2; + UINT16 *m_vctrl_2; + UINT16 *m_spriteram; + UINT16 *m_spriteram2; + UINT16 *m_paletteram; + size_t m_paletteram_size; + UINT16 *m_paletteram2; + size_t m_paletteram2_size; + + int m_tiles_offset; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; // Layer 0 + tilemap_t *m_tilemap_2; + tilemap_t *m_tilemap_3; // Layer 1 + int m_tilemaps_flip; + int m_samples_bank; + int m_color_mode_shift; + int m_current_tilemap_mode[2]; + + uPD71054_state m_uPD71054; + const game_offset *m_global_offsets; + + bool m_coin_lockout_initialized; + int m_coin_lockout; + + int m_sub_ctrl_data; + + int m_gun_input_bit; + int m_gun_input_src; + int m_gun_bit_count; + int m_gun_old_clock; + + UINT8 m_usclssic_port_select; + int m_keroppi_prize_hop; + int m_keroppi_protection_count; + UINT16 *m_kiwame_nvram; + + int m_wiggie_soundlatch; + + UINT16 *m_inttoote_key_select; + UINT16 *m_inttoote_700000; + UINT8 m_jockeyc_key_select; + + UINT8 m_twineagl_xram[8]; + int m_twineagl_tilebank[4]; + + UINT16 m_pairslove_protram[0x200]; + UINT16 m_pairslove_protram_old[0x200]; + UINT16 m_downtown_protection[0x200/2]; }; /*----------- defined in video/seta.c -----------*/ diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index d87337a24d9..20b4ceb765c 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -7,24 +7,25 @@ public: optional_shared_ptr<UINT16> m_nvram; - UINT16 *vregs; - int xoffset, yoffset; - int keyboard_row; + UINT16 *m_vregs; + int m_xoffset; + int m_yoffset; + int m_keyboard_row; - UINT16 *spriteram; - size_t spriteram_size; - UINT16 *buffered_spriteram; - UINT32 *coldfire_regs; + UINT16 *m_spriteram; + size_t m_spriteram_size; + UINT16 *m_buffered_spriteram; + UINT32 *m_coldfire_regs; - UINT8 *funcube_outputs; - UINT8 *funcube_leds; + UINT8 *m_funcube_outputs; + UINT8 *m_funcube_leds; - UINT64 funcube_coin_start_cycles; - UINT8 funcube_hopper_motor; - UINT8 funcube_press; + UINT64 m_funcube_coin_start_cycles; + UINT8 m_funcube_hopper_motor; + UINT8 m_funcube_press; - UINT8 funcube_serial_fifo[4]; - UINT8 funcube_serial_count; + UINT8 m_funcube_serial_fifo[4]; + UINT8 m_funcube_serial_count; }; /*----------- defined in video/seta2.c -----------*/ diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index 3bf007b198d..73cb7cf27de 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -11,19 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; - UINT16 * objectram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t videoram_size; + UINT16 * m_videoram; + UINT16 * m_objectram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_videoram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap; - int sf_active; - UINT16 bgscroll, fgscroll; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_tx_tilemap; + int m_sf_active; + UINT16 m_bgscroll; + UINT16 m_fgscroll; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index 8f88739f252..ce141c18b47 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -4,23 +4,23 @@ public: shadfrce_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - tilemap_t *fgtilemap; - tilemap_t *bg0tilemap; - tilemap_t *bg1tilemap; + tilemap_t *m_fgtilemap; + tilemap_t *m_bg0tilemap; + tilemap_t *m_bg1tilemap; - UINT16 *fgvideoram; - UINT16 *bg0videoram; - UINT16 *bg1videoram; - UINT16 *spvideoram; - UINT16 *spvideoram_old; - size_t spvideoram_size; + UINT16 *m_fgvideoram; + UINT16 *m_bg0videoram; + UINT16 *m_bg1videoram; + UINT16 *m_spvideoram; + UINT16 *m_spvideoram_old; + size_t m_spvideoram_size; - int video_enable; - int irqs_enable; - int raster_scanline; - int raster_irq_enable; - int vblank; - int prev_value; + int m_video_enable; + int m_irqs_enable; + int m_raster_scanline; + int m_raster_irq_enable; + int m_vblank; + int m_prev_value; }; diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index 1ba5ab78c36..0cc9037f735 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -4,16 +4,16 @@ public: shangha3_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int prot_count; - UINT16 *ram; - size_t ram_size; + int m_prot_count; + UINT16 *m_ram; + size_t m_ram_size; - int do_shadows; + int m_do_shadows; - UINT16 gfxlist_addr; - bitmap_t *rawbitmap; + UINT16 m_gfxlist_addr; + bitmap_t *m_rawbitmap; - UINT8 drawmode_table[16]; + UINT8 m_drawmode_table[16]; }; diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index 9fc9bc3e61f..55dc38aa94e 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -4,13 +4,13 @@ public: shangkid_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *spriteram; - UINT8 bbx_sound_enable; - UINT8 sound_latch; - UINT8 *videoreg; - int gfx_type; - tilemap_t *background; + UINT8 *m_videoram; + UINT8 *m_spriteram; + UINT8 m_bbx_sound_enable; + UINT8 m_sound_latch; + UINT8 *m_videoreg; + int m_gfx_type; + tilemap_t *m_background; }; diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index 6fcd35084a9..11dff920c36 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -4,14 +4,14 @@ public: shaolins_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - size_t spriteram_size; - UINT8 *spriteram; - UINT8 *videoram; - UINT8 *colorram; - int palettebank; + size_t m_spriteram_size; + UINT8 *m_spriteram; + UINT8 *m_videoram; + UINT8 *m_colorram; + int m_palettebank; - tilemap_t *bg_tilemap; - UINT8 nmi_enable; + tilemap_t *m_bg_tilemap; + UINT8 m_nmi_enable; }; diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index 2ebe5c17b9a..d6af97294c5 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -4,10 +4,10 @@ public: shisen_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int gfxbank; - tilemap_t *bg_tilemap; - UINT8 *paletteram; - UINT8 *videoram; + int m_gfxbank; + tilemap_t *m_bg_tilemap; + UINT8 *m_paletteram; + UINT8 *m_videoram; }; diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 86eafabd4bb..b104a6b7573 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -4,12 +4,12 @@ public: shootout_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - tilemap_t *background; - tilemap_t *foreground; - UINT8 *spriteram; - UINT8 *videoram; - UINT8 *textram; - int bFlicker; + tilemap_t *m_background; + tilemap_t *m_foreground; + UINT8 *m_spriteram; + UINT8 *m_videoram; + UINT8 *m_textram; + int m_bFlicker; }; diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h index c0ded7077d2..b76b0f1d66c 100644 --- a/src/mame/includes/shuuz.h +++ b/src/mame/includes/shuuz.h @@ -12,7 +12,7 @@ public: shuuz_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - int cur[2]; + int m_cur[2]; }; diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index 192aa88255c..0873f0f844b 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -4,26 +4,26 @@ public: sidearms_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int gameid; + int m_gameid; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *bg_scrollx; - UINT8 *bg_scrolly; - UINT8 *tilerom; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_bg_scrollx; + UINT8 *m_bg_scrolly; + UINT8 *m_tilerom; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; - int bgon; - int objon; - int staron; - int charon; - int flipon; + int m_bgon; + int m_objon; + int m_staron; + int m_charon; + int m_flipon; - UINT32 hflop_74a_n; - UINT32 hcount_191; - UINT32 vcount_191; - UINT32 latch_374; + UINT32 m_hflop_74a_n; + UINT32 m_hcount_191; + UINT32 m_vcount_191; + UINT32 m_latch_374; }; /*----------- defined in video/sidearms.c -----------*/ diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index 8cf2b586108..0f9627baccc 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -4,17 +4,17 @@ public: sidepckt_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - tilemap_t *bg_tilemap; - UINT8 *colorram; - UINT8 *videoram; - size_t videoram_size; - UINT8 *spriteram; - size_t spriteram_size; - int i8751_return; - int current_ptr; - int current_table; - int in_math; - int math_param; + tilemap_t *m_bg_tilemap; + UINT8 *m_colorram; + UINT8 *m_videoram; + size_t m_videoram_size; + UINT8 *m_spriteram; + size_t m_spriteram_size; + int m_i8751_return; + int m_current_ptr; + int m_current_table; + int m_in_math; + int m_math_param; }; diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index 63832def482..10472b4f665 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -4,14 +4,14 @@ public: silkroad_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 *vidram; - UINT32 *vidram2; - UINT32 *vidram3; - UINT32 *sprram; - UINT32 *regs; - tilemap_t *fg_tilemap; - tilemap_t *fg2_tilemap; - tilemap_t *fg3_tilemap; + UINT32 *m_vidram; + UINT32 *m_vidram2; + UINT32 *m_vidram3; + UINT32 *m_sprram; + UINT32 *m_regs; + tilemap_t *m_fg_tilemap; + tilemap_t *m_fg2_tilemap; + tilemap_t *m_fg3_tilemap; }; diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index b798fde5622..9d7ad2e8e1f 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -13,24 +13,24 @@ class simpl156_state : public driver_device public: simpl156_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - deco_tilegen1(*this, "tilegen1"), - eeprom(*this, "eeprom"), - okimusic(*this, "okimusic") { } + m_maincpu(*this, "maincpu"), + m_deco_tilegen1(*this, "tilegen1"), + m_eeprom(*this, "eeprom"), + m_okimusic(*this, "okimusic") { } /* memory pointers */ - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT32 * mainram; - UINT32 * systemram; - UINT16 *spriteram; - size_t spriteram_size; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT32 * m_mainram; + UINT32 * m_systemram; + UINT16 *m_spriteram; + size_t m_spriteram_size; /* devices */ - required_device<cpu_device> maincpu; - required_device<deco16ic_device> deco_tilegen1; - required_device<eeprom_device> eeprom; - required_device<okim6295_device> okimusic; + required_device<cpu_device> m_maincpu; + required_device<deco16ic_device> m_deco_tilegen1; + required_device<eeprom_device> m_eeprom; + required_device<okim6295_device> m_okimusic; }; diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index 3e18c1724c9..c22ccc093ad 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -6,27 +6,28 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; - UINT8 * xtraram; - UINT16 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; + UINT8 * m_xtraram; + UINT16 * m_spriteram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int sprite_colorbase, layer_colorbase[3]; - int layerpri[3]; + int m_sprite_colorbase; + int m_layer_colorbase[3]; + int m_layerpri[3]; /* misc */ - int firq_enabled; - int video_bank; - //int nmi_enabled; + int m_firq_enabled; + int m_video_bank; + //int m_nmi_enabled; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k053260; - device_t *k052109; - device_t *k053246; - device_t *k053251; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k053260; + device_t *m_k052109; + device_t *m_k053246; + device_t *m_k053251; }; /*----------- defined in machine/simpsons.c -----------*/ diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index 6e972354437..9dcf2f9ca75 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -25,10 +25,10 @@ public: skydiver_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int nmion; - UINT8 *videoram; - tilemap_t *bg_tilemap; - int width; + int m_nmion; + UINT8 *m_videoram; + tilemap_t *m_bg_tilemap; + int m_width; }; diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 1c3b59bba2c..ea25adfe54c 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -11,18 +11,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - UINT8 vreg[8]; - int bg_pos, bg_ctrl; + UINT8 m_vreg[8]; + int m_bg_pos; + int m_bg_ctrl; /* misc */ - int palette_selected; + int m_palette_selected; /* devices */ - device_t *maincpu; + device_t *m_maincpu; }; /*----------- defined in video/skyfox.c -----------*/ diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index 303a2f496c5..f0d456e36e5 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -4,15 +4,15 @@ public: skykid_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 inputport_selected; - UINT8 *textram; - UINT8 *videoram; - UINT8 *spriteram; - tilemap_t *bg_tilemap; - tilemap_t *tx_tilemap; - UINT8 priority; - UINT16 scroll_x; - UINT16 scroll_y; + UINT8 m_inputport_selected; + UINT8 *m_textram; + UINT8 *m_videoram; + UINT8 *m_spriteram; + tilemap_t *m_bg_tilemap; + tilemap_t *m_tx_tilemap; + UINT8 m_priority; + UINT16 m_scroll_x; + UINT16 m_scroll_y; }; diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index 2e0b8e58e16..926cb6b4458 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -6,16 +6,16 @@ public: skyraid_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int analog_range; - int analog_offset; + int m_analog_range; + int m_analog_offset; - int scroll; + int m_scroll; - UINT8* alpha_num_ram; - UINT8* pos_ram; - UINT8* obj_ram; + UINT8* m_alpha_num_ram; + UINT8* m_pos_ram; + UINT8* m_obj_ram; - bitmap_t *helper; + bitmap_t *m_helper; }; diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 41c5b9355c6..f6e87063d35 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -17,41 +17,41 @@ public: slapfght_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int getstar_id; - UINT8 *slapfight_videoram; - UINT8 *slapfight_colorram; - UINT8 *slapfight_fixvideoram; - UINT8 *slapfight_fixcolorram; - UINT8 *slapfight_scrollx_lo; - UINT8 *slapfight_scrollx_hi; - UINT8 *slapfight_scrolly; - int slapfight_status; - int getstar_sequence_index; - int getstar_sh_intenabled; - int slapfight_status_state; - UINT8 mcu_val; - UINT8 getstar_cmd; - UINT8 gs_a; - UINT8 gs_d; - UINT8 gs_e; - UINT8 tigerhb_cmd; - UINT8 from_main; - UINT8 from_mcu; - int mcu_sent; - int main_sent; - UINT8 portA_in; - UINT8 portA_out; - UINT8 ddrA; - UINT8 portB_in; - UINT8 portB_out; - UINT8 ddrB; - UINT8 portC_in; - UINT8 portC_out; - UINT8 ddrC; - int flipscreen; - int slapfight_palette_bank; - tilemap_t *pf1_tilemap; - tilemap_t *fix_tilemap; + int m_getstar_id; + UINT8 *m_slapfight_videoram; + UINT8 *m_slapfight_colorram; + UINT8 *m_slapfight_fixvideoram; + UINT8 *m_slapfight_fixcolorram; + UINT8 *m_slapfight_scrollx_lo; + UINT8 *m_slapfight_scrollx_hi; + UINT8 *m_slapfight_scrolly; + int m_slapfight_status; + int m_getstar_sequence_index; + int m_getstar_sh_intenabled; + int m_slapfight_status_state; + UINT8 m_mcu_val; + UINT8 m_getstar_cmd; + UINT8 m_gs_a; + UINT8 m_gs_d; + UINT8 m_gs_e; + UINT8 m_tigerhb_cmd; + UINT8 m_from_main; + UINT8 m_from_mcu; + int m_mcu_sent; + int m_main_sent; + UINT8 m_portA_in; + UINT8 m_portA_out; + UINT8 m_ddrA; + UINT8 m_portB_in; + UINT8 m_portB_out; + UINT8 m_ddrB; + UINT8 m_portC_in; + UINT8 m_portC_out; + UINT8 m_ddrC; + int m_flipscreen; + int m_slapfight_palette_bank; + tilemap_t *m_pf1_tilemap; + tilemap_t *m_fix_tilemap; }; @@ -60,13 +60,13 @@ public: /* due to code at 0x108d (GUARDIAN) or 0x1152 (GETSTARJ), register C is a unaltered copy of register A */ -#define GS_SAVE_REGS state->gs_a = cpu_get_reg(&space->device(), Z80_BC) >> 0; \ - state->gs_d = cpu_get_reg(&space->device(), Z80_DE) >> 8; \ - state->gs_e = cpu_get_reg(&space->device(), Z80_DE) >> 0; +#define GS_SAVE_REGS state->m_gs_a = cpu_get_reg(&space->device(), Z80_BC) >> 0; \ + state->m_gs_d = cpu_get_reg(&space->device(), Z80_DE) >> 8; \ + state->m_gs_e = cpu_get_reg(&space->device(), Z80_DE) >> 0; -#define GS_RESET_REGS state->gs_a = 0; \ - state->gs_d = 0; \ - state->gs_e = 0; +#define GS_RESET_REGS state->m_gs_a = 0; \ + state->m_gs_d = 0; \ + state->m_gs_e = 0; /*----------- defined in machine/slapfght.c -----------*/ diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index 68f7f94fca5..e0a3f2c18ee 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -21,33 +21,37 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * color_ram; - UINT16 * spriteram; - UINT16 * spriteext; - UINT16 * spriteram_buffered, *spriteram_delayed; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteext_size; - size_t spriteram_size; + UINT16 * m_color_ram; + UINT16 * m_spriteram; + UINT16 * m_spriteext; + UINT16 * m_spriteram_buffered; + UINT16 * m_spriteram_delayed; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteext_size; + size_t m_spriteram_size; /* video-related */ - struct slapshot_tempsprite *spritelist; - INT32 sprites_disabled, sprites_active_area, sprites_master_scrollx, sprites_master_scrolly; - int sprites_flipscreen; - int prepare_sprites; - int dislayer[5]; + struct slapshot_tempsprite *m_spritelist; + INT32 m_sprites_disabled; + INT32 m_sprites_active_area; + INT32 m_sprites_master_scrollx; + INT32 m_sprites_master_scrolly; + int m_sprites_flipscreen; + int m_prepare_sprites; + int m_dislayer[5]; - UINT16 spritebank[8]; + UINT16 m_spritebank[8]; /* misc */ - INT32 banknum; + INT32 m_banknum; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *tc0140syt; - device_t *tc0480scp; - device_t *tc0360pri; - device_t *tc0640fio; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_tc0140syt; + device_t *m_tc0480scp; + device_t *m_tc0360pri; + device_t *m_tc0640fio; }; diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index b066c3154bf..abbe1ea23f5 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -408,24 +408,31 @@ public: : driver_device(machine, config) { } /* misc */ - UINT16 htmult; /* in 512 wide, we run HTOTAL double and halve it on latching */ - UINT16 cgram_address; /* CGRAM address */ - UINT8 vram_read_offset; /* VRAM read offset */ - UINT8 read_ophct, read_opvct; - UINT16 hblank_offset; - UINT16 vram_fgr_high, vram_fgr_increment, vram_fgr_count, vram_fgr_mask, vram_fgr_shift, vram_read_buffer; - UINT32 wram_address; - UINT16 htime, vtime; - UINT16 vmadd; + UINT16 m_htmult; /* in 512 wide, we run HTOTAL double and halve it on latching */ + UINT16 m_cgram_address; /* CGRAM address */ + UINT8 m_vram_read_offset; /* VRAM read offset */ + UINT8 m_read_ophct; + UINT8 m_read_opvct; + UINT16 m_hblank_offset; + UINT16 m_vram_fgr_high; + UINT16 m_vram_fgr_increment; + UINT16 m_vram_fgr_count; + UINT16 m_vram_fgr_mask; + UINT16 m_vram_fgr_shift; + UINT16 m_vram_read_buffer; + UINT32 m_wram_address; + UINT16 m_htime; + UINT16 m_vtime; + UINT16 m_vmadd; /* timers */ - emu_timer *scanline_timer; - emu_timer *hblank_timer; - emu_timer *nmi_timer; - emu_timer *hirq_timer; - emu_timer *div_timer; - emu_timer *mult_timer; - emu_timer *io_timer; + emu_timer *m_scanline_timer; + emu_timer *m_hblank_timer; + emu_timer *m_nmi_timer; + emu_timer *m_hirq_timer; + emu_timer *m_div_timer; + emu_timer *m_mult_timer; + emu_timer *m_io_timer; /* DMA/HDMA-related */ struct @@ -444,33 +451,42 @@ public: int do_transfer; int dma_disabled; // used to stop DMA if HDMA is enabled (currently not implemented, see machine/snes.c) - }dma_channel[8]; - UINT8 hdmaen; /* channels enabled for HDMA */ + }m_dma_channel[8]; + UINT8 m_hdmaen; /* channels enabled for HDMA */ /* input-related */ - UINT8 joy1l, joy1h, joy2l, joy2h, joy3l, joy3h, joy4l, joy4h; - UINT16 data1[2], data2[2]; - UINT8 read_idx[2]; - snes_joypad joypad[2]; - snes_mouse mouse[2]; - snes_superscope scope[2]; + UINT8 m_joy1l; + UINT8 m_joy1h; + UINT8 m_joy2l; + UINT8 m_joy2h; + UINT8 m_joy3l; + UINT8 m_joy3h; + UINT8 m_joy4l; + UINT8 m_joy4h; + UINT16 m_data1[2]; + UINT16 m_data2[2]; + UINT8 m_read_idx[2]; + snes_joypad m_joypad[2]; + snes_mouse m_mouse[2]; + snes_superscope m_scope[2]; /* input callbacks (to allow MESS to have its own input handlers) */ - snes_io_read io_read; - snes_oldjoy_read oldjoy1_read, oldjoy2_read; + snes_io_read m_io_read; + snes_oldjoy_read m_oldjoy1_read; + snes_oldjoy_read m_oldjoy2_read; /* cart related */ - UINT8 has_addon_chip; - UINT32 cart_size; - snes_cart_info cart[2]; // the second one is used by MESS for Sufami Turbo and, eventually, BS-X + UINT8 m_has_addon_chip; + UINT32 m_cart_size; + snes_cart_info m_cart[2]; // the second one is used by MESS for Sufami Turbo and, eventually, BS-X /* devices */ - _5a22_device *maincpu; - spc700_device *soundcpu; - snes_sound_device *spc700; - cpu_device *superfx; - upd7725_device *upd7725; - upd96050_device *upd96050; + _5a22_device *m_maincpu; + spc700_device *m_soundcpu; + snes_sound_device *m_spc700; + cpu_device *m_superfx; + upd7725_device *m_upd7725; + upd96050_device *m_upd96050; }; /* Special chips, checked at init and used in memory handlers */ diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index fdfd320def3..f52968262e0 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -10,38 +10,45 @@ public: snk_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int countryc_trackball; - int last_value[2]; - int cp_count[2]; + int m_countryc_trackball; + int m_last_value[2]; + int m_cp_count[2]; - int marvins_sound_busy_flag; + int m_marvins_sound_busy_flag; // FIXME this should be initialised on machine reset - int sound_status; - - UINT8 *spriteram; - UINT8 *tx_videoram; - UINT8 *fg_videoram; - UINT8 *bg_videoram; - - tilemap_t *tx_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - int fg_scrollx, fg_scrolly, bg_scrollx, bg_scrolly; - int sp16_scrollx, sp16_scrolly, sp32_scrollx, sp32_scrolly; - UINT8 sprite_split_point; - int num_sprites, yscroll_mask; - UINT32 bg_tile_offset; - UINT32 tx_tile_offset; - int is_psychos; - - UINT8 drawmode_table[16]; - UINT8 empty_tile[16*16]; - int hf_posy; - int hf_posx; - int tc16_posy; - int tc16_posx; - int tc32_posy; - int tc32_posx; + int m_sound_status; + + UINT8 *m_spriteram; + UINT8 *m_tx_videoram; + UINT8 *m_fg_videoram; + UINT8 *m_bg_videoram; + + tilemap_t *m_tx_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + int m_fg_scrollx; + int m_fg_scrolly; + int m_bg_scrollx; + int m_bg_scrolly; + int m_sp16_scrollx; + int m_sp16_scrolly; + int m_sp32_scrollx; + int m_sp32_scrolly; + UINT8 m_sprite_split_point; + int m_num_sprites; + int m_yscroll_mask; + UINT32 m_bg_tile_offset; + UINT32 m_tx_tile_offset; + int m_is_psychos; + + UINT8 m_drawmode_table[16]; + UINT8 m_empty_tile[16*16]; + int m_hf_posy; + int m_hf_posx; + int m_tc16_posy; + int m_tc16_posx; + int m_tc32_posy; + int m_tc32_posx; }; diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index e53611166ef..965ac9b2599 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -16,19 +16,19 @@ public: snk6502_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 sasuke_counter; + UINT8 m_sasuke_counter; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *videoram2; - UINT8 *charram; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_videoram2; + UINT8 *m_charram; - int charbank; - int backcolor; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + int m_charbank; + int m_backcolor; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; - rgb_t palette[64]; + rgb_t m_palette[64]; }; diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index b16d385d277..5c6fdbbdc78 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -4,17 +4,17 @@ public: snk68_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int invert_controls; - int sound_status; + int m_invert_controls; + int m_sound_status; - UINT16* pow_fg_videoram; + UINT16* m_pow_fg_videoram; - UINT16 *spriteram; - UINT16 *paletteram; - int sprite_flip_axis; - tilemap_t *fg_tilemap; - int flipscreen; - UINT32 fg_tile_offset; + UINT16 *m_spriteram; + UINT16 *m_paletteram; + int m_sprite_flip_axis; + tilemap_t *m_fg_tilemap; + int m_flipscreen; + UINT32 m_fg_tile_offset; }; diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index 901e6a952a1..a7ffaed1294 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -4,17 +4,17 @@ public: snookr10_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int outportl; - int outporth; - int bit0; - int bit1; - int bit2; - int bit3; - int bit4; - int bit5; - UINT8 *videoram; - UINT8 *colorram; - tilemap_t *bg_tilemap; + int m_outportl; + int m_outporth; + int m_bit0; + int m_bit1; + int m_bit2; + int m_bit3; + int m_bit4; + int m_bit5; + UINT8 *m_videoram; + UINT8 *m_colorram; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index f7852c83e2f..81bf94f257a 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -6,12 +6,12 @@ public: snowbros_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *hyperpac_ram; - int sb3_music_is_playing; - int sb3_music; - UINT8 semicom_prot_offset; - UINT8 *spriteram; - UINT16 *bootleg_spriteram16; - size_t spriteram_size; + UINT16 *m_hyperpac_ram; + int m_sb3_music_is_playing; + int m_sb3_music; + UINT8 m_semicom_prot_offset; + UINT8 *m_spriteram; + UINT16 *m_bootleg_spriteram16; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index d208cb76839..bf0d527cc22 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -4,15 +4,15 @@ public: solomon_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - size_t spriteram_size; - UINT8 *spriteram; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *videoram2; - UINT8 *colorram2; + size_t m_spriteram_size; + UINT8 *m_spriteram; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_videoram2; + UINT8 *m_colorram2; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; }; diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index 0406a89af71..b01c49c42a0 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -11,20 +11,20 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - size_t videoram_size; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + size_t m_videoram_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* misc */ - int last_irq; + int m_last_irq; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 72728b20186..30af71df7af 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -30,16 +30,16 @@ public: spacefb_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 sound_latch; - emu_timer *interrupt_timer; - UINT8 *videoram; - size_t videoram_size; - UINT8 *object_present_map; - UINT8 port_0; - UINT8 port_2; - UINT32 star_shift_reg; - double color_weights_rg[3]; - double color_weights_b[2]; + UINT8 m_sound_latch; + emu_timer *m_interrupt_timer; + UINT8 *m_videoram; + size_t m_videoram_size; + UINT8 *m_object_present_map; + UINT8 m_port_0; + UINT8 m_port_2; + UINT32 m_star_shift_reg; + double m_color_weights_rg[3]; + double m_color_weights_b[2]; }; diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index a67081addaa..fa546983498 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -4,12 +4,12 @@ public: spbactn_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *bgvideoram; - UINT16 *fgvideoram; - UINT16 *spvideoram; + UINT16 *m_bgvideoram; + UINT16 *m_fgvideoram; + UINT16 *m_spvideoram; - bitmap_t *tile_bitmap_bg; - bitmap_t *tile_bitmap_fg; + bitmap_t *m_tile_bitmap_bg; + bitmap_t *m_tile_bitmap_fg; }; diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index 78a2b0d6896..3622a95f113 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -4,12 +4,12 @@ public: spcforce_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *scrollram; - UINT8 *videoram; - UINT8 *colorram; + UINT8 *m_scrollram; + UINT8 *m_videoram; + UINT8 *m_colorram; - int sn76496_latch; - int sn76496_select; + int m_sn76496_latch; + int m_sn76496_select; }; diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index 67f96f0c4cb..34ae7bbdf69 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -4,31 +4,31 @@ public: spdodgeb_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int toggle; - int adpcm_pos[2]; - int adpcm_end[2]; - int adpcm_idle[2]; - int adpcm_data[2]; - int mcu63701_command; - int inputs[4]; - UINT8 tapc[4]; - UINT8 last_port[2]; - UINT8 last_dash[2]; + int m_toggle; + int m_adpcm_pos[2]; + int m_adpcm_end[2]; + int m_adpcm_idle[2]; + int m_adpcm_data[2]; + int m_mcu63701_command; + int m_inputs[4]; + UINT8 m_tapc[4]; + UINT8 m_last_port[2]; + UINT8 m_last_dash[2]; #if 0 - int running[2]; - int jumped[2]; - int prev[2][2]; - int countup[2][2]; - int countdown[2][2]; - int prev[2]; + int m_running[2]; + int m_jumped[2]; + int m_prev[2][2]; + int m_countup[2][2]; + int m_countdown[2][2]; + int m_prev[2]; #endif - UINT8 *videoram; - int tile_palbank; - int sprite_palbank; - tilemap_t *bg_tilemap; - int lastscroll; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_videoram; + int m_tile_palbank; + int m_sprite_palbank; + tilemap_t *m_bg_tilemap; + int m_lastscroll; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index 15ee5c05895..bc16e024420 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -4,15 +4,16 @@ public: speedatk_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *colorram; - UINT8 crtc_vreg[0x100],crtc_index; - UINT8 flip_scr; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 m_crtc_vreg[0x100]; + UINT8 m_crtc_index; + UINT8 m_flip_scr; - UINT8 mux_data; - UINT8 km_status; - UINT8 coin_settings; - UINT8 coin_impulse; + UINT8 m_mux_data; + UINT8 m_km_status; + UINT8 m_coin_settings; + UINT8 m_coin_impulse; }; diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index 25f9a843552..0741bf5276e 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -4,12 +4,12 @@ public: speedbal_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *background_videoram; - UINT8 *foreground_videoram; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_background_videoram; + UINT8 *m_foreground_videoram; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index 134d61e0f41..309b0874329 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -4,11 +4,11 @@ public: speedspn_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *attram; - tilemap_t *tilemap; - UINT8 display_disable; - int bank_vidram; - UINT8* vidram; + UINT8 *m_attram; + tilemap_t *m_tilemap; + UINT8 m_display_disable; + int m_bank_vidram; + UINT8* m_vidram; }; diff --git a/src/mame/includes/spiders.h b/src/mame/includes/spiders.h index b69b6d5bf59..aee604a2076 100644 --- a/src/mame/includes/spiders.h +++ b/src/mame/includes/spiders.h @@ -13,13 +13,13 @@ public: spiders_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *ram; - UINT8 flipscreen; - UINT16 gfx_rom_address; - UINT8 gfx_rom_ctrl_mode; - UINT8 gfx_rom_ctrl_latch; - UINT8 gfx_rom_ctrl_data; - pen_t pens[NUM_PENS]; + UINT8 *m_ram; + UINT8 m_flipscreen; + UINT16 m_gfx_rom_address; + UINT8 m_gfx_rom_ctrl_mode; + UINT8 m_gfx_rom_ctrl_latch; + UINT8 m_gfx_rom_ctrl_data; + pen_t m_pens[NUM_PENS]; }; diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index 1b0943ec049..2cd55e56e1d 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -4,26 +4,30 @@ public: splash_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *vregs; - UINT16 *videoram; - UINT16 *spriteram; - UINT16 *pixelram; - UINT16 *bitmap_mode; - int bitmap_type; - int sprite_attr2_shift; - tilemap_t *bg_tilemap[2]; - - int adpcm_data; - int ret; - - int vblank_irq, sound_irq; - - int msm_data1, msm_data2; - int msm_toggle1, msm_toggle2; - int msm_source; - int snd_interrupt_enable1, snd_interrupt_enable2; - - UINT16 *protdata; + UINT16 *m_vregs; + UINT16 *m_videoram; + UINT16 *m_spriteram; + UINT16 *m_pixelram; + UINT16 *m_bitmap_mode; + int m_bitmap_type; + int m_sprite_attr2_shift; + tilemap_t *m_bg_tilemap[2]; + + int m_adpcm_data; + int m_ret; + + int m_vblank_irq; + int m_sound_irq; + + int m_msm_data1; + int m_msm_data2; + int m_msm_toggle1; + int m_msm_toggle2; + int m_msm_source; + int m_snd_interrupt_enable1; + int m_snd_interrupt_enable2; + + UINT16 *m_protdata; }; diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h index b509ade740b..8a87d40f406 100644 --- a/src/mame/includes/sprcros2.h +++ b/src/mame/includes/sprcros2.h @@ -4,14 +4,14 @@ public: sprcros2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 s_port3; + UINT8 m_s_port3; UINT8 m_port7; - tilemap_t *bgtilemap; - tilemap_t *fgtilemap; - UINT8 *fgvideoram; - UINT8 *bgvideoram; - UINT8 *spriteram; - size_t spriteram_size; + tilemap_t *m_bgtilemap; + tilemap_t *m_fgtilemap; + UINT8 *m_fgvideoram; + UINT8 *m_bgvideoram; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index a198de8ca51..f6914676b4d 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -27,15 +27,15 @@ public: sprint2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int attract; - int steering[2]; - int gear[2]; - int game; - UINT8 dial[2]; - UINT8* video_ram; - tilemap_t* bg_tilemap; - bitmap_t* helper; - int collision[2]; + int m_attract; + int m_steering[2]; + int m_gear[2]; + int m_game; + UINT8 m_dial[2]; + UINT8* m_video_ram; + tilemap_t* m_bg_tilemap; + bitmap_t* m_helper; + int m_collision[2]; }; diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index b8fdfce3662..580aecbab8d 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -4,15 +4,15 @@ public: sprint4_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - int da_latch; - int steer_FF1[4]; - int steer_FF2[4]; - int gear[4]; - UINT8 last_wheel[4]; - int collision[4]; - tilemap_t* playfield; - bitmap_t* helper; + UINT8 *m_videoram; + int m_da_latch; + int m_steer_FF1[4]; + int m_steer_FF2[4]; + int m_gear[4]; + UINT8 m_last_wheel[4]; + int m_collision[4]; + tilemap_t* m_playfield; + bitmap_t* m_helper; }; diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index e2ee61717e9..71a4f4d168d 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -6,20 +6,20 @@ public: sprint8_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int steer_dir[8]; - int steer_flag[8]; - int collision_reset; - int collision_index; - UINT8 dial[8]; - UINT8* video_ram; - UINT8* pos_h_ram; - UINT8* pos_v_ram; - UINT8* pos_d_ram; - UINT8* team; - tilemap_t* tilemap1; - tilemap_t* tilemap2; - bitmap_t* helper1; - bitmap_t* helper2; + int m_steer_dir[8]; + int m_steer_flag[8]; + int m_collision_reset; + int m_collision_index; + UINT8 m_dial[8]; + UINT8* m_video_ram; + UINT8* m_pos_h_ram; + UINT8* m_pos_v_ram; + UINT8* m_pos_d_ram; + UINT8* m_team; + tilemap_t* m_tilemap1; + tilemap_t* m_tilemap2; + bitmap_t* m_helper1; + bitmap_t* m_helper2; }; diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index 4165d99271a..577121cc550 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -11,25 +11,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; - UINT8 pmcram[0x800]; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; + UINT8 m_pmcram[0x800]; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; + int m_layer_colorbase[3]; + int m_sprite_colorbase; /* misc */ - int rambank, pmcbank; - int video_enable; - int old_3f90; + int m_rambank; + int m_pmcbank; + int m_video_enable; + int m_old_3f90; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k007232_1; - device_t *k007232_2; - device_t *k052109; - device_t *k051960; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k007232_1; + device_t *m_k007232_2; + device_t *m_k052109; + device_t *m_k051960; }; diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 2977074631d..c5e0f1b6d86 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -12,23 +12,23 @@ public: srmp2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int color_bank; - int gfx_bank; + int m_color_bank; + int m_gfx_bank; - int adpcm_bank; - int adpcm_data; - UINT32 adpcm_sptr; - UINT32 adpcm_eptr; + int m_adpcm_bank; + int m_adpcm_data; + UINT32 m_adpcm_sptr; + UINT32 m_adpcm_eptr; - int port_select; + int m_port_select; union { UINT8 *u8; UINT16 *u16; - } spriteram1, spriteram2, spriteram3; + } m_spriteram1, m_spriteram2, m_spriteram3; - iox_t iox; + iox_t m_iox; }; diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index 816868fc8dd..139eaf39b7b 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -4,11 +4,11 @@ public: srumbler_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *backgroundram; - UINT8 *foregroundram; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - int scroll[4]; + UINT8 *m_backgroundram; + UINT8 *m_foregroundram; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + int m_scroll[4]; }; diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index a871de0f751..d90b3faf404 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -5,22 +5,22 @@ class sshangha_state : public driver_device public: sshangha_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - deco_tilegen1(*this, "tilegen1") + m_deco_tilegen1(*this, "tilegen1") { } - UINT16 *prot_data; - UINT16 *sound_shared_ram; - int video_control; + UINT16 *m_prot_data; + UINT16 *m_sound_shared_ram; + int m_video_control; - UINT16* pf1_rowscroll; - UINT16* pf2_rowscroll; + UINT16* m_pf1_rowscroll; + UINT16* m_pf2_rowscroll; - UINT16* sprite_paletteram; - UINT16* sprite_paletteram2; - UINT16* tile_paletteram1; - UINT16* tile_paletteram2; + UINT16* m_sprite_paletteram; + UINT16* m_sprite_paletteram2; + UINT16* m_tile_paletteram1; + UINT16* m_tile_paletteram2; - required_device<deco16ic_device> deco_tilegen1; + required_device<deco16ic_device> m_deco_tilegen1; }; diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index d0037d19c0e..a5815e87749 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -4,29 +4,29 @@ public: sslam_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - emu_timer *music_timer; + emu_timer *m_music_timer; - int sound; - int melody; - int bar; - int track; - int snd_bank; + int m_sound; + int m_melody; + int m_bar; + int m_track; + int m_snd_bank; - UINT16 *bg_tileram; - UINT16 *tx_tileram; - UINT16 *md_tileram; - UINT16 *spriteram; - UINT16 *regs; + UINT16 *m_bg_tileram; + UINT16 *m_tx_tileram; + UINT16 *m_md_tileram; + UINT16 *m_spriteram; + UINT16 *m_regs; - UINT8 oki_control; - UINT8 oki_command; - UINT8 oki_bank; + UINT8 m_oki_control; + UINT8 m_oki_command; + UINT8 m_oki_bank; - tilemap_t *bg_tilemap; - tilemap_t *tx_tilemap; - tilemap_t *md_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_tx_tilemap; + tilemap_t *m_md_tilemap; - int sprites_x_offset; + int m_sprites_x_offset; }; diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index b9829f48fc8..f67dcea15f1 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -4,16 +4,16 @@ public: ssozumo_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - size_t spriteram_size; - UINT8 *spriteram; - UINT8 *paletteram; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *videoram2; - UINT8 *colorram2; + size_t m_spriteram_size; + UINT8 *m_spriteram; + UINT8 *m_paletteram; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_videoram2; + UINT8 *m_colorram2; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; }; diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index 58dc45f44c5..19b0f89c2c1 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -4,18 +4,18 @@ public: sspeedr_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 led_TIME[2]; - UINT8 led_SCORE[24]; - int toggle; - unsigned driver_horz; - unsigned driver_vert; - unsigned driver_pic; - unsigned drones_horz; - unsigned drones_vert[3]; - unsigned drones_mask; - unsigned track_horz; - unsigned track_vert[2]; - unsigned track_ice; + UINT8 m_led_TIME[2]; + UINT8 m_led_SCORE[24]; + int m_toggle; + unsigned m_driver_horz; + unsigned m_driver_vert; + unsigned m_driver_pic; + unsigned m_drones_horz; + unsigned m_drones_vert[3]; + unsigned m_drones_mask; + unsigned m_track_horz; + unsigned m_track_vert[2]; + unsigned m_track_ice; }; diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index 742a1676304..3d78af3f5b5 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -4,13 +4,15 @@ public: ssrj_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int oldport; - tilemap_t *tilemap1,*tilemap2,*tilemap4; - UINT8 *vram1; - UINT8 *vram2; - UINT8 *vram3; - UINT8 *vram4; - UINT8 *scrollram; + int m_oldport; + tilemap_t *m_tilemap1; + tilemap_t *m_tilemap2; + tilemap_t *m_tilemap4; + UINT8 *m_vram1; + UINT8 *m_vram2; + UINT8 *m_vram3; + UINT8 *m_vram4; + UINT8 *m_scrollram; }; diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 5ce47c6c258..92ba5ca7585 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -10,45 +10,45 @@ public: optional_device<upd96050_device> m_dsp; - UINT16 *scroll; - UINT16 *paletteram; - UINT16 *spriteram; - UINT16 *spriteram2; + UINT16 *m_scroll; + UINT16 *m_paletteram; + UINT16 *m_spriteram; + UINT16 *m_spriteram2; - int tile_code[16]; + int m_tile_code[16]; - int enable_video; - int shadow_pen_mask; - int shadow_pen_shift; + int m_enable_video; + int m_shadow_pen_mask; + int m_shadow_pen_shift; - UINT8 requested_int; - UINT16 *irq_vectors; - UINT16 irq_enable; - UINT16 *mainram; + UINT8 m_requested_int; + UINT16 *m_irq_vectors; + UINT16 m_irq_enable; + UINT16 *m_mainram; - UINT16 *dsp_ram; + UINT16 *m_dsp_ram; - UINT16 *eaglshot_gfxram; - UINT16 *gdfs_tmapram; - UINT16 *gdfs_tmapscroll; + UINT16 *m_eaglshot_gfxram; + UINT16 *m_gdfs_tmapram; + UINT16 *m_gdfs_tmapscroll; - tilemap_t *gdfs_tmap; + tilemap_t *m_gdfs_tmap; - int interrupt_ultrax; + int m_interrupt_ultrax; - UINT16 *input_sel; - int gdfs_gfxram_bank; - int gdfs_lightgun_select; - UINT16 *gdfs_blitram; + UINT16 *m_input_sel; + int m_gdfs_gfxram_bank; + int m_gdfs_lightgun_select; + UINT16 *m_gdfs_blitram; - UINT16 sxyreact_serial; - int sxyreact_dial; - UINT16 gdfs_eeprom_old; + UINT16 m_sxyreact_serial; + int m_sxyreact_dial; + UINT16 m_gdfs_eeprom_old; - UINT32 latches[8]; + UINT32 m_latches[8]; - UINT8 trackball_select; - UINT8 gfxrom_select; + UINT8 m_trackball_select; + UINT8 m_gfxrom_select; }; /*----------- defined in video/ssv.c -----------*/ diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index 54627ee6f64..f9d7a64b2e0 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -14,28 +14,28 @@ public: : driver_device(machine, config) { } /* machine state */ - int vert_pos; - int horiz_pos; - UINT8 *motor_on; + int m_vert_pos; + int m_horiz_pos; + UINT8 *m_motor_on; /* video state */ - UINT8 *videoram_b; - UINT8 *videoram_d; - UINT8 *videoram_e; - UINT8 *videoram_f; - UINT8 *palette; - UINT8 *display_buffer; - UINT8 *lamps; - - UINT8 y_scroll_d; - UINT8 y_scroll_e; - UINT8 y_scroll_f; - UINT8 frame_count; - UINT8 shot_standby; - UINT8 shot_arrive; - UINT16 beam_state; - UINT16 old_beam_state; - UINT16 beam_states_per_frame; + UINT8 *m_videoram_b; + UINT8 *m_videoram_d; + UINT8 *m_videoram_e; + UINT8 *m_videoram_f; + UINT8 *m_palette; + UINT8 *m_display_buffer; + UINT8 *m_lamps; + + UINT8 m_y_scroll_d; + UINT8 m_y_scroll_e; + UINT8 m_y_scroll_f; + UINT8 m_frame_count; + UINT8 m_shot_standby; + UINT8 m_shot_arrive; + UINT16 m_beam_state; + UINT16 m_old_beam_state; + UINT16 m_beam_states_per_frame; }; diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index e51867d026f..6523f67c250 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -4,10 +4,10 @@ public: stadhero_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *pf1_data; - tilemap_t *pf1_tilemap; - int flipscreen; - UINT16 *spriteram; + UINT16 *m_pf1_data; + tilemap_t *m_pf1_tilemap; + int m_flipscreen; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index 420af9247ed..2c049aad679 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -4,38 +4,38 @@ public: starcrus_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - bitmap_t *ship1_vid; - bitmap_t *ship2_vid; - bitmap_t *proj1_vid; - bitmap_t *proj2_vid; - - int s1_x; - int s1_y; - int s2_x; - int s2_y; - int p1_x; - int p1_y; - int p2_x; - int p2_y; - - int p1_sprite; - int p2_sprite; - int s1_sprite; - int s2_sprite; - - int engine1_on; - int engine2_on; - int explode1_on; - int explode2_on; - int launch1_on; - int launch2_on; - - int collision_reg; - - int engine_sound_playing; - int explode_sound_playing; - int launch1_sound_playing; - int launch2_sound_playing; + bitmap_t *m_ship1_vid; + bitmap_t *m_ship2_vid; + bitmap_t *m_proj1_vid; + bitmap_t *m_proj2_vid; + + int m_s1_x; + int m_s1_y; + int m_s2_x; + int m_s2_y; + int m_p1_x; + int m_p1_y; + int m_p2_x; + int m_p2_y; + + int m_p1_sprite; + int m_p2_sprite; + int m_s1_sprite; + int m_s2_sprite; + + int m_engine1_on; + int m_engine2_on; + int m_explode1_on; + int m_explode2_on; + int m_launch1_on; + int m_launch2_on; + + int m_collision_reg; + + int m_engine_sound_playing; + int m_explode_sound_playing; + int m_launch1_sound_playing; + int m_launch2_sound_playing; }; diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index fd6e4263868..c6fd778835f 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -16,20 +16,20 @@ public: starfire_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - read8_space_func input_read; + read8_space_func m_input_read; - UINT8 fireone_select; + UINT8 m_fireone_select; - UINT8 starfire_vidctrl; - UINT8 starfire_vidctrl1; - UINT8 starfire_color; - UINT16 starfire_colors[STARFIRE_NUM_PENS]; + UINT8 m_starfire_vidctrl; + UINT8 m_starfire_vidctrl1; + UINT8 m_starfire_color; + UINT16 m_starfire_colors[STARFIRE_NUM_PENS]; - UINT8 *starfire_videoram; - UINT8 *starfire_colorram; + UINT8 *m_starfire_videoram; + UINT8 *m_starfire_colorram; - emu_timer* scanline_timer; - bitmap_t *starfire_screen; + emu_timer* m_scanline_timer; + bitmap_t *m_starfire_screen; }; /*----------- defined in video/starfire.c -----------*/ diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index cc7006c07a3..f27010b0331 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -36,30 +36,30 @@ public: starshp1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int analog_in_select; - int attract; - UINT8 *playfield_ram; - UINT8 *hpos_ram; - UINT8 *vpos_ram; - UINT8 *obj_ram; - int ship_explode; - int ship_picture; - int ship_hoffset; - int ship_voffset; - int ship_size; - int circle_hpos; - int circle_vpos; - int circle_size; - int circle_mod; - int circle_kill; - int phasor; - int collision_latch; - int starfield_kill; - int mux; - int inverse; - UINT16 *LSFR; - bitmap_t *helper; - tilemap_t *bg_tilemap; + int m_analog_in_select; + int m_attract; + UINT8 *m_playfield_ram; + UINT8 *m_hpos_ram; + UINT8 *m_vpos_ram; + UINT8 *m_obj_ram; + int m_ship_explode; + int m_ship_picture; + int m_ship_hoffset; + int m_ship_voffset; + int m_ship_size; + int m_circle_hpos; + int m_circle_vpos; + int m_circle_size; + int m_circle_mod; + int m_circle_kill; + int m_phasor; + int m_collision_latch; + int m_starfield_kill; + int m_mux; + int m_inverse; + UINT16 *m_LSFR; + bitmap_t *m_helper; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h index 0a115320a79..393aa4ccd49 100644 --- a/src/mame/includes/starwars.h +++ b/src/mame/includes/starwars.h @@ -13,32 +13,32 @@ public: starwars_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 sound_data; - UINT8 main_data; - device_t *riot; - UINT8 *slapstic_source; - UINT8 *slapstic_base; - UINT8 slapstic_current_bank; - offs_t slapstic_last_pc; - offs_t slapstic_last_address; - UINT8 is_esb; - UINT8 *mathram; - UINT8 control_num; - int MPA; - int BIC; - UINT16 dvd_shift; - UINT16 quotient_shift; - UINT16 divisor; - UINT16 dividend; - UINT8 *PROM_STR; - UINT8 *PROM_MAS; - UINT8 *PROM_AM; - int math_run; - emu_timer *math_timer; - INT16 A; - INT16 B; - INT16 C; - INT32 ACC; + UINT8 m_sound_data; + UINT8 m_main_data; + device_t *m_riot; + UINT8 *m_slapstic_source; + UINT8 *m_slapstic_base; + UINT8 m_slapstic_current_bank; + offs_t m_slapstic_last_pc; + offs_t m_slapstic_last_address; + UINT8 m_is_esb; + UINT8 *m_mathram; + UINT8 m_control_num; + int m_MPA; + int m_BIC; + UINT16 m_dvd_shift; + UINT16 m_quotient_shift; + UINT16 m_divisor; + UINT16 m_dividend; + UINT8 *m_PROM_STR; + UINT8 *m_PROM_MAS; + UINT8 *m_PROM_AM; + int m_math_run; + emu_timer *m_math_timer; + INT16 m_A; + INT16 m_B; + INT16 m_C; + INT32 m_ACC; }; diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index ad682331d6a..5bfddb832c0 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -4,22 +4,22 @@ public: stfight_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *text_char_ram; - UINT8 *text_attr_ram; - UINT8 *vh_latch_ram; - UINT8 *sprite_ram; - UINT8 *decrypt; - int adpcm_data_offs; - int adpcm_data_end; - int toggle; - UINT8 fm_data; - int coin_mech_latch[2]; - int coin_mech_query_active; - int coin_mech_query; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - tilemap_t *tx_tilemap; - int sprite_base; + UINT8 *m_text_char_ram; + UINT8 *m_text_attr_ram; + UINT8 *m_vh_latch_ram; + UINT8 *m_sprite_ram; + UINT8 *m_decrypt; + int m_adpcm_data_offs; + int m_adpcm_data_end; + int m_toggle; + UINT8 m_fm_data; + int m_coin_mech_latch[2]; + int m_coin_mech_query_active; + int m_coin_mech_query; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_tx_tilemap; + int m_sprite_base; }; diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index f0c49d09937..6d337da4c5e 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -4,23 +4,23 @@ public: stlforce_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - tilemap_t *bg_tilemap; - tilemap_t *mlow_tilemap; - tilemap_t *mhigh_tilemap; - tilemap_t *tx_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_mlow_tilemap; + tilemap_t *m_mhigh_tilemap; + tilemap_t *m_tx_tilemap; - UINT16 *bg_videoram; - UINT16 *mlow_videoram; - UINT16 *mhigh_videoram; - UINT16 *tx_videoram; - UINT16 *bg_scrollram; - UINT16 *mlow_scrollram; - UINT16 *mhigh_scrollram; - UINT16 *vidattrram; + UINT16 *m_bg_videoram; + UINT16 *m_mlow_videoram; + UINT16 *m_mhigh_videoram; + UINT16 *m_tx_videoram; + UINT16 *m_bg_scrollram; + UINT16 *m_mlow_scrollram; + UINT16 *m_mhigh_scrollram; + UINT16 *m_vidattrram; - UINT16 *spriteram; + UINT16 *m_spriteram; - int sprxoffs; + int m_sprxoffs; }; diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h index 934a5c9f978..8932d679235 100644 --- a/src/mame/includes/strnskil.h +++ b/src/mame/includes/strnskil.h @@ -4,12 +4,12 @@ public: strnskil_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *xscroll; - UINT8 scrl_ctrl; - tilemap_t *bg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_videoram; + UINT8 *m_xscroll; + UINT8 m_scrl_ctrl; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index a54a9f8c400..0b5000b7dbd 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -22,14 +22,14 @@ public: subs_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *spriteram; - int steering_buf1; - int steering_buf2; - int steering_val1; - int steering_val2; - int last_val_1; - int last_val_2; + UINT8 *m_videoram; + UINT8 *m_spriteram; + int m_steering_buf1; + int m_steering_buf2; + int m_steering_val1; + int m_steering_val2; + int m_last_val_1; + int m_last_val_2; }; diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index c34b3f0c562..5fab251677f 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -4,11 +4,11 @@ public: suna16_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 prot; - UINT16 *paletteram; - UINT16 *spriteram; - UINT16 *spriteram2; - int color_bank; + UINT16 m_prot; + UINT16 *m_paletteram; + UINT16 *m_spriteram; + UINT16 *m_spriteram2; + int m_color_bank; }; diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 883c8dbbd21..c2b2d243ba8 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -8,31 +8,31 @@ public: suna8_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 rombank; - UINT8 spritebank; - UINT8 palettebank; - UINT8 unknown; + UINT8 m_rombank; + UINT8 m_spritebank; + UINT8 m_palettebank; + UINT8 m_unknown; - UINT8 protection_val; - UINT8 nmi_enable; - UINT8 spritebank_latch; - UINT8 trash_prot; + UINT8 m_protection_val; + UINT8 m_nmi_enable; + UINT8 m_spritebank_latch; + UINT8 m_trash_prot; - UINT8 *hardhead_ip; - UINT8 *wram; - UINT8 *spriteram; + UINT8 *m_hardhead_ip; + UINT8 *m_wram; + UINT8 *m_spriteram; - int text_dim; /* specifies format of text layer */ + int m_text_dim; /* specifies format of text layer */ #if TILEMAPS - tilemap_t *bg_tilemap; - int tiles; - int trombank; - int page; + tilemap_t *m_bg_tilemap; + int m_tiles; + int m_trombank; + int m_page; #endif - INT16 *samplebuf; - int sample; + INT16 *m_samplebuf; + int m_sample; }; diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h index aafe2b222bf..cf11fd1c8c7 100644 --- a/src/mame/includes/supbtime.h +++ b/src/mame/includes/supbtime.h @@ -11,18 +11,18 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling (in decocomn.c) - size_t spriteram_size; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling (in decocomn.c) + size_t m_spriteram_size; /* video-related */ /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *deco_tilegen1; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_deco_tilegen1; }; diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index dc803576b90..5e28ca5cc04 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -14,14 +14,14 @@ public: superchs_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 coin_word; - UINT32 *ram; - UINT32 *shared_ram; - int steer; - struct tempsprite *spritelist; - UINT32 mem[2]; - UINT32 *spriteram; - size_t spriteram_size; + UINT16 m_coin_word; + UINT32 *m_ram; + UINT32 *m_shared_ram; + int m_steer; + struct tempsprite *m_spritelist; + UINT32 m_mem[2]; + UINT32 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index 28e52f45d2c..8c47ca312bd 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -4,34 +4,34 @@ public: superqix_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - INT16 *samplebuf; - UINT8 port1; - UINT8 port2; - UINT8 port3; - UINT8 port3_latch; - UINT8 from_mcu; - UINT8 from_z80; - UINT8 portb; - int from_mcu_pending; - int from_z80_pending; - int invert_coin_lockout; - int oldpos[2]; - int sign[2]; - UINT8 portA_in; - UINT8 portB_out; - UINT8 portC; - int curr_player; - UINT8 *videoram; - UINT8 *bitmapram; - UINT8 *bitmapram2; - int pbillian_show_power; - int gfxbank; - bitmap_t *fg_bitmap[2]; - int show_bitmap; - tilemap_t *bg_tilemap; - int last_power[2]; - UINT8 *spriteram; - size_t spriteram_size; + INT16 *m_samplebuf; + UINT8 m_port1; + UINT8 m_port2; + UINT8 m_port3; + UINT8 m_port3_latch; + UINT8 m_from_mcu; + UINT8 m_from_z80; + UINT8 m_portb; + int m_from_mcu_pending; + int m_from_z80_pending; + int m_invert_coin_lockout; + int m_oldpos[2]; + int m_sign[2]; + UINT8 m_portA_in; + UINT8 m_portB_out; + UINT8 m_portC; + int m_curr_player; + UINT8 *m_videoram; + UINT8 *m_bitmapram; + UINT8 *m_bitmapram2; + int m_pbillian_show_power; + int m_gfxbank; + bitmap_t *m_fg_bitmap[2]; + int m_show_bitmap; + tilemap_t *m_bg_tilemap; + int m_last_power[2]; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index 10da30163fe..91904c84436 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -4,12 +4,12 @@ public: suprloco_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *scrollram; - tilemap_t *bg_tilemap; - int control; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_videoram; + UINT8 *m_scrollram; + tilemap_t *m_bg_tilemap; + int m_control; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index c399a77b9fa..a5890db662e 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -6,7 +6,7 @@ public: skns_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - sknsspr_device* spritegen; + sknsspr_device* m_spritegen; }; extern UINT32 *skns_tilemapA_ram, *skns_tilemapB_ram, *skns_v3slc_ram; diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index f20c53b2a0c..a64d78a941b 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -10,16 +10,16 @@ public: suprridr_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 nmi_enable; - UINT8 sound_data; - UINT8 *fgram; - UINT8 *bgram; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - tilemap_t *bg_tilemap_noscroll; - UINT8 flipx; - UINT8 flipy; - UINT8 *spriteram; + UINT8 m_nmi_enable; + UINT8 m_sound_data; + UINT8 *m_fgram; + UINT8 *m_bgram; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_bg_tilemap_noscroll; + UINT8 m_flipx; + UINT8 m_flipy; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 90db6647dfd..3666f08aa93 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -11,24 +11,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * screen_videoram; - UINT16 * bg_videoram; - UINT16 * sp_videoram; - UINT16 * spriteram; -// UINT16 * paletteram; // this currently uses generic palette handling + UINT16 * m_screen_videoram; + UINT16 * m_bg_videoram; + UINT16 * m_sp_videoram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // this currently uses generic palette handling /* video-related */ - tilemap_t *screen_tilemap, *bg_tilemap; - UINT16 screen_bank, bg_bank; - UINT16 *spr_ctrl; - UINT16 *screen_vregs; + tilemap_t *m_screen_tilemap; + tilemap_t *m_bg_tilemap; + UINT16 m_screen_bank; + UINT16 m_bg_bank; + UINT16 *m_spr_ctrl; + UINT16 *m_screen_vregs; /* misc */ - int pending_command; + int m_pending_command; /* devices */ - device_t *audiocpu; - device_t *k053936; + device_t *m_audiocpu; + device_t *m_k053936; }; diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index 18860e1ac39..e90603e213d 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -11,21 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; - int layerpri[3]; + int m_layer_colorbase[3]; + int m_sprite_colorbase; + int m_layerpri[3]; /* misc */ - int videobank; + int m_videobank; /* devices */ - device_t *maincpu; - device_t *k052109; - device_t *k053244; - device_t *k053251; + device_t *m_maincpu; + device_t *m_k052109; + device_t *m_k053244; + device_t *m_k053251; }; /*----------- defined in video/surpratk.c -----------*/ diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 76531fd4a4c..5cffe12a6fb 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -4,27 +4,27 @@ public: system1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - void (*videomode_custom)(running_machine &machine, UINT8 data, UINT8 prevdata); - UINT8 mute_xor; - UINT8 *ram; - UINT8 dakkochn_mux_data; - UINT8 videomode_prev; - UINT8 mcu_control; - UINT8 *nob_mcu_status; - UINT8 *nob_mcu_latch; - UINT8 nob_maincpu_latch; - int nobb_inport23_step; - UINT8 *mix_collide; - UINT8 mix_collide_summary; - UINT8 *sprite_collide; - UINT8 sprite_collide_summary; - bitmap_t *sprite_bitmap; - UINT8 video_mode; - UINT8 videoram_bank; - tilemap_t *tilemap_page[8]; - UINT8 tilemap_pages; - UINT8 *spriteram; + UINT8 *m_videoram; + void (*m_videomode_custom)(running_machine &machine, UINT8 data, UINT8 prevdata); + UINT8 m_mute_xor; + UINT8 *m_ram; + UINT8 m_dakkochn_mux_data; + UINT8 m_videomode_prev; + UINT8 m_mcu_control; + UINT8 *m_nob_mcu_status; + UINT8 *m_nob_mcu_latch; + UINT8 m_nob_maincpu_latch; + int m_nobb_inport23_step; + UINT8 *m_mix_collide; + UINT8 m_mix_collide_summary; + UINT8 *m_sprite_collide; + UINT8 m_sprite_collide_summary; + bitmap_t *m_sprite_bitmap; + UINT8 m_video_mode; + UINT8 m_videoram_bank; + tilemap_t *m_tilemap_page[8]; + UINT8 m_tilemap_pages; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index 21603b40202..40dca40376f 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -7,88 +7,97 @@ public: segas1x_bootleg_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 * bg0_tileram; - UINT16 * bg1_tileram; - UINT16 * textram; - UINT16 * tileram; + UINT16 * m_bg0_tileram; + UINT16 * m_bg1_tileram; + UINT16 * m_textram; + UINT16 * m_tileram; - UINT16 coinctrl; + UINT16 m_coinctrl; /* game specific */ - int passht4b_io1_val; - int passht4b_io2_val; - int passht4b_io3_val; + int m_passht4b_io1_val; + int m_passht4b_io2_val; + int m_passht4b_io3_val; - int beautyb_unkx; + int m_beautyb_unkx; - int shinobl_kludge; + int m_shinobl_kludge; - UINT16* goldnaxeb2_fgpage; - UINT16* goldnaxeb2_bgpage; + UINT16* m_goldnaxeb2_fgpage; + UINT16* m_goldnaxeb2_bgpage; - int eswat_tilebank0; + int m_eswat_tilebank0; /* video-related */ - tilemap_t *background, *foreground, *text_layer; - tilemap_t *background2, *foreground2; - tilemap_t *bg_tilemaps[2]; - tilemap_t *text_tilemap; - double weights[2][3][6]; + tilemap_t *m_background; + tilemap_t *m_foreground; + tilemap_t *m_text_layer; + tilemap_t *m_background2; + tilemap_t *m_foreground2; + tilemap_t *m_bg_tilemaps[2]; + tilemap_t *m_text_tilemap; + double m_weights[2][3][6]; - int spritebank_type; - int back_yscroll; - int fore_yscroll; - int text_yscroll; + int m_spritebank_type; + int m_back_yscroll; + int m_fore_yscroll; + int m_text_yscroll; - int bg1_trans; // alien syn + sys18 + int m_bg1_trans; // alien syn + sys18 - int tile_bank1; - int tile_bank0; - int bg_page[4]; - int fg_page[4]; + int m_tile_bank1; + int m_tile_bank0; + int m_bg_page[4]; + int m_fg_page[4]; - UINT16 datsu_page[4]; + UINT16 m_datsu_page[4]; - int bg2_page[4]; - int fg2_page[4]; + int m_bg2_page[4]; + int m_fg2_page[4]; - int old_bg_page[4],old_fg_page[4], old_tile_bank1, old_tile_bank0; - int old_bg2_page[4], old_fg2_page[4]; + int m_old_bg_page[4]; + int m_old_fg_page[4]; + int m_old_tile_bank1; + int m_old_tile_bank0; + int m_old_bg2_page[4]; + int m_old_fg2_page[4]; - int bg_scrollx, bg_scrolly; - int fg_scrollx, fg_scrolly; - UINT16 tilemapselect; + int m_bg_scrollx; + int m_bg_scrolly; + int m_fg_scrollx; + int m_fg_scrolly; + UINT16 m_tilemapselect; - int textlayer_lo_min; - int textlayer_lo_max; - int textlayer_hi_min; - int textlayer_hi_max; + int m_textlayer_lo_min; + int m_textlayer_lo_max; + int m_textlayer_hi_min; + int m_textlayer_hi_max; - int tilebank_switch; + int m_tilebank_switch; /* sound-related */ - int sample_buffer; - int sample_select; + int m_sample_buffer; + int m_sample_select; - UINT8 *soundbank_ptr; /* Pointer to currently selected portion of ROM */ + UINT8 *m_soundbank_ptr; /* Pointer to currently selected portion of ROM */ /* sys18 */ - UINT8 *sound_bank; - UINT16 *splittab_bg_x; - UINT16 *splittab_bg_y; - UINT16 *splittab_fg_x; - UINT16 *splittab_fg_y; - int sound_info[4*2]; - int refreshenable; - int system18; + UINT8 *m_sound_bank; + UINT16 *m_splittab_bg_x; + UINT16 *m_splittab_bg_y; + UINT16 *m_splittab_fg_x; + UINT16 *m_splittab_fg_y; + int m_sound_info[4*2]; + int m_refreshenable; + int m_system18; - UINT8 *decrypted_region; // goldnaxeb1 & bayrouteb1 + UINT8 *m_decrypted_region; // goldnaxeb1 & bayrouteb1 /* devices */ - device_t *maincpu; - device_t *soundcpu; + device_t *m_maincpu; + device_t *m_soundcpu; }; /*----------- defined in video/system16.c -----------*/ diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index f74eb3e6443..9747d76775a 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -4,11 +4,11 @@ public: tagteam_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int coin; - UINT8 *videoram; - UINT8 *colorram; - int palettebank; - tilemap_t *bg_tilemap; + int m_coin; + UINT8 *m_videoram; + UINT8 *m_colorram; + int m_palettebank; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index b0f80011861..871830d7b44 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -11,20 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * bgvideoram; - UINT16 * spriteram; - UINT16 * zoomdata; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; + UINT16 * m_bgvideoram; + UINT16 * m_spriteram; + UINT16 * m_zoomdata; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int charbank, charpalette, video_enable; + tilemap_t *m_bg_tilemap; + int m_charbank; + int m_charpalette; + int m_video_enable; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k051316; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k051316; }; diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index e3227deff77..5c242369b59 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -6,31 +6,32 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * spriteram; - UINT16 * pixelram; -// UINT16 * paletteram; // this currently uses generic palette handlers + UINT16 * m_spriteram; + UINT16 * m_pixelram; +// UINT16 * m_paletteram; // this currently uses generic palette handlers /* video-related */ /* framebuffer is a raw bitmap, remapped as a last step */ - bitmap_t *framebuffer[2], *pixel_bitmap; + bitmap_t *m_framebuffer[2]; + bitmap_t *m_pixel_bitmap; - UINT16 pixel_scroll[2]; + UINT16 m_pixel_scroll[2]; - int b_fg_color_base; - int b_sp_color_base; + int m_b_fg_color_base; + int m_b_sp_color_base; /* misc */ - UINT16 eep_latch; - UINT16 coin_word; + UINT16 m_eep_latch; + UINT16 m_coin_word; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *mb87078; - device_t *ym; - device_t *tc0180vcu; - device_t *tc0640fio; - device_t *tc0220ioc; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_mb87078; + device_t *m_ym; + device_t *m_tc0180vcu; + device_t *m_tc0640fio; + device_t *m_tc0220ioc; }; diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index fe04e96e004..70f36d15ffd 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -15,67 +15,71 @@ class taitof2_state : public driver_device public: taitof2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - oki(*this, "oki") { } + m_oki(*this, "oki") { } /* memory pointers */ - UINT16 * sprite_extension; - UINT16 * spriteram; - UINT16 * spriteram_buffered; - UINT16 * spriteram_delayed; - UINT16 * cchip2_ram; // for megablst only -// UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; - size_t spriteext_size; + UINT16 * m_sprite_extension; + UINT16 * m_spriteram; + UINT16 * m_spriteram_buffered; + UINT16 * m_spriteram_delayed; + UINT16 * m_cchip2_ram; // for megablst only +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_spriteram_size; + size_t m_spriteext_size; /* video-related */ - struct f2_tempsprite *spritelist; - int sprite_type; + struct f2_tempsprite *m_spritelist; + int m_sprite_type; - UINT16 spritebank[8]; -// UINT16 spritebank_eof[8]; - UINT16 spritebank_buffered[8]; + UINT16 m_spritebank[8]; +// UINT16 m_spritebank_eof[8]; + UINT16 m_spritebank_buffered[8]; - INT32 sprites_disabled, sprites_active_area, sprites_master_scrollx, sprites_master_scrolly; + INT32 m_sprites_disabled; + INT32 m_sprites_active_area; + INT32 m_sprites_master_scrollx; + INT32 m_sprites_master_scrolly; /* remember flip status over frames because driftout can fail to set it */ - INT32 sprites_flipscreen; + INT32 m_sprites_flipscreen; /* On the left hand screen edge (assuming horiz screen, no screenflip: in screenflip it is the right hand edge etc.) there may be 0-3 unwanted pixels in both tilemaps *and* sprites. To erase this we use f2_hide_pixels (0 to +3). */ - INT32 hide_pixels; - INT32 flip_hide_pixels; /* Different in some games */ + INT32 m_hide_pixels; + INT32 m_flip_hide_pixels; /* Different in some games */ - INT32 pivot_xdisp; /* Needed in games with a pivot layer */ - INT32 pivot_ydisp; + INT32 m_pivot_xdisp; /* Needed in games with a pivot layer */ + INT32 m_pivot_ydisp; - INT32 game; + INT32 m_game; - UINT8 tilepri[6]; // todo - move into taitoic.c - UINT8 spritepri[6]; // todo - move into taitoic.c - UINT8 spriteblendmode; // todo - move into taitoic.c + UINT8 m_tilepri[6]; // todo - move into taitoic.c + UINT8 m_spritepri[6]; // todo - move into taitoic.c + UINT8 m_spriteblendmode; // todo - move into taitoic.c - int prepare_sprites; + int m_prepare_sprites; /* misc */ - INT32 mjnquest_input; - int last[2], nibble; - INT32 driveout_sound_latch; - INT32 oki_bank; + INT32 m_mjnquest_input; + int m_last[2]; + int m_nibble; + INT32 m_driveout_sound_latch; + INT32 m_oki_bank; /* devices */ - device_t *maincpu; - device_t *audiocpu; - optional_device<okim6295_device> oki; - device_t *tc0100scn; - device_t *tc0100scn_1; - device_t *tc0100scn_2; - device_t *tc0360pri; - device_t *tc0280grd; - device_t *tc0430grw; - device_t *tc0480scp; + device_t *m_maincpu; + device_t *m_audiocpu; + optional_device<okim6295_device> m_oki; + device_t *m_tc0100scn; + device_t *m_tc0100scn_1; + device_t *m_tc0100scn_2; + device_t *m_tc0360pri; + device_t *m_tc0280grd; + device_t *m_tc0430grw; + device_t *m_tc0480scp; }; /*----------- defined in video/taito_f2.c -----------*/ diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index ea5b4d9cd1a..2928821b9af 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -45,145 +45,145 @@ public: taito_f3_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 *videoram; - UINT32 *spriteram; - size_t spriteram_size; - UINT32 coin_word[2]; - UINT32 *f3_ram; - int f3_game; - UINT32 *f3_vram; - UINT32 *f3_line_ram; - UINT32 *f3_pf_data; - UINT32 *f3_pivot_ram; - tilemap_t *pf1_tilemap; - tilemap_t *pf2_tilemap; - tilemap_t *pf3_tilemap; - tilemap_t *pf4_tilemap; - tilemap_t *pixel_layer; - tilemap_t *vram_layer; - UINT32 *spriteram32_buffered; - UINT32 f3_control_0[8]; - UINT32 f3_control_1[8]; - int flipscreen; - UINT8 sprite_extra_planes; - UINT8 sprite_pen_mask; - UINT32 *f3_pf_data_1; - UINT32 *f3_pf_data_2; - UINT32 *f3_pf_data_3; - UINT32 *f3_pf_data_4; - int f3_skip_this_frame; - int sprite_lag; - UINT8 sprite_pri_usage; - bitmap_t *pri_alp_bitmap; - int f3_alpha_level_2as; - int f3_alpha_level_2ad; - int f3_alpha_level_3as; - int f3_alpha_level_3ad; - int f3_alpha_level_2bs; - int f3_alpha_level_2bd; - int f3_alpha_level_3bs; - int f3_alpha_level_3bd; - int alpha_level_last; - int width_mask; - int twidth_mask; - int twidth_mask_bit; - UINT8 *tile_opaque_sp; - UINT8 *tile_opaque_pf[4]; - UINT8 add_sat[256][256]; - int alpha_s_1_1; - int alpha_s_1_2; - int alpha_s_1_4; - int alpha_s_1_5; - int alpha_s_1_6; - int alpha_s_1_8; - int alpha_s_1_9; - int alpha_s_1_a; - int alpha_s_2a_0; - int alpha_s_2a_4; - int alpha_s_2a_8; - int alpha_s_2b_0; - int alpha_s_2b_4; - int alpha_s_2b_8; - int alpha_s_3a_0; - int alpha_s_3a_1; - int alpha_s_3a_2; - int alpha_s_3b_0; - int alpha_s_3b_1; - int alpha_s_3b_2; - UINT32 dval; - UINT8 pval; - UINT8 tval; - UINT8 pdest_2a; - UINT8 pdest_2b; - int tr_2a; - int tr_2b; - UINT8 pdest_3a; - UINT8 pdest_3b; - int tr_3a; - int tr_3b; - UINT16 *src0; - UINT16 *src_s0; - UINT16 *src_e0; - UINT16 clip_al0; - UINT16 clip_ar0; - UINT16 clip_bl0; - UINT16 clip_br0; - UINT8 *tsrc0; - UINT8 *tsrc_s0; - UINT32 x_count0; - UINT32 x_zoom0; - UINT16 *src1; - UINT16 *src_s1; - UINT16 *src_e1; - UINT16 clip_al1; - UINT16 clip_ar1; - UINT16 clip_bl1; - UINT16 clip_br1; - UINT8 *tsrc1; - UINT8 *tsrc_s1; - UINT32 x_count1; - UINT32 x_zoom1; - UINT16 *src2; - UINT16 *src_s2; - UINT16 *src_e2; - UINT16 clip_al2; - UINT16 clip_ar2; - UINT16 clip_bl2; - UINT16 clip_br2; - UINT8 *tsrc2; - UINT8 *tsrc_s2; - UINT32 x_count2; - UINT32 x_zoom2; - UINT16 *src3; - UINT16 *src_s3; - UINT16 *src_e3; - UINT16 clip_al3; - UINT16 clip_ar3; - UINT16 clip_bl3; - UINT16 clip_br3; - UINT8 *tsrc3; - UINT8 *tsrc_s3; - UINT32 x_count3; - UINT32 x_zoom3; - UINT16 *src4; - UINT16 *src_s4; - UINT16 *src_e4; - UINT16 clip_al4; - UINT16 clip_ar4; - UINT16 clip_bl4; - UINT16 clip_br4; - UINT8 *tsrc4; - UINT8 *tsrc_s4; - UINT32 x_count4; - UINT32 x_zoom4; - struct tempsprite *spritelist; - const struct tempsprite *sprite_end; - struct f3_playfield_line_inf *pf_line_inf; - struct f3_spritealpha_line_inf *sa_line_inf; - const struct F3config *f3_game_config; - int (*dpix_n[8][16])(taito_f3_state *state, UINT32 s_pix); - int (**dpix_lp[5])(taito_f3_state *state, UINT32 s_pix); - int (**dpix_sp[9])(taito_f3_state *state, UINT32 s_pix); + UINT32 *m_videoram; + UINT32 *m_spriteram; + size_t m_spriteram_size; + UINT32 m_coin_word[2]; + UINT32 *m_f3_ram; + int m_f3_game; + UINT32 *m_f3_vram; + UINT32 *m_f3_line_ram; + UINT32 *m_f3_pf_data; + UINT32 *m_f3_pivot_ram; + tilemap_t *m_pf1_tilemap; + tilemap_t *m_pf2_tilemap; + tilemap_t *m_pf3_tilemap; + tilemap_t *m_pf4_tilemap; + tilemap_t *m_pixel_layer; + tilemap_t *m_vram_layer; + UINT32 *m_spriteram32_buffered; + UINT32 m_f3_control_0[8]; + UINT32 m_f3_control_1[8]; + int m_flipscreen; + UINT8 m_sprite_extra_planes; + UINT8 m_sprite_pen_mask; + UINT32 *m_f3_pf_data_1; + UINT32 *m_f3_pf_data_2; + UINT32 *m_f3_pf_data_3; + UINT32 *m_f3_pf_data_4; + int m_f3_skip_this_frame; + int m_sprite_lag; + UINT8 m_sprite_pri_usage; + bitmap_t *m_pri_alp_bitmap; + int m_f3_alpha_level_2as; + int m_f3_alpha_level_2ad; + int m_f3_alpha_level_3as; + int m_f3_alpha_level_3ad; + int m_f3_alpha_level_2bs; + int m_f3_alpha_level_2bd; + int m_f3_alpha_level_3bs; + int m_f3_alpha_level_3bd; + int m_alpha_level_last; + int m_width_mask; + int m_twidth_mask; + int m_twidth_mask_bit; + UINT8 *m_tile_opaque_sp; + UINT8 *m_tile_opaque_pf[4]; + UINT8 m_add_sat[256][256]; + int m_alpha_s_1_1; + int m_alpha_s_1_2; + int m_alpha_s_1_4; + int m_alpha_s_1_5; + int m_alpha_s_1_6; + int m_alpha_s_1_8; + int m_alpha_s_1_9; + int m_alpha_s_1_a; + int m_alpha_s_2a_0; + int m_alpha_s_2a_4; + int m_alpha_s_2a_8; + int m_alpha_s_2b_0; + int m_alpha_s_2b_4; + int m_alpha_s_2b_8; + int m_alpha_s_3a_0; + int m_alpha_s_3a_1; + int m_alpha_s_3a_2; + int m_alpha_s_3b_0; + int m_alpha_s_3b_1; + int m_alpha_s_3b_2; + UINT32 m_dval; + UINT8 m_pval; + UINT8 m_tval; + UINT8 m_pdest_2a; + UINT8 m_pdest_2b; + int m_tr_2a; + int m_tr_2b; + UINT8 m_pdest_3a; + UINT8 m_pdest_3b; + int m_tr_3a; + int m_tr_3b; + UINT16 *m_src0; + UINT16 *m_src_s0; + UINT16 *m_src_e0; + UINT16 m_clip_al0; + UINT16 m_clip_ar0; + UINT16 m_clip_bl0; + UINT16 m_clip_br0; + UINT8 *m_tsrc0; + UINT8 *m_tsrc_s0; + UINT32 m_x_count0; + UINT32 m_x_zoom0; + UINT16 *m_src1; + UINT16 *m_src_s1; + UINT16 *m_src_e1; + UINT16 m_clip_al1; + UINT16 m_clip_ar1; + UINT16 m_clip_bl1; + UINT16 m_clip_br1; + UINT8 *m_tsrc1; + UINT8 *m_tsrc_s1; + UINT32 m_x_count1; + UINT32 m_x_zoom1; + UINT16 *m_src2; + UINT16 *m_src_s2; + UINT16 *m_src_e2; + UINT16 m_clip_al2; + UINT16 m_clip_ar2; + UINT16 m_clip_bl2; + UINT16 m_clip_br2; + UINT8 *m_tsrc2; + UINT8 *m_tsrc_s2; + UINT32 m_x_count2; + UINT32 m_x_zoom2; + UINT16 *m_src3; + UINT16 *m_src_s3; + UINT16 *m_src_e3; + UINT16 m_clip_al3; + UINT16 m_clip_ar3; + UINT16 m_clip_bl3; + UINT16 m_clip_br3; + UINT8 *m_tsrc3; + UINT8 *m_tsrc_s3; + UINT32 m_x_count3; + UINT32 m_x_zoom3; + UINT16 *m_src4; + UINT16 *m_src_s4; + UINT16 *m_src_e4; + UINT16 m_clip_al4; + UINT16 m_clip_ar4; + UINT16 m_clip_bl4; + UINT16 m_clip_br4; + UINT8 *m_tsrc4; + UINT8 *m_tsrc_s4; + UINT32 m_x_count4; + UINT32 m_x_zoom4; + struct tempsprite *m_spritelist; + const struct tempsprite *m_sprite_end; + struct f3_playfield_line_inf *m_pf_line_inf; + struct f3_spritealpha_line_inf *m_sa_line_inf; + const struct F3config *m_f3_game_config; + int (*m_dpix_n[8][16])(taito_f3_state *state, UINT32 s_pix); + int (**m_dpix_lp[5])(taito_f3_state *state, UINT32 s_pix); + int (**m_dpix_sp[9])(taito_f3_state *state, UINT32 s_pix); }; diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index 8663465ac9e..f860b4b225e 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -11,17 +11,17 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * m68000_mainram; + UINT16 * m_m68000_mainram; // UINT16 * paletteram; // currently this uses generic palette handling /* misc */ - INT32 banknum; + INT32 m_banknum; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *tc0080vco; - device_t *tc0220ioc; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_tc0080vco; + device_t *m_tc0220ioc; }; /*----------- defined in video/taito_h.c -----------*/ diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 27adcdf20ab..7db85c97e18 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -8,50 +8,57 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * shared_ram; + UINT8 * m_shared_ram; /* video-related */ - tilemap_t *bg18_tilemap, *bg19_tilemap, *ch1a_tilemap; - UINT8 buff_spriteram[TAITOL_SPRITERAM_SIZE]; - int cur_ctrl; - int horshoes_gfxbank; - int bankc[4]; - int flipscreen; + tilemap_t *m_bg18_tilemap; + tilemap_t *m_bg19_tilemap; + tilemap_t *m_ch1a_tilemap; + UINT8 m_buff_spriteram[TAITOL_SPRITERAM_SIZE]; + int m_cur_ctrl; + int m_horshoes_gfxbank; + int m_bankc[4]; + int m_flipscreen; /* misc */ - void (*current_notifier[4])(running_machine &, int); - UINT8 *current_base[4]; + void (*m_current_notifier[4])(running_machine &, int); + UINT8 *m_current_base[4]; - int cur_rombank, cur_rombank2, cur_rambank[4]; - int irq_adr_table[3]; - int irq_enable; - int adpcm_pos; - int adpcm_data; - int trackx, tracky; - int mux_ctrl; - int extport; - int last_irq_level; - int high; - int high2; - int last_data_adr, last_data; - int cur_bank; + int m_cur_rombank; + int m_cur_rombank2; + int m_cur_rambank[4]; + int m_irq_adr_table[3]; + int m_irq_enable; + int m_adpcm_pos; + int m_adpcm_data; + int m_trackx; + int m_tracky; + int m_mux_ctrl; + int m_extport; + int m_last_irq_level; + int m_high; + int m_high2; + int m_last_data_adr; + int m_last_data; + int m_cur_bank; - const UINT8 *mcu_reply; - int mcu_pos, mcu_reply_len; + const UINT8 *m_mcu_reply; + int m_mcu_pos; + int m_mcu_reply_len; - const char *porte0_tag; - const char *porte1_tag; - const char *portf0_tag; - const char *portf1_tag; + const char *m_porte0_tag; + const char *m_porte1_tag; + const char *m_portf0_tag; + const char *m_portf1_tag; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; /* memory buffers */ - UINT8 rambanks[0x1000 * 12]; - UINT8 palette_ram[0x1000]; - UINT8 empty_ram[0x1000]; + UINT8 m_rambanks[0x1000 * 12]; + UINT8 m_palette_ram[0x1000]; + UINT8 m_empty_ram[0x1000]; }; /*----------- defined in video/taito_l.c -----------*/ diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index daee027bc39..0e3a43ed4e9 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -14,8 +14,8 @@ public: // UINT16 * paletteram; // currently this uses generic palette handling /* devices */ - device_t *maincpu; - device_t *tc0080vco; + device_t *m_maincpu; + device_t *m_tc0080vco; }; /*----------- defined in video/taito_o.c -----------*/ diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index dae63d33229..237af045d66 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -12,38 +12,38 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * spriteram; + UINT16 * m_spriteram; // UINT16 * paletteram; // currently this uses generic palette handling - offs_t spriteram_size; + offs_t m_spriteram_size; /* video-related */ - int sci_spriteframe; - int road_palbank; + int m_sci_spriteframe; + int m_road_palbank; /* misc */ - int chasehq_lamps; - INT32 banknum; - UINT16 cpua_ctrl; - INT32 sci_int6; - INT32 dblaxle_int6; - INT32 ioc220_port; - UINT16 eep_latch; + int m_chasehq_lamps; + INT32 m_banknum; + UINT16 m_cpua_ctrl; + INT32 m_sci_int6; + INT32 m_dblaxle_int6; + INT32 m_ioc220_port; + UINT16 m_eep_latch; // UINT8 pandata[4]; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *subcpu; - device_t *eeprom; - device_t *tc0480scp; - device_t *tc0150rod; - device_t *tc0100scn; - device_t *tc0220ioc; - device_t *tc0140syt; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_subcpu; + device_t *m_eeprom; + device_t *m_tc0480scp; + device_t *m_tc0150rod; + device_t *m_tc0100scn; + device_t *m_tc0220ioc; + device_t *m_tc0140syt; /* dblaxle motor flag */ - int dblaxle_vibration; + int m_dblaxle_vibration; }; /*----------- defined in video/taito_z.c -----------*/ diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 599d09d2507..fbe388b4793 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -24,22 +24,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * m68000_mainram; - UINT16 * line_ram; - UINT16 * dsp_ram; /* Shared 68000/TMS32025 RAM */ - UINT16 * paletteram; + UINT16 * m_m68000_mainram; + UINT16 * m_line_ram; + UINT16 * m_dsp_ram; /* Shared 68000/TMS32025 RAM */ + UINT16 * m_paletteram; /* video-related */ - taitoair_poly q; + taitoair_poly m_q; /* misc */ - int dsp_hold_signal; - INT32 banknum; + int m_dsp_hold_signal; + INT32 m_banknum; /* devices */ - device_t *audiocpu; - device_t *dsp; - device_t *tc0080vco; + device_t *m_audiocpu; + device_t *m_dsp; + device_t *m_tc0080vco; }; diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index 7063a33a3fb..4a85b4f26f4 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -6,54 +6,54 @@ public: taitojc_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int texture_x; - int texture_y; + int m_texture_x; + int m_texture_y; - UINT32 dsp_rom_pos; - UINT16 dsp_tex_address; - UINT16 dsp_tex_offset; + UINT32 m_dsp_rom_pos; + UINT16 m_dsp_tex_address; + UINT16 m_dsp_tex_offset; - int first_dsp_reset; - int viewport_data[3]; + int m_first_dsp_reset; + int m_viewport_data[3]; - INT32 projected_point_x; - INT32 projected_point_y; - INT32 projection_data[3]; + INT32 m_projected_point_x; + INT32 m_projected_point_y; + INT32 m_projection_data[3]; - INT32 intersection_data[3]; + INT32 m_intersection_data[3]; - UINT8 *texture; - bitmap_t *framebuffer; - bitmap_t *zbuffer; + UINT8 *m_texture; + bitmap_t *m_framebuffer; + bitmap_t *m_zbuffer; - UINT32 *vram; - UINT32 *objlist; + UINT32 *m_vram; + UINT32 *m_objlist; //int debug_tex_pal; - int gfx_index; + int m_gfx_index; - UINT32 *char_ram; - UINT32 *tile_ram; - tilemap_t *tilemap; + UINT32 *m_char_ram; + UINT32 *m_tile_ram; + tilemap_t *m_tilemap; - poly_manager *poly; + poly_manager *m_poly; - UINT32 *f3_shared_ram; - UINT32 *main_ram; - UINT16 *dsp_shared_ram; - UINT32 *palette_ram; + UINT32 *m_f3_shared_ram; + UINT32 *m_main_ram; + UINT16 *m_dsp_shared_ram; + UINT32 *m_palette_ram; - UINT16 *polygon_fifo; - int polygon_fifo_ptr; + UINT16 *m_polygon_fifo; + int m_polygon_fifo_ptr; - UINT8 mcu_comm_main; - UINT8 mcu_comm_hc11; - UINT8 mcu_data_main; - UINT8 mcu_data_hc11; + UINT8 m_mcu_comm_main; + UINT8 m_mcu_comm_hc11; + UINT8 m_mcu_data_main; + UINT8 m_mcu_data_hc11; - UINT16 debug_dsp_ram[0x8000]; + UINT16 m_debug_dsp_ram[0x8000]; }; diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 2ca8aa37655..edafecb30db 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -4,41 +4,41 @@ public: taitosj_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 sndnmi_disable; - UINT8 input_port_4_f0; - UINT8 kikstart_gears[2]; - INT8 dac_out; - UINT8 dac_vol; - UINT8 *videoram_1; - UINT8 *videoram_2; - UINT8 *videoram_3; - UINT8 *spriteram; - UINT8 *paletteram; - UINT8 *characterram; - UINT8 *scroll; - UINT8 *colscrolly; - UINT8 *gfxpointer; - UINT8 *colorbank; - UINT8 *video_mode; - UINT8 *video_priority; - UINT8 *collision_reg; - UINT8 *kikstart_scrollram; - UINT8 fromz80; - UINT8 toz80; - UINT8 zaccept; - UINT8 zready; - UINT8 busreq; - UINT8 portA_in; - UINT8 portA_out; - UINT8 spacecr_prot_value; - UINT8 protection_value; - UINT32 address; - bitmap_t *layer_bitmap[3]; - bitmap_t *sprite_sprite_collbitmap1; - bitmap_t *sprite_sprite_collbitmap2; - bitmap_t *sprite_layer_collbitmap1; - bitmap_t *sprite_layer_collbitmap2[3]; - int draw_order[32][4]; + UINT8 m_sndnmi_disable; + UINT8 m_input_port_4_f0; + UINT8 m_kikstart_gears[2]; + INT8 m_dac_out; + UINT8 m_dac_vol; + UINT8 *m_videoram_1; + UINT8 *m_videoram_2; + UINT8 *m_videoram_3; + UINT8 *m_spriteram; + UINT8 *m_paletteram; + UINT8 *m_characterram; + UINT8 *m_scroll; + UINT8 *m_colscrolly; + UINT8 *m_gfxpointer; + UINT8 *m_colorbank; + UINT8 *m_video_mode; + UINT8 *m_video_priority; + UINT8 *m_collision_reg; + UINT8 *m_kikstart_scrollram; + UINT8 m_fromz80; + UINT8 m_toz80; + UINT8 m_zaccept; + UINT8 m_zready; + UINT8 m_busreq; + UINT8 m_portA_in; + UINT8 m_portA_out; + UINT8 m_spacecr_prot_value; + UINT8 m_protection_value; + UINT32 m_address; + bitmap_t *m_layer_bitmap[3]; + bitmap_t *m_sprite_sprite_collbitmap1; + bitmap_t *m_sprite_sprite_collbitmap2; + bitmap_t *m_sprite_layer_collbitmap1; + bitmap_t *m_sprite_layer_collbitmap2[3]; + int m_draw_order[32][4]; }; diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index 9ba008507c2..8d54f35dadc 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -29,16 +29,16 @@ public: tank8_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int collision_index; - UINT8 *video_ram; - UINT8 *pos_h_ram; - UINT8 *pos_v_ram; - UINT8 *pos_d_ram; - UINT8 *team; - tilemap_t *tilemap; - bitmap_t *helper1; - bitmap_t *helper2; - bitmap_t *helper3; + int m_collision_index; + UINT8 *m_video_ram; + UINT8 *m_pos_h_ram; + UINT8 *m_pos_v_ram; + UINT8 *m_pos_d_ram; + UINT8 *m_team; + tilemap_t *m_tilemap; + bitmap_t *m_helper1; + bitmap_t *m_helper2; + bitmap_t *m_helper3; }; diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 41eedc1f326..b03fe4bb211 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -4,12 +4,12 @@ public: tankbatt_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - int nmi_enable; - int sound_enable; - UINT8 *bulletsram; - size_t bulletsram_size; - tilemap_t *bg_tilemap; + UINT8 *m_videoram; + int m_nmi_enable; + int m_sound_enable; + UINT8 *m_bulletsram; + size_t m_bulletsram_size; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index ca2b57dd77f..7e65447ae98 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -4,19 +4,19 @@ public: tankbust_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int latch; - UINT32 timer1; - int e0xx_data[8]; - UINT8 variable_data; - UINT8 *txtram; - UINT8 *videoram; - UINT8 *colorram; - tilemap_t *bg_tilemap; - tilemap_t *txt_tilemap; - UINT8 xscroll[2]; - UINT8 yscroll[2]; - UINT8 *spriteram; - size_t spriteram_size; + int m_latch; + UINT32 m_timer1; + int m_e0xx_data[8]; + UINT8 m_variable_data; + UINT8 *m_txtram; + UINT8 *m_videoram; + UINT8 *m_colorram; + tilemap_t *m_bg_tilemap; + tilemap_t *m_txt_tilemap; + UINT8 m_xscroll[2]; + UINT8 m_yscroll[2]; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index 7bb9395a500..4b95fcfe0ba 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -4,18 +4,18 @@ public: taotaido_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int pending_command; - UINT16 *spriteram; - UINT16 *spriteram2; - UINT16 *scrollram; - UINT16 *bgram; - UINT16 sprite_character_bank_select[8]; - UINT16 video_bank_select[8]; - tilemap_t *bg_tilemap; - UINT16 *spriteram_old; - UINT16 *spriteram_older; - UINT16 *spriteram2_old; - UINT16 *spriteram2_older; + int m_pending_command; + UINT16 *m_spriteram; + UINT16 *m_spriteram2; + UINT16 *m_scrollram; + UINT16 *m_bgram; + UINT16 m_sprite_character_bank_select[8]; + UINT16 m_video_bank_select[8]; + tilemap_t *m_bg_tilemap; + UINT16 *m_spriteram_old; + UINT16 *m_spriteram_older; + UINT16 *m_spriteram2_old; + UINT16 *m_spriteram2_older; }; diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index 21a2409528a..95c7ecd85db 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -4,10 +4,10 @@ public: targeth_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *vregs; - UINT16 *videoram; - UINT16 *spriteram; - tilemap_t *pant[2]; + UINT16 *m_vregs; + UINT16 *m_videoram; + UINT16 *m_spriteram; + tilemap_t *m_pant[2]; }; diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index 875607ab8b8..f2ee8257dbb 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -4,50 +4,50 @@ public: tatsumi_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT16 *cyclwarr_cpua_ram; - UINT16 *cyclwarr_cpub_ram; - UINT16 bigfight_a20000[8]; - UINT16 bigfight_a60000[2]; - UINT16 *apache3_g_ram; - UINT16 bigfight_a40000[2]; - UINT8 *rom_sprite_lookup1; - UINT8 *rom_sprite_lookup2; - UINT8 *rom_clut0; - UINT8 *rom_clut1; - UINT16 *roundup5_d0000_ram; - UINT16 *roundup5_e0000_ram; - UINT16 *roundup5_unknown0; - UINT16 *roundup5_unknown1; - UINT16 *roundup5_unknown2; - UINT16 *_68k_ram; - UINT8 *apache3_z80_ram; - UINT16 control_word; - UINT16 apache3_rotate_ctrl[12]; - UINT16* sprite_control_ram; - UINT16 *cyclwarr_videoram0; - UINT16 *cyclwarr_videoram1; - UINT16 *roundup_r_ram; - UINT16 *roundup_p_ram; - UINT16 *roundup_l_ram; - UINT16 last_control; - UINT8 apache3_adc; - int apache3_rot_idx; - tilemap_t *tx_layer; - tilemap_t *layer0; - tilemap_t *layer1; - tilemap_t *layer2; - tilemap_t *layer3; - bitmap_t *temp_bitmap; - UINT8 *apache3_road_x_ram; - UINT8 apache3_road_z; - UINT16* roundup5_vram; - UINT16 bigfight_bank; - UINT16 bigfight_last_bank; - UINT8 roundupt_crt_selected_reg; - UINT8 roundupt_crt_reg[64]; - UINT8* shadow_pen_array; - UINT16 *spriteram; + UINT16 *m_videoram; + UINT16 *m_cyclwarr_cpua_ram; + UINT16 *m_cyclwarr_cpub_ram; + UINT16 m_bigfight_a20000[8]; + UINT16 m_bigfight_a60000[2]; + UINT16 *m_apache3_g_ram; + UINT16 m_bigfight_a40000[2]; + UINT8 *m_rom_sprite_lookup1; + UINT8 *m_rom_sprite_lookup2; + UINT8 *m_rom_clut0; + UINT8 *m_rom_clut1; + UINT16 *m_roundup5_d0000_ram; + UINT16 *m_roundup5_e0000_ram; + UINT16 *m_roundup5_unknown0; + UINT16 *m_roundup5_unknown1; + UINT16 *m_roundup5_unknown2; + UINT16 *m_68k_ram; + UINT8 *m_apache3_z80_ram; + UINT16 m_control_word; + UINT16 m_apache3_rotate_ctrl[12]; + UINT16* m_sprite_control_ram; + UINT16 *m_cyclwarr_videoram0; + UINT16 *m_cyclwarr_videoram1; + UINT16 *m_roundup_r_ram; + UINT16 *m_roundup_p_ram; + UINT16 *m_roundup_l_ram; + UINT16 m_last_control; + UINT8 m_apache3_adc; + int m_apache3_rot_idx; + tilemap_t *m_tx_layer; + tilemap_t *m_layer0; + tilemap_t *m_layer1; + tilemap_t *m_layer2; + tilemap_t *m_layer3; + bitmap_t *m_temp_bitmap; + UINT8 *m_apache3_road_x_ram; + UINT8 m_apache3_road_z; + UINT16* m_roundup5_vram; + UINT16 m_bigfight_bank; + UINT16 m_bigfight_last_bank; + UINT8 m_roundupt_crt_selected_reg; + UINT8 m_roundupt_crt_reg[64]; + UINT8* m_shadow_pen_array; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/taxidrvr.h b/src/mame/includes/taxidrvr.h index de623f425d3..646de68b906 100644 --- a/src/mame/includes/taxidrvr.h +++ b/src/mame/includes/taxidrvr.h @@ -4,23 +4,23 @@ public: taxidrvr_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int s1; - int s2; - int s3; - int s4; - int latchA; - int latchB; - UINT8 *vram0; - UINT8 *vram1; - UINT8 *vram2; - UINT8 *vram3; - UINT8 *vram4; - UINT8 *vram5; - UINT8 *vram6; - UINT8 *vram7; - UINT8 *scroll; - int bghide; - int spritectrl[9]; + int m_s1; + int m_s2; + int m_s3; + int m_s4; + int m_latchA; + int m_latchB; + UINT8 *m_vram0; + UINT8 *m_vram1; + UINT8 *m_vram2; + UINT8 *m_vram3; + UINT8 *m_vram4; + UINT8 *m_vram5; + UINT8 *m_vram6; + UINT8 *m_vram7; + UINT8 *m_scroll; + int m_bghide; + int m_spritectrl[9]; }; diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index 7898cdeb127..cdefda7cf81 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -4,21 +4,21 @@ public: tbowl_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int adpcm_pos[2]; - int adpcm_end[2]; - int adpcm_data[2]; - UINT8 *shared_ram; - UINT8 *txvideoram; - UINT8 *bgvideoram; - UINT8 *bg2videoram; - UINT8 *spriteram; - tilemap_t *tx_tilemap; - tilemap_t *bg_tilemap; - tilemap_t *bg2_tilemap; - UINT16 xscroll; - UINT16 yscroll; - UINT16 bg2xscroll; - UINT16 bg2yscroll; + int m_adpcm_pos[2]; + int m_adpcm_end[2]; + int m_adpcm_data[2]; + UINT8 *m_shared_ram; + UINT8 *m_txvideoram; + UINT8 *m_bgvideoram; + UINT8 *m_bg2videoram; + UINT8 *m_spriteram; + tilemap_t *m_tx_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_bg2_tilemap; + UINT16 m_xscroll; + UINT16 m_yscroll; + UINT16 m_bg2xscroll; + UINT16 m_bg2yscroll; }; diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index caae11fc377..6fdd0327288 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -4,27 +4,27 @@ public: tceptor_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 m6809_irq_enable; - UINT8 m68k_irq_enable; - UINT8 mcu_irq_enable; - UINT8 *m68k_shared_ram; - UINT8 *tile_ram; - UINT8 *tile_attr; - UINT8 *bg_ram; - UINT16 *sprite_ram; - int sprite16; - int sprite32; - int bg; - tilemap_t *tx_tilemap; - tilemap_t *bg1_tilemap; - tilemap_t *bg2_tilemap; - INT32 bg1_scroll_x; - INT32 bg1_scroll_y; - INT32 bg2_scroll_x; - INT32 bg2_scroll_y; - bitmap_t *temp_bitmap; - UINT16 *sprite_ram_buffered; - int is_mask_spr[1024/16]; + UINT8 m_m6809_irq_enable; + UINT8 m_m68k_irq_enable; + UINT8 m_mcu_irq_enable; + UINT8 *m_m68k_shared_ram; + UINT8 *m_tile_ram; + UINT8 *m_tile_attr; + UINT8 *m_bg_ram; + UINT16 *m_sprite_ram; + int m_sprite16; + int m_sprite32; + int m_bg; + tilemap_t *m_tx_tilemap; + tilemap_t *m_bg1_tilemap; + tilemap_t *m_bg2_tilemap; + INT32 m_bg1_scroll_x; + INT32 m_bg1_scroll_y; + INT32 m_bg2_scroll_x; + INT32 m_bg2_scroll_y; + bitmap_t *m_temp_bitmap; + UINT16 *m_sprite_ram_buffered; + int m_is_mask_spr[1024/16]; }; diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index ad42ee45f40..87e20f71a48 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -4,20 +4,20 @@ public: tecmo_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int adpcm_pos; - int adpcm_end; - int adpcm_data; - int video_type; - UINT8 *txvideoram; - UINT8 *fgvideoram; - UINT8 *bgvideoram; - tilemap_t *tx_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - UINT8 fgscroll[3]; - UINT8 bgscroll[3]; - UINT8 *spriteram; - size_t spriteram_size; + int m_adpcm_pos; + int m_adpcm_end; + int m_adpcm_data; + int m_video_type; + UINT8 *m_txvideoram; + UINT8 *m_fgvideoram; + UINT8 *m_bgvideoram; + tilemap_t *m_tx_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + UINT8 m_fgscroll[3]; + UINT8 m_bgscroll[3]; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index bdd219f9631..c572bf0a01c 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -4,27 +4,27 @@ public: tecmo16_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT16 *colorram; - UINT16 *videoram2; - UINT16 *colorram2; - UINT16 *charram; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - tilemap_t *tx_tilemap; - bitmap_t *sprite_bitmap; - bitmap_t *tile_bitmap_bg; - bitmap_t *tile_bitmap_fg; - int flipscreen; - int game_is_riot; - UINT16 scroll_x_w; - UINT16 scroll_y_w; - UINT16 scroll2_x_w; - UINT16 scroll2_y_w; - UINT16 scroll_char_x_w; - UINT16 scroll_char_y_w; - UINT16 *spriteram; - size_t spriteram_size; + UINT16 *m_videoram; + UINT16 *m_colorram; + UINT16 *m_videoram2; + UINT16 *m_colorram2; + UINT16 *m_charram; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_tx_tilemap; + bitmap_t *m_sprite_bitmap; + bitmap_t *m_tile_bitmap_bg; + bitmap_t *m_tile_bitmap_fg; + int m_flipscreen; + int m_game_is_riot; + UINT16 m_scroll_x_w; + UINT16 m_scroll_y_w; + UINT16 m_scroll2_x_w; + UINT16 m_scroll2_y_w; + UINT16 m_scroll_char_x_w; + UINT16 m_scroll_char_y_w; + UINT16 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index bcca59844e3..1afa135c764 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -10,32 +10,32 @@ public: tecmosys_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16* spriteram; - UINT16* tilemap_paletteram16; - UINT16* bg2tilemap_ram; - UINT16* bg1tilemap_ram; - UINT16* bg0tilemap_ram; - UINT16* fgtilemap_ram; - UINT16* bg0tilemap_lineram; - UINT16* bg1tilemap_lineram; - UINT16* bg2tilemap_lineram; - UINT16* a80000regs; - UINT16* b00000regs; - UINT16* c00000regs; - UINT16* c80000regs; - UINT16* _880000regs; - int spritelist; - bitmap_t *sprite_bitmap; - bitmap_t *tmp_tilemap_composebitmap; - bitmap_t *tmp_tilemap_renderbitmap; - tilemap_t *bg0tilemap; - tilemap_t *bg1tilemap; - tilemap_t *bg2tilemap; - tilemap_t *txt_tilemap; - UINT8 device_read_ptr; - UINT8 device_status; - const struct prot_data* device_data; - UINT8 device_value; + UINT16* m_spriteram; + UINT16* m_tilemap_paletteram16; + UINT16* m_bg2tilemap_ram; + UINT16* m_bg1tilemap_ram; + UINT16* m_bg0tilemap_ram; + UINT16* m_fgtilemap_ram; + UINT16* m_bg0tilemap_lineram; + UINT16* m_bg1tilemap_lineram; + UINT16* m_bg2tilemap_lineram; + UINT16* m_a80000regs; + UINT16* m_b00000regs; + UINT16* m_c00000regs; + UINT16* m_c80000regs; + UINT16* m_880000regs; + int m_spritelist; + bitmap_t *m_sprite_bitmap; + bitmap_t *m_tmp_tilemap_composebitmap; + bitmap_t *m_tmp_tilemap_renderbitmap; + tilemap_t *m_bg0tilemap; + tilemap_t *m_bg1tilemap; + tilemap_t *m_bg2tilemap; + tilemap_t *m_txt_tilemap; + UINT8 m_device_read_ptr; + UINT8 m_device_status; + const struct prot_data* m_device_data; + UINT8 m_device_value; }; diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index 04f2f7984cf..f0cceb1645e 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -4,20 +4,20 @@ public: tehkanwc_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int track0[2]; - int track1[2]; - int msm_data_offs; - int toggle; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *videoram2; - UINT8 scroll_x[2]; - UINT8 led0; - UINT8 led1; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + int m_track0[2]; + int m_track1[2]; + int m_msm_data_offs; + int m_toggle; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_videoram2; + UINT8 m_scroll_x[2]; + UINT8 m_led0; + UINT8 m_led1; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index efeeef415d0..a152da467b1 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -4,16 +4,16 @@ public: terracre_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - const UINT16 *mpProtData; - UINT8 mAmazonProtCmd; - UINT8 mAmazonProtReg[6]; - UINT16 *amazon_videoram; - UINT16 xscroll; - UINT16 yscroll; - tilemap_t *background; - tilemap_t *foreground; - UINT16 *spriteram; + UINT16 *m_videoram; + const UINT16 *m_mpProtData; + UINT8 m_mAmazonProtCmd; + UINT8 m_mAmazonProtReg[6]; + UINT16 *m_amazon_videoram; + UINT16 m_xscroll; + UINT16 m_yscroll; + tilemap_t *m_background; + tilemap_t *m_foreground; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index d52c5f290a7..ed5e36e9ef8 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -4,39 +4,39 @@ public: tetrisp2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 systemregs[0x10]; - UINT16 *vram_bg; - UINT16 *scroll_bg; - UINT16 *vram_fg; - UINT16 *scroll_fg; - UINT16 *vram_rot; - UINT16 *rotregs; - UINT8 *priority; - UINT16 *rocknms_sub_vram_bg; - UINT16 *rocknms_sub_scroll_bg; - UINT16 *rocknms_sub_vram_fg; - UINT16 *rocknms_sub_scroll_fg; - UINT16 *rocknms_sub_vram_rot; - UINT16 *rocknms_sub_rotregs; - UINT16 *rocknms_sub_priority; - UINT16 rocknms_sub_systemregs[0x10]; - UINT16 rockn_protectdata; - UINT16 rockn_adpcmbank; - UINT16 rockn_soundvolume; - emu_timer *rockn_timer_l4; - emu_timer *rockn_timer_sub_l4; - int bank_lo; - int bank_hi; - UINT16 *nvram; - UINT16 rocknms_main2sub; - UINT16 rocknms_sub2main; - int flipscreen_old; - tilemap_t *tilemap_bg; - tilemap_t *tilemap_fg; - tilemap_t *tilemap_rot; - tilemap_t *tilemap_sub_bg; - tilemap_t *tilemap_sub_fg; - tilemap_t *tilemap_sub_rot; + UINT16 m_systemregs[0x10]; + UINT16 *m_vram_bg; + UINT16 *m_scroll_bg; + UINT16 *m_vram_fg; + UINT16 *m_scroll_fg; + UINT16 *m_vram_rot; + UINT16 *m_rotregs; + UINT8 *m_priority; + UINT16 *m_rocknms_sub_vram_bg; + UINT16 *m_rocknms_sub_scroll_bg; + UINT16 *m_rocknms_sub_vram_fg; + UINT16 *m_rocknms_sub_scroll_fg; + UINT16 *m_rocknms_sub_vram_rot; + UINT16 *m_rocknms_sub_rotregs; + UINT16 *m_rocknms_sub_priority; + UINT16 m_rocknms_sub_systemregs[0x10]; + UINT16 m_rockn_protectdata; + UINT16 m_rockn_adpcmbank; + UINT16 m_rockn_soundvolume; + emu_timer *m_rockn_timer_l4; + emu_timer *m_rockn_timer_sub_l4; + int m_bank_lo; + int m_bank_hi; + UINT16 *m_nvram; + UINT16 m_rocknms_main2sub; + UINT16 m_rocknms_sub2main; + int m_flipscreen_old; + tilemap_t *m_tilemap_bg; + tilemap_t *m_tilemap_fg; + tilemap_t *m_tilemap_rot; + tilemap_t *m_tilemap_sub_bg; + tilemap_t *m_tilemap_sub_fg; + tilemap_t *m_tilemap_sub_rot; }; diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index 588cd187562..1b7d3f4d146 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -4,20 +4,20 @@ public: thedeep_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *spriteram; - size_t spriteram_size; - int nmi_enable; - UINT8 protection_command; - UINT8 protection_data; - int protection_index; - int protection_irq; - int rombank; - UINT8 *vram_0; - UINT8 *vram_1; - UINT8 *scroll; - UINT8 *scroll2; - tilemap_t *tilemap_0; - tilemap_t *tilemap_1; + UINT8 *m_spriteram; + size_t m_spriteram_size; + int m_nmi_enable; + UINT8 m_protection_command; + UINT8 m_protection_data; + int m_protection_index; + int m_protection_irq; + int m_rombank; + UINT8 *m_vram_0; + UINT8 *m_vram_1; + UINT8 *m_scroll; + UINT8 *m_scroll2; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; }; diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index ab6c3074ece..dba2c56c53e 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -4,20 +4,20 @@ public: thepit_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int question_address; - int question_rom; - int remap_address[16]; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *attributesram; - UINT8 *spriteram; - size_t spriteram_size; - UINT8 graphics_bank; - UINT8 flip_screen_x; - UINT8 flip_screen_y; - tilemap_t *solid_tilemap; - tilemap_t *tilemap; - UINT8 *dummy_tile; + int m_question_address; + int m_question_rom; + int m_remap_address[16]; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_attributesram; + UINT8 *m_spriteram; + size_t m_spriteram_size; + UINT8 m_graphics_bank; + UINT8 m_flip_screen_x; + UINT8 m_flip_screen_y; + tilemap_t *m_solid_tilemap; + tilemap_t *m_tilemap; + UINT8 *m_dummy_tile; }; diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h index 0cbe5fe870a..17b255d153a 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -11,12 +11,12 @@ public: thief_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 input_select; - UINT8 read_mask; - UINT8 write_mask; - UINT8 video_control; - coprocessor_t coprocessor; + UINT8 *m_videoram; + UINT8 m_input_select; + UINT8 m_read_mask; + UINT8 m_write_mask; + UINT8 m_video_control; + coprocessor_t m_coprocessor; }; diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index 3ab54bab577..ff96bd88369 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -4,12 +4,12 @@ public: thoop2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *vregs; - UINT16 *videoram; - UINT16 *spriteram; - int sprite_count[5]; - int *sprite_table[5]; - tilemap_t *pant[2]; + UINT16 *m_vregs; + UINT16 *m_videoram; + UINT16 *m_spriteram; + int m_sprite_count[5]; + int *m_sprite_table[5]; + tilemap_t *m_pant[2]; }; diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h index 493f157f354..232feb58600 100644 --- a/src/mame/includes/thunderj.h +++ b/src/mame/includes/thunderj.h @@ -12,7 +12,7 @@ public: thunderj_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT8 alpha_tile_bank; + UINT8 m_alpha_tile_bank; }; diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index 601b5039a96..f2a6b81edcb 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -11,25 +11,27 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; - UINT8 pmcram[0x800]; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; + UINT8 m_pmcram[0x800]; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; + int m_layer_colorbase[3]; + int m_sprite_colorbase; /* misc */ - int priority; - UINT8 _1f98_data; - int palette_selected; - int rambank, pmcbank; + int m_priority; + UINT8 m_1f98_data; + int m_palette_selected; + int m_rambank; + int m_pmcbank; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k007232; - device_t *k052109; - device_t *k051960; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k007232; + device_t *m_k052109; + device_t *m_k051960; }; diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 99d20d85b1e..e6efbb828e6 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -6,18 +6,18 @@ public: tiamc1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *tileram; - UINT8 *charram; - UINT8 *spriteram_x; - UINT8 *spriteram_y; - UINT8 *spriteram_a; - UINT8 *spriteram_n; - UINT8 layers_ctrl; - UINT8 bg_vshift; - UINT8 bg_hshift; - tilemap_t *bg_tilemap1; - tilemap_t *bg_tilemap2; - rgb_t *palette; + UINT8 *m_tileram; + UINT8 *m_charram; + UINT8 *m_spriteram_x; + UINT8 *m_spriteram_y; + UINT8 *m_spriteram_a; + UINT8 *m_spriteram_n; + UINT8 m_layers_ctrl; + UINT8 m_bg_vshift; + UINT8 m_bg_hshift; + tilemap_t *m_bg_tilemap1; + tilemap_t *m_bg_tilemap2; + rgb_t *m_palette; }; diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index d1a01070c93..a3dcd7f6f28 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -4,11 +4,11 @@ public: tigeroad_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT16 *ram16; - int bgcharbank; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + UINT16 *m_videoram; + UINT16 *m_ram16; + int m_bgcharbank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; }; diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index d808ae6bf56..9f7cb0f4dcb 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -4,16 +4,16 @@ public: timelimt_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - int nmi_enabled; - UINT8 *bg_videoram; - size_t bg_videoram_size; - int scrollx; - int scrolly; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_videoram; + int m_nmi_enabled; + UINT8 *m_bg_videoram; + size_t m_bg_videoram_size; + int m_scrollx; + int m_scrolly; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 01a820b039f..f4aa44ed650 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -11,19 +11,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * spriteram; - UINT8 * spriteram2; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; /* misc */ - UINT8 nmi_enable; + UINT8 m_nmi_enable; /* devices */ - cpu_device *maincpu; + cpu_device *m_maincpu; }; diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index bede042a8c8..92a89f06635 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -6,50 +6,58 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * tmnt2_1c0800; - UINT16 * sunset_104000; - UINT16 * tmnt2_rom; -// UINT16 * paletteram; // currently this uses generic palette handling -// UINT8 * nvram; // currently cuebrick uses generic nvram handling -// UINT8 * cuebrick_nvram; - UINT16 *spriteram; + UINT16 * m_tmnt2_1c0800; + UINT16 * m_sunset_104000; + UINT16 * m_tmnt2_rom; +// UINT16 * m_paletteram; // currently this uses generic palette handling +// UINT8 * m_nvram; // currently cuebrick uses generic nvram handling +// UINT8 * m_cuebrick_nvram; + UINT16 *m_spriteram; /* video-related */ - int layer_colorbase[3], sprite_colorbase; - int layerpri[3]; - int sorted_layer[3]; // this might not be necessary, but tmnt2 uses it in a strange way... + int m_layer_colorbase[3]; + int m_sprite_colorbase; + int m_layerpri[3]; + int m_sorted_layer[3]; // this might not be necessary, but tmnt2 uses it in a strange way... - tilemap_t *roz_tilemap; - int glfgreat_roz_rom_bank, glfgreat_roz_char_bank, glfgreat_roz_rom_mode; - int glfgreat_pixel; - int prmrsocr_sprite_bank; - int blswhstl_rombank; - int tmnt_priorityflag; - int lastdim, lasten, dim_c, dim_v; /* lgtnfght, ssriders, tmnt2 only */ + tilemap_t *m_roz_tilemap; + int m_glfgreat_roz_rom_bank; + int m_glfgreat_roz_char_bank; + int m_glfgreat_roz_rom_mode; + int m_glfgreat_pixel; + int m_prmrsocr_sprite_bank; + int m_blswhstl_rombank; + int m_tmnt_priorityflag; + int m_lastdim; + int m_lasten; + int m_dim_c; + int m_dim_v; /* lgtnfght, ssriders, tmnt2 only */ /* misc */ - int tmnt_soundlatch; - int cuebrick_snd_irqlatch, cuebrick_nvram_bank; - int toggle, last; + int m_tmnt_soundlatch; + int m_cuebrick_snd_irqlatch; + int m_cuebrick_nvram_bank; + int m_toggle; + int m_last; UINT16 m_cuebrick_nvram[0x400 * 0x20]; // 32k paged in a 1k window /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k007232; - device_t *k053260; - device_t *k054539; - device_t *k052109; - device_t *k051960; - device_t *k053245; - device_t *k053251; - device_t *k053936; - device_t *k054000; - device_t *upd; - device_t *samples; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k007232; + device_t *m_k053260; + device_t *m_k054539; + device_t *m_k052109; + device_t *m_k051960; + device_t *m_k053245; + device_t *m_k053251; + device_t *m_k053936; + device_t *m_k054000; + device_t *m_upd; + device_t *m_samples; /* memory buffers */ - INT16 sampledata[0x40000]; + INT16 m_sampledata[0x40000]; }; diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index 240ec2c7139..a19c3e6080d 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -22,36 +22,41 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * objram; - UINT8 * vdcram; - UINT8 * scrollram; - UINT8 * objctrl; - UINT8 * bg_flag; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_objram; + UINT8 * m_vdcram; + UINT8 * m_scrollram; + UINT8 * m_objctrl; + UINT8 * m_bg_flag; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int screenflip; + int m_screenflip; /* sound-related */ - INT16 *sampledata[MAX_SAMPLES]; - int samplesize[MAX_SAMPLES]; + INT16 *m_sampledata[MAX_SAMPLES]; + int m_samplesize[MAX_SAMPLES]; /* misc / mcu */ - int kageki_csport_sel; - int input_select; - int mcu_type; - int mcu_initializing, mcu_coinage_init, mcu_command, mcu_readcredits; - int mcu_reportcoin; - int insertcoin; - UINT8 mcu_coinage[4]; - UINT8 mcu_coins_a, mcu_coins_b, mcu_credits; - int bank1; - int bank2; + int m_kageki_csport_sel; + int m_input_select; + int m_mcu_type; + int m_mcu_initializing; + int m_mcu_coinage_init; + int m_mcu_command; + int m_mcu_readcredits; + int m_mcu_reportcoin; + int m_insertcoin; + UINT8 m_mcu_coinage[4]; + UINT8 m_mcu_coins_a; + UINT8 m_mcu_coins_b; + UINT8 m_mcu_credits; + int m_bank1; + int m_bank2; /* devices */ - device_t *audiocpu; - device_t *subcpu; - device_t *mcu; + device_t *m_audiocpu; + device_t *m_subcpu; + device_t *m_mcu; }; diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index c5948e0eb5f..40ee4280dd6 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -10,77 +10,80 @@ public: toaplan1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int unk_reset_port; - UINT16 *colorram1; - UINT16 *colorram2; - size_t colorram1_size; - size_t colorram2_size; + int m_unk_reset_port; + UINT16 *m_colorram1; + UINT16 *m_colorram2; + size_t m_colorram1_size; + size_t m_colorram2_size; - UINT8 *sharedram; + UINT8 *m_sharedram; - int coin_count; /* coin count increments on startup ? , so dont count it */ - int intenable; + int m_coin_count; /* coin count increments on startup ? , so dont count it */ + int m_intenable; /* Demon world */ - int dsp_on; - int dsp_BIO; - int dsp_execute; - UINT32 dsp_addr_w; - UINT32 main_ram_seg; - - UINT8 vimana_coins[2]; - UINT8 vimana_credits; - UINT8 vimana_latch; - - UINT16 *pf4_tilevram16; /* || Drawn in this order */ - UINT16 *pf3_tilevram16; /* || */ - UINT16 *pf2_tilevram16; /* \||/ */ - UINT16 *pf1_tilevram16; /* \/ */ - - size_t spriteram_size; - UINT16 *spriteram; - UINT16 *buffered_spriteram; - UINT16 *spritesizeram16; - UINT16 *buffered_spritesizeram16; - - INT32 bcu_flipscreen; /* Tile controller flip flag */ - INT32 fcu_flipscreen; /* Sprite controller flip flag */ - - INT32 pf_voffs; - INT32 spriteram_offs; - - INT32 pf1_scrollx; - INT32 pf1_scrolly; - INT32 pf2_scrollx; - INT32 pf2_scrolly; - INT32 pf3_scrollx; - INT32 pf3_scrolly; - INT32 pf4_scrollx; - INT32 pf4_scrolly; - INT32 scrollx_offs1; - INT32 scrollx_offs2; - INT32 scrollx_offs3; - INT32 scrollx_offs4; - INT32 scrolly_offs; + int m_dsp_on; + int m_dsp_BIO; + int m_dsp_execute; + UINT32 m_dsp_addr_w; + UINT32 m_main_ram_seg; + + UINT8 m_vimana_coins[2]; + UINT8 m_vimana_credits; + UINT8 m_vimana_latch; + + UINT16 *m_pf4_tilevram16; /* || Drawn in this order */ + UINT16 *m_pf3_tilevram16; /* || */ + UINT16 *m_pf2_tilevram16; /* \||/ */ + UINT16 *m_pf1_tilevram16; /* \/ */ + + size_t m_spriteram_size; + UINT16 *m_spriteram; + UINT16 *m_buffered_spriteram; + UINT16 *m_spritesizeram16; + UINT16 *m_buffered_spritesizeram16; + + INT32 m_bcu_flipscreen; /* Tile controller flip flag */ + INT32 m_fcu_flipscreen; /* Sprite controller flip flag */ + + INT32 m_pf_voffs; + INT32 m_spriteram_offs; + + INT32 m_pf1_scrollx; + INT32 m_pf1_scrolly; + INT32 m_pf2_scrollx; + INT32 m_pf2_scrolly; + INT32 m_pf3_scrollx; + INT32 m_pf3_scrolly; + INT32 m_pf4_scrollx; + INT32 m_pf4_scrolly; + INT32 m_scrollx_offs1; + INT32 m_scrollx_offs2; + INT32 m_scrollx_offs3; + INT32 m_scrollx_offs4; + INT32 m_scrolly_offs; #ifdef MAME_DEBUG - int display_pf1; - int display_pf2; - int display_pf3; - int display_pf4; - int displog; + int m_display_pf1; + int m_display_pf2; + int m_display_pf3; + int m_display_pf4; + int m_displog; #endif - INT32 tiles_offsetx; - INT32 tiles_offsety; + INT32 m_tiles_offsetx; + INT32 m_tiles_offsety; - int reset; /* Hack! See toaplan1_bcu_control below */ + int m_reset; /* Hack! See toaplan1_bcu_control below */ - tilemap_t *pf1_tilemap, *pf2_tilemap, *pf3_tilemap, *pf4_tilemap; + tilemap_t *m_pf1_tilemap; + tilemap_t *m_pf2_tilemap; + tilemap_t *m_pf3_tilemap; + tilemap_t *m_pf4_tilemap; // an empty tile, so that we can safely disable tiles - UINT8 empty_tile[8*8]; + UINT8 m_empty_tile[8*8]; }; diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index bd5ac8178f7..cc41d7e497d 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -15,44 +15,44 @@ public: toaplan2_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { - vdp0 = NULL; - vdp1 = NULL; + m_vdp0 = NULL; + m_vdp1 = NULL; } - gp9001vdp_device* vdp0; - gp9001vdp_device* vdp1; + gp9001vdp_device* m_vdp0; + gp9001vdp_device* m_vdp1; - UINT8 *shared_ram; /* 8 bit RAM shared between 68K and sound CPU */ - UINT16 *shared_ram16; /* Really 8 bit RAM connected to Z180 */ + UINT8 *m_shared_ram; /* 8 bit RAM shared between 68K and sound CPU */ + UINT16 *m_shared_ram16; /* Really 8 bit RAM connected to Z180 */ - device_t *main_cpu; - device_t *sub_cpu; + device_t *m_main_cpu; + device_t *m_sub_cpu; - UINT16 mcu_data; - UINT16 video_status; - INT8 old_p1_paddle_h; /* For Ghox */ - INT8 old_p2_paddle_h; - UINT8 v25_reset_line; /* 0x20 for dogyuun/batsugun, 0x10 for vfive, 0x08 for fixeight */ - UINT8 sndirq_line; /* IRQ4 for batrider, IRQ2 for bbakraid */ - UINT8 z80_busreq; + UINT16 m_mcu_data; + UINT16 m_video_status; + INT8 m_old_p1_paddle_h; /* For Ghox */ + INT8 m_old_p2_paddle_h; + UINT8 m_v25_reset_line; /* 0x20 for dogyuun/batsugun, 0x10 for vfive, 0x08 for fixeight */ + UINT8 m_sndirq_line; /* IRQ4 for batrider, IRQ2 for bbakraid */ + UINT8 m_z80_busreq; - UINT16 *txvideoram16; - UINT16 *txvideoram16_offs; - UINT16 *txscrollram16; - UINT16 *tx_gfxram16; - UINT16 *mainram16; + UINT16 *m_txvideoram16; + UINT16 *m_txvideoram16_offs; + UINT16 *m_txscrollram16; + UINT16 *m_tx_gfxram16; + UINT16 *m_mainram16; - size_t tx_vram_size; - size_t tx_offs_vram_size; - size_t tx_scroll_vram_size; - size_t paletteram_size; - size_t mainram_overlap_size; + size_t m_tx_vram_size; + size_t m_tx_offs_vram_size; + size_t m_tx_scroll_vram_size; + size_t m_paletteram_size; + size_t m_mainram_overlap_size; - bitmap_t* custom_priority_bitmap; - bitmap_t* secondary_render_bitmap; + bitmap_t* m_custom_priority_bitmap; + bitmap_t* m_secondary_render_bitmap; - tilemap_t *tx_tilemap; /* Tilemap for extra-text-layer */ - UINT8 tx_flip; + tilemap_t *m_tx_tilemap; /* Tilemap for extra-text-layer */ + UINT8 m_tx_flip; }; /*----------- defined in video/toaplan2.c -----------*/ diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index 0fc1f6d4055..711d712fb94 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -4,15 +4,15 @@ public: toki_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - int msm5205next; - int toggle; - UINT16 *background1_videoram16; - UINT16 *background2_videoram16; - UINT16 *scrollram16; - tilemap_t *background_layer; - tilemap_t *foreground_layer; - tilemap_t *text_layer; + UINT16 *m_videoram; + int m_msm5205next; + int m_toggle; + UINT16 *m_background1_videoram16; + UINT16 *m_background2_videoram16; + UINT16 *m_scrollram16; + tilemap_t *m_background_layer; + tilemap_t *m_foreground_layer; + tilemap_t *m_text_layer; }; diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h index 6795b65a275..15a25a6777b 100644 --- a/src/mame/includes/toobin.h +++ b/src/mame/includes/toobin.h @@ -12,10 +12,10 @@ public: toobin_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 * interrupt_scan; + UINT16 * m_interrupt_scan; - double brightness; - bitmap_t * pfbitmap; + double m_brightness; + bitmap_t * m_pfbitmap; }; diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index 8fba9818802..045dd888109 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -11,30 +11,30 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * spritemap; - UINT16 * raster_ctrl; - UINT16 * spriteram; - UINT16 * sharedram; + UINT16 * m_spritemap; + UINT16 * m_raster_ctrl; + UINT16 * m_spriteram; + UINT16 * m_sharedram; // UINT16 * paletteram; // currently this uses generic palette handling - size_t spriteram_size; - size_t sharedram_size; + size_t m_spriteram_size; + size_t m_sharedram_size; /* misc */ - UINT16 cpua_ctrl; - INT32 ioc220_port; - INT32 banknum; - int adpcm_pos; - int adpcm_data; + UINT16 m_cpua_ctrl; + INT32 m_ioc220_port; + INT32 m_banknum; + int m_adpcm_pos; + int m_adpcm_data; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *subcpu; - device_t *pc080sn_1; - device_t *pc080sn_2; - device_t *tc0220ioc; - - UINT8 dislayer[5]; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_subcpu; + device_t *m_pc080sn_1; + device_t *m_pc080sn_2; + device_t *m_tc0220ioc; + + UINT8 m_dislayer[5]; }; diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index fe42485d9c5..9ff298b8f07 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -4,15 +4,15 @@ public: toypop_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *spriteram; - UINT16 *bg_image; - UINT8 *m68000_sharedram; - tilemap_t *bg_tilemap; + UINT8 *m_videoram; + UINT8 *m_spriteram; + UINT16 *m_bg_image; + UINT8 *m_m68000_sharedram; + tilemap_t *m_bg_tilemap; - int bitmapflip; - int palettebank; - int interrupt_enable_68k; + int m_bitmapflip; + int m_palettebank; + int m_interrupt_enable_68k; }; diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index 0b25a7e58a6..f90d85a5ac6 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -4,19 +4,19 @@ public: tp84_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - cpu_device *audiocpu; - UINT8 *bg_videoram; - UINT8 *bg_colorram; - UINT8 *fg_videoram; - UINT8 *fg_colorram; - UINT8 *spriteram; - UINT8 *scroll_x; - UINT8 *scroll_y; - UINT8 *palette_bank; - UINT8 *flipscreen_x; - UINT8 *flipscreen_y; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; + cpu_device *m_audiocpu; + UINT8 *m_bg_videoram; + UINT8 *m_bg_colorram; + UINT8 *m_fg_videoram; + UINT8 *m_fg_colorram; + UINT8 *m_spriteram; + UINT8 *m_scroll_x; + UINT8 *m_scroll_y; + UINT8 *m_palette_bank; + UINT8 *m_flipscreen_x; + UINT8 *m_flipscreen_y; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; }; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index 373cfdf7511..264a7f93de4 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -12,19 +12,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * colorram; - UINT8 * scroll; - UINT8 * scroll2; - UINT8 * spriteram; - UINT8 * spriteram2; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_colorram; + UINT8 * m_scroll; + UINT8 * m_scroll2; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; - int bg_bank, sprite_bank1, sprite_bank2; - int old_gfx_bank; // needed by atlantol - int sprites_gfx_banked; + tilemap_t *m_bg_tilemap; + int m_bg_bank; + int m_sprite_bank1; + int m_sprite_bank2; + int m_old_gfx_bank; // needed by atlantol + int m_sprites_gfx_banked; }; diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index 625c74be7f2..435c41f1d0a 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -5,13 +5,13 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + size_t m_spriteram_size; /* video-related */ - tilemap_t* bg_tilemap; - int scrollx[2]; + tilemap_t* m_bg_tilemap; + int m_scrollx[2]; }; /*----------- defined in video/travrusa.c -----------*/ diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index fcb557f7279..702e18db386 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -22,20 +22,20 @@ public: triplhnt_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 cmos[16]; - UINT8 da_latch; - UINT8 misc_flags; - UINT8 cmos_latch; - UINT8 hit_code; - UINT8* playfield_ram; - UINT8* vpos_ram; - UINT8* hpos_ram; - UINT8* code_ram; - UINT8* orga_ram; - int sprite_zoom; - int sprite_bank; - bitmap_t* helper; - tilemap_t* bg_tilemap; + UINT8 m_cmos[16]; + UINT8 m_da_latch; + UINT8 m_misc_flags; + UINT8 m_cmos_latch; + UINT8 m_hit_code; + UINT8* m_playfield_ram; + UINT8* m_vpos_ram; + UINT8* m_hpos_ram; + UINT8* m_code_ram; + UINT8* m_orga_ram; + int m_sprite_zoom; + int m_sprite_bank; + bitmap_t* m_helper; + tilemap_t* m_bg_tilemap; }; diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h index 2083c2c5016..d4214cae472 100644 --- a/src/mame/includes/truco.h +++ b/src/mame/includes/truco.h @@ -4,9 +4,9 @@ public: truco_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *battery_ram; - int trigger; + UINT8 *m_videoram; + UINT8 *m_battery_ram; + int m_trigger; }; diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index 82521acc223..eb50e275d58 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -4,11 +4,11 @@ public: trucocl_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int cur_dac_address; - int cur_dac_address_index; - UINT8 *videoram; - UINT8 *colorram; - tilemap_t *bg_tilemap; + int m_cur_dac_address; + int m_cur_dac_address_index; + UINT8 *m_videoram; + UINT8 *m_colorram; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index 0b6d509355c..7c33b85879a 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -4,15 +4,15 @@ public: tryout_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *gfx_control; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - UINT8 vram_bank; - UINT8 *vram; - UINT8 *vram_gfx; - UINT8 *spriteram; - UINT8 *spriteram2; + UINT8 *m_videoram; + UINT8 *m_gfx_control; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + UINT8 m_vram_bank; + UINT8 *m_vram; + UINT8 *m_vram_gfx; + UINT8 *m_spriteram; + UINT8 *m_spriteram2; }; diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index 29ea6cccf07..0f5f04d3b82 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -4,23 +4,23 @@ public: tsamurai_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int nmi_enabled; - int sound_command1; - int sound_command2; - int sound_command3; - int vsgongf_sound_nmi_enabled; - UINT8 *videoram; - UINT8 *colorram; - UINT8 *bg_videoram; - int bgcolor; - int textbank1; - int textbank2; - tilemap_t *background; - tilemap_t *foreground; - int flicker; - int vsgongf_color; - int key_count; - UINT8 *spriteram; + int m_nmi_enabled; + int m_sound_command1; + int m_sound_command2; + int m_sound_command3; + int m_vsgongf_sound_nmi_enabled; + UINT8 *m_videoram; + UINT8 *m_colorram; + UINT8 *m_bg_videoram; + int m_bgcolor; + int m_textbank1; + int m_textbank2; + tilemap_t *m_background; + tilemap_t *m_foreground; + int m_flicker; + int m_vsgongf_color; + int m_key_count; + UINT8 *m_spriteram; }; diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index 51cc4dc627c..f179555e535 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -4,38 +4,38 @@ public: tubep_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 sound_latch; - UINT8 ls74; - UINT8 ls377; - emu_timer *interrupt_timer; - int curr_scanline; - UINT8 *rjammer_backgroundram; - UINT8 *backgroundram; - UINT8 *textram; - UINT8 *sprite_colorsharedram; - UINT8 *spritemap; - UINT8 prom2[32]; - UINT32 romD_addr; - UINT32 romEF_addr; - UINT32 E16_add_b; - UINT32 HINV; - UINT32 VINV; - UINT32 XSize; - UINT32 YSize; - UINT32 mark_1; - UINT32 mark_2; - UINT32 colorram_addr_hi; - UINT32 ls273_g6; - UINT32 ls273_j6; - UINT32 romHI_addr_mid; - UINT32 romHI_addr_msb; - UINT8 DISP; - UINT8 background_romsel; - UINT8 color_A4; - UINT8 ls175_b7; - UINT8 ls175_e8; - UINT8 ls377_data; - UINT32 page; + UINT8 m_sound_latch; + UINT8 m_ls74; + UINT8 m_ls377; + emu_timer *m_interrupt_timer; + int m_curr_scanline; + UINT8 *m_rjammer_backgroundram; + UINT8 *m_backgroundram; + UINT8 *m_textram; + UINT8 *m_sprite_colorsharedram; + UINT8 *m_spritemap; + UINT8 m_prom2[32]; + UINT32 m_romD_addr; + UINT32 m_romEF_addr; + UINT32 m_E16_add_b; + UINT32 m_HINV; + UINT32 m_VINV; + UINT32 m_XSize; + UINT32 m_YSize; + UINT32 m_mark_1; + UINT32 m_mark_2; + UINT32 m_colorram_addr_hi; + UINT32 m_ls273_g6; + UINT32 m_ls273_j6; + UINT32 m_romHI_addr_mid; + UINT32 m_romHI_addr_msb; + UINT8 m_DISP; + UINT8 m_background_romsel; + UINT8 m_color_A4; + UINT8 m_ls175_b7; + UINT8 m_ls175_e8; + UINT8 m_ls377_data; + UINT32 m_page; }; diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index 0b7cac7fbb5..23268fa23a0 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -6,33 +6,36 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * pf1_data; - UINT16 * pf2_data; - UINT16 * mainram; - UINT16 * spriteram; - UINT16 * control; - size_t spriteram_size; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_pf1_data; + UINT16 * m_pf2_data; + UINT16 * m_mainram; + UINT16 * m_spriteram; + UINT16 * m_control; + size_t m_spriteram_size; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* misc */ - int music_command; - int music_bank; - int music_is_playing; + int m_music_command; + int m_music_bank; + int m_music_is_playing; /* video-related */ - tilemap_t *pf1_tilemap,*pf1_alt_tilemap,*pf2_tilemap,*pf2_alt_tilemap; - UINT16 control_0[8]; - int flipscreen; - UINT16 tilebank; - int sprite_xoffset; - int sprite_yoffset; + tilemap_t *m_pf1_tilemap; + tilemap_t *m_pf1_alt_tilemap; + tilemap_t *m_pf2_tilemap; + tilemap_t *m_pf2_alt_tilemap; + UINT16 m_control_0[8]; + int m_flipscreen; + UINT16 m_tilebank; + int m_sprite_xoffset; + int m_sprite_yoffset; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *oki; - UINT8 semicom_prot_offset; - UINT16 protbase; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_oki; + UINT8 m_semicom_prot_offset; + UINT16 m_protbase; }; /*----------- defined in video/tumbleb.c -----------*/ diff --git a/src/mame/includes/tumblep.h b/src/mame/includes/tumblep.h index 642500d8f79..f3a7bc201d0 100644 --- a/src/mame/includes/tumblep.h +++ b/src/mame/includes/tumblep.h @@ -11,16 +11,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling (in decocomn.c) - size_t spriteram_size; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling (in decocomn.c) + size_t m_spriteram_size; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *deco_tilegen1; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_deco_tilegen1; }; diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index f9c40ca1e6b..a6e6ce808cc 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -4,11 +4,11 @@ public: tunhunt_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 control; - UINT8 *workram; - UINT8 *spriteram; - UINT8 *videoram; - tilemap_t *fg_tilemap; + UINT8 m_control; + UINT8 *m_workram; + UINT8 *m_spriteram; + UINT8 *m_videoram; + tilemap_t *m_fg_tilemap; }; diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 0a8fec35186..ead8266b42c 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -29,42 +29,56 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * sprite_position; - UINT8 * buckrog_bitmap_ram; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_sprite_position; + UINT8 * m_buckrog_bitmap_ram; /* machine states */ - i8279_state i8279; + i8279_state m_i8279; /* sound state */ - UINT8 turbo_osel, turbo_bsel; - UINT8 sound_state[3]; + UINT8 m_turbo_osel; + UINT8 m_turbo_bsel; + UINT8 m_sound_state[3]; /* video state */ - tilemap_t * fg_tilemap; + tilemap_t * m_fg_tilemap; /* Turbo-specific states */ - UINT8 turbo_opa, turbo_opb, turbo_opc; - UINT8 turbo_ipa, turbo_ipb, turbo_ipc; - UINT8 turbo_fbpla, turbo_fbcol; - UINT8 turbo_speed; - UINT8 turbo_collision; - UINT8 turbo_last_analog; - UINT8 turbo_accel; + UINT8 m_turbo_opa; + UINT8 m_turbo_opb; + UINT8 m_turbo_opc; + UINT8 m_turbo_ipa; + UINT8 m_turbo_ipb; + UINT8 m_turbo_ipc; + UINT8 m_turbo_fbpla; + UINT8 m_turbo_fbcol; + UINT8 m_turbo_speed; + UINT8 m_turbo_collision; + UINT8 m_turbo_last_analog; + UINT8 m_turbo_accel; /* Subroc-specific states */ - UINT8 subroc3d_col, subroc3d_ply, subroc3d_flip; - UINT8 subroc3d_mdis, subroc3d_mdir; - UINT8 subroc3d_tdis, subroc3d_tdir; - UINT8 subroc3d_fdis, subroc3d_fdir; - UINT8 subroc3d_hdis, subroc3d_hdir; + UINT8 m_subroc3d_col; + UINT8 m_subroc3d_ply; + UINT8 m_subroc3d_flip; + UINT8 m_subroc3d_mdis; + UINT8 m_subroc3d_mdir; + UINT8 m_subroc3d_tdis; + UINT8 m_subroc3d_tdir; + UINT8 m_subroc3d_fdis; + UINT8 m_subroc3d_fdir; + UINT8 m_subroc3d_hdis; + UINT8 m_subroc3d_hdir; /* Buck Rogers-specific states */ - UINT8 buckrog_fchg, buckrog_mov, buckrog_obch; - UINT8 buckrog_command; - UINT8 buckrog_myship; - int last_sound_a; + UINT8 m_buckrog_fchg; + UINT8 m_buckrog_mov; + UINT8 m_buckrog_obch; + UINT8 m_buckrog_command; + UINT8 m_buckrog_myship; + int m_last_sound_a; }; diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h index 0e89268aee1..c5958028240 100644 --- a/src/mame/includes/tutankhm.h +++ b/src/mame/includes/tutankhm.h @@ -5,19 +5,21 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * paletteram; - UINT8 * scroll; + UINT8 * m_videoram; + UINT8 * m_paletteram; + UINT8 * m_scroll; /* video-related */ - tilemap_t *bg_tilemap; - UINT8 flip_x, flip_y; + tilemap_t *m_bg_tilemap; + UINT8 m_flip_x; + UINT8 m_flip_y; /* misc */ - UINT8 irq_toggle, irq_enable; + UINT8 m_irq_toggle; + UINT8 m_irq_enable; /* devices */ - cpu_device *maincpu; + cpu_device *m_maincpu; }; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 2038791a453..f368b689df6 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -4,26 +4,26 @@ public: twin16_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - UINT16 CPUA_register; - UINT16 CPUB_register; - UINT16 sound_command; - int cuebrickj_nvram_bank; - UINT16 cuebrickj_nvram[0x400*0x20]; - UINT16 custom_video; - UINT16 *gfx_rom; - UINT16 *text_ram; - UINT16 *sprite_gfx_ram; - UINT16 *tile_gfx_ram; - UINT16 sprite_buffer[0x800]; - emu_timer *sprite_timer; - int sprite_busy; - int need_process_spriteram; - UINT16 gfx_bank; - UINT16 scrollx[3]; - UINT16 scrolly[3]; - UINT16 video_register; - tilemap_t *text_tilemap; + UINT16 *m_videoram; + UINT16 m_CPUA_register; + UINT16 m_CPUB_register; + UINT16 m_sound_command; + int m_cuebrickj_nvram_bank; + UINT16 m_cuebrickj_nvram[0x400*0x20]; + UINT16 m_custom_video; + UINT16 *m_gfx_rom; + UINT16 *m_text_ram; + UINT16 *m_sprite_gfx_ram; + UINT16 *m_tile_gfx_ram; + UINT16 m_sprite_buffer[0x800]; + emu_timer *m_sprite_timer; + int m_sprite_busy; + int m_need_process_spriteram; + UINT16 m_gfx_bank; + UINT16 m_scrollx[3]; + UINT16 m_scrolly[3]; + UINT16 m_video_register; + tilemap_t *m_text_tilemap; }; diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index 8fc174ed5f2..e5c4f8386ac 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -13,41 +13,41 @@ public: twincobr_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int toaplan_main_cpu; - int wardner_membank; - UINT8 *sharedram; - INT32 fg_rom_bank; - INT32 bg_ram_bank; - INT32 wardner_sprite_hack; - int intenable; - int dsp_on; - int dsp_BIO; - int fsharkbt_8741; - int dsp_execute; - UINT32 dsp_addr_w; - UINT32 main_ram_seg; - UINT16 *bgvideoram16; - UINT16 *fgvideoram16; - UINT16 *txvideoram16; - size_t bgvideoram_size; - size_t fgvideoram_size; - size_t txvideoram_size; - INT32 txscrollx; - INT32 txscrolly; - INT32 fgscrollx; - INT32 fgscrolly; - INT32 bgscrollx; - INT32 bgscrolly; - INT32 txoffs; - INT32 fgoffs; - INT32 bgoffs; - INT32 scroll_x; - INT32 scroll_y; - INT32 display_on; - INT32 flip_screen; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *tx_tilemap; + int m_toaplan_main_cpu; + int m_wardner_membank; + UINT8 *m_sharedram; + INT32 m_fg_rom_bank; + INT32 m_bg_ram_bank; + INT32 m_wardner_sprite_hack; + int m_intenable; + int m_dsp_on; + int m_dsp_BIO; + int m_fsharkbt_8741; + int m_dsp_execute; + UINT32 m_dsp_addr_w; + UINT32 m_main_ram_seg; + UINT16 *m_bgvideoram16; + UINT16 *m_fgvideoram16; + UINT16 *m_txvideoram16; + size_t m_bgvideoram_size; + size_t m_fgvideoram_size; + size_t m_txvideoram_size; + INT32 m_txscrollx; + INT32 m_txscrolly; + INT32 m_fgscrollx; + INT32 m_fgscrolly; + INT32 m_bgscrollx; + INT32 m_bgscrolly; + INT32 m_txoffs; + INT32 m_fgoffs; + INT32 m_bgoffs; + INT32 m_scroll_x; + INT32 m_scroll_y; + INT32 m_display_on; + INT32 m_flip_screen; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_tx_tilemap; }; diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index b135cf0bc92..97845f28c37 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -104,22 +104,22 @@ public: tx1_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - math_t math; - sn74s516_t sn74s516; - UINT8 *z80_ram; - UINT8 ppi_latch_a; - UINT8 ppi_latch_b; - UINT32 ts; - UINT16 *math_ram; - vregs_t vregs; - UINT16 *vram; - UINT16 *objram; - UINT16 *rcram; - emu_timer *interrupt_timer; - UINT8 *chr_bmp; - UINT8 *obj_bmp; - UINT8 *rod_bmp; - bitmap_t *bitmap; + math_t m_math; + sn74s516_t m_sn74s516; + UINT8 *m_z80_ram; + UINT8 m_ppi_latch_a; + UINT8 m_ppi_latch_b; + UINT32 m_ts; + UINT16 *m_math_ram; + vregs_t m_vregs; + UINT16 *m_vram; + UINT16 *m_objram; + UINT16 *m_rcram; + emu_timer *m_interrupt_timer; + UINT8 *m_chr_bmp; + UINT8 *m_obj_bmp; + UINT8 *m_rod_bmp; + bitmap_t *m_bitmap; }; diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index 73550b6eef6..303baacfea9 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -11,19 +11,22 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int sprite_colorbase, zoom_colorbase[3]; - int bank0, bank1, bank2; + int m_sprite_colorbase; + int m_zoom_colorbase[3]; + int m_bank0; + int m_bank1; + int m_bank2; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k051316_1; - device_t *k051316_2; - device_t *k051316_3; - device_t *k051960; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k051316_1; + device_t *m_k051316_2; + device_t *m_k051316_3; + device_t *m_k051960; }; diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index fa294e09af5..822ebcd4a51 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -11,11 +11,11 @@ public: ultratnk_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - int da_latch; - int collision[4]; - tilemap_t* playfield; - bitmap_t* helper; + UINT8 *m_videoram; + int m_da_latch; + int m_collision[4]; + tilemap_t* m_playfield; + bitmap_t* m_helper; }; diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index a514d3413bc..0fad111c5e0 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -14,16 +14,16 @@ public: undrfire_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 coin_word; - UINT16 port_sel; - int frame_counter; - UINT32 *ram; - UINT32 *shared_ram; - struct tempsprite *spritelist; - UINT16 rotate_ctrl[8]; - UINT8 dislayer[6]; - UINT32 *spriteram; - size_t spriteram_size; + UINT16 m_coin_word; + UINT16 m_port_sel; + int m_frame_counter; + UINT32 *m_ram; + UINT32 *m_shared_ram; + struct tempsprite *m_spritelist; + UINT16 m_rotate_ctrl[8]; + UINT8 m_dislayer[6]; + UINT32 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index 98ac37cf69b..dc728964ac3 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -4,15 +4,15 @@ public: unico_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *vram; - UINT16 *scroll; - UINT32 *vram32; - UINT32 *scroll32; - tilemap_t *tilemap[3]; - int sprites_scrolldx; - int sprites_scrolldy; - UINT16 *spriteram; - size_t spriteram_size; + UINT16 *m_vram; + UINT16 *m_scroll; + UINT32 *m_vram32; + UINT32 *m_scroll32; + tilemap_t *m_tilemap[3]; + int m_sprites_scrolldx; + int m_sprites_scrolldy; + UINT16 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index 4b089f33a6d..64db14c5961 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -4,9 +4,9 @@ public: usgames_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *charram; - tilemap_t *tilemap; + UINT8 *m_videoram; + UINT8 *m_charram; + tilemap_t *m_tilemap; }; diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index 6d088c170ac..ae0d40177b0 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -11,19 +11,19 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * pf1_rowscroll; - UINT16 * pf2_rowscroll; - UINT16 * pf3_rowscroll; - UINT16 * pf4_rowscroll; + UINT16 * m_pf1_rowscroll; + UINT16 * m_pf2_rowscroll; + UINT16 * m_pf3_rowscroll; + UINT16 * m_pf4_rowscroll; /* misc */ - UINT16 priority[2]; + UINT16 m_priority[2]; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *deco_tilegen1; - device_t *deco_tilegen2; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_deco_tilegen1; + device_t *m_deco_tilegen2; }; diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index fe6ff46c0cc..1aee0bbadcd 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -4,22 +4,22 @@ public: vastar_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *spriteram1; - UINT8 *spriteram2; - UINT8 *spriteram3; - - UINT8 *bg1videoram; - UINT8 *bg2videoram; - UINT8 *fgvideoram; - UINT8 *bg1_scroll; - UINT8 *bg2_scroll; - UINT8 *sprite_priority; - - tilemap_t *fg_tilemap; - tilemap_t *bg1_tilemap; - tilemap_t *bg2_tilemap; - - UINT8 *sharedram; + UINT8 *m_spriteram1; + UINT8 *m_spriteram2; + UINT8 *m_spriteram3; + + UINT8 *m_bg1videoram; + UINT8 *m_bg2videoram; + UINT8 *m_fgvideoram; + UINT8 *m_bg1_scroll; + UINT8 *m_bg2_scroll; + UINT8 *m_sprite_priority; + + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg1_tilemap; + tilemap_t *m_bg2_tilemap; + + UINT8 *m_sharedram; }; diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index 60aba746fa5..fae4731448b 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -4,19 +4,19 @@ public: vball_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *vb_attribram; - UINT8 *vb_videoram; - UINT8 *vb_scrolly_lo; - int vb_scrollx_hi; - int vb_scrolly_hi; - int vb_scrollx_lo; - int gfxset; - int vb_scrollx[256]; - int vb_bgprombank; - int vb_spprombank; - tilemap_t *bg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_vb_attribram; + UINT8 *m_vb_videoram; + UINT8 *m_vb_scrolly_lo; + int m_vb_scrollx_hi; + int m_vb_scrolly_hi; + int m_vb_scrollx_lo; + int m_gfxset; + int m_vb_scrollx[256]; + int m_vb_bgprombank; + int m_vb_spprombank; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index 79d90d1c0ad..ba2923449f3 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -11,25 +11,26 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * ram; -// UINT8 * paletteram; // currently this uses generic palette handling + UINT8 * m_ram; +// UINT8 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; - int layerpri[3]; + int m_layer_colorbase[3]; + int m_sprite_colorbase; + int m_layerpri[3]; /* misc */ - int irq_enabled; - offs_t video_banking_base; + int m_irq_enabled; + offs_t m_video_banking_base; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k053260; - device_t *k052109; - device_t *k053246; - device_t *k053251; - device_t *k054000; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k053260; + device_t *m_k052109; + device_t *m_k053246; + device_t *m_k053251; + device_t *m_k054000; }; /*----------- defined in video/vendetta.c -----------*/ diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h index 299c1d172f3..8e6cfed6221 100644 --- a/src/mame/includes/vertigo.h +++ b/src/mame/includes/vertigo.h @@ -83,16 +83,16 @@ public: vertigo_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *vectorram; - device_t *ttl74148; - attotime irq4_time; - UINT8 irq_state; - UINT8 adc_result; - vproc vs; - am2901 bsp; - vector_generator vgen; - UINT16 *vectorrom; - microcode mc[MC_LENGTH]; + UINT16 *m_vectorram; + device_t *m_ttl74148; + attotime m_irq4_time; + UINT8 m_irq_state; + UINT8 m_adc_result; + vproc m_vs; + am2901 m_bsp; + vector_generator m_vgen; + UINT16 *m_vectorrom; + microcode m_mc[MC_LENGTH]; }; diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 9deea3f1ced..8c109a2d0a1 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -28,11 +28,11 @@ public: vicdual_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT32 coin_status; - UINT8 *videoram; - UINT8 *characterram; - UINT8 samurai_protection_data; - UINT8 palette_bank; + UINT32 m_coin_status; + UINT8 *m_videoram; + UINT8 *m_characterram; + UINT8 m_samurai_protection_data; + UINT8 m_palette_bank; }; diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index f234b41c07b..dc6b868c752 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -35,25 +35,25 @@ public: victory_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *charram; - UINT16 paletteram[0x40]; - UINT8 *bgbitmap; - UINT8 *fgbitmap; - UINT8 *rram; - UINT8 *gram; - UINT8 *bram; - UINT8 vblank_irq; - UINT8 fgcoll; - UINT8 fgcollx; - UINT8 fgcolly; - UINT8 bgcoll; - UINT8 bgcollx; - UINT8 bgcolly; - UINT8 scrollx; - UINT8 scrolly; - UINT8 video_control; - struct micro_t micro; + UINT8 *m_videoram; + UINT8 *m_charram; + UINT16 m_paletteram[0x40]; + UINT8 *m_bgbitmap; + UINT8 *m_fgbitmap; + UINT8 *m_rram; + UINT8 *m_gram; + UINT8 *m_bram; + UINT8 m_vblank_irq; + UINT8 m_fgcoll; + UINT8 m_fgcollx; + UINT8 m_fgcolly; + UINT8 m_bgcoll; + UINT8 m_bgcollx; + UINT8 m_bgcolly; + UINT8 m_scrollx; + UINT8 m_scrolly; + UINT8 m_video_control; + struct micro_t m_micro; }; diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 2d6138d74e3..5bd16acdd03 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -21,14 +21,14 @@ public: videopin_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - attotime time_pushed; - attotime time_released; - UINT8 prev; - UINT8 mask; - UINT8* video_ram; - int ball_x; - int ball_y; - tilemap_t* bg_tilemap; + attotime m_time_pushed; + attotime m_time_released; + UINT8 m_prev; + UINT8 m_mask; + UINT8* m_video_ram; + int m_ball_x; + int m_ball_y; + tilemap_t* m_bg_tilemap; }; diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index 1b708a6bc7e..15e0c1080fc 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -4,17 +4,17 @@ public: vigilant_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - int horiz_scroll_low; - int horiz_scroll_high; - int rear_horiz_scroll_low; - int rear_horiz_scroll_high; - int rear_color; - int rear_disable; - int rear_refresh; - bitmap_t *bg_bitmap; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_videoram; + int m_horiz_scroll_low; + int m_horiz_scroll_high; + int m_rear_horiz_scroll_low; + int m_rear_horiz_scroll_high; + int m_rear_color; + int m_rear_disable; + int m_rear_refresh; + bitmap_t *m_bg_bitmap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h index adad272da4f..2463f67df6c 100644 --- a/src/mame/includes/vindictr.h +++ b/src/mame/includes/vindictr.h @@ -12,9 +12,9 @@ public: vindictr_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT8 playfield_tile_bank; - UINT16 playfield_xscroll; - UINT16 playfield_yscroll; + UINT8 m_playfield_tile_bank; + UINT16 m_playfield_xscroll; + UINT16 m_playfield_yscroll; }; diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index 7a24cf6badd..e1905029ad4 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -11,24 +11,24 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * video_ram; - UINT8 * cchip_ram; + UINT16 * m_video_ram; + UINT8 * m_cchip_ram; // UINT16 * paletteram; // this currently uses generic palette handlers /* video-related */ - UINT16 video_ctrl; - UINT16 video_mask; + UINT16 m_video_ctrl; + UINT16 m_video_mask; /* c-chip */ - UINT8 current_bank; - UINT8 current_flag; - UINT8 cc_port; - UINT8 current_cmd; + UINT8 m_current_bank; + UINT8 m_current_flag; + UINT8 m_cc_port; + UINT8 m_current_cmd; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *pc090oj; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_pc090oj; }; diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h index e11657f9c6a..7391940793c 100644 --- a/src/mame/includes/vsnes.h +++ b/src/mame/includes/vsnes.h @@ -4,37 +4,37 @@ public: vsnes_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *work_ram; - UINT8 *work_ram_1; - int coin; - int do_vrom_bank; - int input_latch[4]; - int sound_fix; - UINT8 last_bank; - UINT8* vram; - UINT8* vrom[2]; - UINT8* nt_ram[2]; - UINT8* nt_page[2][4]; - UINT32 vrom_size[2]; - int vrom_banks; - int zapstore; - int old_bank; - int drmario_shiftreg; - int drmario_shiftcount; - int size16k; - int switchlow; - int vrom4k; - int MMC3_cmd; - int MMC3_prg_bank[4]; - int MMC3_chr_bank[6]; - int MMC3_prg_mask; - int IRQ_enable; - int IRQ_count; - int IRQ_count_latch; - int VSindex; - int supxevs_prot_index; - int security_counter; - int ret; + UINT8 *m_work_ram; + UINT8 *m_work_ram_1; + int m_coin; + int m_do_vrom_bank; + int m_input_latch[4]; + int m_sound_fix; + UINT8 m_last_bank; + UINT8* m_vram; + UINT8* m_vrom[2]; + UINT8* m_nt_ram[2]; + UINT8* m_nt_page[2][4]; + UINT32 m_vrom_size[2]; + int m_vrom_banks; + int m_zapstore; + int m_old_bank; + int m_drmario_shiftreg; + int m_drmario_shiftcount; + int m_size16k; + int m_switchlow; + int m_vrom4k; + int m_MMC3_cmd; + int m_MMC3_prg_bank[4]; + int m_MMC3_chr_bank[6]; + int m_MMC3_prg_mask; + int m_IRQ_enable; + int m_IRQ_count; + int m_IRQ_count_latch; + int m_VSindex; + int m_supxevs_prot_index; + int m_security_counter; + int m_ret; }; diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index 0106e6d8ac4..0ab535685f8 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -4,15 +4,15 @@ public: vulgus_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *fgvideoram; - UINT8 *bgvideoram; - UINT8 *scroll_low; - UINT8 *scroll_high; - int palette_bank; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_fgvideoram; + UINT8 *m_bgvideoram; + UINT8 *m_scroll_low; + UINT8 *m_scroll_high; + int m_palette_bank; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index 92a17b38e6d..5f66537a963 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -6,17 +6,17 @@ public: warpwarp_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *geebee_videoram; - UINT8 *videoram; - int geebee_bgw; - int ball_on; - int ball_h; - int ball_v; - int ball_pen; - int ball_sizex; - int ball_sizey; - int handle_joystick; - tilemap_t *bg_tilemap; + UINT8 *m_geebee_videoram; + UINT8 *m_videoram; + int m_geebee_bgw; + int m_ball_on; + int m_ball_h; + int m_ball_v; + int m_ball_pen; + int m_ball_sizex; + int m_ball_sizey; + int m_handle_joystick; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index a011786b8e6..3040e67eccc 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -11,25 +11,25 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * spriteram; - size_t spriteram_size; + UINT16 * m_spriteram; + size_t m_spriteram_size; /* misc */ - INT32 banknum; - int pandata[4]; + INT32 m_banknum; + int m_pandata[4]; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *tc0140syt; - device_t *tc0100scn_1; - device_t *tc0100scn_2; - device_t *lscreen; - device_t *rscreen; - device_t *_2610_1l; - device_t *_2610_1r; - device_t *_2610_2l; - device_t *_2610_2r; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_tc0140syt; + device_t *m_tc0100scn_1; + device_t *m_tc0100scn_2; + device_t *m_lscreen; + device_t *m_rscreen; + device_t *m_2610_1l; + device_t *m_2610_1r; + device_t *m_2610_2l; + device_t *m_2610_2r; }; diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index c8fa1f0243a..bdbd1ba0eda 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -4,26 +4,26 @@ public: wc90_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *fgvideoram; - UINT8 *bgvideoram; - UINT8 *txvideoram; - UINT8 *scroll0xlo; - UINT8 *scroll0xhi; - UINT8 *scroll1xlo; - UINT8 *scroll1xhi; - UINT8 *scroll2xlo; - UINT8 *scroll2xhi; - UINT8 *scroll0ylo; - UINT8 *scroll0yhi; - UINT8 *scroll1ylo; - UINT8 *scroll1yhi; - UINT8 *scroll2ylo; - UINT8 *scroll2yhi; - tilemap_t *tx_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_fgvideoram; + UINT8 *m_bgvideoram; + UINT8 *m_txvideoram; + UINT8 *m_scroll0xlo; + UINT8 *m_scroll0xhi; + UINT8 *m_scroll1xlo; + UINT8 *m_scroll1xhi; + UINT8 *m_scroll2xlo; + UINT8 *m_scroll2xhi; + UINT8 *m_scroll0ylo; + UINT8 *m_scroll0yhi; + UINT8 *m_scroll1ylo; + UINT8 *m_scroll1yhi; + UINT8 *m_scroll2ylo; + UINT8 *m_scroll2yhi; + tilemap_t *m_tx_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index 3b5b8f9aecb..71183ab85c0 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -4,21 +4,21 @@ public: wc90b_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int msm5205next; - int toggle; - UINT8 *fgvideoram; - UINT8 *bgvideoram; - UINT8 *txvideoram; - UINT8 *scroll1x; - UINT8 *scroll2x; - UINT8 *scroll1y; - UINT8 *scroll2y; - UINT8 *scroll_x_lo; - tilemap_t *tx_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; - UINT8 *spriteram; - size_t spriteram_size; + int m_msm5205next; + int m_toggle; + UINT8 *m_fgvideoram; + UINT8 *m_bgvideoram; + UINT8 *m_txvideoram; + UINT8 *m_scroll1x; + UINT8 *m_scroll2x; + UINT8 *m_scroll1y; + UINT8 *m_scroll2y; + UINT8 *m_scroll_x_lo; + tilemap_t *m_tx_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 61ffedced0d..a8c5fcced03 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -4,39 +4,39 @@ public: wecleman_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *blitter_regs; - int multiply_reg[2]; - UINT16 *protection_ram; - int spr_color_offs; - int prot_state; - int selected_ip; - int irqctrl; - UINT16 *videostatus; - UINT16 *pageram; - UINT16 *txtram; - UINT16 *roadram; - size_t roadram_size; - int bgpage[4]; - int fgpage[4]; - const int *gfx_bank; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - tilemap_t *txt_tilemap; - int *spr_idx_list; - int *spr_pri_list; - int *t32x32pm; - int gameid; - int spr_offsx; - int spr_offsy; - int spr_count; - UINT16 *rgb_half; - int cloud_blend; - int cloud_ds; - int cloud_visible; - pen_t black_pen; - struct sprite *sprite_list; - struct sprite **spr_ptr_list; - UINT16 *spriteram; + UINT16 *m_blitter_regs; + int m_multiply_reg[2]; + UINT16 *m_protection_ram; + int m_spr_color_offs; + int m_prot_state; + int m_selected_ip; + int m_irqctrl; + UINT16 *m_videostatus; + UINT16 *m_pageram; + UINT16 *m_txtram; + UINT16 *m_roadram; + size_t m_roadram_size; + int m_bgpage[4]; + int m_fgpage[4]; + const int *m_gfx_bank; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + tilemap_t *m_txt_tilemap; + int *m_spr_idx_list; + int *m_spr_pri_list; + int *m_t32x32pm; + int m_gameid; + int m_spr_offsx; + int m_spr_offsy; + int m_spr_count; + UINT16 *m_rgb_half; + int m_cloud_blend; + int m_cloud_ds; + int m_cloud_visible; + pen_t m_black_pen; + struct sprite *m_sprite_list; + struct sprite **m_spr_ptr_list; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index 2141a9ba6a9..0264cc3d763 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -4,19 +4,19 @@ public: welltris_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int pending_command; + int m_pending_command; - UINT16 *spriteram; - UINT16 *pixelram; - UINT16 *charvideoram; + UINT16 *m_spriteram; + UINT16 *m_pixelram; + UINT16 *m_charvideoram; - tilemap_t *char_tilemap; - UINT8 gfxbank[8]; - UINT16 charpalettebank; - UINT16 spritepalettebank; - UINT16 pixelpalettebank; - int scrollx; - int scrolly; + tilemap_t *m_char_tilemap; + UINT8 m_gfxbank[8]; + UINT16 m_charpalettebank; + UINT16 m_spritepalettebank; + UINT16 m_pixelpalettebank; + int m_scrollx; + int m_scrolly; }; diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 3b042b5372d..e6ce50aa487 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -11,35 +11,38 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * spritemap; - UINT16 * spriteram; - UINT16 * pivram; - UINT16 * piv_ctrlram; - UINT16 * sharedram; -// UINT16 * paletteram; // currently this uses generic palette handling - size_t sharedram_size; - size_t spritemap_size; - size_t spriteram_size; + UINT16 * m_spritemap; + UINT16 * m_spriteram; + UINT16 * m_pivram; + UINT16 * m_piv_ctrlram; + UINT16 * m_sharedram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + size_t m_sharedram_size; + size_t m_spritemap_size; + size_t m_spriteram_size; /* video-related */ - tilemap_t *piv_tilemap[3]; - UINT16 piv_ctrl_reg; - UINT16 piv_zoom[3], piv_scrollx[3], piv_scrolly[3]; - UINT16 rotate_ctrl[8]; - int piv_xoffs, piv_yoffs; - UINT8 dislayer[4]; + tilemap_t *m_piv_tilemap[3]; + UINT16 m_piv_ctrl_reg; + UINT16 m_piv_zoom[3]; + UINT16 m_piv_scrollx[3]; + UINT16 m_piv_scrolly[3]; + UINT16 m_rotate_ctrl[8]; + int m_piv_xoffs; + int m_piv_yoffs; + UINT8 m_dislayer[4]; /* misc */ - UINT16 cpua_ctrl; - UINT16 port_sel; - INT32 banknum; + UINT16 m_cpua_ctrl; + UINT16 m_port_sel; + INT32 m_banknum; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *subcpu; - device_t *tc0100scn; - device_t *tc0140syt; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_subcpu; + device_t *m_tc0100scn; + device_t *m_tc0140syt; }; diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index db63353826d..ef943e99898 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -15,31 +15,31 @@ public: m_nvram(*this, "nvram") { } required_shared_ptr<UINT8> m_nvram; - UINT8 *mayday_protection; - UINT8 *videoram; - UINT8 *williams2_tileram; - UINT8 *blaster_palette_0; - UINT8 *blaster_scanline_control; - UINT8 blitter_config; - UINT16 blitter_clip_address; - UINT8 blitter_window_enable; - UINT8 williams2_tilemap_config; - UINT8 cocktail; - UINT8 blaster_bank; - UINT8 vram_bank; - UINT16 joust2_current_sound_data; - UINT8 port_select; - rgb_t *palette_lookup; - UINT8 blitterram[8]; - UINT8 blitter_xor; - UINT8 blitter_remap_index; - const UINT8 *blitter_remap; - UINT8 *blitter_remap_lookup; - rgb_t blaster_color0; - UINT8 blaster_video_control; - tilemap_t *bg_tilemap; - UINT16 tilemap_xscroll; - UINT8 williams2_fg_color; + UINT8 *m_mayday_protection; + UINT8 *m_videoram; + UINT8 *m_williams2_tileram; + UINT8 *m_blaster_palette_0; + UINT8 *m_blaster_scanline_control; + UINT8 m_blitter_config; + UINT16 m_blitter_clip_address; + UINT8 m_blitter_window_enable; + UINT8 m_williams2_tilemap_config; + UINT8 m_cocktail; + UINT8 m_blaster_bank; + UINT8 m_vram_bank; + UINT16 m_joust2_current_sound_data; + UINT8 m_port_select; + rgb_t *m_palette_lookup; + UINT8 m_blitterram[8]; + UINT8 m_blitter_xor; + UINT8 m_blitter_remap_index; + const UINT8 *m_blitter_remap; + UINT8 *m_blitter_remap_lookup; + rgb_t m_blaster_color0; + UINT8 m_blaster_video_control; + tilemap_t *m_bg_tilemap; + UINT16 m_tilemap_xscroll; + UINT8 m_williams2_fg_color; }; diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index e921c8e4da1..0a8b09b6f3c 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -4,14 +4,14 @@ public: wiping_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *sharedram1; - UINT8 *sharedram2; - UINT8 *videoram; - UINT8 *colorram; - int flipscreen; - UINT8 *soundregs; - UINT8 *spriteram; - size_t spriteram_size; + UINT8 *m_sharedram1; + UINT8 *m_sharedram2; + UINT8 *m_videoram; + UINT8 *m_colorram; + int m_flipscreen; + UINT8 *m_soundregs; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index a1f60badfc7..f177f1e1e08 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -4,23 +4,23 @@ public: wiz_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - int dsc0; - int dsc1; - UINT8 *videoram2; - UINT8 *colorram2; - UINT8 *attributesram; - UINT8 *attributesram2; - UINT8 *sprite_bank; - INT32 flipx; - INT32 flipy; - INT32 bgpen; - UINT8 char_bank[2]; - UINT8 palbank[2]; - int palette_bank; - UINT8 *spriteram; - UINT8 *spriteram2; - size_t spriteram_size; + UINT8 *m_videoram; + int m_dsc0; + int m_dsc1; + UINT8 *m_videoram2; + UINT8 *m_colorram2; + UINT8 *m_attributesram; + UINT8 *m_attributesram2; + UINT8 *m_sprite_bank; + INT32 m_flipx; + INT32 m_flipy; + INT32 m_bgpen; + UINT8 m_char_bank[2]; + UINT8 m_palbank[2]; + int m_palette_bank; + UINT8 *m_spriteram; + UINT8 *m_spriteram2; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 8638f2d5f9f..29558e5b592 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -4,23 +4,23 @@ public: wolfpack_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int collision; - UINT8* alpha_num_ram; - unsigned current_index; - UINT8 video_invert; - UINT8 ship_reflect; - UINT8 pt_pos_select; - UINT8 pt_horz; - UINT8 pt_pic; - UINT8 ship_h; - UINT8 torpedo_pic; - UINT8 ship_size; - UINT8 ship_h_precess; - UINT8 ship_pic; - UINT8 torpedo_h; - UINT8 torpedo_v; - UINT8* LFSR; - bitmap_t* helper; + int m_collision; + UINT8* m_alpha_num_ram; + unsigned m_current_index; + UINT8 m_video_invert; + UINT8 m_ship_reflect; + UINT8 m_pt_pos_select; + UINT8 m_pt_horz; + UINT8 m_pt_pic; + UINT8 m_ship_h; + UINT8 m_torpedo_pic; + UINT8 m_ship_size; + UINT8 m_ship_h_precess; + UINT8 m_ship_pic; + UINT8 m_torpedo_h; + UINT8 m_torpedo_v; + UINT8* m_LFSR; + bitmap_t* m_helper; }; diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index fa93fdde4f5..dff1eb55122 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -4,11 +4,11 @@ public: wrally_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *shareram; - tilemap_t *pant[2]; - UINT16 *vregs; - UINT16 *videoram; - UINT16 *spriteram; + UINT16 *m_shareram; + tilemap_t *m_pant[2]; + UINT16 *m_vregs; + UINT16 *m_videoram; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 0bfd615fbfd..6d8c760c9d6 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -4,14 +4,14 @@ public: wwfsstar_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int vblank; - int scrollx; - int scrolly; - UINT16 *spriteram; - UINT16 *fg0_videoram; - UINT16 *bg0_videoram; - tilemap_t *fg0_tilemap; - tilemap_t *bg0_tilemap; + int m_vblank; + int m_scrollx; + int m_scrolly; + UINT16 *m_spriteram; + UINT16 *m_fg0_videoram; + UINT16 *m_bg0_videoram; + tilemap_t *m_fg0_tilemap; + tilemap_t *m_bg0_tilemap; }; diff --git a/src/mame/includes/wwfwfest.h b/src/mame/includes/wwfwfest.h index 033dbe8f2b8..f9e74d9f10e 100644 --- a/src/mame/includes/wwfwfest.h +++ b/src/mame/includes/wwfwfest.h @@ -4,20 +4,20 @@ public: wwfwfest_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *fg0_videoram; - UINT16 *bg0_videoram; - UINT16 *bg1_videoram; - UINT16 pri; - UINT16 bg0_scrollx; - UINT16 bg0_scrolly; - UINT16 bg1_scrollx; - UINT16 bg1_scrolly; - tilemap_t *fg0_tilemap; - tilemap_t *bg0_tilemap; - tilemap_t *bg1_tilemap; - UINT16 sprite_xoff; - UINT16 bg0_dx; - UINT16 bg1_dx[2]; + UINT16 *m_fg0_videoram; + UINT16 *m_bg0_videoram; + UINT16 *m_bg1_videoram; + UINT16 m_pri; + UINT16 m_bg0_scrollx; + UINT16 m_bg0_scrolly; + UINT16 m_bg1_scrollx; + UINT16 m_bg1_scrolly; + tilemap_t *m_fg0_tilemap; + tilemap_t *m_bg0_tilemap; + tilemap_t *m_bg1_tilemap; + UINT16 m_sprite_xoff; + UINT16 m_bg0_dx; + UINT16 m_bg1_dx[2]; }; diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index b5f2ce2c84d..7815006d222 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -4,33 +4,33 @@ public: xain_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int vblank; - int from_main; - int from_mcu; - UINT8 ddr_a; - UINT8 ddr_b; - UINT8 ddr_c; - UINT8 port_a_out; - UINT8 port_b_out; - UINT8 port_c_out; - UINT8 port_a_in; - UINT8 port_b_in; - UINT8 port_c_in; - int _mcu_ready; - int _mcu_accept; - UINT8 *charram; - UINT8 *bgram0; - UINT8 *bgram1; - UINT8 pri; - tilemap_t *char_tilemap; - tilemap_t *bgram0_tilemap; - tilemap_t *bgram1_tilemap; - UINT8 scrollxP0[2]; - UINT8 scrollyP0[2]; - UINT8 scrollxP1[2]; - UINT8 scrollyP1[2]; - UINT8 *spriteram; - size_t spriteram_size; + int m_vblank; + int m_from_main; + int m_from_mcu; + UINT8 m_ddr_a; + UINT8 m_ddr_b; + UINT8 m_ddr_c; + UINT8 m_port_a_out; + UINT8 m_port_b_out; + UINT8 m_port_c_out; + UINT8 m_port_a_in; + UINT8 m_port_b_in; + UINT8 m_port_c_in; + int m_mcu_ready; + int m_mcu_accept; + UINT8 *m_charram; + UINT8 *m_bgram0; + UINT8 *m_bgram1; + UINT8 m_pri; + tilemap_t *m_char_tilemap; + tilemap_t *m_bgram0_tilemap; + tilemap_t *m_bgram1_tilemap; + UINT8 m_scrollxP0[2]; + UINT8 m_scrollyP0[2]; + UINT8 m_scrollxP1[2]; + UINT8 m_scrollyP1[2]; + UINT8 *m_spriteram; + size_t m_spriteram_size; }; diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index aa8d965bec0..9552bc815b2 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -11,36 +11,39 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * workram; - UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling + UINT16 * m_workram; + UINT16 * m_spriteram; +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[4], sprite_colorbase; - int layerpri[4]; - int cur_alpha; + int m_layer_colorbase[4]; + int m_sprite_colorbase; + int m_layerpri[4]; + int m_cur_alpha; /* misc */ - UINT16 cur_control2; - INT32 cur_sound_region, strip_0x1a; - int suspension_active, resume_trigger; - emu_timer *dmadelay_timer; - int frame; + UINT16 m_cur_control2; + INT32 m_cur_sound_region; + INT32 m_strip_0x1a; + int m_suspension_active; + int m_resume_trigger; + emu_timer *m_dmadelay_timer; + int m_frame; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k054539; - device_t *filter1l; - device_t *filter1r; - device_t *filter2l; - device_t *filter2r; - device_t *k056832; - device_t *k053246; - device_t *k053250; - device_t *k053251; - device_t *k053252; - device_t *k054338; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k054539; + device_t *m_filter1l; + device_t *m_filter1r; + device_t *m_filter2l; + device_t *m_filter2r; + device_t *m_k056832; + device_t *m_k053246; + device_t *m_k053250; + device_t *m_k053251; + device_t *m_k053252; + device_t *m_k054338; }; diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index 5f0f688ea0b..89b68946a99 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -6,34 +6,35 @@ public: : driver_device(machine, config) { } /* memory pointers */ -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * m_paletteram; // currently this uses generic palette handling /* video-related */ - int layer_colorbase[3], sprite_colorbase; - int layerpri[3]; + int m_layer_colorbase[3]; + int m_sprite_colorbase; + int m_layerpri[3]; /* for xmen6p */ - bitmap_t *screen_right; - bitmap_t *screen_left; - UINT16 * xmen6p_spriteramleft; - UINT16 * xmen6p_spriteramright; - UINT16 * xmen6p_tilemapleft; - UINT16 * xmen6p_tilemapright; - UINT16 * k053247_ram; - UINT16 current_frame; + bitmap_t *m_screen_right; + bitmap_t *m_screen_left; + UINT16 * m_xmen6p_spriteramleft; + UINT16 * m_xmen6p_spriteramright; + UINT16 * m_xmen6p_tilemapleft; + UINT16 * m_xmen6p_tilemapright; + UINT16 * m_k053247_ram; + UINT16 m_current_frame; /* misc */ - UINT8 sound_curbank; + UINT8 m_sound_curbank; /* devices */ - device_t *maincpu; - device_t *audiocpu; - device_t *k054539; - device_t *k052109; - device_t *k053246; - device_t *k053251; - device_t *lscreen; - device_t *rscreen; + device_t *m_maincpu; + device_t *m_audiocpu; + device_t *m_k054539; + device_t *m_k052109; + device_t *m_k053246; + device_t *m_k053251; + device_t *m_lscreen; + device_t *m_rscreen; }; /*----------- defined in video/xmen.c -----------*/ diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index 0468e557b5d..6b0e584e8f0 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -4,9 +4,9 @@ public: xorworld_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT16 *videoram; - tilemap_t *bg_tilemap; - UINT16 *spriteram; + UINT16 *m_videoram; + tilemap_t *m_bg_tilemap; + UINT16 *m_spriteram; }; diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 6041f12df01..b508fb709ae 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -4,15 +4,15 @@ public: xxmissio_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 status; - UINT8 *bgram; - UINT8 *fgram; - UINT8 *spriteram; - tilemap_t *bg_tilemap; - tilemap_t *fg_tilemap; - UINT8 xscroll; - UINT8 yscroll; - UINT8 flipscreen; + UINT8 m_status; + UINT8 *m_bgram; + UINT8 *m_fgram; + UINT8 *m_spriteram; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; + UINT8 m_xscroll; + UINT8 m_yscroll; + UINT8 m_flipscreen; }; diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h index 32711458661..f95af2ad0a3 100644 --- a/src/mame/includes/xybots.h +++ b/src/mame/includes/xybots.h @@ -12,7 +12,7 @@ public: xybots_state(running_machine &machine, const driver_device_config_base &config) : atarigen_state(machine, config) { } - UINT16 h256; + UINT16 m_h256; }; diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index 6a1f5300621..ae1990b4d55 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -4,13 +4,13 @@ public: xyonix_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *vidram; - tilemap_t *tilemap; + UINT8 *m_vidram; + tilemap_t *m_tilemap; - int e0_data; - int credits; - int coins; - int prev_coin; + int m_e0_data; + int m_credits; + int m_coins; + int m_prev_coin; }; diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index ec9d13a70cb..d7f5e5299ec 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -5,15 +5,15 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; - UINT8 * spriteram2; - size_t spriteram_size; + UINT8 * m_videoram; + UINT8 * m_spriteram; + UINT8 * m_spriteram2; + size_t m_spriteram_size; /* video-related */ - tilemap_t *bg_tilemap; + tilemap_t *m_bg_tilemap; - int yiear_nmi_enable; + int m_yiear_nmi_enable; }; diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index fb7f7f4801d..9eb0b193e73 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -11,21 +11,23 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * vram_0; - UINT16 * vram_1; - UINT16 * scrollram_0; - UINT16 * scrollram_1; - UINT16 * priorityram; -// UINT16 * paletteram; // currently this uses generic palette handling - UINT16 * spriteram; - size_t spriteram_size; + UINT16 * m_vram_0; + UINT16 * m_vram_1; + UINT16 * m_scrollram_0; + UINT16 * m_scrollram_1; + UINT16 * m_priorityram; +// UINT16 * m_paletteram; // currently this uses generic palette handling + UINT16 * m_spriteram; + size_t m_spriteram_size; /* other video-related elements */ - tilemap_t *tilemap_0, *tilemap_1; - int sprites_scrolldx, sprites_scrolldy; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; + int m_sprites_scrolldx; + int m_sprites_scrolldy; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index f84c45a1d16..24e39b12d10 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -11,20 +11,22 @@ public: : driver_device(machine, config) { } /* video-related */ - tilemap_t *tilemap_0, *tilemap_1; - UINT8 *videoram_0, *videoram_1; - int layers_ctrl; - int videobank; + tilemap_t *m_tilemap_0; + tilemap_t *m_tilemap_1; + UINT8 *m_videoram_0; + UINT8 *m_videoram_1; + int m_layers_ctrl; + int m_videobank; /* misc */ - int adpcm; - int toggle; + int m_adpcm; + int m_toggle; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; /* memory */ - UINT8 videoram[0x4000]; + UINT8 m_videoram[0x4000]; }; diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 9cbff80c7d6..c50b964152a 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -4,12 +4,12 @@ public: zac2650_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *videoram; - UINT8 *s2636_0_ram; - bitmap_t *spritebitmap; - int CollisionBackground; - int CollisionSprite; - tilemap_t *bg_tilemap; + UINT8 *m_videoram; + UINT8 *m_s2636_0_ram; + bitmap_t *m_spritebitmap; + int m_CollisionBackground; + int m_CollisionSprite; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index 8a69ac0b0ef..eb91543a5b8 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -4,17 +4,17 @@ public: zaccaria_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - int dsw; - int active_8910; - int port0a; - int acs; - int last_port0b; - int toggle; - UINT8 *videoram; - UINT8 *attributesram; - tilemap_t *bg_tilemap; - UINT8 *spriteram; - UINT8 *spriteram2; + int m_dsw; + int m_active_8910; + int m_port0a; + int m_acs; + int m_last_port0b; + int m_toggle; + UINT8 *m_videoram; + UINT8 *m_attributesram; + tilemap_t *m_bg_tilemap; + UINT8 *m_spriteram; + UINT8 *m_spriteram2; }; diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index 1d8bc09c19f..44423726157 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -10,30 +10,30 @@ public: zaxxon_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 *colorram; - UINT8 *videoram; - UINT8 *spriteram; - - UINT8 int_enabled; - UINT8 coin_status[3]; - UINT8 coin_enable[3]; - - UINT8 razmataz_dial_pos[2]; - UINT16 razmataz_counter; - - UINT8 sound_state[3]; - UINT8 bg_enable; - UINT8 bg_color; - UINT16 bg_position; - UINT8 fg_color; - - UINT8 congo_fg_bank; - UINT8 congo_color_bank; - UINT8 congo_custom[4]; - - const UINT8 *color_codes; - tilemap_t *fg_tilemap; - tilemap_t *bg_tilemap; + UINT8 *m_colorram; + UINT8 *m_videoram; + UINT8 *m_spriteram; + + UINT8 m_int_enabled; + UINT8 m_coin_status[3]; + UINT8 m_coin_enable[3]; + + UINT8 m_razmataz_dial_pos[2]; + UINT16 m_razmataz_counter; + + UINT8 m_sound_state[3]; + UINT8 m_bg_enable; + UINT8 m_bg_color; + UINT16 m_bg_position; + UINT8 m_fg_color; + + UINT8 m_congo_fg_bank; + UINT8 m_congo_color_bank; + UINT8 m_congo_custom[4]; + + const UINT8 *m_color_codes; + tilemap_t *m_fg_tilemap; + tilemap_t *m_bg_tilemap; }; diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index f11395a2e95..8d2dc6617e2 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -11,16 +11,16 @@ public: : driver_device(machine, config) { } /* memory pointers */ - UINT16 * videoram; + UINT16 * m_videoram; // UINT16 * paletteram; // currently this uses generic palette handling - size_t videoram_size; + size_t m_videoram_size; /* video-related */ - UINT16 tilebank; - tilemap_t *zz_tilemap; + UINT16 m_tilebank; + tilemap_t *m_zz_tilemap; /* devices */ - device_t *audiocpu; + device_t *m_audiocpu; }; /*----------- defined in video/zerozone.c -----------*/ diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h index 89f54e639ca..af946ecd86c 100644 --- a/src/mame/includes/zodiack.h +++ b/src/mame/includes/zodiack.h @@ -4,27 +4,28 @@ public: zodiack_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config) { } - UINT8 * videoram; - UINT8 * attributeram; - UINT8 * spriteram; - UINT8 * videoram_2; - UINT8 * bulletsram; - size_t videoram_size; - size_t spriteram_size; - size_t bulletsram_size; + UINT8 * m_videoram; + UINT8 * m_attributeram; + UINT8 * m_spriteram; + UINT8 * m_videoram_2; + UINT8 * m_bulletsram; + size_t m_videoram_size; + size_t m_spriteram_size; + size_t m_bulletsram_size; /* video-related */ - tilemap_t *bg_tilemap, *fg_tilemap; + tilemap_t *m_bg_tilemap; + tilemap_t *m_fg_tilemap; /* sound-related */ - UINT8 sound_nmi_enabled; + UINT8 m_sound_nmi_enabled; /* misc */ - int percuss_hardware; + int m_percuss_hardware; /* devices */ - device_t *maincpu; - device_t *audiocpu; + device_t *m_maincpu; + device_t *m_audiocpu; }; /*----------- defined in video/zodiack.c -----------*/ |