Remove some dependency between src/devices/ and src/mame (nw)

This commit is contained in:
Miodrag Milanovic 2017-02-05 12:46:44 +01:00
parent 07d28fd847
commit 39370345d6
59 changed files with 102 additions and 86 deletions

View File

@ -1424,3 +1424,15 @@ if (SOUNDS["MM5837"]~=null) then
MAME_DIR .. "src/devices/sound/mm5837.h",
}
end
---------------------------------------------------
-- Intelligent Designs DAVE
--@src/devices/sound/dave.h,MACHINES["DAVE"] = true
---------------------------------------------------
if (SOUNDS["DAVE"]~=null) then
files {
MAME_DIR .. "src/devices/sound/dave.cpp",
MAME_DIR .. "src/devices/sound/dave.h",
}
end

View File

@ -936,3 +936,16 @@ if (VIDEOS["EF9369"]~=null) then
MAME_DIR .. "src/devices/video/ef9369.h",
}
end
--------------------------------------------------
--
--@src/devices/video/ppu2c0x.h,VIDEOS["PPU2C0X"] = true
--------------------------------------------------
if (VIDEOS["PPU2C0X"]~=null) then
files {
MAME_DIR .. "src/devices/video/ppu2c0x.cpp",
MAME_DIR .. "src/devices/video/ppu2c0x.h",
}
end

View File

@ -265,6 +265,7 @@ SOUNDS["VOLT_REG"] = true
--SOUNDS["MEA8000"] = true
SOUNDS["DAC76"] = true
SOUNDS["MM5837"] = true
--SOUNDS["DAVE"] = true
--------------------------------------------------
-- specify available video cores
@ -339,6 +340,7 @@ VIDEOS["V9938"] = true
VIDEOS["VOODOO"] = true
VIDEOS["VOODOO_PCI"] = true
VIDEOS["ZEUS2"] = true
VIDEOS["PPU2C0X"] = true
--------------------------------------------------
-- specify available machine cores
@ -2872,10 +2874,6 @@ files {
MAME_DIR .. "src/mame/includes/vsnes.h",
MAME_DIR .. "src/mame/machine/vsnes.cpp",
MAME_DIR .. "src/mame/video/vsnes.cpp",
MAME_DIR .. "src/mame/video/ppu2c0x.cpp",
MAME_DIR .. "src/mame/video/ppu2c0x.h",
}
createMAMEProjects(_target, _subtarget, "nix")

View File

@ -267,6 +267,7 @@ SOUNDS["VOLT_REG"] = true
SOUNDS["MEA8000"] = true
--SOUNDS["DAC76"] = true
--SOUNDS["MM5837"] = true
SOUNDS["DAVE"] = true
--------------------------------------------------
-- specify available video cores
@ -344,6 +345,7 @@ VIDEOS["SCN2674"] = true
VIDEOS["GB_LCD"] = true
VIDEOS["GBA_LCD"] = true
VIDEOS["MGA2064W"] = true
VIDEOS["PPU2C0X"] = true
--------------------------------------------------
-- specify available machine cores
@ -1158,8 +1160,6 @@ files {
MAME_DIR .. "src/mame/machine/kabuki.cpp",
MAME_DIR .. "src/mame/machine/kabuki.h",
MAME_DIR .. "src/mame/video/pk8000.cpp",
MAME_DIR .. "src/mame/video/ppu2c0x.cpp",
MAME_DIR .. "src/mame/video/ppu2c0x.h",
MAME_DIR .. "src/mame/machine/snes.cpp",
MAME_DIR .. "src/mame/audio/snes_snd.cpp",
MAME_DIR .. "src/mame/audio/snes_snd.h",
@ -1842,8 +1842,6 @@ files {
createMESSProjects(_target, _subtarget, "enterprise")
files {
MAME_DIR .. "src/mame/drivers/ep64.cpp",
MAME_DIR .. "src/mame/audio/dave.cpp",
MAME_DIR .. "src/mame/audio/dave.h",
MAME_DIR .. "src/mame/video/nick.cpp",
MAME_DIR .. "src/mame/video/nick.h",
}

View File

@ -10,7 +10,6 @@
*********************************************************************/
#include "a2alfam2.h"
#include "includes/apple2.h"
#include "sound/sn76496.h"
/***************************************************************************

View File

@ -12,7 +12,6 @@
*********************************************************************/
#include "a2applicard.h"
#include "includes/apple2.h"
#include "cpu/z80/z80.h"
#include "machine/z80ctc.h"

View File

@ -12,7 +12,6 @@
*********************************************************************/
#include "a2cffa.h"
#include "includes/apple2.h"
#include "machine/ataintf.h"
#include "imagedev/harddriv.h"
#include "softlist.h"

View File

@ -41,7 +41,6 @@
*********************************************************************/
#include "a2corvus.h"
#include "includes/apple2.h"
#include "imagedev/harddriv.h"
/***************************************************************************

View File

@ -9,7 +9,6 @@
*********************************************************************/
#include "emu.h"
#include "includes/apple2.h"
#include "imagedev/flopdrv.h"
#include "formats/ap2_dsk.h"
#include "machine/appldriv.h"

View File

@ -8,7 +8,6 @@
*********************************************************************/
#include "includes/apple2.h"
#include "a2dx1.h"
#include "sound/volt_reg.h"

View File

@ -9,7 +9,6 @@
*********************************************************************/
#include "a2echoii.h"
#include "includes/apple2.h"
#include "sound/tms5220.h"
/***************************************************************************

View File

@ -9,7 +9,6 @@
*********************************************************************/
#include "emu.h"
#include "includes/apple2.h"
#include "a2eext80col.h"

View File

@ -10,7 +10,6 @@
*********************************************************************/
#include "emu.h"
#include "includes/apple2.h"
#include "a2eramworks3.h"

View File

@ -9,7 +9,6 @@
*********************************************************************/
#include "emu.h"
#include "includes/apple2.h"
#include "a2estd80col.h"

View File

@ -39,7 +39,6 @@
*********************************************************************/
#include "a2hsscsi.h"
#include "includes/apple2.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"

View File

@ -13,7 +13,6 @@
*********************************************************************/
#include "emu.h"
#include "includes/apple2.h"
#include "a2lang.h"
@ -70,12 +69,12 @@ void a2bus_lang_device::device_reset()
void a2bus_lang_device::langcard_touch(offs_t offset)
{
uint32_t val, mask;
/* uint32_t val, mask;
if (LOG_LANGCARD)
logerror("language card bankswitch read, offset: $c08%0x\n", offset);
/* determine which flags to change */
// determine which flags to change
mask = VAR_LCWRITE | VAR_LCRAM | VAR_LCRAM2;
val = 0;
@ -93,9 +92,9 @@ void a2bus_lang_device::langcard_touch(offs_t offset)
if ((offset & 0x08) == 0)
val |= VAR_LCRAM2;
/* change the flags */
// change the flags
apple2_state *state = machine().driver_data<apple2_state>();
state->apple2_setvar(val, mask);
state->apple2_setvar(val, mask);*/
}
@ -106,7 +105,7 @@ void a2bus_lang_device::langcard_touch(offs_t offset)
uint8_t a2bus_lang_device::read_c0nx(address_space &space, uint8_t offset)
{
apple2_state *state = machine().driver_data<apple2_state>();
/* apple2_state *state = machine().driver_data<apple2_state>();
// enforce "read twice" for c081/3/9/B
// but only on the II/II+ with a discrete language card.
@ -128,7 +127,7 @@ uint8_t a2bus_lang_device::read_c0nx(address_space &space, uint8_t offset)
}
langcard_touch(offset);
last_offset = offset;
last_offset = offset;*/
return 0;
}

View File

@ -11,7 +11,6 @@
*********************************************************************/
#include "a2mcms.h"
#include "includes/apple2.h"
// the actual sound device (a slot device can't currently also be a sound device so we keep this private here)
enum

View File

@ -9,7 +9,6 @@
*********************************************************************/
#include "a2memexp.h"
#include "includes/apple2.h"
/***************************************************************************

View File

@ -8,7 +8,6 @@
*********************************************************************/
#include "includes/apple2.h"
#include "a2sam.h"
#include "sound/volt_reg.h"

View File

@ -32,7 +32,6 @@
*********************************************************************/
#include "a2scsi.h"
#include "includes/apple2.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"

View File

@ -9,7 +9,6 @@
*********************************************************************/
#include "a2softcard.h"
#include "includes/apple2.h"
#include "cpu/z80/z80.h"
/***************************************************************************

View File

@ -9,7 +9,6 @@
*********************************************************************/
#include "emu.h"
#include "includes/apple2.h"
#include "a2swyft.h"

View File

@ -23,7 +23,6 @@
*********************************************************************/
#include "a2themill.h"
#include "includes/apple2.h"
#include "cpu/m6809/m6809.h"
/***************************************************************************

View File

@ -28,7 +28,6 @@
*********************************************************************/
#include "a2ultraterm.h"
#include "includes/apple2.h"
/***************************************************************************

View File

@ -24,7 +24,6 @@
*********************************************************************/
#include "a2videoterm.h"
#include "includes/apple2.h"
/***************************************************************************

View File

@ -54,7 +54,6 @@
*********************************************************************/
#include "a2vulcan.h"
#include "includes/apple2.h"
#include "machine/ataintf.h"
#include "imagedev/harddriv.h"

View File

@ -20,7 +20,6 @@
*********************************************************************/
#include "a2zipdrive.h"
#include "includes/apple2.h"
#include "machine/ataintf.h"
#include "imagedev/harddriv.h"

View File

@ -9,7 +9,6 @@
*********************************************************************/
#include "laser128.h"
#include "includes/apple2.h"
/***************************************************************************
PARAMETERS

View File

@ -10,7 +10,6 @@
#include "emu.h"
#include "osdcore.h"
#include "includes/coco.h"
#include "coco_dwsock.h"

View File

@ -46,7 +46,6 @@
#include "cococart.h"
#include "coco_fdc.h"
#include "imagedev/flopdrv.h"
#include "includes/coco.h"
#include "machine/msm6242.h"
#include "machine/ds1315.h"
#include "machine/wd_fdc.h"

View File

@ -52,7 +52,6 @@
***************************************************************************/
#include "emu.h"
#include "includes/coco.h"
#include "coco_multi.h"
#include "coco_232.h"
#include "coco_orch90.h"
@ -161,7 +160,7 @@ void coco_multipak_device::device_start()
// install $FF7F handler
write8_delegate wh = write8_delegate(FUNC(coco_multipak_device::ff7f_write), this);
machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM).install_write_handler(0xFF7F, 0xFF7F, wh);
machine().device(":maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xFF7F, 0xFF7F, wh);
// initial state
m_select = 0xFF;

View File

@ -10,9 +10,9 @@
#include "emu.h"
#include "coco_pak.h"
#include "includes/coco.h"
#define CARTSLOT_TAG "cart"
#define CART_AUTOSTART_TAG "cart_autostart"
/***************************************************************************
IMPLEMENTATION
@ -26,6 +26,19 @@ ROM_START( coco_pak )
// this region is filled by cococart_slot_device::call_load()
ROM_END
//-------------------------------------------------
// INPUT_PORTS( coco_cart_autostart )
//-------------------------------------------------
static INPUT_PORTS_START( coco_cart_autostart )
PORT_START(CART_AUTOSTART_TAG)
PORT_CONFNAME( 0x01, 0x01, "Cart Auto-Start" )
PORT_CONFSETTING( 0x00, DEF_STR( Off ))
PORT_CONFSETTING( 0x01, DEF_STR( On ))
INPUT_PORTS_END
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
@ -42,14 +55,14 @@ const device_type COCO_PAK = &device_creator<coco_pak_device>;
coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr),
m_autostart(*this, ":" CART_AUTOSTART_TAG)
m_autostart(*this, CART_AUTOSTART_TAG)
{
}
coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, COCO_PAK, "CoCo Program PAK", tag, owner, clock, "cocopak", __FILE__),
device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr),
m_autostart(*this, ":" CART_AUTOSTART_TAG)
m_autostart(*this, CART_AUTOSTART_TAG)
{
}
@ -73,6 +86,15 @@ machine_config_constructor coco_pak_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( coco_pak );
}
//-------------------------------------------------
// input_ports - device-specific input ports
//-------------------------------------------------
ioport_constructor coco_pak_device::device_input_ports() const
{
return INPUT_PORTS_NAME( coco_cart_autostart );
}
//-------------------------------------------------
// rom_region - device-specific ROM region
//-------------------------------------------------

View File

@ -26,6 +26,7 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual ioport_constructor device_input_ports() const override;
virtual uint8_t* get_cart_base() override;
protected:

View File

@ -41,7 +41,6 @@
#include "emu.h"
#include "coco_t4426.h"
#include "includes/coco.h"
#define LOG_GENERAL 0x01
#define LOG_SETUP 0x02
@ -74,6 +73,7 @@
#define UART_TAG "acia"
#define PIA_TAG "pia"
#define CARTSLOT_TAG "t4426"
#define CART_AUTOSTART_TAG "cart_autostart"
/***************************************************************************
IMPLEMENTATION
@ -109,6 +109,17 @@ ROM_START( coco_t4426 )
ROM_RELOAD(0x18000,0x1000)
ROM_END
//-------------------------------------------------
// INPUT_PORTS( coco_cart_autostart )
//-------------------------------------------------
static INPUT_PORTS_START( coco_cart_autostart )
PORT_START(CART_AUTOSTART_TAG)
PORT_CONFNAME( 0x01, 0x01, "Cart Auto-Start" )
PORT_CONFSETTING( 0x00, DEF_STR( Off ))
PORT_CONFSETTING( 0x01, DEF_STR( On ))
INPUT_PORTS_END
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
@ -129,7 +140,7 @@ coco_t4426_device::coco_t4426_device(const machine_config &mconfig, device_type
,m_cart(nullptr)
,m_owner(nullptr)
,m_select(0)
,m_autostart(*this, ":" CART_AUTOSTART_TAG)
,m_autostart(*this, CART_AUTOSTART_TAG)
,m_uart(*this, UART_TAG)
,m_pia(*this, PIA_TAG)
{
@ -141,7 +152,7 @@ coco_t4426_device::coco_t4426_device(const machine_config &mconfig, const char *
,m_cart(nullptr)
,m_owner(nullptr)
,m_select(0)
,m_autostart(*this, ":" CART_AUTOSTART_TAG)
,m_autostart(*this, CART_AUTOSTART_TAG)
,m_uart(*this, UART_TAG)
,m_pia(*this, PIA_TAG)
{
@ -179,6 +190,16 @@ const tiny_rom_entry *coco_t4426_device::device_rom_region() const
return ROM_NAME( coco_t4426 );
}
//-------------------------------------------------
// input_ports - device-specific input ports
//-------------------------------------------------
ioport_constructor coco_t4426_device::device_input_ports() const
{
return INPUT_PORTS_NAME( coco_cart_autostart );
}
/*-------------------------------------------------
device_reset - device-specific startup
-------------------------------------------------*/

View File

@ -28,6 +28,7 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual ioport_constructor device_input_ports() const override;
virtual uint8_t* get_cart_base() override;
DECLARE_WRITE8_MEMBER( pia_A_w );

View File

@ -69,7 +69,6 @@
#include "cococart.h"
#include "coco_fdc.h"
#include "imagedev/flopdrv.h"
#include "includes/coco.h"
#include "machine/wd_fdc.h"
#include "formats/dmk_dsk.h"
#include "formats/jvc_dsk.h"

View File

@ -7,7 +7,6 @@
*/
#include "emu.h"
#include "includes/amstrad.h"
#include "amdrum.h"
#include "sound/volt_reg.h"

View File

@ -8,7 +8,6 @@
#include "emu.h"
#include "cpc_pds.h"
#include "includes/amstrad.h"
//**************************************************************************

View File

@ -8,10 +8,10 @@
#include "emu.h"
#include "cpc_rom.h"
#include "includes/amstrad.h"
const device_type CPC_ROM = &device_creator<cpc_rom_device>;
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE CONFIG INTERFACE

View File

@ -7,7 +7,8 @@
*/
#include "cpc_rs232.h"
#include "includes/amstrad.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS

View File

@ -10,7 +10,7 @@
#include "emu.h"
#include "cpc_ssa1.h"
#include "includes/amstrad.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS

View File

@ -6,8 +6,8 @@
#include "emu.h"
#include "ddi1.h"
#include "includes/amstrad.h"
#include "softlist.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS

View File

@ -7,7 +7,7 @@
*/
#include "doubler.h"
#include "includes/amstrad.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS

View File

@ -8,8 +8,7 @@
#include "emu.h"
#include "hd20.h"
#include "includes/amstrad.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS

View File

@ -8,10 +8,9 @@
*/
#include "emu.h"
#include "includes/amstrad.h"
#include "magicsound.h"
#include "sound/volt_reg.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS

View File

@ -8,7 +8,7 @@
#include "emu.h"
#include "mface2.h"
#include "includes/amstrad.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS

View File

@ -11,7 +11,7 @@
*/
#include "playcity.h"
#include "includes/amstrad.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS

View File

@ -11,8 +11,7 @@
#include "emu.h"
#include "smartwatch.h"
#include "includes/amstrad.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS

View File

@ -9,7 +9,7 @@
*/
#include "transtape.h"
#include "includes/amstrad.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS

View File

@ -48,7 +48,7 @@
#define __EP64_EXPANSION_BUS__
#include "emu.h"
#include "audio/dave.h"
#include "sound/dave.h"

View File

@ -15,8 +15,7 @@
#include "emu.h"
#include "ggenie.h"
#include "includes/nes.h"
#include "bus/nes/nes_carts.h"
#ifdef NES_PCB_DEBUG
#define VERBOSE 1

View File

@ -106,19 +106,6 @@ INPUT_PORTS_END
//-------------------------------------------------
// INPUT_PORTS( coco_cart_autostart )
//-------------------------------------------------
INPUT_PORTS_START( coco_cart_autostart )
PORT_START(CART_AUTOSTART_TAG)
PORT_CONFNAME( 0x01, 0x01, "Cart Auto-Start" )
PORT_CONFSETTING( 0x00, DEF_STR( Off ))
PORT_CONFSETTING( 0x01, DEF_STR( On ))
INPUT_PORTS_END
//-------------------------------------------------
// INPUT_PORTS( coco_beckerport )
//-------------------------------------------------
@ -238,7 +225,6 @@ static INPUT_PORTS_START( coco )
PORT_INCLUDE( coco_keyboard )
PORT_INCLUDE( coco_joystick )
PORT_INCLUDE( coco_analog_control )
PORT_INCLUDE( coco_cart_autostart )
PORT_INCLUDE( coco_rtc )
PORT_INCLUDE( coco_beckerport )
INPUT_PORTS_END

View File

@ -221,7 +221,6 @@ static INPUT_PORTS_START( coco3 )
PORT_INCLUDE( coco3_keyboard )
PORT_INCLUDE( coco3_joystick )
PORT_INCLUDE( coco_analog_control )
PORT_INCLUDE( coco_cart_autostart )
PORT_INCLUDE( coco_rat_mouse )
PORT_INCLUDE( coco_lightgun )
PORT_INCLUDE( coco_rtc )

View File

@ -151,7 +151,7 @@ Notes: (All IC's shown)
#include "emu.h"
#include "softlist.h"
#include "audio/dave.h"
#include "sound/dave.h"
#include "bus/rs232/rs232.h"
#include "bus/ep64/exp.h"
#include "cpu/z80/z80.h"

View File

@ -32,7 +32,6 @@
//**************************************************************************
INPUT_PORTS_EXTERN( coco_analog_control );
INPUT_PORTS_EXTERN( coco_cart_autostart );
INPUT_PORTS_EXTERN( coco_rtc );
INPUT_PORTS_EXTERN( coco_beckerport );
@ -58,7 +57,6 @@ SLOT_INTERFACE_EXTERN( coco_cart );
// inputs
#define CTRL_SEL_TAG "ctrl_sel"
#define HIRES_INTF_TAG "hires_intf"
#define CART_AUTOSTART_TAG "cart_autostart"
#define BECKERPORT_TAG "beckerport"
#define JOYSTICK_RX_TAG "joystick_rx"
#define JOYSTICK_RY_TAG "joystick_ry"