diff options
Diffstat (limited to 'src/mame/drivers/cps3.cpp')
-rw-r--r-- | src/mame/drivers/cps3.cpp | 211 |
1 files changed, 125 insertions, 86 deletions
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index 10f9558b8e2..3cf6d516ab2 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -464,9 +464,8 @@ hardware modification to the security cart..... #include "machine/intelfsh.h" #include "machine/nvram.h" #include "includes/cps3.h" -#include "bus/scsi/scsi.h" -#include "bus/scsi/scsicd.h" -#include "machine/wd33c93.h" +#include "machine/nscsi_cd.h" +#include "machine/wd33c9x.h" #include "screen.h" #include "speaker.h" @@ -773,12 +772,6 @@ void cps3_state::cps3_decrypt_bios() #endif } -void cps3_state::init_common(void) -{ - m_eeprom = std::make_unique<uint32_t[]>(0x400/4); - subdevice<nvram_device>("eeprom")->set_base(m_eeprom.get(), 0x400); -} - void cps3_state::init_crypt(uint32_t key1, uint32_t key2, int altEncryption) { @@ -815,8 +808,6 @@ void cps3_state::init_crypt(uint32_t key1, uint32_t key2, int altEncryption) m_maincpu->sh2drc_add_fastram(0x040C0030, 0x040C003b, 0, &m_tilemap30_regs_base[0]); cps3_decrypt_bios(); - - init_common(); } void cps3_state::init_redearth() { init_crypt(0x9e300ab1, 0xa175b82c, 0); } @@ -903,13 +894,8 @@ void cps3_state::cps3_set_mame_colours(int colournum, uint16_t data, uint32_t fa void cps3_state::video_start() { - m_ss_ram = std::make_unique<uint32_t[]>(0x10000/4); - memset(m_ss_ram.get(), 0x00, 0x10000); - save_pointer(NAME(m_ss_ram), 0x10000/4); - - m_char_ram = std::make_unique<uint32_t[]>(0x800000/4); - memset(m_char_ram.get(), 0x00, 0x800000); - save_pointer(NAME(m_char_ram), 0x800000 /4); + m_ss_ram = make_unique_clear<uint32_t[]>(0x10000/4); + m_char_ram = make_unique_clear<uint32_t[]>(0x800000/4); /* create the char set (gfx will then be updated dynamically from RAM) */ m_gfxdecode->set_gfx(0, std::make_unique<gfx_element>(m_palette, cps3_tiles8x8_layout, (uint8_t *)m_ss_ram.get(), 0, m_palette->entries() / 16, 0)); @@ -922,8 +908,7 @@ void cps3_state::video_start() //decode_charram(); - m_mame_colours = std::make_unique<uint32_t[]>(0x80000/4); - memset(m_mame_colours.get(), 0x00, 0x80000); + m_mame_colours = make_unique_clear<uint32_t[]>(0x80000/2); m_screenwidth = 384; @@ -934,6 +919,14 @@ void cps3_state::video_start() m_renderbuffer_clip.set(0, m_screenwidth-1, 0, 224-1); m_renderbuffer_bitmap.fill(0x3f, m_renderbuffer_clip); + + save_item(NAME(m_ss_pal_base)); + save_item(NAME(m_unk_vidregs)); + save_item(NAME(m_ss_bank_base)); + + save_pointer(NAME(m_ss_ram), 0x10000/4); + save_pointer(NAME(m_char_ram), 0x800000/4); + save_pointer(NAME(m_mame_colours), 0x80000/2); } // the 0x400 bit in the tilemap regs is "draw it upside-down" (bios tilemap during flashing, otherwise capcom logo is flipped) @@ -1087,10 +1080,16 @@ uint32_t cps3_state::screen_update_cps3(screen_device &screen, bitmap_rgb32 &bit uint32_t fszx = (fullscreenzoomx << 16) / 0x40; uint32_t fszy = (fullscreenzoomy << 16) / 0x40; - m_renderbuffer_clip.set( - 0, ((m_screenwidth*fszx) >> 16) - 1, - 0, ((224 * fszx) >> 16) - 1); - + if (fullscreenzoomx == 0x40 && fullscreenzoomy == 0x40) + { + m_renderbuffer_clip = cliprect; + } + else + { + m_renderbuffer_clip.set( + (cliprect.left() * fszx) >> 16, (((cliprect.right() + 1) * fszx + 0x8000) >> 16) - 1, + (cliprect.top() * fszy) >> 16, (((cliprect.bottom() + 1) * fszy + 0x8000) >> 16) - 1); + } m_renderbuffer_bitmap.fill(0, m_renderbuffer_clip); /* Sprites */ @@ -1165,7 +1164,7 @@ uint32_t cps3_state::screen_update_cps3(screen_device &screen, bitmap_rgb32 &bit if (bg_drawn[tilemapnum] == 0) { - for (int uu = 0; uu < 1023; uu++) + for (int uu = m_renderbuffer_clip.top(); uu <= m_renderbuffer_clip.bottom(); uu++) { cps3_draw_tilemapsprite_line(tilemapnum, uu, m_renderbuffer_bitmap, m_renderbuffer_clip); } @@ -1270,21 +1269,35 @@ uint32_t cps3_state::screen_update_cps3(screen_device &screen, bitmap_rgb32 &bit } } - /* copy render bitmap with zoom */ + if (fullscreenzoomx == 0x40 && fullscreenzoomy == 0x40) { - uint32_t srcy = 0; - for (uint32_t rendery = 0; rendery < 224; rendery++) + /* copy render bitmap without zoom */ + for (uint32_t rendery = cliprect.top(); rendery <= cliprect.bottom(); rendery++) + { + uint32_t* dstbitmap = &bitmap.pix32(rendery); + uint32_t* srcbitmap = &m_renderbuffer_bitmap.pix32(rendery); + + for (uint32_t renderx = cliprect.left(); renderx <= cliprect.right(); renderx++) + { + dstbitmap[renderx] = m_mame_colours[srcbitmap[renderx] & 0x1ffff]; + } + } + } + else + { + /* copy render bitmap with zoom */ + uint32_t srcy = cliprect.top() * fszy; + for (uint32_t rendery = cliprect.top(); rendery <= cliprect.bottom(); rendery++) { uint32_t* dstbitmap = &bitmap.pix32(rendery); uint32_t* srcbitmap = &m_renderbuffer_bitmap.pix32(srcy >> 16); - uint32_t srcx = 0; + uint32_t srcx = cliprect.left() * fszx; - for (uint32_t renderx = 0; renderx < m_screenwidth; renderx++) + for (uint32_t renderx = cliprect.left(); renderx <= cliprect.right(); renderx++) { dstbitmap[renderx] = m_mame_colours[srcbitmap[srcx >> 16] & 0x1ffff]; srcx += fszx; } - srcy += fszy; } } @@ -1392,22 +1405,22 @@ READ32_MEMBER(cps3_state::cps3_gfxflash_r) if (ACCESSING_BITS_24_31) // GFX Flash 1 { //logerror("read GFX flash chip %s addr %02x\n", chip0->tag(), (offset<<1)); - result |= chip0->read(space, (offset<<1)) << 24; + result |= chip0->read(offset<<1) << 24; } if (ACCESSING_BITS_16_23) // GFX Flash 2 { //logerror("read GFX flash chip %s addr %02x\n", chip1->tag(), (offset<<1)); - result |= chip1->read(space, (offset<<1)) << 16; + result |= chip1->read(offset<<1) << 16; } if (ACCESSING_BITS_8_15) // GFX Flash 1 { //logerror("read GFX flash chip %s addr %02x\n", chip0->tag(), (offset<<1)+1); - result |= chip0->read(space, (offset<<1)+0x1) << 8; + result |= chip0->read((offset<<1)+0x1) << 8; } if (ACCESSING_BITS_0_7) // GFX Flash 2 { //logerror("read GFX flash chip %s addr %02x\n", chip1->tag(), (offset<<1)+1); - result |= chip1->read(space, (offset<<1)+0x1) << 0; + result |= chip1->read((offset<<1)+0x1) << 0; } //printf("read GFX flash chips addr %02x returning %08x mem_mask %08x crambank %08x gfxbank %08x\n", offset*2, result,mem_mask, m_cram_bank, m_cram_gfxflash_bank ); @@ -1432,25 +1445,25 @@ WRITE32_MEMBER(cps3_state::cps3_gfxflash_w) { command = (data >> 24) & 0xff; //logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip0->tag(), (offset<<1), command); - chip0->write(space, (offset<<1), command); + chip0->write((offset<<1), command); } if (ACCESSING_BITS_16_23) // GFX Flash 2 { command = (data >> 16) & 0xff; //logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip1->tag(), (offset<<1), command); - chip1->write(space, (offset<<1), command); + chip1->write((offset<<1), command); } if (ACCESSING_BITS_8_15) // GFX Flash 1 { command = (data >> 8) & 0xff; //logerror("write to GFX flash chip %s addr %02x cmd %02x\n", chip0->tag(), (offset<<1)+1, command); - chip0->write(space, (offset<<1)+0x1, command); + chip0->write((offset<<1)+0x1, command); } if (ACCESSING_BITS_0_7) // GFX Flash 2 { command = (data >> 0) & 0xff; //if ( ((offset<<1)+1) != 0x555) printf("write to GFX flash chip %s addr %02x cmd %02x\n", chip1->tag(), (offset<<1)+1, command); - chip1->write(space, (offset<<1)+0x1, command); + chip1->write((offset<<1)+0x1, command); } /* make a copy in the linear memory region we actually use for drawing etc. having it stored in interleaved flash roms isnt' very useful */ @@ -1483,22 +1496,22 @@ uint32_t cps3_state::cps3_flashmain_r(int which, uint32_t offset, uint32_t mem_m if (ACCESSING_BITS_24_31) // Flash 1 { //logerror("read flash chip %d addr %02x\n", base+0, offset*4 ); - result |= (m_simm[which][0]->read(machine().dummy_space(), offset)<<24); + result |= (m_simm[which][0]->read(offset)<<24); } if (ACCESSING_BITS_16_23) // Flash 1 { //logerror("read flash chip %d addr %02x\n", base+1, offset*4 ); - result |= (m_simm[which][1]->read(machine().dummy_space(), offset)<<16); + result |= (m_simm[which][1]->read(offset)<<16); } if (ACCESSING_BITS_8_15) // Flash 1 { //logerror("read flash chip %d addr %02x\n", base+2, offset*4 ); - result |= (m_simm[which][2]->read(machine().dummy_space(), offset)<<8); + result |= (m_simm[which][2]->read(offset)<<8); } if (ACCESSING_BITS_0_7) // Flash 1 { //logerror("read flash chip %d addr %02x\n", base+3, offset*4 ); - result |= (m_simm[which][3]->read(machine().dummy_space(), offset)<<0); + result |= (m_simm[which][3]->read(offset)<<0); } // if (base==4) logerror("read flash chips addr %02x returning %08x\n", offset*4, result ); @@ -1539,25 +1552,25 @@ void cps3_state::cps3_flashmain_w(int which, uint32_t offset, uint32_t data, uin { command = (data >> 24) & 0xff; //logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][0]->tag(), offset, command); - m_simm[which][0]->write(machine().dummy_space(), offset, command); + m_simm[which][0]->write(offset, command); } if (ACCESSING_BITS_16_23) // Flash 2 { command = (data >> 16) & 0xff; //logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][1]->tag(), offset, command); - m_simm[which][1]->write(machine().dummy_space(), offset, command); + m_simm[which][1]->write(offset, command); } if (ACCESSING_BITS_8_15) // Flash 2 { command = (data >> 8) & 0xff; //logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][2]->tag(), offset, command); - m_simm[which][2]->write(machine().dummy_space(), offset, command); + m_simm[which][2]->write(offset, command); } if (ACCESSING_BITS_0_7) // Flash 2 { command = (data >> 0) & 0xff; //logerror("write to flash chip %s addr %02x cmd %02x\n", m_simm[which][3]->tag(), offset, command); - m_simm[which][3]->write(machine().dummy_space(), offset, command); + m_simm[which][3]->write(offset, command); } /* copy data into regions to execute from */ @@ -2177,7 +2190,7 @@ void cps3_state::cps3_map(address_map &map) map(0x05100000, 0x05100003).w(FUNC(cps3_state::cps3_irq12_ack_w)); map(0x05110000, 0x05110003).w(FUNC(cps3_state::cps3_irq10_ack_w)); - map(0x05140000, 0x05140003).rw("wd33c93", FUNC(wd33c93_device::read), FUNC(wd33c93_device::write)).umask32(0x00ff00ff); + map(0x05140000, 0x05140003).rw("scsi:7:wd33c93", FUNC(wd33c93_device::indir_r), FUNC(wd33c93_device::indir_w)).umask32(0x00ff00ff); map(0x06000000, 0x067fffff).rw(FUNC(cps3_state::cps3_flash1_r), FUNC(cps3_state::cps3_flash1_w)); /* Flash ROMs simm 1 */ map(0x06800000, 0x06ffffff).rw(FUNC(cps3_state::cps3_flash2_r), FUNC(cps3_state::cps3_flash2_w)); /* Flash ROMs simm 2 */ @@ -2276,6 +2289,28 @@ INTERRUPT_GEN_MEMBER(cps3_state::cps3_other_interrupt) } +void cps3_state::machine_start() +{ + m_eeprom = std::make_unique<uint32_t[]>(0x400/4); + subdevice<nvram_device>("eeprom")->set_base(m_eeprom.get(), 0x400); + + save_item(NAME(m_cram_gfxflash_bank)); + save_item(NAME(m_cram_bank)); + save_item(NAME(m_current_eeprom_read)); + save_item(NAME(m_paldma_source)); + save_item(NAME(m_paldma_realsource)); + save_item(NAME(m_paldma_dest)); + save_item(NAME(m_paldma_fade)); + save_item(NAME(m_paldma_other2)); + save_item(NAME(m_paldma_length)); + save_item(NAME(m_chardma_source)); + save_item(NAME(m_chardma_other)); + save_item(NAME(m_current_table_address)); + + save_pointer(NAME(m_eeprom), 0x400/4); +} + + void cps3_state::machine_reset() { m_current_table_address = -1; @@ -2285,6 +2320,12 @@ void cps3_state::machine_reset() } +void cps3_state::device_post_load() +{ + // copy data from flashroms back into user regions + decrypt into regions we execute/draw from. + copy_from_nvram(); +} + // make a copy in the regions we execute code / draw gfx from void cps3_state::copy_from_nvram() @@ -2510,11 +2551,9 @@ void cps3_state::cps3(machine_config &config) m_maincpu->set_periodic_int(FUNC(cps3_state::cps3_other_interrupt), attotime::from_hz(80)); /* ?source? */ m_maincpu->set_dma_kludge_callback(FUNC(cps3_state::dma_callback)); - scsi_port_device &scsi(SCSI_PORT(config, "scsi")); - scsi.set_slot_device(1, "cdrom", SCSICD, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_1)); - - wd33c93_device& wd33c93(WD33C93(config, "wd33c93")); - wd33c93.set_scsi_port("scsi"); + NSCSI_BUS(config, "scsi"); + NSCSI_CONNECTOR(config, "scsi:1").option_set("cdrom", NSCSI_CDROM); + NSCSI_CONNECTOR(config, "scsi:7").option_set("wd33c93", WD33C93A).clock(10'000'000); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -2613,7 +2652,7 @@ ROM_START( redearth ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "redearth_euro.29f400.u2", 0x000000, 0x080000, CRC(02e0f336) SHA1(acc37e830dfeb9674f5a0fb24f4cc23217ae4ff5) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-wzd-5", 0, BAD_DUMP SHA1(e5676752b08283dc4a98c3d7b759e8aa6dcd0679) ) ROM_END @@ -2621,7 +2660,7 @@ ROM_START( redearthr1 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "redearth_euro.29f400.u2", 0x000000, 0x080000, CRC(02e0f336) SHA1(acc37e830dfeb9674f5a0fb24f4cc23217ae4ff5) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-wzd-3", 0, SHA1(a6ff67093db6bc80ee5fc46e4300e0177b213a52) ) ROM_END @@ -2629,7 +2668,7 @@ ROM_START( warzard ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "warzard_japan.29f400.u2", 0x000000, 0x080000, CRC(f8e2f0c6) SHA1(93d6a986f44c211fff014e55681eca4d2a2774d6) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-wzd-5", 0, BAD_DUMP SHA1(e5676752b08283dc4a98c3d7b759e8aa6dcd0679) ) ROM_END @@ -2637,7 +2676,7 @@ ROM_START( warzardr1 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "warzard_japan.29f400.u2", 0x000000, 0x080000, CRC(f8e2f0c6) SHA1(93d6a986f44c211fff014e55681eca4d2a2774d6) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-wzd-3", 0, SHA1(a6ff67093db6bc80ee5fc46e4300e0177b213a52) ) ROM_END @@ -2646,7 +2685,7 @@ ROM_START( sfiii ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii_euro.29f400.u2", 0x000000, 0x080000, CRC(27699ddc) SHA1(d8b525cd27e584560b129598df31fd2c5b2a682a) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-sf3-3", 0, BAD_DUMP SHA1(606e62cc5f46275e366e7dbb412dbaeb7e54cd0c) ) ROM_END @@ -2654,7 +2693,7 @@ ROM_START( sfiiiu ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii_usa_region_b1.29f400.u2", 0x000000, 0x080000, CRC(fb172a8e) SHA1(48ebf59910f246835f7dc0c588da30f7a908072f) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-sf3-3", 0, BAD_DUMP SHA1(606e62cc5f46275e366e7dbb412dbaeb7e54cd0c) ) ROM_END @@ -2662,7 +2701,7 @@ ROM_START( sfiiia ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii_asia_region_bd.29f400.u2", 0x000000, 0x080000, CRC(cbd28de7) SHA1(9c15ecb73b9587d20850e62e8683930a45caa01b) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-sf3-3", 0, BAD_DUMP SHA1(606e62cc5f46275e366e7dbb412dbaeb7e54cd0c) ) ROM_END @@ -2670,7 +2709,7 @@ ROM_START( sfiiij ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii_japan.29f400.u2", 0x000000, 0x080000, CRC(74205250) SHA1(c3e83ace7121d32da729162662ec6b5285a31211) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-sf3-3", 0, BAD_DUMP SHA1(606e62cc5f46275e366e7dbb412dbaeb7e54cd0c) ) ROM_END @@ -2678,7 +2717,7 @@ ROM_START( sfiiih ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii_hispanic.29f400.u2", 0x000000, 0x080000, CRC(d2b3cd48) SHA1(00ebb270c24a66515c97e35331de54ff5358000e) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-sf3-3", 0, BAD_DUMP SHA1(606e62cc5f46275e366e7dbb412dbaeb7e54cd0c) ) ROM_END @@ -2687,7 +2726,7 @@ ROM_START( sfiii2 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii2_usa.29f400.u2", 0x000000, 0x080000, CRC(75dd72e0) SHA1(5a12d6ea6734df5de00ecee6f9ef470749d2f242) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-3ga000", 0, BAD_DUMP SHA1(4e162885b0b3265a56e0265037bcf247e820f027) ) ROM_END @@ -2695,7 +2734,7 @@ ROM_START( sfiii2j ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii2_japan.29f400.u2", 0x000000, 0x080000, CRC(faea0a3e) SHA1(a03cd63bcf52e4d57f7a598c8bc8e243694624ec) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-3ga000", 0, BAD_DUMP SHA1(4e162885b0b3265a56e0265037bcf247e820f027) ) ROM_END @@ -2704,7 +2743,7 @@ ROM_START( jojo ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "jojo_usa.29f400.u2", 0x000000, 0x080000, CRC(8d40f7be) SHA1(2a4bd83db2f959c33b071e517941aa55a0f919c0) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-jjk-3", 0, SHA1(dc6e74b5e02e13f62cb8c4e234dd6061501e49c1) ) ROM_END @@ -2712,7 +2751,7 @@ ROM_START( jojor1 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "jojo_usa.29f400.u2", 0x000000, 0x080000, CRC(8d40f7be) SHA1(2a4bd83db2f959c33b071e517941aa55a0f919c0) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-jjk-2", 0, BAD_DUMP SHA1(0f5c09171409213e191a607ee89ca3a91fe9c96a) ) ROM_END @@ -2720,7 +2759,7 @@ ROM_START( jojor2 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "jojo_usa.29f400.u2", 0x000000, 0x080000, CRC(8d40f7be) SHA1(2a4bd83db2f959c33b071e517941aa55a0f919c0) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-jjk000", 0, BAD_DUMP SHA1(09869f6d8c032b527e02d815749dc8fab1289e86) ) ROM_END @@ -2728,7 +2767,7 @@ ROM_START( jojoj ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "jojo_japan.29f400.u2", 0x000000, 0x080000, CRC(02778f60) SHA1(a167f9ebe030592a0cdb0c6a3c75835c6a43be4c) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-jjk-3", 0, SHA1(dc6e74b5e02e13f62cb8c4e234dd6061501e49c1) ) ROM_END @@ -2736,7 +2775,7 @@ ROM_START( jojojr1 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "jojo_japan.29f400.u2", 0x000000, 0x080000, CRC(02778f60) SHA1(a167f9ebe030592a0cdb0c6a3c75835c6a43be4c) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-jjk-2", 0, BAD_DUMP SHA1(0f5c09171409213e191a607ee89ca3a91fe9c96a) ) ROM_END @@ -2744,7 +2783,7 @@ ROM_START( jojojr2 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "jojo_japan.29f400.u2", 0x000000, 0x080000, CRC(02778f60) SHA1(a167f9ebe030592a0cdb0c6a3c75835c6a43be4c) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-jjk000", 0, BAD_DUMP SHA1(09869f6d8c032b527e02d815749dc8fab1289e86) ) ROM_END @@ -2753,7 +2792,7 @@ ROM_START( sfiii3 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii3_euro.29f400.u2", 0x000000, 0x080000, CRC(30bbf293) SHA1(f094c2eeaf4f6709060197aca371a4532346bf78) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-33s-2", 0, BAD_DUMP SHA1(41b0e246db91cbfc3f8f0f62d981734feb4b4ab5) ) ROM_END @@ -2761,7 +2800,7 @@ ROM_START( sfiii3r1 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii3_euro.29f400.u2", 0x000000, 0x080000, CRC(30bbf293) SHA1(f094c2eeaf4f6709060197aca371a4532346bf78) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-33s-1", 0, BAD_DUMP SHA1(2f4a9006a31903114f9f9dc09465ae253e565c51) ) ROM_END @@ -2769,7 +2808,7 @@ ROM_START( sfiii3u ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii3_usa.29f400.u2", 0x000000, 0x080000, CRC(ecc545c1) SHA1(e39083820aae914fd8b80c9765129bedb745ceba) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-33s-2", 0, BAD_DUMP SHA1(41b0e246db91cbfc3f8f0f62d981734feb4b4ab5) ) ROM_END @@ -2777,7 +2816,7 @@ ROM_START( sfiii3ur1 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii3_usa.29f400.u2", 0x000000, 0x080000, CRC(ecc545c1) SHA1(e39083820aae914fd8b80c9765129bedb745ceba) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-33s-1", 0, BAD_DUMP SHA1(2f4a9006a31903114f9f9dc09465ae253e565c51) ) ROM_END @@ -2785,7 +2824,7 @@ ROM_START( sfiii3j ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii3_japan.29f400.u2", 0x000000, 0x080000, CRC(63f23d1f) SHA1(58559403c325454f8c8d3eb0f569a531aa22db26) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-33s-2", 0, BAD_DUMP SHA1(41b0e246db91cbfc3f8f0f62d981734feb4b4ab5) ) ROM_END @@ -2793,7 +2832,7 @@ ROM_START( sfiii3jr1 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "sfiii3_japan.29f400.u2", 0x000000, 0x080000, CRC(63f23d1f) SHA1(58559403c325454f8c8d3eb0f569a531aa22db26) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-33s-1", 0, BAD_DUMP SHA1(2f4a9006a31903114f9f9dc09465ae253e565c51) ) ROM_END @@ -2802,7 +2841,7 @@ ROM_START( jojoba ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "jojoba_japan.29f400.u2", 0x000000, 0x080000, CRC(3085478c) SHA1(055eab1fc42816f370a44b17fd7e87ffcb10e8b7) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-jjm-1", 0, SHA1(8628d3fa555fbd5f4121082e925c1834b76c5e65) ) ROM_END @@ -2810,7 +2849,7 @@ ROM_START( jojobar1 ) ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "jojoba_japan.29f400.u2", 0x000000, 0x080000, CRC(3085478c) SHA1(055eab1fc42816f370a44b17fd7e87ffcb10e8b7) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "cap-jjm-0", 0, BAD_DUMP SHA1(0678a0baeb853dcff1d230c14f0873cc9f143d7b) ) ROM_END @@ -3671,7 +3710,7 @@ ROM_START( cps3boot ) // for cart with standard SH2 ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "no-battery_bios_29f400_for_hd6417095_sh2.u2", 0x000000, 0x080000, CRC(cb9bd5b0) SHA1(ea7ecb3deb69f5307a62d8f0d7d8e68d49013d07)) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "unicd-cps3_for_standard_sh2_v4", 0, SHA1(099c52bd38753f0f4876243e7aa87ca482a2dcb7) ) ROM_END @@ -3679,7 +3718,7 @@ ROM_START( cps3booto ) // for cart with standard SH2 ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "no-battery_bios_29f400_for_hd6417095_sh2.u2", 0x000000, 0x080000, CRC(cb9bd5b0) SHA1(ea7ecb3deb69f5307a62d8f0d7d8e68d49013d07)) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "no-battery_multi-game_bootleg_cd_for_hd6417095_sh2", 0, SHA1(6057cc3ec7991c0c00a7ab9da6ac2f92c9fb1aed) ) ROM_END @@ -3687,7 +3726,7 @@ ROM_START( cps3booto2 ) // for cart with standard SH2 ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "no-battery_bios_29f400_for_hd6417095_sh2.u2", 0x000000, 0x080000, CRC(cb9bd5b0) SHA1(ea7ecb3deb69f5307a62d8f0d7d8e68d49013d07)) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "no-battery_multi-game_bootleg_cd_for_hd6417095_sh2_older", 0, SHA1(123f2fcb0f3dd3d6b859e82a51d0127e46763776) ) ROM_END @@ -3695,7 +3734,7 @@ ROM_START( cps3bs32 ) // for cart with standard SH2 ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "no-battery_bios_29f400_for_hd6417095_sh2.u2", 0x000000, 0x080000, CRC(cb9bd5b0) SHA1(ea7ecb3deb69f5307a62d8f0d7d8e68d49013d07)) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "sfiii_2nd_impact_converted_for_standard_sh2_v3", 0, SHA1(8f180d159e88042a1e819cefd39eef67f5e86e3d) ) ROM_END @@ -3703,7 +3742,7 @@ ROM_START( cps3bs32a ) // for cart with standard SH2 ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "no-battery_bios_29f400_for_hd6417095_sh2.u2", 0x000000, 0x080000, CRC(cb9bd5b0) SHA1(ea7ecb3deb69f5307a62d8f0d7d8e68d49013d07)) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "sfiii_2nd_impact_converted_for_standard_sh2_older", 0, SHA1(8a8e4138c3bf12435933ab9d9ace510513200843) ) // v1 or v2? ROM_END @@ -3711,7 +3750,7 @@ ROM_START( cps3boota ) // for cart with dead custom SH2 (or 2nd Impact CPU which ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "no-battery_bios_29f400_for_dead_security_cart.u2", 0x000000, 0x080000, CRC(0fd56fb3) SHA1(5a8bffc07eb7da73cf4bca6718df72e471296bfd) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "unicd-cps3_for_custom_sh2_v5", 0, SHA1(50a5b2845d3dd3de3bce15c4f1b58500db80cabe) ) ROM_END @@ -3719,7 +3758,7 @@ ROM_START( cps3bootao ) // for cart with dead custom SH2 (or 2nd Impact CPU whic ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "no-battery_bios_29f400_for_dead_security_cart.u2", 0x000000, 0x080000, CRC(0fd56fb3) SHA1(5a8bffc07eb7da73cf4bca6718df72e471296bfd) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "no-battery_multi-game_bootleg_cd_for_dead_security_cart", 0, SHA1(1ede2f1ba197ee787208358a13eae7185a5ae3b2) ) ROM_END @@ -3728,7 +3767,7 @@ ROM_START( cps3bootao2 ) // for cart with dead custom SH2 (or 2nd Impact CPU whi ROM_REGION32_BE( 0x080000, "bios", 0 ) /* bios region */ ROM_LOAD( "no-battery_bios_29f400_for_dead_security_cart.u2", 0x000000, 0x080000, CRC(0fd56fb3) SHA1(5a8bffc07eb7da73cf4bca6718df72e471296bfd) ) - DISK_REGION( "scsi:" SCSI_PORT_DEVICE1 ":cdrom" ) + DISK_REGION( "scsi:1:cdrom" ) DISK_IMAGE_READONLY( "no-battery_multi-game_bootleg_cd_for_dead_security_cart_older", 0, SHA1(4b0b673b45dac94da018576c0a7f8644653fc564) ) ROM_END |