Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

(MESS) comx35: Moved expansion port under emu/bus. (nw)

Browse source
This commit is contained in:
Curt Coder 2013-10-20 19:43:30 +00:00
parent d2236708b3
commit 726983263b
24 changed files with 86 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
.gitattributes vendored
View file

@ -561,6 +561,24 @@ src/emu/bus/cbmiec/interpod.c svneol=native#text/plain
src/emu/bus/cbmiec/interpod.h svneol=native#text/plain
src/emu/bus/cbmiec/serialbox.c svneol=native#text/plain
src/emu/bus/cbmiec/serialbox.h svneol=native#text/plain
src/emu/bus/comx35/clm.c svneol=native#text/plain
src/emu/bus/comx35/clm.h svneol=native#text/plain
src/emu/bus/comx35/eprom.c svneol=native#text/plain
src/emu/bus/comx35/eprom.h svneol=native#text/plain
src/emu/bus/comx35/exp.c svneol=native#text/plain
src/emu/bus/comx35/exp.h svneol=native#text/plain
src/emu/bus/comx35/expbox.c svneol=native#text/plain
src/emu/bus/comx35/expbox.h svneol=native#text/plain
src/emu/bus/comx35/fdc.c svneol=native#text/plain
src/emu/bus/comx35/fdc.h svneol=native#text/plain
src/emu/bus/comx35/joycard.c svneol=native#text/plain
src/emu/bus/comx35/joycard.h svneol=native#text/plain
src/emu/bus/comx35/printer.c svneol=native#text/plain
src/emu/bus/comx35/printer.h svneol=native#text/plain
src/emu/bus/comx35/ram.c svneol=native#text/plain
src/emu/bus/comx35/ram.h svneol=native#text/plain
src/emu/bus/comx35/thermal.c svneol=native#text/plain
src/emu/bus/comx35/thermal.h svneol=native#text/plain
src/emu/bus/ieee488/c2031.c svneol=native#text/plain
src/emu/bus/ieee488/c2031.h svneol=native#text/plain
src/emu/bus/ieee488/c2040.c svneol=native#text/plain
@ -7492,24 +7510,6 @@ src/mess/machine/coleco.h svneol=native#text/plain
src/mess/machine/compis.c svneol=native#text/plain
src/mess/machine/compiskb.c svneol=native#text/plain
src/mess/machine/compiskb.h svneol=native#text/plain
src/mess/machine/comx_clm.c svneol=native#text/plain
src/mess/machine/comx_clm.h svneol=native#text/plain
src/mess/machine/comx_eb.c svneol=native#text/plain
src/mess/machine/comx_eb.h svneol=native#text/plain
src/mess/machine/comx_epr.c svneol=native#text/plain
src/mess/machine/comx_epr.h svneol=native#text/plain
src/mess/machine/comx_fd.c svneol=native#text/plain
src/mess/machine/comx_fd.h svneol=native#text/plain
src/mess/machine/comx_joy.c svneol=native#text/plain
src/mess/machine/comx_joy.h svneol=native#text/plain
src/mess/machine/comx_prn.c svneol=native#text/plain
src/mess/machine/comx_prn.h svneol=native#text/plain
src/mess/machine/comx_ram.c svneol=native#text/plain
src/mess/machine/comx_ram.h svneol=native#text/plain
src/mess/machine/comx_thm.c svneol=native#text/plain
src/mess/machine/comx_thm.h svneol=native#text/plain
src/mess/machine/comxexp.c svneol=native#text/plain
src/mess/machine/comxexp.h svneol=native#text/plain
src/mess/machine/comxpl80.c svneol=native#text/plain
src/mess/machine/comxpl80.h svneol=native#text/plain
src/mess/machine/concept.c svneol=native#text/plain

18
src/emu/bus/bus.mak
View file

@ -152,6 +152,24 @@ BUSOBJS += $(BUSOBJ)/cbmiec/serialbox.o
endif
#-------------------------------------------------
#
#@src/emu/bus/comx35/exp.h,BUSES += COMX35
#-------------------------------------------------
ifneq ($(filter COMX35,$(BUSES)),)
BUSOBJS += $(BUSOBJ)/comx35/exp.o
BUSOBJS += $(BUSOBJ)/comx35/clm.o
BUSOBJS += $(BUSOBJ)/comx35/expbox.o
BUSOBJS += $(BUSOBJ)/comx35/eprom.o
BUSOBJS += $(BUSOBJ)/comx35/fdc.o
BUSOBJS += $(BUSOBJ)/comx35/joycard.o
BUSOBJS += $(BUSOBJ)/comx35/printer.o
BUSOBJS += $(BUSOBJ)/comx35/ram.o
BUSOBJS += $(BUSOBJ)/comx35/thermal.o
endif
#-------------------------------------------------
#
#@src/emu/bus/ieee488/ieee488.h,BUSES += IEEE488

2
src/mess/machine/comx_clm.c → src/emu/bus/comx35/clm.c
View file

@ -47,7 +47,7 @@ Notes:
*/
#include "comx_clm.h"
#include "clm.h"

3
src/mess/machine/comx_clm.h → src/emu/bus/comx35/clm.h
View file

@ -14,9 +14,8 @@
#ifndef __COMX_CLM__
#define __COMX_CLM__
#include "emu.h"
#include "machine/comxexp.h"
#include "exp.h"
#include "video/mc6845.h"

2
src/mess/machine/comx_epr.c → src/emu/bus/comx35/eprom.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "comx_epr.h"
#include "eprom.h"

3
src/mess/machine/comx_epr.h → src/emu/bus/comx35/eprom.h
View file

@ -14,9 +14,8 @@
#ifndef __COMX_EPR__
#define __COMX_EPR__
#include "emu.h"
#include "machine/comxexp.h"
#include "exp.h"

18
src/mess/machine/comxexp.c → src/emu/bus/comx35/exp.c
View file

@ -11,7 +11,7 @@
#include "emu.h"
#include "emuopts.h"
#include "machine/comxexp.h"
#include "exp.h"
//**************************************************************************
@ -220,3 +220,19 @@ READ_LINE_MEMBER( comx_expansion_slot_device::ef4_r )
WRITE_LINE_MEMBER( comx_expansion_slot_device::int_w ) { m_out_int_func(state); }
WRITE_LINE_MEMBER( comx_expansion_slot_device::wait_w ) { m_out_wait_func(state); }
WRITE_LINE_MEMBER( comx_expansion_slot_device::clear_w ) { m_out_clear_func(state); }
//-------------------------------------------------
// SLOT_INTERFACE( comx_expansion_cards )
//-------------------------------------------------
SLOT_INTERFACE_START( comx_expansion_cards )
SLOT_INTERFACE("eb", COMX_EB)
SLOT_INTERFACE("fd", COMX_FD)
SLOT_INTERFACE("clm", COMX_CLM)
SLOT_INTERFACE("ram", COMX_RAM)
SLOT_INTERFACE("joy", COMX_JOY)
SLOT_INTERFACE("prn", COMX_PRN)
SLOT_INTERFACE("thm", COMX_THM)
SLOT_INTERFACE("epr", COMX_EPR)
SLOT_INTERFACE_END

12
src/mess/machine/comxexp.h → src/emu/bus/comx35/exp.h
View file

@ -160,5 +160,17 @@ protected:
extern const device_type COMX_EXPANSION_SLOT;
// slot devices
#include "clm.h"
#include "eprom.h"
#include "expbox.h"
#include "fdc.h"
#include "joycard.h"
#include "printer.h"
#include "ram.h"
#include "thermal.h"
SLOT_INTERFACE_EXTERN( comx_expansion_cards );
#endif

12
src/mess/machine/comx_eb.c → src/emu/bus/comx35/expbox.c
View file

@ -49,7 +49,7 @@ Notes:
*/
#include "comx_eb.h"
#include "expbox.h"
@ -100,16 +100,6 @@ const rom_entry *comx_eb_device::device_rom_region() const
// COMX_EXPANSION_INTERFACE( expansion_intf )
//-------------------------------------------------
static SLOT_INTERFACE_START( comx_expansion_cards )
SLOT_INTERFACE("fd", COMX_FD)
SLOT_INTERFACE("clm", COMX_CLM)
SLOT_INTERFACE("ram", COMX_RAM)
SLOT_INTERFACE("joy", COMX_JOY)
SLOT_INTERFACE("prn", COMX_PRN)
SLOT_INTERFACE("thm", COMX_THM)
SLOT_INTERFACE("epr", COMX_EPR)
SLOT_INTERFACE_END
WRITE_LINE_DEVICE_HANDLER( int_w )
{
comx_eb_device *eb = downcast<comx_eb_device *>(device->owner());

10
src/mess/machine/comx_eb.h → src/emu/bus/comx35/expbox.h
View file

@ -14,16 +14,8 @@
#ifndef __COMX_EB__
#define __COMX_EB__
#include "emu.h"
#include "machine/comxexp.h"
#include "machine/comx_clm.h"
#include "machine/comx_epr.h"
#include "machine/comx_fd.h"
#include "machine/comx_joy.h"
#include "machine/comx_prn.h"
#include "machine/comx_ram.h"
#include "machine/comx_thm.h"
#include "exp.h"

2
src/mess/machine/comx_fd.c → src/emu/bus/comx35/fdc.c
View file

@ -52,7 +52,7 @@ Notes:
*/
#include "comx_fd.h"
#include "fdc.h"

3
src/mess/machine/comx_fd.h → src/emu/bus/comx35/fdc.h
View file

@ -14,10 +14,9 @@
#ifndef __COMX_FD__
#define __COMX_FD__
#include "emu.h"
#include "exp.h"
#include "formats/comx35_dsk.h"
#include "machine/comxexp.h"
#include "machine/wd_fdc.h"

2
src/mess/machine/comx_joy.c → src/emu/bus/comx35/joycard.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "comx_joy.h"
#include "joycard.h"

3
src/mess/machine/comx_joy.h → src/emu/bus/comx35/joycard.h
View file

@ -14,9 +14,8 @@
#ifndef __COMX_JOY__
#define __COMX_JOY__
#include "emu.h"
#include "machine/comxexp.h"
#include "exp.h"

6
src/mess/machine/comx_prn.c → src/emu/bus/comx35/printer.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "comx_prn.h"
#include "printer.h"
@ -58,7 +58,7 @@ const rom_entry *comx_prn_device::device_rom_region() const
SLOT_INTERFACE_START(comx_centronics_printer)
SLOT_INTERFACE("printer", CENTRONICS_PRINTER)
SLOT_INTERFACE("pl80", COMX_PL80)
//SLOT_INTERFACE("pl80", COMX_PL80)
SLOT_INTERFACE_END
@ -67,7 +67,7 @@ SLOT_INTERFACE_END
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( comx_prn )
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, standard_centronics, comx_centronics_printer, "pl80")
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, standard_centronics, comx_centronics_printer, "printer")
MACHINE_CONFIG_END

4
src/mess/machine/comx_prn.h → src/emu/bus/comx35/printer.h
View file

@ -14,10 +14,8 @@
#ifndef __COMX_PRN__
#define __COMX_PRN__
#include "emu.h"
#include "machine/comxexp.h"
#include "machine/comxpl80.h"
#include "exp.h"
#include "machine/ctronics.h"

2
src/mess/machine/comx_ram.c → src/emu/bus/comx35/ram.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "comx_ram.h"
#include "ram.h"

3
src/mess/machine/comx_ram.h → src/emu/bus/comx35/ram.h
View file

@ -14,9 +14,8 @@
#ifndef __COMX_RAM__
#define __COMX_RAM__
#include "emu.h"
#include "machine/comxexp.h"
#include "exp.h"

2
src/mess/machine/comx_thm.c → src/emu/bus/comx35/thermal.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "comx_thm.h"
#include "thermal.h"

3
src/mess/machine/comx_thm.h → src/emu/bus/comx35/thermal.h
View file

@ -14,9 +14,8 @@
#ifndef __COMX_THM__
#define __COMX_THM__
#include "emu.h"
#include "machine/comxexp.h"
#include "exp.h"

1
src/emu/emu.mak
View file

@ -32,6 +32,7 @@ OBJDIRS += \
$(EMUOBJ)/bus/adamnet \
$(EMUOBJ)/bus/c64 \
$(EMUOBJ)/bus/cbmiec \
$(EMUOBJ)/bus/comx35 \
$(EMUOBJ)/bus/ieee488 \
$(EMUOBJ)/bus/isbx \
$(EMUOBJ)/bus/s100 \

11
src/mess/drivers/comx35.c
View file

@ -599,17 +599,6 @@ static COMX_EXPANSION_INTERFACE( expansion_intf )
DEVCB_NULL
};
static SLOT_INTERFACE_START( comx_expansion_cards )
SLOT_INTERFACE("eb", COMX_EB)
SLOT_INTERFACE("fd", COMX_FD)
SLOT_INTERFACE("clm", COMX_CLM)
SLOT_INTERFACE("ram", COMX_RAM)
SLOT_INTERFACE("joy", COMX_JOY)
SLOT_INTERFACE("prn", COMX_PRN)
SLOT_INTERFACE("thm", COMX_THM)
SLOT_INTERFACE("epr", COMX_EPR)
SLOT_INTERFACE_END
//**************************************************************************

11
src/mess/includes/comx35.h
View file

@ -5,23 +5,14 @@
#ifndef __COMX35__
#define __COMX35__
#include "emu.h"
#include "bus/comx35/exp.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "imagedev/printer.h"
#include "imagedev/snapquik.h"
#include "machine/cdp1871.h"
#include "machine/comxexp.h"
#include "machine/comxpl80.h"
#include "machine/comx_clm.h"
#include "machine/comx_eb.h"
#include "machine/comx_epr.h"
#include "machine/comx_fd.h"
#include "machine/comx_joy.h"
#include "machine/comx_prn.h"
#include "machine/comx_ram.h"
#include "machine/comx_thm.h"
#include "machine/ram.h"
#include "machine/rescap.h"
#include "sound/cdp1869.h"

10
src/mess/mess.mak
View file

@ -481,6 +481,7 @@ BUSES += ABCBUS
BUSES += ADAMNET
BUSES += C64
BUSES += CBMIEC
BUSES += COMX35
BUSES += IEEE488
BUSES += ISBX
BUSES += S100
@ -1182,15 +1183,6 @@ $(MESSOBJ)/comx.a: \
$(MESS_DRIVERS)/comx35.o \
$(MESS_MACHINE)/comxpl80.o \
$(MESS_VIDEO)/comx35.o \
$(MESS_MACHINE)/comxexp.o \
$(MESS_MACHINE)/comx_clm.o \
$(MESS_MACHINE)/comx_eb.o \
$(MESS_MACHINE)/comx_epr.o \
$(MESS_MACHINE)/comx_fd.o \
$(MESS_MACHINE)/comx_joy.o \
$(MESS_MACHINE)/comx_prn.o \
$(MESS_MACHINE)/comx_ram.o \
$(MESS_MACHINE)/comx_thm.o \
$(MESSOBJ)/concept.a: \
$(MESS_DRIVERS)/concept.o \