diff options
-rw-r--r-- | src/emu/mconfig.c | 12 | ||||
-rw-r--r-- | src/mame/drivers/appoooh.c | 52 | ||||
-rw-r--r-- | src/mame/drivers/ashnojoe.c | 70 | ||||
-rw-r--r-- | src/mame/drivers/asterix.c | 59 |
4 files changed, 68 insertions, 125 deletions
diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index b7f1301da79..3461f714837 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -349,20 +349,20 @@ static void machine_config_detokenize(machine_config *config, const machine_conf case MCONFIG_TOKEN_CPU_PROGRAM_MAP: assert(cpu != NULL); - cpu->construct_map[ADDRESS_SPACE_PROGRAM][0] = TOKEN_GET_PTR(tokens, voidptr); - cpu->construct_map[ADDRESS_SPACE_PROGRAM][1] = TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_PROGRAM][0] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_PROGRAM][1] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); break; case MCONFIG_TOKEN_CPU_DATA_MAP: assert(cpu != NULL); - cpu->construct_map[ADDRESS_SPACE_DATA][0] = TOKEN_GET_PTR(tokens, voidptr); - cpu->construct_map[ADDRESS_SPACE_DATA][1] = TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_DATA][0] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_DATA][1] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); break; case MCONFIG_TOKEN_CPU_IO_MAP: assert(cpu != NULL); - cpu->construct_map[ADDRESS_SPACE_IO][0] = TOKEN_GET_PTR(tokens, voidptr); - cpu->construct_map[ADDRESS_SPACE_IO][1] = TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_IO][0] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_IO][1] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); break; case MCONFIG_TOKEN_CPU_VBLANK_INT: diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index 2b19481f572..81e5bc8027d 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -86,43 +86,29 @@ static WRITE8_HANDLER( appoooh_adpcm_w ) -static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_ROM) - AM_RANGE(0xa000, 0xdfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe800, 0xefff) AM_READ(MRA8_RAM) /* RAM ? */ - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe800, 0xefff) AM_WRITE(MWA8_RAM) /* RAM ? */ - AM_RANGE(0xf000, 0xf01f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) +static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0x7fff) AM_ROM + AM_RANGE(0x8000, 0x9fff) AM_ROM + AM_RANGE(0xa000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0xe000, 0xe7ff) AM_RAM + AM_RANGE(0xe800, 0xefff) AM_RAM /* RAM ? */ + + AM_RANGE(0xf000, 0xf01f) AM_BASE(&spriteram) AM_RANGE(0xf020, 0xf3ff) AM_WRITE(appoooh_fg_videoram_w) AM_BASE(&appoooh_fg_videoram) AM_RANGE(0xf420, 0xf7ff) AM_WRITE(appoooh_fg_colorram_w) AM_BASE(&appoooh_fg_colorram) - AM_RANGE(0xf800, 0xf81f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0xf800, 0xf81f) AM_BASE(&spriteram_2) AM_RANGE(0xf820, 0xfbff) AM_WRITE(appoooh_bg_videoram_w) AM_BASE(&appoooh_bg_videoram) AM_RANGE(0xfc20, 0xffff) AM_WRITE(appoooh_bg_colorram_w) AM_BASE(&appoooh_bg_colorram) + AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) - ADDRESS_MAP_FLAGS( AMEF_ABITS(8) ) - AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r) /* IN0 */ - AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r) /* IN1 */ - AM_RANGE(0x03, 0x03) AM_READ(input_port_3_r) /* DSW */ - AM_RANGE(0x04, 0x04) AM_READ(input_port_2_r) /* IN2 */ -ADDRESS_MAP_END - -static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) +static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_FLAGS( AMEF_ABITS(8) ) - AM_RANGE(0x00, 0x00) AM_WRITE(SN76496_0_w) - AM_RANGE(0x01, 0x01) AM_WRITE(SN76496_1_w) + AM_RANGE(0x00, 0x00) AM_READWRITE(input_port_0_r, SN76496_0_w) + AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_1_r, SN76496_1_w) AM_RANGE(0x02, 0x02) AM_WRITE(SN76496_2_w) - AM_RANGE(0x03, 0x03) AM_WRITE(appoooh_adpcm_w) - AM_RANGE(0x04, 0x04) AM_WRITE(appoooh_out_w) + AM_RANGE(0x03, 0x03) AM_READWRITE(input_port_3_r, appoooh_adpcm_w) + AM_RANGE(0x04, 0x04) AM_READWRITE(input_port_2_r, appoooh_out_w) AM_RANGE(0x05, 0x05) AM_WRITE(appoooh_scroll_w) /* unknown */ ADDRESS_MAP_END @@ -228,8 +214,8 @@ static MACHINE_DRIVER_START( appoooh ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */ - MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_IO_MAP(readport,writeport) + MDRV_CPU_PROGRAM_MAP(main_map,0) + MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) /* video hardware */ @@ -430,8 +416,8 @@ static MACHINE_DRIVER_START( robowres ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */ - MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_IO_MAP(readport,writeport) + MDRV_CPU_PROGRAM_MAP(main_map,0) + MDRV_CPU_IO_MAP(main_portmap,0) MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) /* video hardware */ diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index 8be2bbe0841..edb5ec2fca8 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -115,35 +115,26 @@ static WRITE16_HANDLER( ashnojoe_soundlatch_w ) } } -static ADDRESS_MAP_START( ashnojoe_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_READ(MRA16_RAM) - AM_RANGE(0x044000, 0x048fff) AM_READ(MRA16_RAM) - AM_RANGE(0x049000, 0x049fff) AM_READ(MRA16_RAM) +static ADDRESS_MAP_START( ashnojoe_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x01ffff) AM_ROM + AM_RANGE(0x040000, 0x041fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram3_w) AM_BASE(&ashnojoetileram16_3) + AM_RANGE(0x042000, 0x043fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram4_w) AM_BASE(&ashnojoetileram16_4) + AM_RANGE(0x044000, 0x044fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram5_w) AM_BASE(&ashnojoetileram16_5) + AM_RANGE(0x045000, 0x045fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram2_w) AM_BASE(&ashnojoetileram16_2) + AM_RANGE(0x046000, 0x046fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram6_w) AM_BASE(&ashnojoetileram16_6) + AM_RANGE(0x047000, 0x047fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram7_w) AM_BASE(&ashnojoetileram16_7) + AM_RANGE(0x048000, 0x048fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram_w) AM_BASE(&ashnojoetileram16) + AM_RANGE(0x049000, 0x049fff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x04a000, 0x04a001) AM_READ(input_port_0_word_r) // p1 inputs, coins AM_RANGE(0x04a002, 0x04a003) AM_READ(input_port_1_word_r) // p2 inputs AM_RANGE(0x04a004, 0x04a005) AM_READ(input_port_2_word_r) // dipswitches - AM_RANGE(0x04a00a, 0x04a00b) AM_READ(fake_4a00a_r) // ?? - AM_RANGE(0x04c000, 0x04ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x080000, 0x0bffff) AM_READ(MRA16_ROM) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( ashnojoe_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x041fff) AM_WRITE(ashnojoe_tileram3_w) AM_BASE(&ashnojoetileram16_3) - AM_RANGE(0x042000, 0x043fff) AM_WRITE(ashnojoe_tileram4_w) AM_BASE(&ashnojoetileram16_4) - AM_RANGE(0x044000, 0x044fff) AM_WRITE(ashnojoe_tileram5_w) AM_BASE(&ashnojoetileram16_5) - AM_RANGE(0x045000, 0x045fff) AM_WRITE(ashnojoe_tileram2_w) AM_BASE(&ashnojoetileram16_2) - AM_RANGE(0x046000, 0x046fff) AM_WRITE(ashnojoe_tileram6_w) AM_BASE(&ashnojoetileram16_6) - AM_RANGE(0x047000, 0x047fff) AM_WRITE(ashnojoe_tileram7_w) AM_BASE(&ashnojoetileram16_7) - AM_RANGE(0x048000, 0x048fff) AM_WRITE(ashnojoe_tileram_w) AM_BASE(&ashnojoetileram16) - AM_RANGE(0x049000, 0x049fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x04a006, 0x04a007) AM_WRITE(MWA16_RAM) AM_BASE(&ashnojoe_tilemap_reg) AM_RANGE(0x04a008, 0x04a009) AM_WRITE(ashnojoe_soundlatch_w) + AM_RANGE(0x04a00a, 0x04a00b) AM_READ(fake_4a00a_r) // ?? AM_RANGE(0x04a010, 0x04a019) AM_WRITE(joe_tilemaps_xscroll_w) AM_RANGE(0x04a020, 0x04a029) AM_WRITE(joe_tilemaps_yscroll_w) - AM_RANGE(0x04c000, 0x04ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x080000, 0x0bffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x04c000, 0x04ffff) AM_RAM + AM_RANGE(0x080000, 0x0bffff) AM_ROM ADDRESS_MAP_END static READ8_HANDLER(fake_6_r) @@ -163,33 +154,21 @@ static WRITE8_HANDLER( adpcm_data_w ) MSM5205_data_w(0, data>>4); } -static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK4) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) +static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0x5fff) AM_ROM + AM_RANGE(0x6000, 0x7fff) AM_RAM + AM_RANGE(0x8000, 0xffff) AM_ROMBANK(4) ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) +static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_FLAGS( AMEF_ABITS(8) ) - AM_RANGE(0x00, 0x00) AM_READ(YM2203_status_port_0_r) - AM_RANGE(0x01, 0x01) AM_READ(YM2203_read_port_0_r) + AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w) + AM_RANGE(0x01, 0x01) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w) + AM_RANGE(0x02, 0x02) AM_WRITE(adpcm_data_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r) //PC: 15D -> cp $7f AM_RANGE(0x06, 0x06) AM_READ(fake_6_r/*soundlatch_r */) //PC: 14A -> and $1 ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) - ADDRESS_MAP_FLAGS( AMEF_ABITS(8) ) - AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w) - AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w) - AM_RANGE(0x02, 0x02) AM_WRITE(adpcm_data_w) -ADDRESS_MAP_END - static INPUT_PORTS_START( ashnojoe ) PORT_START_TAG("IN0") /* player 1 16-bit */ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1) @@ -355,13 +334,12 @@ static MACHINE_DRIVER_START( ashnojoe ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz (verified on pcb) */ - MDRV_CPU_PROGRAM_MAP(ashnojoe_readmem,ashnojoe_writemem) + MDRV_CPU_PROGRAM_MAP(ashnojoe_map,0) MDRV_CPU_VBLANK_INT(irq1_line_hold,1) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (verified on pcb) */ - /* audio CPU */ - MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_IO_MAP(sound_readport,sound_writeport) + MDRV_CPU_PROGRAM_MAP(sound_map,0) + MDRV_CPU_IO_MAP(sound_portmap,0) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index b157a7d2322..f7708ed4769 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -183,54 +183,34 @@ static WRITE16_HANDLER( protection_w ) -static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x107fff) AM_READ(MRA16_RAM) // Main RAM. - AM_RANGE(0x180000, 0x1807ff) AM_READ(K053245_word_r) // Sprites - AM_RANGE(0x180800, 0x180fff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x20000f) AM_READ(K053244_word_r) - AM_RANGE(0x280000, 0x280fff) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x30001f) AM_READ(K053244_lsb_r) +static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) + AM_RANGE(0x000000, 0x0fffff) AM_ROM + AM_RANGE(0x100000, 0x107fff) AM_RAM + AM_RANGE(0x180000, 0x1807ff) AM_READWRITE(K053245_word_r, K053245_word_w) + AM_RANGE(0x180800, 0x180fff) AM_RAM // extra RAM, or mirror for the above? + AM_RANGE(0x200000, 0x20000f) AM_READWRITE(K053244_word_r, K053244_word_w) + AM_RANGE(0x280000, 0x280fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x300000, 0x30001f) AM_READWRITE(K053244_lsb_r, K053244_lsb_w) AM_RANGE(0x380000, 0x380001) AM_READ(input_port_0_word_r) AM_RANGE(0x380002, 0x380003) AM_READ(control1_r) - AM_RANGE(0x380200, 0x380203) AM_READ(asterix_sound_r) // 053260 - AM_RANGE(0x380600, 0x380601) AM_READ(MRA16_NOP) // Watchdog - AM_RANGE(0x400000, 0x400fff) AM_READ(K056832_ram_half_word_r) // Graphic planes - AM_RANGE(0x420000, 0x421fff) AM_READ(K056832_old_rom_word_r) // Passthrough to tile roms -ADDRESS_MAP_END - -static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x107fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x180000, 0x1807ff) AM_WRITE(K053245_word_w) - AM_RANGE(0x180800, 0x180fff) AM_WRITE(MWA16_RAM) // extra RAM, or mirror for the above? - AM_RANGE(0x200000, 0x20000f) AM_WRITE(K053244_word_w) - AM_RANGE(0x280000, 0x280fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x300000, 0x30001f) AM_WRITE(K053244_lsb_w) AM_RANGE(0x380100, 0x380101) AM_WRITE(control2_w) - AM_RANGE(0x380200, 0x380203) AM_WRITE(K053260_0_lsb_w) + AM_RANGE(0x380200, 0x380203) AM_READWRITE(asterix_sound_r, K053260_0_lsb_w) AM_RANGE(0x380300, 0x380301) AM_WRITE(sound_irq_w) AM_RANGE(0x380400, 0x380401) AM_WRITE(asterix_spritebank_w) AM_RANGE(0x380500, 0x38051f) AM_WRITE(K053251_lsb_w) - AM_RANGE(0x380600, 0x380601) AM_WRITE(MWA16_NOP) // Watchdog + AM_RANGE(0x380600, 0x380601) AM_NOP // Watchdog AM_RANGE(0x380700, 0x380707) AM_WRITE(K056832_b_word_w) AM_RANGE(0x380800, 0x380803) AM_WRITE(protection_w) - AM_RANGE(0x400000, 0x400fff) AM_WRITE(K056832_ram_half_word_w) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(K056832_ram_half_word_r, K056832_ram_half_word_w) + AM_RANGE(0x420000, 0x421fff) AM_READ(K056832_old_rom_word_r) // Passthrough to tile roms AM_RANGE(0x440000, 0x44003f) AM_WRITE(K056832_word_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0xfa00, 0xfa2f) AM_READ(K053260_0_r) -ADDRESS_MAP_END - -static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0xfa00, 0xfa2f) AM_WRITE(K053260_0_w) +static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0xefff) AM_ROM + AM_RANGE(0xf000, 0xf7ff) AM_RAM + AM_RANGE(0xf801, 0xf801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) + AM_RANGE(0xfa00, 0xfa2f) AM_READWRITE(K053260_0_r, K053260_0_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w) AM_RANGE(0xfe00, 0xfe00) AM_WRITE(YM2151_register_port_0_w) ADDRESS_MAP_END @@ -276,12 +256,11 @@ static MACHINE_DRIVER_START( asterix ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) - MDRV_CPU_PROGRAM_MAP(readmem,writemem) + MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT(asterix_interrupt,1) MDRV_CPU_ADD(Z80, 8000000) - /* audio CPU */ - MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) + MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_NVRAM_HANDLER(asterix) |