Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-23 22:20:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fixed CPU tags in recently added drivers. Added interface to the C6280 sound

Browse Source 
chip to let it specify the CPU. Fixed remaining duplicate device tags. Made 
validity check for duplicate devices fatal.
This commit is contained in:
Aaron Giles 2009-02-26 07:54:28 +00:00
parent 4e365930b2
commit 2e22a3a35e
12 changed files with 65 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/devintrf.c
View File

@ -104,7 +104,7 @@ device_config *device_list_add(device_config **listheadptr, const device_config
/* find the end of the list, and ensure no duplicates along the way */
for (devptr = listheadptr; *devptr != NULL; devptr = &(*devptr)->next)
if (type == (*devptr)->type && strcmp(tag, (*devptr)->tag) == 0)
if (strcmp(tag, (*devptr)->tag) == 0)
fatalerror("Attempted to add duplicate device: type=%s tag=%s\n", device_get_name(*devptr), tag);
/* get the size of the inline config */

3
src/emu/sound/c6280.c
View File

@ -99,6 +99,7 @@ INLINE c6280_t *get_safe_token(const device_config *device)
static void c6280_init(const device_config *device, c6280_t *p, double clk, double rate)
{
const c6280_interface *intf = device->static_config;
int i;
double step;
@ -109,7 +110,7 @@ static void c6280_init(const device_config *device, c6280_t *p, double clk, doub
memset(p, 0, sizeof(c6280_t));
p->device = device;
p->cpudevice = cputag_get_cpu(device->machine, device->tag);
p->cpudevice = cputag_get_cpu(device->machine, intf->cpu);
if (p->cpudevice == NULL)
fatalerror("c6280_init: no CPU found with tag of '%s'\n", device->tag);

6
src/emu/sound/c6280.h
View File

@ -3,6 +3,12 @@
#ifndef __C6280_H__
#define __C6280_H__
typedef struct _c6280_interface c6280_interface;
struct _c6280_interface
{
const char * cpu;
};
/* Function prototypes */
WRITE8_DEVICE_HANDLER( c6280_w );
READ8_DEVICE_HANDLER( c6280_r );

10
src/mame/drivers/battlera.c
View File

@ -121,7 +121,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x040001) AM_DEVWRITE(SOUND, "ym", ym2203_w)
AM_RANGE(0x080000, 0x080001) AM_WRITE(battlera_adpcm_data_w)
AM_RANGE(0x1fe800, 0x1fe80f) AM_DEVWRITE(SOUND, "audiocpu", c6280_w)
AM_RANGE(0x1fe800, 0x1fe80f) AM_DEVWRITE(SOUND, "c6280", c6280_w)
AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(7) /* Main ram */
AM_RANGE(0x1ff000, 0x1ff001) AM_READ(soundlatch_r) AM_DEVWRITE(SOUND, "msm", battlera_adpcm_reset_w)
AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w)
@ -234,6 +234,11 @@ static const msm5205_interface msm5205_config =
/******************************************************************************/
static const c6280_interface c6280_config =
{
"audiocpu"
};
static MACHINE_DRIVER_START( battlera )
/* basic machine hardware */
@ -270,7 +275,8 @@ static MACHINE_DRIVER_START( battlera )
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.85)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.85)
MDRV_SOUND_ADD("audiocpu", C6280, 21477270/6)
MDRV_SOUND_ADD("c6280", C6280, 21477270/6)
MDRV_SOUND_CONFIG(c6280_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_DRIVER_END

20
src/mame/drivers/bfm_sc1.c
View File

@ -750,7 +750,7 @@ static MACHINE_RESET( bfm_sc1 )
// init rom bank ////////////////////////////////////////////////////////////////////
{
UINT8 *rom = memory_region(machine, "main");
UINT8 *rom = memory_region(machine, "maincpu");
memory_configure_bank(machine,1, 0, 1, &rom[0x10000], 0);
memory_configure_bank(machine,1, 1, 3, &rom[0x02000], 0x02000);
@ -1242,7 +1242,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( scorpion1 )
MDRV_MACHINE_RESET(bfm_sc1) // main scorpion1 board initialisation
MDRV_CPU_ADD("main", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
MDRV_CPU_PROGRAM_MAP(memmap,0) // setup read and write memorymap
MDRV_CPU_PERIODIC_INT(timer_irq, 1000 ) // generate 1000 IRQ's per second
@ -1261,7 +1261,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( scorpion1_adder2 )
MDRV_IMPORT_FROM( scorpion1 )
MDRV_CPU_MODIFY("main")
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(memmap_adder2,0) // setup read and write memorymap
MDRV_DEFAULT_LAYOUT(layout_bfm_sc1)
@ -1291,7 +1291,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( scorpion1_nec_uk )
MDRV_IMPORT_FROM( scorpion1 )
MDRV_CPU_MODIFY("main")
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(sc1_nec_uk,0) // setup read and write memorymap
MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
@ -1301,21 +1301,21 @@ MACHINE_DRIVER_END
// ROM definition ///////////////////////////////////////////////////////////////////
ROM_START( m_lotsse )
ROM_REGION( 0x12000, "main", 0 )
ROM_REGION( 0x12000, "maincpu", 0 )
ROM_LOAD( "lotusse.bin", 0x0000, 0x10000, CRC(636dadc4) SHA1(85bad5d76dac028fe9f3303dd09e8266aba7db4d))
ROM_END
/////////////////////////////////////////////////////////////////////////////////////
ROM_START( m_roulet )
ROM_REGION( 0x12000, "main", 0 )
ROM_REGION( 0x12000, "maincpu", 0 )
ROM_LOAD( "rou029.bin", 0x8000, 0x08000, CRC(31723f0A) SHA1(e220976116a0aaf24dc0c4af78a9311a360e8104))
ROM_END
/////////////////////////////////////////////////////////////////////////////////////
ROM_START( m_clattr )
ROM_REGION( 0x12000, "main", 0 )
ROM_REGION( 0x12000, "maincpu", 0 )
ROM_LOAD( "39370196.1", 0x8000, 0x08000, CRC(4c2e465f) SHA1(101939d37d9c033f6d1dfb83b4beb54e4061aec2))
ROM_LOAD( "39370196.2", 0x0000, 0x08000, CRC(c809c22d) SHA1(fca7515bc84d432150ffe5e32fccc6aed458b8b0))
ROM_END
@ -1323,7 +1323,7 @@ ROM_END
/////////////////////////////////////////////////////////////////////////////////////
ROM_START( m_tppokr )
ROM_REGION( 0x12000, "main", 0 )
ROM_REGION( 0x12000, "maincpu", 0 )
ROM_LOAD( "95750899.bin", 0x0000, 0x10000, CRC(639d1d62) SHA1(80620c14bf9f953588555510fc2e6e930140923f))
ROM_REGION( 0x20000, "adder2", 0 )
@ -1339,7 +1339,7 @@ static void sc1_common_init(running_machine *machine, int reels, int decrypt)
{
UINT8 *rom, i;
rom = memory_region(machine, "main");
rom = memory_region(machine, "maincpu");
if ( rom )
{
memcpy(&rom[0x10000], &rom[0x00000], 0x2000);
@ -1352,7 +1352,7 @@ static void sc1_common_init(running_machine *machine, int reels, int decrypt)
{
stepper_config(machine, i, &starpoint_interface_48step);
}
if (decrypt) decode_sc1(machine,"main"); // decode main rom
if (decrypt) decode_sc1(machine,"maincpu"); // decode main rom
if (reels)
{
awp_reel_setup();

4
src/mame/drivers/bfmsys85.c
View File

@ -436,7 +436,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( bfmsys85 )
MDRV_MACHINE_START(bfm_sys85) // main system85 board initialisation
MDRV_MACHINE_RESET(bfm_sys85)
MDRV_CPU_ADD("main", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
MDRV_CPU_PROGRAM_MAP(memmap,0) // setup read and write memorymap
MDRV_CPU_PERIODIC_INT(timer_irq, 1000 ) // generate 1000 IRQ's per second
@ -479,7 +479,7 @@ INPUT_PORTS_END
// ROM definition /////////////////////////////////////////////////////////
ROM_START( m_supcrd )
ROM_REGION( 0x10000, "main", 0 )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "sc271.bin", 0x8000, 0x8000, CRC(58e9c9df) SHA1(345c5aa279327d7142edc6823aad0cfd40cbeb73))
ROM_END

4
src/mame/drivers/maygay1b.c
View File

@ -790,7 +790,7 @@ static MACHINE_DRIVER_START( m1 )
MDRV_MACHINE_START(m1)
MDRV_MACHINE_RESET(m1)
MDRV_CPU_ADD("main", M6809, M1_MASTER_CLOCK/2)
MDRV_CPU_ADD("maincpu", M6809, M1_MASTER_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(m1_memmap,0)
MDRV_DUART68681_ADD("duart68681", M1_DUART_CLOCK, maygaym1_duart68681_config)
@ -811,7 +811,7 @@ static MACHINE_DRIVER_START( m1 )
MACHINE_DRIVER_END
ROM_START( m_sptlgt )
ROM_REGION( 0x10000, "main", ROMREGION_ERASE00 )
ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
ROM_LOAD( "sa2-412.bin",0x0000, 0x10000, CRC(17531aad) SHA1(decec517b89be9019913be59c5fC2aa2ee6e3f8f))
ROM_END

22
src/mame/drivers/maygayv1.c
View File

@ -651,7 +651,7 @@ static WRITE16_HANDLER( vsync_int_ctrl )
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
AM_RANGE(0x100000, 0x17ffff) AM_ROM AM_REGION("main", 0x80000)
AM_RANGE(0x100000, 0x17ffff) AM_ROM AM_REGION("maincpu", 0x80000)
AM_RANGE(0x820000, 0x820003) AM_READWRITE(maygay_8279_r, maygay_8279_w)
AM_RANGE(0x800000, 0x800003) AM_DEVWRITE8( SOUND, "ym", ym2413_w, 0xff00 )
AM_RANGE(0x860000, 0x86000d) AM_READWRITE(read_odd, write_odd)
@ -992,11 +992,11 @@ static INTERRUPT_GEN( vsync_interrupt )
static MACHINE_DRIVER_START( maygayv1 )
MDRV_CPU_ADD("main", M68000, XTAL_16MHz / 2)
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2)
MDRV_CPU_PROGRAM_MAP(main_map, 0)
MDRV_CPU_VBLANK_INT("main", vsync_interrupt)
MDRV_CPU_VBLANK_INT("screen", vsync_interrupt)
MDRV_CPU_ADD("sound", I8052, XTAL_11_0592MHz)
MDRV_CPU_ADD("soundcpu", I8052, XTAL_11_0592MHz)
MDRV_CPU_PROGRAM_MAP(sound_prg, 0)
MDRV_CPU_DATA_MAP(sound_data, 0)
MDRV_CPU_IO_MAP(sound_io, 0)
@ -1007,7 +1007,7 @@ static MACHINE_DRIVER_START( maygayv1 )
MDRV_NVRAM_HANDLER(generic_0fill)
/* TODO: Use real video timings */
MDRV_SCREEN_ADD("main", RASTER)
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_REFRESH_RATE(60)
MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
@ -1039,7 +1039,7 @@ MACHINE_DRIVER_END
*************************************/
ROM_START( screenpl )
ROM_REGION( 0x100000, "main", 0 )
ROM_REGION( 0x100000, "maincpu", 0 )
ROM_LOAD16_BYTE( "20p6pnd_u15.bin", 0x00000, 0x20000, CRC(4334453c) SHA1(5c18acf29c7b3f44589b92d74b79ac66730db810) )
ROM_LOAD16_BYTE( "20p6pnd_u16.bin", 0x00001, 0x20000, CRC(90b3f67c) SHA1(a58a0bc4ccccf083fe3222f02eb06ee5fa6f386a) )
ROM_LOAD16_BYTE( "20p6pnd_u17.bin", 0x40000, 0x20000, CRC(ba576b11) SHA1(3ba7bcaf4e3cc4eaeeece6e3f4957c3a8dfd5752) )
@ -1050,7 +1050,7 @@ ROM_START( screenpl )
ROM_LOAD16_BYTE( "20p6pnd_u4.bin", 0xc0000, 0x20000, CRC(01aafd7e) SHA1(d2161066655218468da8eae8aa9da8a80c07c489) )
ROM_LOAD16_BYTE( "20p6pnd_u3.bin", 0xc0001, 0x20000, CRC(aa02dc54) SHA1(a05c8c26480f3bae671428380c7684b9c29b5a53) )
ROM_REGION( 0x10000, "sound", 0 )
ROM_REGION( 0x10000, "soundcpu", 0 )
ROM_LOAD( "reels.bin", 0x0000, 0x10000, CRC(1319cf82) SHA1(7a233072890361bcf384de4f90170c2ca713b1de) )
ROM_REGION( 0x20000, "upd", 0 )
@ -1058,7 +1058,7 @@ ROM_START( screenpl )
ROM_END
ROM_START( screenp1 )
ROM_REGION( 0x100000, "main", 0 )
ROM_REGION( 0x100000, "maincpu", 0 )
ROM_LOAD16_BYTE( "sa4-379.u15", 0x00000, 0x20000, CRC(e21b120d) SHA1(bcdebf797381b0c585dbd3511b5e984f22de2206) )
ROM_LOAD16_BYTE( "sa4-379.u16", 0x00001, 0x20000, CRC(b04588b7) SHA1(1f9b933e441969c95bbbabbfbe44349bd945c326) )
ROM_LOAD16_BYTE( "sa4-379.u17", 0x40000, 0x20000, CRC(4b6cdc43) SHA1(1d6a4796ce67d0d00fe74a6bafd8b731450cdaab) )
@ -1069,7 +1069,7 @@ ROM_START( screenp1 )
ROM_LOAD16_BYTE( "sq3-458.u4", 0xc0000, 0x20000, CRC(0fb0fc84) SHA1(e7ef68130f9627a842849f41f67accf8593a0819) )
ROM_LOAD16_BYTE( "sq3-458.u3", 0xc0001, 0x20000, CRC(ef4617d8) SHA1(48231405a775585451bf970db5bb57ec2f238250) )
ROM_REGION( 0x10000, "sound", 0 )
ROM_REGION( 0x10000, "soundcpu", 0 )
ROM_LOAD( "sr2-002", 0x0000, 0x10000, CRC(1319cf82) SHA1(7a233072890361bcf384de4f90170c2ca713b1de) )
ROM_REGION( 0x20000, "upd", 0 )
@ -1077,7 +1077,7 @@ ROM_START( screenp1 )
ROM_END
ROM_START( screenp2 )
ROM_REGION( 0x100000, "main", 0 )
ROM_REGION( 0x100000, "maincpu", 0 )
ROM_LOAD16_BYTE( "sa4-280.u15", 0x00000, 0x20000, CRC(d7206438) SHA1(70e7dc7d58bfa7dfe00250ab46fa71e951dbf901) )
ROM_LOAD16_BYTE( "sa4-280.u16", 0x00001, 0x20000, CRC(f99e972f) SHA1(b01c8796967ff7f27269b31ef983b5fb26b03aab) )
ROM_LOAD16_BYTE( "sa4-280.u17", 0x40000, 0x20000, CRC(cbde5343) SHA1(e341d642d8537bc221b3ca9803c221dc0cdf86c3) )
@ -1088,7 +1088,7 @@ ROM_START( screenp2 )
ROM_LOAD16_BYTE( "u4.bin", 0xc0000, 0x20000, CRC(0fb0fc84) SHA1(e7ef68130f9627a842849f41f67accf8593a0819) )
ROM_LOAD16_BYTE( "u3.bin", 0xc0001, 0x20000, CRC(ef4617d8) SHA1(48231405a775585451bf970db5bb57ec2f238250) )
ROM_REGION( 0x10000, "sound", 0 )
ROM_REGION( 0x10000, "soundcpu", 0 )
ROM_LOAD( "reels.bin", 0x00000, 0x10000, CRC(1319cf82) SHA1(7a233072890361bcf384de4f90170c2ca713b1de) )
ROM_REGION( 0x20000, "upd", 0 )

12
src/mame/drivers/mpu4.c
View File

@ -1791,7 +1791,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mod4yam )
MDRV_IMPORT_FROM( mpu4mod2 )
MDRV_MACHINE_START(mpu4mod4)
MDRV_CPU_MODIFY("main")
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(mod4_yam_map,0)
MDRV_SOUND_REMOVE("ay8913")
@ -1802,7 +1802,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mod4oki )
MDRV_IMPORT_FROM( mpu4mod2 )
MDRV_MACHINE_START(mpu4mod4)
MDRV_CPU_MODIFY("main")
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(mod4_oki_map,0)
MDRV_SOUND_REMOVE("ay8913")
@ -1812,23 +1812,23 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mpu4dutch )
MDRV_IMPORT_FROM( mod4oki )
MDRV_CPU_MODIFY("main")
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(dutch_memmap,0) // setup read and write memorymap
MDRV_MACHINE_START(mpu4dutch) // main mpu4 board initialisation
MACHINE_DRIVER_END
ROM_START( m_oldtmr )
ROM_REGION( 0x10000, "main", 0 )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "dot11.bin", 0x00000, 0x10000, CRC(da095666) SHA1(bc7654dc9da1f830a43f925db8079f27e18bb61e))
ROM_END
ROM_START( m_ccelbr )
ROM_REGION( 0x10000, "main", 0 )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "cels.p1", 0x00000, 0x10000, CRC(19d2162f) SHA1(24fe435809352725e7614c32e2184142f355298e))
ROM_END
ROM_START( m_gmball )
ROM_REGION( 0x10000, "main", ROMREGION_ERASE00 )
ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
ROM_LOAD( "gbbx.p1", 0x0000, 0x10000, CRC(0b5adcd0) SHA1(1a198bd4a1e7d6bf4cf025c43d35aaef351415fc))
ROM_END

2
src/mame/drivers/onetwo.c
View File

@ -313,7 +313,7 @@ MACHINE_DRIVER_END
ROM_START( onetwo )
ROM_REGION( 0x30000, "maincpu", 0 ) /* main z80 */
ROM_LOAD( "main", 0x10000, 0x20000, CRC(83431e6e) SHA1(61ab386a1d0af050f091f5df28c55ad5ad1a0d4b) )
ROM_LOAD( "maincpu", 0x10000, 0x20000, CRC(83431e6e) SHA1(61ab386a1d0af050f091f5df28c55ad5ad1a0d4b) )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* sound z80 */
ROM_LOAD( "sound_prog", 0x00000, 0x10000, CRC(90aba4f3) SHA1(914b1c8684993ddc7200a3d61e07f4f6d59e9d02) )

10
src/mame/drivers/paranoia.c
View File

@ -59,7 +59,7 @@ static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE( 0x1F0000, 0x1F1FFF) AM_RAM AM_MIRROR(0x6000) AM_BASE( &pce_user_ram )
AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w )
AM_RANGE( 0x1FE400, 0x1FE7FF) AM_READWRITE( vce_r, vce_w )
AM_RANGE( 0x1FE800, 0x1FEBFF) AM_DEVREADWRITE( SOUND, "maincpu", c6280_r, c6280_w )
AM_RANGE( 0x1FE800, 0x1FEBFF) AM_DEVREADWRITE( SOUND, "c6280", c6280_r, c6280_w )
AM_RANGE( 0x1FEC00, 0x1FEFFF) AM_READWRITE( h6280_timer_r, h6280_timer_w )
AM_RANGE( 0x1FF000, 0x1FF3FF) AM_READWRITE( pce_joystick_r, pce_joystick_w )
AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( h6280_irq_status_r, h6280_irq_status_w )
@ -130,6 +130,11 @@ static ADDRESS_MAP_START(paranoia_z80_io_map, ADDRESS_SPACE_IO, 8)
AM_RANGE( 0x37, 0x37 ) AM_WRITE( paranoia_z80_io_37_w )
ADDRESS_MAP_END
static const c6280_interface c6280_config =
{
"maincpu"
};
static MACHINE_DRIVER_START( paranoia )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
@ -161,7 +166,8 @@ static MACHINE_DRIVER_START( paranoia )
MDRV_VIDEO_UPDATE( pce )
MDRV_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
MDRV_SOUND_ADD("maincpu", C6280, PCE_MAIN_CLOCK/6)
MDRV_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
MDRV_SOUND_CONFIG(c6280_config)
MDRV_SOUND_ROUTE(0, "lspeaker", 1.00)
MDRV_SOUND_ROUTE(1, "rspeaker", 1.00)

10
src/mame/drivers/uapce.c
View File

@ -168,7 +168,7 @@ static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE( 0x1F0000, 0x1F1FFF) AM_RAM AM_MIRROR(0x6000) AM_BASE( &pce_user_ram )
AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w )
AM_RANGE( 0x1FE400, 0x1FE7FF) AM_READWRITE( vce_r, vce_w )
AM_RANGE( 0x1FE800, 0x1FEBFF) AM_DEVREADWRITE( SOUND, "maincpu", c6280_r, c6280_w )
AM_RANGE( 0x1FE800, 0x1FEBFF) AM_DEVREADWRITE( SOUND, "c6280", c6280_r, c6280_w )
AM_RANGE( 0x1FEC00, 0x1FEFFF) AM_READWRITE( h6280_timer_r, h6280_timer_w )
AM_RANGE( 0x1FF000, 0x1FF3FF) AM_READWRITE( pce_joystick_r, pce_joystick_w )
AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( h6280_irq_status_r, h6280_irq_status_w )
@ -178,6 +178,11 @@ static ADDRESS_MAP_START( pce_io , ADDRESS_SPACE_IO, 8)
AM_RANGE( 0x00, 0x03) AM_READWRITE( vdc_0_r, vdc_0_w )
ADDRESS_MAP_END
static const c6280_interface c6280_config =
{
"maincpu"
};
static MACHINE_DRIVER_START( uapce )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
@ -206,7 +211,8 @@ static MACHINE_DRIVER_START( uapce )
MDRV_VIDEO_UPDATE( pce )
MDRV_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
MDRV_SOUND_ADD("maincpu", C6280, PCE_MAIN_CLOCK/6)
MDRV_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
MDRV_SOUND_CONFIG(c6280_config)
MDRV_SOUND_ROUTE(0, "lspeaker", 1.00)
MDRV_SOUND_ROUTE(1, "rspeaker", 1.00)