Previous 199869 Revisions Next

r18675 Tuesday 23rd October, 2012 at 11:51:04 UTC by smf
SCSICD now has a CDDA sub device [smf]
[src/emu/machine]scsicd.c
[src/mame/drivers]firebeat.c konamigv.c ksys573.c twinkle.c
[src/mess/drivers]ip20.c ip22.c

trunk/src/emu/machine/scsicd.c
r18674r18675
4949{
5050   scsihle_device::device_reset();
5151
52   cdrom = subdevice<cdrom_image_device>("image")->get_cdrom_file();
52   SetDevice( subdevice<cdrom_image_device>("image")->get_cdrom_file() );
5353   if( !cdrom )
5454   {
5555      logerror( "SCSICD %s: no CD found!\n", tag() );
r18674r18675
6868
6969static MACHINE_CONFIG_FRAGMENT(scsi_cdrom)
7070   MCFG_CDROM_ADD("image", scsicd_device::cd_intf)
71   MCFG_SOUND_ADD("cdda", CDDA, 0)
7172MACHINE_CONFIG_END
7273
7374machine_config_constructor scsicd_device::device_mconfig_additions() const
r18674r18675
738739void scsicd_device::SetDevice( void *_cdrom )
739740{
740741   cdrom = (cdrom_file *)_cdrom;
742   cdda_set_cdrom(subdevice("cdda"), cdrom);
741743}
742744
743745int scsicd_device::GetSectorBytes()
trunk/src/mess/drivers/ip22.c
r18674r18675
16631663   MCFG_SOUND_ADD( "dac", DAC, 0 )
16641664   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
16651665
1666   MCFG_SOUND_ADD( "cdda",  CDDA, 0 )
1667   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
1668   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
1669
16701666   MCFG_SCSIBUS_ADD("scsi")
16711667   MCFG_SCSIDEV_ADD("scsi:harddisk1", SCSIHD, SCSI_ID_1)
16721668   MCFG_SCSIDEV_ADD("scsi:cdrom", SCSICD, SCSI_ID_4)
16731669   MCFG_WD33C93_ADD("scsi:wd33c93", wd33c93_intf)
1670
1671   MCFG_SOUND_MODIFY( "scsi:cdrom:cdda" )
1672   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "^^^lspeaker", 1.0)
1673   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "^^^rspeaker", 1.0)
1674
16741675MACHINE_CONFIG_END
16751676
16761677static MACHINE_CONFIG_DERIVED( ip224613, ip225015 )
trunk/src/mess/drivers/ip20.c
r18674r18675
1818
1919#include "emu.h"
2020#include "cpu/mips/mips3.h"
21#include "sound/cdda.h"
2221#include "machine/8530scc.h"
2322#include "machine/sgi.h"
2423#include "machine/eeprom.h"
r18674r18675
602601
603602   MCFG_SPEAKER_STANDARD_MONO("mono")
604603
605   MCFG_SOUND_ADD( "cdda", CDDA, 0 )
606   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
607
608604   MCFG_SCC8530_ADD("scc", 7000000, line_cb_t())
609605
610606   MCFG_SCSIBUS_ADD("scsi")
611607   MCFG_SCSIDEV_ADD("scsi:cdrom", SCSICD, SCSI_ID_6)
612608   MCFG_WD33C93_ADD("scsi:wd33c93", wd33c93_intf)
613609
610   MCFG_SOUND_MODIFY( "scsi:cdrom:cdda" )
611   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "^^^mono", 1.0)
612
614613   MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C56)
615614MACHINE_CONFIG_END
616615
trunk/src/mame/drivers/firebeat.c
r18674r18675
19711971
19721972MACHINE_RESET_MEMBER(firebeat_state,firebeat)
19731973{
1974   void *cd;
19751974   int i;
19761975   UINT8 *sound = memregion("ymz")->base();
19771976
r18674r18675
19801979      sound[i] = m_flash[1]->read(i);
19811980      sound[i+0x200000] = m_flash[2]->read(i);
19821981   }
1983
1984   m_atapi_device_data[1]->GetDevice( &cd );
1985   cdda_set_cdrom(machine().device("cdda"), cd);
19861982}
19871983
19881984const rtc65271_interface firebeat_rtc =
r18674r18675
20302026   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
20312027   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
20322028
2033   MCFG_SOUND_ADD("cdda", CDDA, 0)
2034   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
2035   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
2029   MCFG_SOUND_MODIFY("scsi1:cdda")
2030   MCFG_SOUND_ROUTE(0, "^^lspeaker", 1.0)
2031   MCFG_SOUND_ROUTE(1, "^^rspeaker", 1.0)
20362032
20372033MACHINE_CONFIG_END
20382034
r18674r18675
20832079   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
20842080   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
20852081
2086   MCFG_SOUND_ADD("cdda", CDDA, 0)
2087   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
2088   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
2082   MCFG_SOUND_MODIFY("scsi1:cdda")
2083   MCFG_SOUND_ROUTE(0, "^^lspeaker", 1.0)
2084   MCFG_SOUND_ROUTE(1, "^^rspeaker", 1.0)
20892085
20902086MACHINE_CONFIG_END
20912087
trunk/src/mame/drivers/konamigv.c
r18674r18675
171171   DECLARE_DRIVER_INIT(konamigv);
172172   DECLARE_DRIVER_INIT(btchamp);
173173   DECLARE_MACHINE_START(konamigv);
174   DECLARE_MACHINE_RESET(konamigv);
175174};
176175
177176/* EEPROM handlers */
r18674r18675
319318   save_item(NAME(m_btc_trackball_data));
320319}
321320
322MACHINE_RESET_MEMBER(konamigv_state,konamigv)
323{
324   /* also hook up CDDA audio to the CD-ROM drive */
325   void *cdrom;
326   scsihle_device *scsidev = machine().device<scsihle_device>("scsi:cdrom");
327   scsidev->GetDevice( &cdrom );
328   cdda_set_cdrom(machine().device("cdda"), cdrom);
329}
330
331321static void spu_irq(device_t *device, UINT32 data)
332322{
333323   if (data)
r18674r18675
345335   MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate( FUNC( scsi_dma_write ), (konamigv_state *) owner ) )
346336
347337   MCFG_MACHINE_START_OVERRIDE(konamigv_state, konamigv )
348   MCFG_MACHINE_RESET_OVERRIDE(konamigv_state, konamigv )
349338
350339   MCFG_EEPROM_93C46_ADD("eeprom")
351340
r18674r18675
363352   MCFG_SOUND_ROUTE( 0, "lspeaker", 0.75 )
364353   MCFG_SOUND_ROUTE( 1, "rspeaker", 0.75 )
365354
366   MCFG_SOUND_ADD( "cdda", CDDA, 0 )
367   MCFG_SOUND_ROUTE( 0, "lspeaker", 1.0 )
368   MCFG_SOUND_ROUTE( 1, "rspeaker", 1.0 )
355   MCFG_SOUND_MODIFY( "scsi:cdrom:cdda" )
356   MCFG_SOUND_ROUTE( 0, "^^^lspeaker", 1.0 )
357   MCFG_SOUND_ROUTE( 1, "^^^rspeaker", 1.0 )
369358MACHINE_CONFIG_END
370359
371360
trunk/src/mame/drivers/ksys573.c
r18674r18675
13801380      current_cdrom = new_cdrom;
13811381
13821382      state->m_cr589->SetDevice( new_cdrom );
1383      cdda_set_cdrom(machine.device("cdda"), new_cdrom);
13841383   }
13851384}
13861385
r18674r18675
30663065   MCFG_SOUND_ROUTE( 0, "lspeaker", 1.0 )
30673066   MCFG_SOUND_ROUTE( 1, "rspeaker", 1.0 )
30683067
3069   MCFG_SOUND_ADD( "cdda", CDDA, 0 )
3070   MCFG_SOUND_ROUTE( 0, "lspeaker", 1.0 )
3071   MCFG_SOUND_ROUTE( 1, "rspeaker", 1.0 )
3068   MCFG_SOUND_MODIFY( "cdrom:cdda" )
3069   MCFG_SOUND_ROUTE( 0, "^^lspeaker", 1.0 )
3070   MCFG_SOUND_ROUTE( 1, "^^rspeaker", 1.0 )
30723071
30733072   MCFG_M48T58_ADD( "m48t58" )
30743073
trunk/src/mame/drivers/twinkle.c
r18674r18675
272272   DECLARE_READ16_MEMBER(twinkle_ide_r);
273273   DECLARE_WRITE16_MEMBER(twinkle_ide_w);
274274   DECLARE_DRIVER_INIT(twinkle);
275   DECLARE_MACHINE_RESET(twinkle);
276275};
277276
278277/* RTC */
r18674r18675
871870   i2cmem_wc_write( i2cmem, 0 );
872871}
873872
874MACHINE_RESET_MEMBER(twinkle_state,twinkle)
875{
876   /* also hook up CDDA audio to the CD-ROM drive */
877   void *cdrom;
878   scsihle_device *scsidev = machine().device<scsihle_device>("scsi:cdrom");
879   scsidev->GetDevice( &cdrom );
880   cdda_set_cdrom(machine().device("cdda"), cdrom);
881}
882
883873static void spu_irq(device_t *device, UINT32 data)
884874{
885875   if (data)
r18674r18675
918908
919909   MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1200)) /* check TD pin on LTC1232 */
920910
921   MCFG_MACHINE_RESET_OVERRIDE(twinkle_state, twinkle )
922911   MCFG_I2CMEM_ADD("security",i2cmem_interface)
923912
924913   MCFG_SCSIBUS_ADD("scsi")
r18674r18675
942931   MCFG_SOUND_ROUTE(0, "speakerleft", 1.0)
943932   MCFG_SOUND_ROUTE(1, "speakerright", 1.0)
944933
945   MCFG_SOUND_ADD( "cdda", CDDA, 0 )
946   MCFG_SOUND_ROUTE( 0, "speakerleft", 1.0 )
947   MCFG_SOUND_ROUTE( 1, "speakerright", 1.0 )
934   MCFG_SOUND_MODIFY( "scsi:cdrom:cdda" )
935   MCFG_SOUND_ROUTE( 0, "^^^speakerleft", 1.0 )
936   MCFG_SOUND_ROUTE( 1, "^^^speakerright", 1.0 )
948937MACHINE_CONFIG_END
949938
950939static INPUT_PORTS_START( twinkle )

Previous 199869 Revisions Next

© 1997-2024 The MAME Team