Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-03 09:06:08 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ultraman.cpp : Minor cleanup

Browse Source
This commit is contained in:
cam900 2018-03-17 16:56:13 +09:00
parent 61f1bf7477
commit ce85ed37a3
3 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mame/drivers/ultraman.cpp
View File

@ -42,12 +42,12 @@ void ultraman_state::main_map(address_map &map)
map(0x1c0021, 0x1c0021).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0x1c0021, 0x1c0021).w(m_soundlatch, FUNC(generic_latch_8_device::write));
map(0x1c0029, 0x1c0029).w(m_soundnmi, FUNC(input_merger_device::in_set<0>)); map(0x1c0029, 0x1c0029).w(m_soundnmi, FUNC(input_merger_device::in_set<0>));
map(0x1c0030, 0x1c0031).w("watchdog", FUNC(watchdog_timer_device::reset16_w)); map(0x1c0030, 0x1c0031).w("watchdog", FUNC(watchdog_timer_device::reset16_w));
map(0x204000, 0x204fff).rw(m_k051316_1, FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #0 RAM */ map(0x204000, 0x204fff).rw(m_k051316[0], FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #0 RAM */
map(0x205000, 0x205fff).rw(m_k051316_2, FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #1 RAM */ map(0x205000, 0x205fff).rw(m_k051316[1], FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #1 RAM */
map(0x206000, 0x206fff).rw(m_k051316_3, FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #2 RAM */ map(0x206000, 0x206fff).rw(m_k051316[2], FUNC(k051316_device::read), FUNC(k051316_device::write)).umask16(0x00ff); /* K051316 #2 RAM */
map(0x207f80, 0x207f9f).w(m_k051316_1, FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #0 registers */ map(0x207f80, 0x207f9f).w(m_k051316[0], FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #0 registers */
map(0x207fa0, 0x207fbf).w(m_k051316_2, FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #1 registers */ map(0x207fa0, 0x207fbf).w(m_k051316[1], FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #1 registers */
map(0x207fc0, 0x207fdf).w(m_k051316_3, FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #2 registers */ map(0x207fc0, 0x207fdf).w(m_k051316[2], FUNC(k051316_device::ctrl_w)).umask16(0x00ff); /* K051316 #2 registers */
map(0x304000, 0x30400f).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)).umask16(0x00ff); /* Sprite control */ map(0x304000, 0x30400f).rw(m_k051960, FUNC(k051960_device::k051937_r), FUNC(k051960_device::k051937_w)).umask16(0x00ff); /* Sprite control */
map(0x304800, 0x304fff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)).umask16(0x00ff); /* Sprite RAM */ map(0x304800, 0x304fff).rw(m_k051960, FUNC(k051960_device::k051960_r), FUNC(k051960_device::k051960_w)).umask16(0x00ff); /* Sprite RAM */
} }
@ -160,16 +160,14 @@ INPUT_PORTS_END
void ultraman_state::machine_start() void ultraman_state::machine_start()
{ {
save_item(NAME(m_bank0)); save_item(NAME(m_bank));
save_item(NAME(m_bank1));
save_item(NAME(m_bank2));
} }
void ultraman_state::machine_reset() void ultraman_state::machine_reset()
{ {
m_bank0 = -1; m_bank[0] = -1;
m_bank1 = -1; m_bank[1] = -1;
m_bank2 = -1; m_bank[2] = -1;
m_soundnmi->in_w<0>(0); m_soundnmi->in_w<0>(0);
} }

26
src/mame/includes/ultraman.h
View File

@ -16,26 +16,22 @@ class ultraman_state : public driver_device
{ {
public: public:
ultraman_state(const machine_config &mconfig, device_type type, const char *tag) ultraman_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag), : driver_device(mconfig, type, tag)
m_maincpu(*this, "maincpu"), , m_maincpu(*this, "maincpu")
m_audiocpu(*this, "audiocpu"), , m_audiocpu(*this, "audiocpu")
m_k051316_1(*this, "k051316_1"), , m_k051316(*this, "k051316_%u", 1)
m_k051316_2(*this, "k051316_2"), , m_k051960(*this, "k051960")
m_k051316_3(*this, "k051316_3"), , m_soundlatch(*this, "soundlatch")
m_k051960(*this, "k051960"), , m_soundnmi(*this, "soundnmi")
m_soundlatch(*this, "soundlatch"), {
m_soundnmi(*this, "soundnmi") { } }
int m_bank0; int m_bank[3];
int m_bank1;
int m_bank2;
/* devices */ /* devices */
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_audiocpu;
required_device<k051316_device> m_k051316_1; required_device_array<k051316_device, 3> m_k051316;
required_device<k051316_device> m_k051316_2;
required_device<k051316_device> m_k051316_3;
required_device<k051960_device> m_k051960; required_device<k051960_device> m_k051960;
required_device<generic_latch_8_device> m_soundlatch; required_device<generic_latch_8_device> m_soundlatch;
required_device<input_merger_device> m_soundnmi; required_device<input_merger_device> m_soundnmi;

36
src/mame/video/ultraman.cpp
View File

@ -29,7 +29,7 @@ K051316_CB_MEMBER(ultraman_state::zoom_callback_1)
{ {
enum { zoom_colorbase_1 = 0 / 16 }; enum { zoom_colorbase_1 = 0 / 16 };
*code |= ((*color & 0x07) << 8) | (m_bank0 << 11); *code |= ((*color & 0x07) << 8) | (m_bank[0] << 11);
*color = zoom_colorbase_1 + ((*color & 0xf8) >> 3); *color = zoom_colorbase_1 + ((*color & 0xf8) >> 3);
} }
@ -37,14 +37,14 @@ K051316_CB_MEMBER(ultraman_state::zoom_callback_2)
{ {
enum { zoom_colorbase_2 = 1024 / 16 }; enum { zoom_colorbase_2 = 1024 / 16 };
*code |= ((*color & 0x07) << 8) | (m_bank1 << 11); *code |= ((*color & 0x07) << 8) | (m_bank[1] << 11);
*color = zoom_colorbase_2 + ((*color & 0xf8) >> 3); *color = zoom_colorbase_2 + ((*color & 0xf8) >> 3);
} }
K051316_CB_MEMBER(ultraman_state::zoom_callback_3) K051316_CB_MEMBER(ultraman_state::zoom_callback_3)
{ {
enum { zoom_colorbase_3 = 2048 / 16 }; enum { zoom_colorbase_3 = 2048 / 16 };
*code |= ((*color & 0x07) << 8) | (m_bank2 << 11); *code |= ((*color & 0x07) << 8) | (m_bank[2] << 11);
*color = zoom_colorbase_3 + ((*color & 0xf8) >> 3); *color = zoom_colorbase_3 + ((*color & 0xf8) >> 3);
} }
@ -69,28 +69,28 @@ WRITE16_MEMBER(ultraman_state::ultraman_gfxctrl_w)
bit 6: coin counter 1 bit 6: coin counter 1
bit 7: coin counter 2 */ bit 7: coin counter 2 */
m_k051316_1->wraparound_enable(data & 0x01); m_k051316[0]->wraparound_enable(data & 0x01);
if (m_bank0 != ((data & 0x02) >> 1)) if (m_bank[0] != ((data & 0x02) >> 1))
{ {
m_bank0 = (data & 0x02) >> 1; m_bank[0] = (data & 0x02) >> 1;
m_k051316_1->mark_tmap_dirty(); m_k051316[0]->mark_tmap_dirty();
} }
m_k051316_2->wraparound_enable(data & 0x04); m_k051316[1]->wraparound_enable(data & 0x04);
if (m_bank1 != ((data & 0x08) >> 3)) if (m_bank[1] != ((data & 0x08) >> 3))
{ {
m_bank1 = (data & 0x08) >> 3; m_bank[1] = (data & 0x08) >> 3;
m_k051316_2->mark_tmap_dirty(); m_k051316[1]->mark_tmap_dirty();
} }
m_k051316_3->wraparound_enable(data & 0x10); m_k051316[2]->wraparound_enable(data & 0x10);
if (m_bank2 != ((data & 0x20) >> 5)) if (m_bank[2] != ((data & 0x20) >> 5))
{ {
m_bank2 = (data & 0x20) >> 5; m_bank[2] = (data & 0x20) >> 5;
m_k051316_3->mark_tmap_dirty(); m_k051316[2]->mark_tmap_dirty();
} }
machine().bookkeeping().coin_counter_w(0, data & 0x40); machine().bookkeeping().coin_counter_w(0, data & 0x40);
@ -110,9 +110,9 @@ uint32_t ultraman_state::screen_update_ultraman(screen_device &screen, bitmap_in
{ {
screen.priority().fill(0, cliprect); screen.priority().fill(0, cliprect);
m_k051316_3->zoom_draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); m_k051316[2]->zoom_draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
m_k051316_2->zoom_draw(screen, bitmap, cliprect, 0, 0); m_k051316[1]->zoom_draw(screen, bitmap, cliprect, 0, 0);
m_k051316_1->zoom_draw(screen, bitmap, cliprect, 0, 1); m_k051316[0]->zoom_draw(screen, bitmap, cliprect, 0, 1);
m_k051960->k051960_sprites_draw(bitmap, cliprect, screen.priority(), -1, -1); m_k051960->k051960_sprites_draw(bitmap, cliprect, screen.priority(), -1, -1);
return 0; return 0;
} }