Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added dummy C139 device for debug, fixed target compile.

Browse Source
This commit is contained in:
angelosa 2016-12-31 23:54:15 +01:00
parent 8e00c03a0e
commit 0387005c1e
6 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/target/mame/arcade.lua
View File

@ -2694,6 +2694,10 @@ files {
MAME_DIR .. "src/mame/machine/namcomcu.h",
MAME_DIR .. "src/mame/machine/namcoio_gearbox.cpp",
MAME_DIR .. "src/mame/machine/namcoio_gearbox.h",
MAME_DIR .. "src/mame/machine/namco_c148.cpp",
MAME_DIR .. "src/mame/machine/namco_c148.h",
MAME_DIR .. "src/mame/machine/namco_c139.cpp",
MAME_DIR .. "src/mame/machine/namco_c139.h",
MAME_DIR .. "src/mame/audio/namco52.cpp",
MAME_DIR .. "src/mame/audio/namco52.h",
MAME_DIR .. "src/mame/audio/namco54.cpp",

13
src/mame/drivers/namcos2.cpp
View File

@ -599,8 +599,8 @@ static ADDRESS_MAP_START( namcos2_68k_default_cpu_board_am, AS_PROGRAM, 16, namc
AM_RANGE(0x440000, 0x44ffff) AM_READWRITE(paletteram_word_r,paletteram_word_w) AM_SHARE("paletteram")
AM_RANGE(0x460000, 0x460fff) AM_READWRITE(dpram_word_r,dpram_word_w)
AM_RANGE(0x468000, 0x468fff) AM_READWRITE(dpram_word_r,dpram_word_w) /* mirror */
AM_RANGE(0x480000, 0x483fff) AM_READWRITE(serial_comms_ram_r,serial_comms_ram_w) AM_SHARE("serialram")
AM_RANGE(0x4a0000, 0x4a000f) AM_READWRITE(serial_comms_ctrl_r,serial_comms_ctrl_w)
AM_RANGE(0x480000, 0x483fff) AM_DEVICE("sci", namco_c139_device, ram_map)
AM_RANGE(0x4a0000, 0x4a000f) AM_DEVICE("sci", namco_c139_device, regs_map)
ADDRESS_MAP_END
/*************************************************************/
@ -1736,7 +1736,8 @@ static MACHINE_CONFIG_START( default, namcos2_state )
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_FRAGMENT_ADD(configure_c148_standard)
MCFG_NAMCO_C139_ADD("sci")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
MCFG_SCREEN_SIZE(384, 264)
@ -1812,6 +1813,7 @@ static MACHINE_CONFIG_START( gollygho, namcos2_state )
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_FRAGMENT_ADD(configure_c148_standard)
MCFG_NAMCO_C139_ADD("sci")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
@ -1861,6 +1863,7 @@ static MACHINE_CONFIG_START( finallap, namcos2_state )
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_FRAGMENT_ADD(configure_c148_standard)
MCFG_NAMCO_C139_ADD("sci")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
@ -1915,6 +1918,7 @@ static MACHINE_CONFIG_START( sgunner, namcos2_state )
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_FRAGMENT_ADD(configure_c148_standard)
MCFG_NAMCO_C139_ADD("sci")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
@ -1971,6 +1975,7 @@ static MACHINE_CONFIG_START( sgunner2, namcos2_state )
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_FRAGMENT_ADD(configure_c148_standard)
MCFG_NAMCO_C139_ADD("sci")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
@ -2022,6 +2027,7 @@ static MACHINE_CONFIG_START( luckywld, namcos2_state )
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_FRAGMENT_ADD(configure_c148_standard)
MCFG_NAMCO_C139_ADD("sci")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
@ -2076,6 +2082,7 @@ static MACHINE_CONFIG_START( metlhawk, namcos2_state )
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_FRAGMENT_ADD(configure_c148_standard)
MCFG_NAMCO_C139_ADD("sci")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )

25
src/mame/drivers/namcos21.cpp
View File

@ -1252,8 +1252,8 @@ static ADDRESS_MAP_START( common_map, AS_PROGRAM, 16, namcos21_state )
AM_RANGE(0x800000, 0x8fffff) AM_ROM AM_REGION("data", 0)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_SHARE("sharedram")
AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(namcos2_68k_dualportram_word_r,namcos2_68k_dualportram_word_w)
AM_RANGE(0xb00000, 0xb03fff) AM_READWRITE(NAMCO_C139_SCI_buffer_r,NAMCO_C139_SCI_buffer_w)
AM_RANGE(0xb80000, 0xb8000f) AM_READWRITE(NAMCO_C139_SCI_register_r,NAMCO_C139_SCI_register_w)
AM_RANGE(0xb00000, 0xb03fff) AM_DEVICE("sci", namco_c139_device, ram_map)
AM_RANGE(0xb80000, 0xb8000f) AM_DEVICE("sci", namco_c139_device, regs_map)
AM_RANGE(0xc00000, 0xcfffff) AM_ROM AM_MIRROR(0x100000) AM_REGION("edata", 0)
ADDRESS_MAP_END
@ -1481,8 +1481,8 @@ static ADDRESS_MAP_START( winrun_master_map, AS_PROGRAM, 16, namcos21_state )
AM_RANGE(0x800000, 0x87ffff) AM_ROM AM_REGION("data", 0)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_SHARE("sharedram")
AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(namcos2_68k_dualportram_word_r,namcos2_68k_dualportram_word_w)
AM_RANGE(0xb00000, 0xb03fff) AM_READWRITE(NAMCO_C139_SCI_buffer_r,NAMCO_C139_SCI_buffer_w)
AM_RANGE(0xb80000, 0xb8000f) AM_READWRITE(NAMCO_C139_SCI_register_r,NAMCO_C139_SCI_register_w)
AM_RANGE(0xb00000, 0xb03fff) AM_DEVICE("sci", namco_c139_device, ram_map)
AM_RANGE(0xb80000, 0xb8000f) AM_DEVICE("sci", namco_c139_device, regs_map)
ADDRESS_MAP_END
static ADDRESS_MAP_START( winrun_slave_map, AS_PROGRAM, 16, namcos21_state )
@ -1493,8 +1493,8 @@ static ADDRESS_MAP_START( winrun_slave_map, AS_PROGRAM, 16, namcos21_state )
AM_RANGE(0x800000, 0x87ffff) AM_ROM AM_REGION("data", 0)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_SHARE("sharedram")
AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(namcos2_68k_dualportram_word_r,namcos2_68k_dualportram_word_w)
AM_RANGE(0xb00000, 0xb03fff) AM_READWRITE(NAMCO_C139_SCI_buffer_r,NAMCO_C139_SCI_buffer_w)
AM_RANGE(0xb80000, 0xb8000f) AM_READWRITE(NAMCO_C139_SCI_register_r,NAMCO_C139_SCI_register_w)
AM_RANGE(0xb00000, 0xb03fff) AM_DEVICE("sci", namco_c139_device, ram_map)
AM_RANGE(0xb80000, 0xb8000f) AM_DEVICE("sci", namco_c139_device, regs_map)
ADDRESS_MAP_END
@ -1573,8 +1573,8 @@ static ADDRESS_MAP_START( driveyes_common_map, AS_PROGRAM, 16, namcos21_state )
AM_RANGE(0x800000, 0x8fffff) AM_ROM AM_REGION("data", 0)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_SHARE("sharedram")
AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(namcos2_68k_dualportram_word_r,namcos2_68k_dualportram_word_w)
AM_RANGE(0xb00000, 0xb03fff) AM_READWRITE(NAMCO_C139_SCI_buffer_r,NAMCO_C139_SCI_buffer_w)
AM_RANGE(0xb80000, 0xb8000f) AM_READWRITE(NAMCO_C139_SCI_register_r,NAMCO_C139_SCI_register_w)
AM_RANGE(0xb00000, 0xb03fff) AM_DEVICE("sci", namco_c139_device, ram_map)
AM_RANGE(0xb80000, 0xb8000f) AM_DEVICE("sci", namco_c139_device, regs_map)
ADDRESS_MAP_END
static ADDRESS_MAP_START( driveyes_master_map, AS_PROGRAM, 16, namcos21_state )
@ -1852,7 +1852,7 @@ MACHINE_START_MEMBER(namcos21_state,namcos21)
namcos2_kickstart = namcos21_kickstart;
}
// TODO: temp
// TODO: temp, C116 device
TIMER_DEVICE_CALLBACK_MEMBER(namcos21_state::screen_scanline)
{
int scanline = param;
@ -1944,7 +1944,8 @@ static MACHINE_CONFIG_START( namcos21, namcos21_state )
MCFG_SCREEN_PALETTE("palette")
MCFG_FRAGMENT_ADD(configure_c148_standard)
MCFG_NAMCO_C139_ADD("sci")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos21)
MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS)
MCFG_PALETTE_FORMAT(XBRG)
@ -1999,6 +2000,7 @@ static MACHINE_CONFIG_START( driveyes, namcos21_state )
MCFG_DEVICE_ADD("gearbox", NAMCOIO_GEARBOX, 0)
MCFG_FRAGMENT_ADD(configure_c148_standard)
MCFG_NAMCO_C139_ADD("sci")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS_NAMCO480I
@ -2054,7 +2056,8 @@ static MACHINE_CONFIG_START( winrun, namcos21_state )
MCFG_FRAGMENT_ADD(configure_c148_standard)
MCFG_NAMCO_C148_ADD("gpu_intc","gpu",false)
MCFG_NAMCO_C139_ADD("sci")
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */
MCFG_MACHINE_START_OVERRIDE(namcos21_state,namcos21)

3
src/mame/includes/namcos2.h
View File

@ -12,6 +12,7 @@
#include "cpu/m6502/m3745x.h"
#include "video/c45.h"
#include "machine/namco_c148.h"
#include "machine/namco_c139.h"
/* CPU reference numbers */
@ -104,6 +105,7 @@ public:
m_c68(*this, "c68"),
m_master_intc(*this, "master_intc"),
m_slave_intc(*this, "slave_intc"),
m_sci(*this, "sci"),
m_gpu(*this, "gpu"),
m_gametype(0),
m_c169_roz_videoram(*this, "rozvideoram", 0),
@ -124,6 +126,7 @@ public:
optional_device<m37450_device> m_c68;
required_device<namco_c148_device> m_master_intc;
required_device<namco_c148_device> m_slave_intc;
required_device<namco_c139_device> m_sci;
optional_device<cpu_device> m_gpu; //to be moved to namco21_state after disentangling
// game type helpers

1
src/mame/includes/namcos21.h
View File

@ -6,7 +6,6 @@
#include "namcos2.h"
#include "machine/namcoio_gearbox.h"
#include "machine/namco_c148.h"
#define NAMCOS21_POLY_FRAME_WIDTH 496
#define NAMCOS21_POLY_FRAME_HEIGHT 480

1
src/mame/video/namcos21.cpp
View File

@ -440,6 +440,7 @@ void namcos21_state::winrun_bitmap_draw(bitmap_ind16 &bitmap, const rectangle &c
{
case 0xff:
break;
// TODO: additive blending? winrun car select uses register [0xc] for a xscroll value
case 0x00:
pDest[sx] = (pDest[sx]&0x1fff)+0x4000;
break;