diff options
author | 2018-12-15 01:46:06 +1100 | |
---|---|---|
committer | 2018-12-15 01:46:06 +1100 | |
commit | 80e0a9dab70e06e9304f168e57577eb3191cfe50 (patch) | |
tree | cedd923d2226abf53c2473b681e1d8aaa2b0ad53 | |
parent | 496be2f305943411ed88d34a8c75f82013b4291f (diff) |
(nw) mhavoc: gave banked vector roms their own rom region
-rw-r--r-- | src/mame/drivers/mhavoc.cpp | 46 | ||||
-rw-r--r-- | src/mame/machine/mhavoc.cpp | 15 | ||||
-rw-r--r-- | src/mame/video/avgdvg.cpp | 2 |
3 files changed, 34 insertions, 29 deletions
diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp index 9a84a3de54f..50d0017fbc9 100644 --- a/src/mame/drivers/mhavoc.cpp +++ b/src/mame/drivers/mhavoc.cpp @@ -6,8 +6,8 @@ driver by Mike Appolo - Modified 10/08/2006 by Jess M. Askey to include support for Speech which was not stuffed on production - Major Havoc PCB's. However, the hardware if stuffed is functional. Speech is used in Major Havoc Return + Modified 10/08/2006 by Jess M. Askey to include support for Speech which was not used on production + Major Havoc PCB's. However, the hardware if used is functional. Speech is used in Major Havoc Return to Vax. Games supported: @@ -620,7 +620,7 @@ MACHINE_CONFIG_END ROM_START( mhavoc ) /* Alpha Processor ROMs */ - ROM_REGION( 0x20000, "alpha", 0 ) /* 152KB for ROMs */ + ROM_REGION( 0x18000, "alpha", 0 ) /* 152KB for ROMs */ /* Vector Generator ROM */ ROM_LOAD( "136025.210", 0x05000, 0x2000, CRC(c67284ca) SHA1(d9adad80c266d36429444f483cac4ebcf1fec7b8) ) @@ -633,8 +633,9 @@ ROM_START( mhavoc ) ROM_LOAD( "136025.318", 0x14000, 0x4000, CRC(ba935067) SHA1(05ad81e7a1982b9d8fddb48502546f48b5dc21b7) ) /* page 2+3 */ /* Paged Vector Generator ROM */ - ROM_LOAD( "136025.106", 0x18000, 0x4000, CRC(2ca83c76) SHA1(cc1adca32f70af30c4590e9fd6b056b051ccdb38) ) /* page 0+1 */ - ROM_LOAD( "136025.107", 0x1c000, 0x4000, CRC(5f81c5f3) SHA1(be4055727a2d4536e37ec20150deffdb5af5b01f) ) /* page 2+3 */ + ROM_REGION( 0x8000, "avgdvg", 0 ) + ROM_LOAD( "136025.106", 0x0000, 0x4000, CRC(2ca83c76) SHA1(cc1adca32f70af30c4590e9fd6b056b051ccdb38) ) /* page 0+1 */ + ROM_LOAD( "136025.107", 0x4000, 0x4000, CRC(5f81c5f3) SHA1(be4055727a2d4536e37ec20150deffdb5af5b01f) ) /* page 2+3 */ /* Gamma Processor ROM */ ROM_REGION( 0x10000, "gamma", 0 ) @@ -648,7 +649,7 @@ ROM_END ROM_START( mhavoc2 ) /* Alpha Processor ROMs */ - ROM_REGION( 0x20000, "alpha", 0 ) + ROM_REGION( 0x18000, "alpha", 0 ) /* Vector Generator ROM */ ROM_LOAD( "136025.110", 0x05000, 0x2000, CRC(16eef583) SHA1(277252bd716dd96d5b98ec5e33a3a6a3bc1a9abf) ) @@ -661,8 +662,9 @@ ROM_START( mhavoc2 ) ROM_LOAD( "136025.109", 0x14000, 0x4000, CRC(4d766827) SHA1(7697bf6f92bff0e62850ed75ff66008a08583ef7) ) /* page 2+3 */ /* Paged Vector Generator ROM */ - ROM_LOAD( "136025.106", 0x18000, 0x4000, CRC(2ca83c76) SHA1(cc1adca32f70af30c4590e9fd6b056b051ccdb38) ) /* page 0+1 */ - ROM_LOAD( "136025.107", 0x1c000, 0x4000, CRC(5f81c5f3) SHA1(be4055727a2d4536e37ec20150deffdb5af5b01f) ) /* page 2+3 */ + ROM_REGION( 0x8000, "avgdvg", 0 ) + ROM_LOAD( "136025.106", 0x0000, 0x4000, CRC(2ca83c76) SHA1(cc1adca32f70af30c4590e9fd6b056b051ccdb38) ) /* page 0+1 */ + ROM_LOAD( "136025.107", 0x4000, 0x4000, CRC(5f81c5f3) SHA1(be4055727a2d4536e37ec20150deffdb5af5b01f) ) /* page 2+3 */ /* the last 0x1000 is used for the 2 RAM pages */ @@ -678,7 +680,7 @@ ROM_END ROM_START( mhavocrv ) /* Alpha Processor ROMs */ - ROM_REGION( 0x20000, "alpha", 0 ) /* 152KB for ROMs */ + ROM_REGION( 0x18000, "alpha", 0 ) /* 152KB for ROMs */ /* Vector Generator ROM */ ROM_LOAD( "136025.210", 0x05000, 0x2000, CRC(c67284ca) SHA1(d9adad80c266d36429444f483cac4ebcf1fec7b8) ) @@ -691,8 +693,9 @@ ROM_START( mhavocrv ) ROM_LOAD( "136025.918", 0x14000, 0x4000, CRC(84735445) SHA1(21aacd862ce8911d257c6f48ead119ee5bb0b60d) ) /* page 2+3 */ /* Paged Vector Generator ROM */ - ROM_LOAD( "136025.106", 0x18000, 0x4000, CRC(2ca83c76) SHA1(cc1adca32f70af30c4590e9fd6b056b051ccdb38) ) /* page 0+1 */ - ROM_LOAD( "136025.907", 0x1c000, 0x4000, CRC(4deea2c9) SHA1(c4107581748a3f2d2084de2a4f120abd67a52189) ) /* page 2+3 */ + ROM_REGION( 0x8000, "avgdvg", 0 ) + ROM_LOAD( "136025.106", 0x0000, 0x4000, CRC(2ca83c76) SHA1(cc1adca32f70af30c4590e9fd6b056b051ccdb38) ) /* page 0+1 */ + ROM_LOAD( "136025.907", 0x4000, 0x4000, CRC(4deea2c9) SHA1(c4107581748a3f2d2084de2a4f120abd67a52189) ) /* page 2+3 */ /* the last 0x1000 is used for the 2 RAM pages */ @@ -708,7 +711,7 @@ ROM_END ROM_START( mhavocp ) /* Alpha Processor ROMs */ - ROM_REGION( 0x20000, "alpha", 0 ) + ROM_REGION( 0x18000, "alpha", 0 ) /* Vector Generator ROM */ ROM_LOAD( "136025.010", 0x05000, 0x2000, CRC(3050c0e6) SHA1(f19a9538996d949cdca7e6abd4f04e8ff6e0e2c1) ) @@ -721,8 +724,9 @@ ROM_START( mhavocp ) ROM_LOAD( "136025.018", 0x14000, 0x4000, CRC(a8c35ccd) SHA1(c243a5407557390a64c6560d857f5031f839973f) ) /* Paged Vector Generator ROM */ - ROM_LOAD( "136025.006", 0x18000, 0x4000, CRC(e272ed41) SHA1(0de395d1c4300a64da7f45746d7b550779e36a21) ) - ROM_LOAD( "136025.007", 0x1c000, 0x4000, CRC(e152c9d8) SHA1(79d0938fa9ad262c7f28c5a8ad21004a4dec9ed8) ) + ROM_REGION( 0x8000, "avgdvg", 0 ) + ROM_LOAD( "136025.006", 0x0000, 0x4000, CRC(e272ed41) SHA1(0de395d1c4300a64da7f45746d7b550779e36a21) ) + ROM_LOAD( "136025.007", 0x4000, 0x4000, CRC(e152c9d8) SHA1(79d0938fa9ad262c7f28c5a8ad21004a4dec9ed8) ) /* the last 0x1000 is used for the 2 RAM pages */ @@ -737,7 +741,7 @@ ROM_END ROM_START( alphaone ) - ROM_REGION( 0x20000, "alpha", 0 ) + ROM_REGION( 0x18000, "alpha", 0 ) /* Vector Generator ROM */ ROM_LOAD( "vec5000.tw", 0x05000, 0x1000, CRC(2a4c149f) SHA1(b60a0b29958bee9b5f7c1d88163680b626bb76dd) ) @@ -752,8 +756,9 @@ ROM_START( alphaone ) ROM_LOAD( "page01.tw", 0x10000, 0x4000, CRC(cbf3b05a) SHA1(1dfaf9300a252c9c921f06167160a59cdf329726) ) /* Paged Vector Generator ROM */ - ROM_LOAD( "vec_pg01.tw", 0x18000, 0x4000, CRC(e392a94d) SHA1(b5843da97d7aa5767c87c29660115efc5ad9ad54) ) - ROM_LOAD( "vec_pg23.tw", 0x1c000, 0x4000, CRC(1ff74292) SHA1(90e61c48544c62d905e207bba5c67ae7694e86a5) ) + ROM_REGION( 0x8000, "avgdvg", 0 ) + ROM_LOAD( "vec_pg01.tw", 0x0000, 0x4000, CRC(e392a94d) SHA1(b5843da97d7aa5767c87c29660115efc5ad9ad54) ) + ROM_LOAD( "vec_pg23.tw", 0x4000, 0x4000, CRC(1ff74292) SHA1(90e61c48544c62d905e207bba5c67ae7694e86a5) ) /* the last 0x1000 is used for the 2 RAM pages */ @@ -764,7 +769,7 @@ ROM_END ROM_START( alphaonea ) - ROM_REGION( 0x20000, "alpha", 0 ) + ROM_REGION( 0x18000, "alpha", 0 ) /* Vector Generator ROM */ ROM_LOAD( "vec5000.tw", 0x05000, 0x1000, CRC(2a4c149f) SHA1(b60a0b29958bee9b5f7c1d88163680b626bb76dd) ) @@ -779,8 +784,9 @@ ROM_START( alphaonea ) ROM_LOAD( "page01.tw", 0x10000, 0x4000, CRC(cbf3b05a) SHA1(1dfaf9300a252c9c921f06167160a59cdf329726) ) /* Paged Vector Generator ROM */ - ROM_LOAD( "vec_pg01.tw", 0x18000, 0x4000, CRC(e392a94d) SHA1(b5843da97d7aa5767c87c29660115efc5ad9ad54) ) - ROM_LOAD( "vec_pg23.tw", 0x1c000, 0x4000, CRC(1ff74292) SHA1(90e61c48544c62d905e207bba5c67ae7694e86a5) ) + ROM_REGION( 0x8000, "avgdvg", 0 ) + ROM_LOAD( "vec_pg01.tw", 0x0000, 0x4000, CRC(e392a94d) SHA1(b5843da97d7aa5767c87c29660115efc5ad9ad54) ) + ROM_LOAD( "vec_pg23.tw", 0x4000, 0x4000, CRC(1ff74292) SHA1(90e61c48544c62d905e207bba5c67ae7694e86a5) ) /* the last 0x1000 is used for the 2 RAM pages */ diff --git a/src/mame/machine/mhavoc.cpp b/src/mame/machine/mhavoc.cpp index fe4395c8c04..69f341fd71a 100644 --- a/src/mame/machine/mhavoc.cpp +++ b/src/mame/machine/mhavoc.cpp @@ -139,14 +139,14 @@ TIMER_CALLBACK_MEMBER(mhavoc_state::delayed_gamma_w) WRITE8_MEMBER(mhavoc_state::mhavoc_gamma_w) { - logerror(" writing to gamma processor: %02x (%d %d)\n", data, m_gamma_rcvd, m_alpha_xmtd); + //logerror(" writing to gamma processor: %02x (%d %d)\n", data, m_gamma_rcvd, m_alpha_xmtd); machine().scheduler().synchronize(timer_expired_delegate(FUNC(mhavoc_state::delayed_gamma_w),this), data); } READ8_MEMBER(mhavoc_state::mhavoc_alpha_r) { - logerror("\t\t\t\t\treading from alpha processor: %02x (%d %d)\n", m_alpha_data, m_gamma_rcvd, m_alpha_xmtd); + //logerror("\t\t\t\t\treading from alpha processor: %02x (%d %d)\n", m_alpha_data, m_gamma_rcvd, m_alpha_xmtd); m_gamma_rcvd = 1; m_alpha_xmtd = 0; return m_alpha_data; @@ -162,7 +162,7 @@ READ8_MEMBER(mhavoc_state::mhavoc_alpha_r) WRITE8_MEMBER(mhavoc_state::mhavoc_alpha_w) { - logerror("\t\t\t\t\twriting to alpha processor: %02x %d %d\n", data, m_alpha_rcvd, m_gamma_xmtd); + //logerror("\t\t\t\t\twriting to alpha processor: %02x %d %d\n", data, m_alpha_rcvd, m_gamma_xmtd); m_alpha_rcvd = 0; m_gamma_xmtd = 1; m_gamma_data = data; @@ -171,7 +171,7 @@ WRITE8_MEMBER(mhavoc_state::mhavoc_alpha_w) READ8_MEMBER(mhavoc_state::mhavoc_gamma_r) { - logerror(" reading from gamma processor: %02x (%d %d)\n", m_gamma_data, m_alpha_rcvd, m_gamma_xmtd); + //logerror(" reading from gamma processor: %02x (%d %d)\n", m_gamma_data, m_alpha_rcvd, m_gamma_xmtd); m_alpha_rcvd = 1; m_gamma_xmtd = 0; return m_gamma_data; @@ -258,7 +258,7 @@ WRITE8_MEMBER(mhavoc_state::mhavoc_out_0_w) m_gamma->set_input_line(INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); if (!(data & 0x08)) { - logerror("\t\t\t\t*** resetting gamma processor. ***\n"); + //logerror("\t\t\t\t*** resetting gamma processor. ***\n"); m_alpha_rcvd = 0; m_alpha_xmtd = 0; m_gamma_rcvd = 0; @@ -287,7 +287,7 @@ WRITE8_MEMBER(mhavoc_state::alphaone_out_0_w) /* Bit 0 = left coin counter */ machine().bookkeeping().coin_counter_w(0, data & 0x01); -logerror("alphaone_out_0_w(%02X)\n", data); + //logerror("alphaone_out_0_w(%02X)\n", data); } @@ -325,8 +325,7 @@ WRITE8_MEMBER(mhavoc_state::mhavocrv_speech_strobe_w) void mhavoc_state::init_mhavocrv() { - /* install the speech support that was only optionally stuffed for use */ - /* in the Return to Vax hack */ + // For Return to Vax, add support for the normally-unused speech module. m_gamma->space(AS_PROGRAM).install_write_handler(0x5800, 0x5800, write8_delegate(FUNC(mhavoc_state::mhavocrv_speech_data_w),this)); m_gamma->space(AS_PROGRAM).install_write_handler(0x5900, 0x5900, write8_delegate(FUNC(mhavoc_state::mhavocrv_speech_strobe_w),this)); } diff --git a/src/mame/video/avgdvg.cpp b/src/mame/video/avgdvg.cpp index ae5c5c60689..ebfa023efc3 100644 --- a/src/mame/video/avgdvg.cpp +++ b/src/mame/video/avgdvg.cpp @@ -892,7 +892,7 @@ void avg_mhavoc_device::update_databus() // mhavoc_data if (m_pc & 0x2000) { - bank = &machine().root_device().memregion("alpha")->base()[0x18000]; + bank = &machine().root_device().memregion("avgdvg")->base()[0]; m_data = bank[(m_map << 13) | ((m_pc ^ 1) & 0x1fff)]; } else |