Skip to content

Commit 8c87c80

Browse files
awjacksonawjackson
committed
thunderx.c: simplify ROM loading/banking and unify it between scontra and thunderx (nw)
1 parent cea2388 commit 8c87c80

File tree

1 file changed

+22
-36
lines changed

1 file changed

+22
-36
lines changed

‎src/mame/drivers/thunderx.c‎

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -579,22 +579,14 @@ MACHINE_START_MEMBER(thunderx_state,scontra)
579579
save_item(NAME(m_palette_selected));
580580
save_item(NAME(m_rambank));
581581
save_item(NAME(m_pmcbank));
582-
583-
membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x10000, 0x2000);
582+
583+
membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base(), 0x2000);
584584
}
585585

586586
MACHINE_START_MEMBER(thunderx_state,thunderx)
587587
{
588-
UINT8 *ROM = memregion("maincpu")->base();
589-
590-
membank("bank1")->configure_entries(0, 12, &ROM[0x10000], 0x2000);
591-
membank("bank1")->configure_entries(12, 4, &ROM[0x08000], 0x2000);
592-
membank("bank1")->set_entry(0);
593-
594-
memset(m_pmcram, 0, sizeof(m_pmcram));
595-
596588
MACHINE_START_CALL_MEMBER(scontra);
597-
589+
memset(m_pmcram, 0, sizeof(m_pmcram));
598590
save_item(NAME(m_pmcram));
599591
}
600592

@@ -658,7 +650,7 @@ MACHINE_CONFIG_END
658650
WRITE8_MEMBER( thunderx_state::thunderx_banking_callback )
659651
{
660652
//logerror("thunderx %04x: bank select %02x\n", machine().device("maincpu")->safe_pc(), data);
661-
membank("bank1")->set_entry(((data & 0x0f) ^ 0x08));
653+
membank("bank1")->set_entry(data & 0x0f);
662654
}
663655

664656
static MACHINE_CONFIG_START( thunderx, thunderx_state )
@@ -712,10 +704,9 @@ MACHINE_CONFIG_END
712704
***************************************************************************/
713705

714706
ROM_START( scontra )
715-
ROM_REGION( 0x30000, "maincpu", 0 ) /* ROMs + banked RAM */
716-
ROM_LOAD( "775-e02.k11", 0x10000, 0x08000, CRC(a61c0ead) SHA1(9a0aadc8d3538fc1d88b761753fffcac8923a218) ) /* banked ROM */
717-
ROM_CONTINUE( 0x08000, 0x08000 ) /* fixed ROM */
718-
ROM_LOAD( "775-e03.k13", 0x20000, 0x10000, CRC(00b02622) SHA1(caf1da53815e437e3fb952d29e71f2c314684cd9) ) /* banked ROM */
707+
ROM_REGION( 0x20000, "maincpu", 0 ) /* banked program ROMs */
708+
ROM_LOAD( "775-e02.k11", 0x00000, 0x10000, CRC(a61c0ead) SHA1(9a0aadc8d3538fc1d88b761753fffcac8923a218) ) /* banked + fixed ROM */
709+
ROM_LOAD( "775-e03.k13", 0x10000, 0x10000, CRC(00b02622) SHA1(caf1da53815e437e3fb952d29e71f2c314684cd9) ) /* banked ROM */
719710

720711
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the SOUND CPU */
721712
ROM_LOAD( "775-c01.bin", 0x00000, 0x08000, CRC(0ced785a) SHA1(1eebe005a968fbaac595c168499107e34763976c) )
@@ -767,10 +758,9 @@ ROM_START( scontra )
767758
ROM_END
768759

769760
ROM_START( scontraj )
770-
ROM_REGION( 0x30000, "maincpu", 0 ) /* ROMs + banked RAM */
771-
ROM_LOAD( "775-f02.bin", 0x10000, 0x08000, CRC(8d5933a7) SHA1(e13ec62a4209b790b609429d98620ec0d07bd0ee) ) /* banked ROM */
772-
ROM_CONTINUE( 0x08000, 0x08000 ) /* fixed ROM */
773-
ROM_LOAD( "775-f03.bin", 0x20000, 0x10000, CRC(1ef63d80) SHA1(8fa41038ec2928f9572d0d4511a4bb3a3d8de06d) ) /* banked ROM */
761+
ROM_REGION( 0x20000, "maincpu", 0 ) /* banked program ROMs */
762+
ROM_LOAD( "775-f02.bin", 0x00000, 0x10000, CRC(8d5933a7) SHA1(e13ec62a4209b790b609429d98620ec0d07bd0ee) ) /* banked + fixed ROM */
763+
ROM_LOAD( "775-f03.bin", 0x10000, 0x10000, CRC(1ef63d80) SHA1(8fa41038ec2928f9572d0d4511a4bb3a3d8de06d) ) /* banked ROM */
774764

775765
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the SOUND CPU */
776766
ROM_LOAD( "775-c01.bin", 0x00000, 0x08000, CRC(0ced785a) SHA1(1eebe005a968fbaac595c168499107e34763976c) )
@@ -822,10 +812,9 @@ ROM_START( scontraj )
822812
ROM_END
823813

824814
ROM_START( thunderx )
825-
ROM_REGION( 0x28000, "maincpu", 0 ) /* ROMs + banked RAM */
826-
ROM_LOAD( "873-s03.k15", 0x10000, 0x10000, CRC(2aec2699) SHA1(8f52703a6a1ba6417c484925192ce697af9c73f1) )
827-
ROM_LOAD( "873-s02.k13", 0x20000, 0x08000, CRC(6619333a) SHA1(1961658d528b0870c57f1cb78e016fb881f50392) )
828-
ROM_CONTINUE( 0x08000, 0x08000 )
815+
ROM_REGION( 0x20000, "maincpu", 0 ) /* banked program ROMs */
816+
ROM_LOAD( "873-s02.k13", 0x00000, 0x10000, CRC(6619333a) SHA1(1961658d528b0870c57f1cb78e016fb881f50392) ) /* banked + fixed ROM */
817+
ROM_LOAD( "873-s03.k15", 0x10000, 0x10000, CRC(2aec2699) SHA1(8f52703a6a1ba6417c484925192ce697af9c73f1) ) /* banked ROM */
829818

830819
ROM_REGION( 0x10000, "audiocpu", 0 )
831820
ROM_LOAD( "873-f01.f8", 0x0000, 0x8000, CRC(ea35ffa3) SHA1(91e82b77d4f3af8238fb198db26182bebc5026e4) )
@@ -855,10 +844,9 @@ ROM_START( thunderx )
855844
ROM_END
856845

857846
ROM_START( thunderxa ) /* Alternate Starting stage then the other 2 sets, Perhaps a US set? */
858-
ROM_REGION( 0x28000, "maincpu", 0 ) /* ROMs + banked RAM */
859-
ROM_LOAD( "873-k03.k15", 0x10000, 0x10000, CRC(276817ad) SHA1(34b1beecf2a4c54dd7cd150c5d83b44f67be288a) )
860-
ROM_LOAD( "873-k02.k13", 0x20000, 0x08000, CRC(80cc1c45) SHA1(881bc6eea94671e8c3fdb7a10b0e742b18cb7212) )
861-
ROM_CONTINUE( 0x08000, 0x08000 )
847+
ROM_REGION( 0x20000, "maincpu", 0 ) /* banked program ROMs */
848+
ROM_LOAD( "873-k02.k13", 0x00000, 0x10000, CRC(80cc1c45) SHA1(881bc6eea94671e8c3fdb7a10b0e742b18cb7212) ) /* banked + fixed ROM */
849+
ROM_LOAD( "873-k03.k15", 0x10000, 0x10000, CRC(276817ad) SHA1(34b1beecf2a4c54dd7cd150c5d83b44f67be288a) ) /* banked ROM */
862850

863851
ROM_REGION( 0x10000, "audiocpu", 0 )
864852
ROM_LOAD( "873-h01.f8", 0x0000, 0x8000, CRC(990b7a7c) SHA1(0965e7350c6006a9652cea0f24d836b4979910fd) )
@@ -888,10 +876,9 @@ ROM_START( thunderxa ) /* Alternate Starting stage then the other 2 sets, Perhap
888876
ROM_END
889877

890878
ROM_START( thunderxb ) /* Set had no labels, same starting stage as parent set */
891-
ROM_REGION( 0x28000, "maincpu", 0 ) /* ROMs + banked RAM */
892-
ROM_LOAD( "873-03.k15", 0x10000, 0x10000, CRC(36680a4e) SHA1(9b3b6bf75a9c04e764448cd958277bd081cc4a53) )
893-
ROM_LOAD( "873-02.k13", 0x20000, 0x08000, CRC(c58b2c34) SHA1(4050d2edc579ffedba3d40782a08e43ac89b1b86) )
894-
ROM_CONTINUE( 0x08000, 0x08000 )
879+
ROM_REGION( 0x20000, "maincpu", 0 ) /* banked program ROMs */
880+
ROM_LOAD( "873-02.k13", 0x00000, 0x10000, CRC(c58b2c34) SHA1(4050d2edc579ffedba3d40782a08e43ac89b1b86) ) /* banked + fixed ROM */
881+
ROM_LOAD( "873-03.k15", 0x10000, 0x10000, CRC(36680a4e) SHA1(9b3b6bf75a9c04e764448cd958277bd081cc4a53) ) /* banked ROM */
895882

896883
ROM_REGION( 0x10000, "audiocpu", 0 )
897884
ROM_LOAD( "873-f01.f8", 0x0000, 0x8000, CRC(ea35ffa3) SHA1(91e82b77d4f3af8238fb198db26182bebc5026e4) )
@@ -921,10 +908,9 @@ ROM_START( thunderxb ) /* Set had no labels, same starting stage as parent set *
921908
ROM_END
922909

923910
ROM_START( thunderxj )
924-
ROM_REGION( 0x28000, "maincpu", 0 ) /* ROMs + banked RAM */
925-
ROM_LOAD( "873-n03.k15", 0x10000, 0x10000, CRC(a01e2e3e) SHA1(eba0d95dc0c5eed18743a96e4bbda5e60d5d9c97) )
926-
ROM_LOAD( "873-n02.k13", 0x20000, 0x08000, CRC(55afa2cc) SHA1(5fb9df0c7c7c0c2029dbe0f3c1e0340234a03e8a) )
927-
ROM_CONTINUE( 0x08000, 0x08000 )
911+
ROM_REGION( 0x20000, "maincpu", 0 ) /* banked program ROMs */
912+
ROM_LOAD( "873-n02.k13", 0x00000, 0x10000, CRC(55afa2cc) SHA1(5fb9df0c7c7c0c2029dbe0f3c1e0340234a03e8a) ) /* banked + fixed ROM */
913+
ROM_LOAD( "873-n03.k15", 0x10000, 0x10000, CRC(a01e2e3e) SHA1(eba0d95dc0c5eed18743a96e4bbda5e60d5d9c97) ) /* banked ROM */
928914

929915
ROM_REGION( 0x10000, "audiocpu", 0 )
930916
ROM_LOAD( "873-f01.f8", 0x0000, 0x8000, CRC(ea35ffa3) SHA1(91e82b77d4f3af8238fb198db26182bebc5026e4) )

0 commit comments

Comments
 (0)