Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 15:32:45 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ata/atapicdr, scsi/scsicd: Set CDDA image on device reset (#11238)

Browse Source 
* ata/atapicdr, scsi/scsicd: Set CDDA image on device reset

* konami/konamim2: Fix CD-ROM image loading
This commit is contained in:
987123879113 2023-05-18 21:58:31 +09:00 committed by GitHub
parent b71a68dfd2
commit 81637569b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/bus/ata/atapicdr.cpp
View File

@ -107,6 +107,7 @@ void atapi_cdrom_device::device_reset()
atapi_hle_device::device_reset();
m_media_change = true;
m_sequence_counter = m_image->sequence_counter();
m_cdda->set_cdrom(m_image);
}
void atapi_fixed_cdrom_device::device_reset()
@ -114,6 +115,7 @@ void atapi_fixed_cdrom_device::device_reset()
atapi_hle_device::device_reset();
m_media_change = false;
m_sequence_counter = m_image->sequence_counter();
m_cdda->set_cdrom(m_image);
}
void atapi_dvdrom_device::device_reset()
@ -121,6 +123,7 @@ void atapi_dvdrom_device::device_reset()
atapi_hle_device::device_reset();
m_media_change = true;
m_sequence_counter = m_image->sequence_counter();
m_cdda->set_cdrom(m_image);
}
void atapi_fixed_dvdrom_device::device_reset()
@ -128,6 +131,7 @@ void atapi_fixed_dvdrom_device::device_reset()
atapi_hle_device::device_reset();
m_media_change = false;
m_sequence_counter = m_image->sequence_counter();
m_cdda->set_cdrom(m_image);
}
void atapi_cdrom_device::process_buffer()

7
src/devices/bus/scsi/scsicd.cpp
View File

@ -30,6 +30,13 @@ void scsicd_device::device_start()
scsihle_device::device_start();
}
void scsicd_device::device_reset()
{
scsihle_device::device_reset();
m_cdda->set_cdrom(m_image);
}
void scsicd_device::device_add_mconfig(machine_config &config)
{
CDROM(config, "image").set_interface("cdrom");

1
src/devices/bus/scsi/scsicd.h
View File

@ -21,6 +21,7 @@ public:
protected:
scsicd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
virtual bool exists() const override;
};

42
src/mame/konami/konamim2.cpp
View File

@ -339,9 +339,6 @@ private:
optional_device<m48t58_device> m_m48t58;
optional_device<ymz280b_device> m_ymz280b;
// ATAPI
cdrom_file *m_available_cdroms = nullptr;
// Konami SIO
uint16_t m_sio_data = 0;
@ -679,9 +676,6 @@ void konamim2_state::machine_start()
m_ppc1->ppcdrc_add_fastram(m_bda->ram_start(), m_bda->ram_end(), false, m_bda->ram_ptr());
m_ppc2->ppcdrc_add_fastram(m_bda->ram_start(), m_bda->ram_end(), false, m_bda->ram_ptr());
chd_file *chd = machine().rom_load().get_disk_handle(":cdrom");
m_available_cdroms = chd ? new cdrom_file(chd) : nullptr;
// TODO: REMOVE
m_atapi_timer = timer_alloc(FUNC(konamim2_state::atapi_delay), this);
m_atapi_timer->adjust( attotime::never );
@ -1232,7 +1226,7 @@ ROM_START( polystar )
ROM_REGION16_BE( 0x80, "eeprom", 0 ) /* EEPROM default contents */
ROM_LOAD( "93c46.7k", 0x000000, 0x000080, CRC(fab5a203) SHA1(153e22aa8cfce80b77ba200957685f796fc99b1c) )
DISK_REGION( "cdrom" ) // Has 1s of silence near the start of the first audio track
DISK_REGION( "ata:0:cr589" ) // Has 1s of silence near the start of the first audio track
DISK_IMAGE_READONLY( "623jaa02", 0, BAD_DUMP SHA1(e7d9e628a3e0e085e084e4e3630fa5e3a7345547) )
ROM_END
@ -1246,7 +1240,7 @@ ROM_START( btltryst )
ROM_REGION( 0x2000, "m48t58", 0 ) /* timekeeper SRAM */
ROM_LOAD( "m48t58", 0x000000, 0x002000, CRC(71ee073b) SHA1(cc8002d7ee8d1695aebbbb2a3a1e97a7e16948c1) )
DISK_REGION( "cdrom" )
DISK_REGION( "ata:0:cr589" )
DISK_IMAGE_READONLY( "636jac02", 0, SHA1(d36556a3a4b91058100924a9e9f1a58983399c6e) )
ROM_END
@ -1258,7 +1252,7 @@ ROM_START( btltrysta )
ROM_REGION( 0x2000, "m48t58", 0 ) /* timekeeper SRAM */
ROM_LOAD( "m48t58y", 0x000000, 0x002000, CRC(8611ff09) SHA1(6410236947d99c552c4a1f7dd5fd8c7a5ae4cba1) )
DISK_REGION( "cdrom" )
DISK_REGION( "ata:0:cr589" )
DISK_IMAGE_READONLY( "636jaa02", 0, SHA1(d36556a3a4b91058100924a9e9f1a58983399c6e) )
ROM_END
#endif
@ -1273,7 +1267,7 @@ ROM_START( heatof11 )
ROM_REGION( 0x2000, "m48t58", 0 ) /* timekeeper SRAM */
ROM_LOAD( "dallas.5e", 0x000000, 0x002000, CRC(5b74eafd) SHA1(afbf5f1f5a27407fd6f17c764bbb7fae4ab779f5) )
DISK_REGION( "cdrom" )
DISK_REGION( "ata:0:cr589" )
DISK_IMAGE_READONLY( "heatof11", 0, BAD_DUMP SHA1(5a0a2782cd8676d3f6dfad4e0f805b309e230d8b) )
ROM_END
@ -1290,23 +1284,10 @@ ROM_START( evilngt )
ROM_REGION( 0x400000, "ymz", 0 ) /* YMZ280B sound rom on sub board */
ROM_LOAD( "810a03.16h", 0x000000, 0x400000, CRC(05112d3a) SHA1(0df2a167b7bc08a32d983b71614d59834efbfb59) )
DISK_REGION( "cdrom" )
DISK_REGION( "ata:0:cr589" )
DISK_IMAGE_READONLY( "810uba02", 0, SHA1(e570470c1cbfe187d5bba8125616412f386264ba) )
ROM_END
ROM_START( evilngte )
ROM_REGION64_BE( 0x200000, "boot", 0 )
ROM_LOAD16_WORD( "636a01.8q", 0x000000, 0x200000, CRC(7b1dc738) SHA1(32ae8e7ddd38fcc70b4410275a2cc5e9a0d7d33b) )
ROM_REGION( 0x2000, "m48t58", 0 ) /* timekeeper SRAM */
ROM_LOAD( "m48t58y.u1", 0x000000, 0x001000, CRC(169bb8f4) SHA1(55c0bafab5d309fe69156489186e232aa87ca0dd) )
ROM_REGION( 0x400000, "ymz", 0 ) /* YMZ280B sound rom on sub board */
ROM_LOAD( "810a03.16h", 0x000000, 0x400000, CRC(05112d3a) SHA1(0df2a167b7bc08a32d983b71614d59834efbfb59) )
// TODO: Add CHD
ROM_END
ROM_START( hellngt )
ROM_REGION64_BE( 0x200000, "boot", 0 )
ROM_LOAD16_WORD( "636a01.8q", 0x000000, 0x200000, CRC(7b1dc738) SHA1(32ae8e7ddd38fcc70b4410275a2cc5e9a0d7d33b) )
@ -1320,7 +1301,7 @@ ROM_START( hellngt )
ROM_REGION( 0x400000, "ymz", 0 ) /* YMZ280B sound rom on sub board */
ROM_LOAD( "810a03.16h", 0x000000, 0x400000, CRC(05112d3a) SHA1(0df2a167b7bc08a32d983b71614d59834efbfb59) )
DISK_REGION( "cdrom" )
DISK_REGION( "ata:0:cr589" )
DISK_IMAGE_READONLY( "810eaa02", 0, SHA1(d701b900eddc7674015823b2cb33e887bf107fa8) )
ROM_END
@ -1334,7 +1315,7 @@ ROM_START( totlvice )
ROM_REGION( 0x100000, "ymz", 0 ) /* YMZ280B sound rom on sub board */
ROM_LOAD( "639jaa02.bin", 0x000000, 0x100000, CRC(c6163818) SHA1(b6f8f2d808b98610becc0a5be5443ece3908df0b) )
DISK_REGION( "cdrom" )
DISK_REGION( "ata:0:cr589" )
DISK_IMAGE_READONLY( "639eba01", 0, BAD_DUMP SHA1(d95c13575e015169b126f7e8492d150bd7e5ebda) )
ROM_END
@ -1347,7 +1328,7 @@ ROM_START( totlvicd )
ROM_REGION( 0x100000, "ymz", 0 ) /* YMZ280B sound rom on sub board */
ROM_LOAD( "639jaa02.bin", 0x000000, 0x100000, CRC(c6163818) SHA1(b6f8f2d808b98610becc0a5be5443ece3908df0b) )
DISK_REGION( "cdrom" )
DISK_REGION( "ata:0:cr589" )
DISK_IMAGE_READONLY( "639ead01", 0, SHA1(9d1085281aeb14185e2e78f3f21e7004a591039c) )
ROM_END
#endif
@ -1359,7 +1340,7 @@ ROM_START( totlvicu )
ROM_REGION( 0x100000, "ymz", 0 ) /* YMZ280B sound rom on sub board */
ROM_LOAD( "639jaa02.bin", 0x000000, 0x100000, CRC(c6163818) SHA1(b6f8f2d808b98610becc0a5be5443ece3908df0b) )
DISK_REGION( "cdrom" )
DISK_REGION( "ata:0:cr589" )
DISK_IMAGE_READONLY( "639uac01", 0, BAD_DUMP SHA1(88431b8a0ce83c156c8b19efbba1af901b859404) )
ROM_END
@ -1370,7 +1351,7 @@ ROM_START( totlvica )
ROM_REGION( 0x100000, "ymz", 0 ) /* YMZ280B sound rom on sub board */
ROM_LOAD( "639jaa02.bin", 0x000000, 0x100000, CRC(c6163818) SHA1(b6f8f2d808b98610becc0a5be5443ece3908df0b) )
DISK_REGION( "cdrom" )
DISK_REGION( "ata:0:cr589" )
DISK_IMAGE_READONLY( "639aab01", 0, SHA1(34f34b26399cc04ffb0207df69f52eba42892eb6) )
ROM_END
@ -1381,7 +1362,7 @@ ROM_START( totlvicj )
ROM_REGION( 0x100000, "ymz", 0 ) /* YMZ280B sound rom on sub board */
ROM_LOAD( "639jaa02.bin", 0x000000, 0x100000, CRC(c6163818) SHA1(b6f8f2d808b98610becc0a5be5443ece3908df0b) )
DISK_REGION( "cdrom" ) // Need a re-image
DISK_REGION( "ata:0:cr589" ) // Need a re-image
DISK_IMAGE_READONLY( "639jad01", 0, BAD_DUMP SHA1(39d41d5a9d1c40636d174c8bb8172b1121e313f8) )
ROM_END
@ -1638,7 +1619,6 @@ GAME( 1998, btltryst, 0, btltryst, btltryst, konamim2_state, init_btltry
//GAME( 1998, btltrysta, btltryst, btltryst, btltryst, konamim2_state, init_btltryst, ROT0, "Konami", "Battle Tryst (ver JAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_TIMING | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1998, heatof11, 0, heatof11, heatof11, konamim2_state, init_btltryst, ROT0, "Konami", "Heat of Eleven '98 (ver EAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_TIMING | MACHINE_IMPERFECT_GRAPHICS)
GAME( 1998, evilngt, 0, evilngt, hellngt, konamim2_state, init_hellngt, ROT0, "Konami", "Evil Night (ver UBA)", MACHINE_IMPERFECT_TIMING )
GAME( 1998, evilngte, evilngt, evilngt, hellngt, konamim2_state, init_hellngt, ROT0, "Konami", "Evil Night (ver EAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_TIMING )
GAME( 1998, hellngt, evilngt, hellngt, hellngt, konamim2_state, init_hellngt, ROT0, "Konami", "Hell Night (ver EAA)", MACHINE_IMPERFECT_TIMING )
//CONS( 199?, 3do_m2, 0, 0, 3do_m2, m2, driver_device, 0, "3DO", "3DO M2", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_TIMING | MACHINE_NO_SOUND )

1
src/mame/mame.lst
View File

@ -23613,7 +23613,6 @@ winspikej // 1997.07 GX705 (Japan)
@source:konami/konamim2.cpp
btltryst // GX636 (c) 1998
evilngt // GX810 (c) 1998
evilngte // GX810 (c) 1998
heatof11 // GX703 (c) 1998
hellngt // GX810 (c) 1998
polystar // GX623 (c) 1997