(MESS) cbmiec: Moved under emu/bus. (nw)

This commit is contained in:
Curt Coder 2013-10-20 16:35:08 +00:00
parent 16b2d6a211
commit c26cf28cba
38 changed files with 143 additions and 74 deletions

40
.gitattributes vendored
View File

@ -357,6 +357,26 @@ src/emu/attotime.h svneol=native#text/plain
src/emu/audit.c svneol=native#text/plain
src/emu/audit.h svneol=native#text/plain
src/emu/bus/bus.mak svneol=native#text/plain
src/emu/bus/cbmiec/c1541.c svneol=native#text/plain
src/emu/bus/cbmiec/c1541.h svneol=native#text/plain
src/emu/bus/cbmiec/c1571.c svneol=native#text/plain
src/emu/bus/cbmiec/c1571.h svneol=native#text/plain
src/emu/bus/cbmiec/c1581.c svneol=native#text/plain
src/emu/bus/cbmiec/c1581.h svneol=native#text/plain
src/emu/bus/cbmiec/c64_nl10.c svneol=native#text/plain
src/emu/bus/cbmiec/c64_nl10.h svneol=native#text/plain
src/emu/bus/cbmiec/cbmiec.c svneol=native#text/plain
src/emu/bus/cbmiec/cbmiec.h svneol=native#text/plain
src/emu/bus/cbmiec/cmdhd.c svneol=native#text/plain
src/emu/bus/cbmiec/cmdhd.h svneol=native#text/plain
src/emu/bus/cbmiec/diag264_lb_iec.c svneol=native#text/plain
src/emu/bus/cbmiec/diag264_lb_iec.h svneol=native#text/plain
src/emu/bus/cbmiec/fd2000.c svneol=native#text/plain
src/emu/bus/cbmiec/fd2000.h svneol=native#text/plain
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/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
@ -7260,14 +7280,8 @@ src/mess/machine/bw2exp.c svneol=native#text/plain
src/mess/machine/bw2exp.h svneol=native#text/plain
src/mess/machine/c128_comal80.c svneol=native#text/plain
src/mess/machine/c128_comal80.h svneol=native#text/plain
src/mess/machine/c1541.c svneol=native#text/plain
src/mess/machine/c1541.h svneol=native#text/plain
src/mess/machine/c1551.c svneol=native#text/plain
src/mess/machine/c1551.h svneol=native#text/plain
src/mess/machine/c1571.c svneol=native#text/plain
src/mess/machine/c1571.h svneol=native#text/plain
src/mess/machine/c1581.c svneol=native#text/plain
src/mess/machine/c1581.h svneol=native#text/plain
src/mess/machine/c2n.c svneol=native#text/plain
src/mess/machine/c2n.h svneol=native#text/plain
src/mess/machine/c64/16kb.c svneol=native#text/plain
@ -7414,8 +7428,6 @@ src/mess/machine/c64/xl80.c svneol=native#text/plain
src/mess/machine/c64/xl80.h svneol=native#text/plain
src/mess/machine/c64/zaxxon.c svneol=native#text/plain
src/mess/machine/c64/zaxxon.h svneol=native#text/plain
src/mess/machine/c64_nl10.c svneol=native#text/plain
src/mess/machine/c64_nl10.h svneol=native#text/plain
src/mess/machine/c65.c svneol=native#text/plain
src/mess/machine/cbm2_24k.c svneol=native#text/plain
src/mess/machine/cbm2_24k.h svneol=native#text/plain
@ -7431,11 +7443,7 @@ src/mess/machine/cbm_crt.c svneol=native#text/plain
src/mess/machine/cbm_crt.h svneol=native#text/plain
src/mess/machine/cbm_snqk.c svneol=native#text/plain
src/mess/machine/cbm_snqk.h svneol=native#text/plain
src/mess/machine/cbmiec.c svneol=native#text/plain
src/mess/machine/cbmiec.h svneol=native#text/plain
src/mess/machine/cgenie.c svneol=native#text/plain
src/mess/machine/cmdhd.c svneol=native#text/plain
src/mess/machine/cmdhd.h svneol=native#text/plain
src/mess/machine/cntr_covox.c svneol=native#text/plain
src/mess/machine/cntr_covox.h svneol=native#text/plain
src/mess/machine/coco.c svneol=native#text/plain
@ -7507,8 +7515,6 @@ src/mess/machine/dec_lk201.c svneol=native#text/plain
src/mess/machine/dec_lk201.h svneol=native#text/plain
src/mess/machine/dgn_beta.c svneol=native#text/plain
src/mess/machine/dgnalpha.c svneol=native#text/plain
src/mess/machine/diag264_lb_iec.c svneol=native#text/plain
src/mess/machine/diag264_lb_iec.h svneol=native#text/plain
src/mess/machine/diag264_lb_tape.c svneol=native#text/plain
src/mess/machine/diag264_lb_tape.h svneol=native#text/plain
src/mess/machine/diag264_lb_user.c svneol=native#text/plain
@ -7545,8 +7551,6 @@ src/mess/machine/esqpanel.h svneol=native#text/plain
src/mess/machine/esqvfd.c svneol=native#text/plain
src/mess/machine/esqvfd.h svneol=native#text/plain
src/mess/machine/europc.c svneol=native#text/plain
src/mess/machine/fd2000.c svneol=native#text/plain
src/mess/machine/fd2000.h svneol=native#text/plain
src/mess/machine/fm_scsi.c svneol=native#text/plain
src/mess/machine/fm_scsi.h svneol=native#text/plain
src/mess/machine/galaxy.c svneol=native#text/plain
@ -7581,8 +7585,6 @@ src/mess/machine/i8271.c svneol=native#text/plain
src/mess/machine/i8271.h svneol=native#text/plain
src/mess/machine/imi5000h.c svneol=native#text/plain
src/mess/machine/imi5000h.h svneol=native#text/plain
src/mess/machine/interpod.c svneol=native#text/plain
src/mess/machine/interpod.h svneol=native#text/plain
src/mess/machine/intv.c svneol=native#text/plain
src/mess/machine/iq151_disc2.c svneol=native#text/plain
src/mess/machine/iq151_disc2.h svneol=native#text/plain
@ -7984,8 +7986,6 @@ src/mess/machine/ser_mouse.c svneol=native#text/plain
src/mess/machine/ser_mouse.h svneol=native#text/plain
src/mess/machine/serial.c svneol=native#text/plain
src/mess/machine/serial.h svneol=native#text/plain
src/mess/machine/serialbox.c svneol=native#text/plain
src/mess/machine/serialbox.h svneol=native#text/plain
src/mess/machine/sgi.c svneol=native#text/plain
src/mess/machine/sgi.h svneol=native#text/plain
src/mess/machine/smartmed.c svneol=native#text/plain

View File

@ -14,6 +14,25 @@ BUSSRC = $(EMUSRC)/bus
BUSOBJ = $(EMUOBJ)/bus
#-------------------------------------------------
#
#@src/emu/bus/cbmiec/cbmiec.h,BUSES += CBMIEC
#-------------------------------------------------
ifneq ($(filter CBMIEC,$(BUSES)),)
BUSOBJS += $(BUSOBJ)/cbmiec/cbmiec.o
BUSOBJS += $(BUSOBJ)/cbmiec/c1541.o
BUSOBJS += $(BUSOBJ)/cbmiec/c1571.o
BUSOBJS += $(BUSOBJ)/cbmiec/c1581.o
BUSOBJS += $(BUSOBJ)/cbmiec/c64_nl10.o
BUSOBJS += $(BUSOBJ)/cbmiec/cmdhd.o
BUSOBJS += $(BUSOBJ)/cbmiec/diag264_lb_iec.o
BUSOBJS += $(BUSOBJ)/cbmiec/fd2000.o
BUSOBJS += $(BUSOBJ)/cbmiec/interpod.o
BUSOBJS += $(BUSOBJ)/cbmiec/serialbox.o
endif
#-------------------------------------------------
#
#@src/emu/bus/ieee488/ieee488.h,BUSES += IEEE488

View File

@ -786,7 +786,7 @@ static C64H156_INTERFACE( ga_intf )
// LEGACY_FLOPPY_OPTIONS( c1541 )
//-------------------------------------------------
LEGACY_FLOPPY_OPTIONS_START( c1541 )
static LEGACY_FLOPPY_OPTIONS_START( c1541 )
LEGACY_FLOPPY_OPTION( c1541, "g64", "Commodore 1541 GCR Disk Image", g64_dsk_identify, g64_dsk_construct, NULL, NULL )
LEGACY_FLOPPY_OPTION( c1541, "d64", "Commodore 1541 Disk Image", d64_dsk_identify, d64_dsk_construct, NULL, NULL )
LEGACY_FLOPPY_OPTIONS_END
@ -796,7 +796,7 @@ LEGACY_FLOPPY_OPTIONS_END
// floppy_interface c1541_floppy_interface
//-------------------------------------------------
const floppy_interface c1541_floppy_interface =
static const floppy_interface c1541_floppy_interface =
{
DEVCB_NULL,
DEVCB_NULL,

View File

@ -15,6 +15,7 @@
#define __C1541__
#include "emu.h"
#include "cbmiec.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/flopdrv.h"
#include "formats/d64_dsk.h"
@ -23,7 +24,6 @@
#include "machine/6522via.h"
#include "machine/6821pia.h"
#include "machine/c64/bn1541.h"
#include "machine/cbmiec.h"
#include "machine/ctronics.h"
@ -273,10 +273,5 @@ extern const device_type C1541_PROFESSIONAL_DOS_V1;
extern const device_type C1541_PROLOGIC_DOS_CLASSIC;
// floppy interface
LEGACY_FLOPPY_OPTIONS_EXTERN( c1541 );
extern const floppy_interface c1541_floppy_interface;
#endif

View File

@ -693,6 +693,16 @@ static const floppy_interface c1571_floppy_interface =
};
//-------------------------------------------------
// LEGACY_FLOPPY_OPTIONS( c1541 )
//-------------------------------------------------
static LEGACY_FLOPPY_OPTIONS_START( c1541 )
LEGACY_FLOPPY_OPTION( c1541, "g64", "Commodore 1541 GCR Disk Image", g64_dsk_identify, g64_dsk_construct, NULL, NULL )
LEGACY_FLOPPY_OPTION( c1541, "d64", "Commodore 1541 Disk Image", d64_dsk_identify, d64_dsk_construct, NULL, NULL )
LEGACY_FLOPPY_OPTIONS_END
//-------------------------------------------------
// floppy_interface c1570_floppy_interface
//-------------------------------------------------

View File

@ -15,6 +15,7 @@
#define __C1571__
#include "emu.h"
#include "cbmiec.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/flopdrv.h"
#include "formats/d64_dsk.h"
@ -22,7 +23,6 @@
#include "machine/64h156.h"
#include "machine/6522via.h"
#include "machine/c64/bn1541.h"
#include "machine/cbmiec.h"
#include "machine/isa.h"
#include "machine/mos6526.h"
#include "machine/wd_fdc.h"

View File

@ -15,9 +15,9 @@
#define __C1581__
#include "emu.h"
#include "cbmiec.h"
#include "cpu/m6502/m6502.h"
#include "formats/d81_dsk.h"
#include "machine/cbmiec.h"
#include "machine/mos6526.h"
#include "machine/wd_fdc.h"

View File

@ -15,7 +15,7 @@
#define __C64_NL10_INTERFACE__
#include "emu.h"
#include "machine/cbmiec.h"
#include "cbmiec.h"

View File

@ -207,15 +207,15 @@ extern const device_type CBM_IEC_SLOT;
// slot devices
#include "machine/c1541.h"
#include "machine/c1571.h"
#include "machine/c1581.h"
#include "machine/c64_nl10.h"
#include "machine/cmdhd.h"
#include "machine/diag264_lb_iec.h"
#include "machine/fd2000.h"
#include "machine/interpod.h"
#include "machine/serialbox.h"
#include "c1541.h"
#include "c1571.h"
#include "c1581.h"
#include "c64_nl10.h"
#include "cmdhd.h"
#include "diag264_lb_iec.h"
#include "fd2000.h"
#include "interpod.h"
#include "serialbox.h"
SLOT_INTERFACE_EXTERN( cbm_iec_devices );

View File

@ -15,10 +15,10 @@
#define __CMD_HD__
#include "emu.h"
#include "cbmiec.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/harddriv.h"
#include "machine/6522via.h"
#include "machine/cbmiec.h"
#include "machine/i8255.h"
#include "machine/scsibus.h"
#include "machine/scsicb.h"

View File

@ -11,12 +11,11 @@
#pragma once
#ifndef __DIAG264_SERIAL_LOOPBACK__
#define __DIAG264_SERIAL_LOOPBACK__
#ifndef __DIAG264_IEC_LOOPBACK__
#define __DIAG264_IEC_LOOPBACK__
#include "emu.h"
#include "machine/cbmiec.h"
#include "cbmiec.h"

View File

@ -15,10 +15,10 @@
#define __FD2000__
#include "emu.h"
#include "cbmiec.h"
#include "cpu/m6502/m65c02.h"
#include "formats/d81_dsk.h"
#include "machine/6522via.h"
#include "machine/cbmiec.h"
#include "machine/upd765.h"

View File

@ -15,12 +15,12 @@
#define __INTERPOD__
#include "emu.h"
#include "cbmiec.h"
#include "bus/ieee488/ieee488.h"
#include "cpu/m6502/m6502.h"
#include "machine/6522via.h"
#include "machine/6532riot.h"
#include "machine/6850acia.h"
#include "machine/cbmiec.h"

View File

@ -16,7 +16,7 @@
#include "emu.h"
#include "cpu/m6502/m65c02.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"

View File

@ -344,6 +344,34 @@ static C64H156_INTERFACE( ga_intf )
};
//-------------------------------------------------
// LEGACY_FLOPPY_OPTIONS( c1541 )
//-------------------------------------------------
static LEGACY_FLOPPY_OPTIONS_START( c1541 )
LEGACY_FLOPPY_OPTION( c1541, "g64", "Commodore 1541 GCR Disk Image", g64_dsk_identify, g64_dsk_construct, NULL, NULL )
LEGACY_FLOPPY_OPTION( c1541, "d64", "Commodore 1541 Disk Image", d64_dsk_identify, d64_dsk_construct, NULL, NULL )
LEGACY_FLOPPY_OPTIONS_END
//-------------------------------------------------
// floppy_interface c2031_floppy_interface
//-------------------------------------------------
static const floppy_interface c2031_floppy_interface =
{
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
FLOPPY_STANDARD_5_25_SSDD,
LEGACY_FLOPPY_OPTIONS_NAME(c1541),
"floppy_5_25",
NULL
};
//-------------------------------------------------
// MACHINE_DRIVER( c2031 )
//-------------------------------------------------
@ -356,7 +384,7 @@ static MACHINE_CONFIG_FRAGMENT( c2031 )
MCFG_VIA6522_ADD(M6522_0_TAG, XTAL_16MHz/16, via0_intf)
MCFG_VIA6522_ADD(M6522_1_TAG, XTAL_16MHz/16, via1_intf)
MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, c1541_floppy_interface)
MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, c2031_floppy_interface)
MCFG_64H156_ADD(C64H156_TAG, XTAL_16MHz, ga_intf)
MACHINE_CONFIG_END

View File

@ -20,7 +20,6 @@
#include "imagedev/flopdrv.h"
#include "machine/64h156.h"
#include "machine/6522via.h"
#include "machine/c1541.h"
@ -31,7 +30,7 @@
// ======================> c2031_device
class c2031_device : public device_t,
public device_ieee488_interface
public device_ieee488_interface
{
public:
// construction/destruction

View File

@ -28,6 +28,7 @@ OBJDIRS += \
$(EMUOBJ)/debugint \
$(EMUOBJ)/audio \
$(EMUOBJ)/bus \
$(EMUOBJ)/bus/cbmiec \
$(EMUOBJ)/bus/ieee488 \
$(EMUOBJ)/bus/isbx \
$(EMUOBJ)/bus/s100 \

View File

@ -57,7 +57,7 @@ bus serial (available in all modes), a Fast and a Burst serial bus
#include "video/vic4567.h"
#include "machine/cbm_snqk.h"
#include "includes/c65.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"
#include "machine/ram.h"
static void cbm_c65_quick_sethiaddress( running_machine &machine, UINT16 hiaddress )

View File

@ -113,7 +113,7 @@ Interrupts:
#include "imagedev/snapquik.h"
#include "imagedev/cartslot.h"
#include "formats/primoptp.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"
static ADDRESS_MAP_START( primoa_port, AS_IO, 8, primo_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)

View File

@ -10,7 +10,7 @@
#include "cpu/m6502/m8502.h"
#include "machine/c64/exp.h"
#include "machine/c64/user.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"
#include "machine/mos6526.h"
#include "machine/mos8722.h"
#include "machine/petcass.h"

View File

@ -10,7 +10,7 @@
#include "machine/cbm_snqk.h"
#include "machine/c64/exp.h"
#include "machine/c64/user.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"
#include "machine/mos6526.h"
#include "machine/petcass.h"
#include "machine/pla.h"

View File

@ -8,7 +8,7 @@
#define C65_H_
#include "machine/mos6526.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"
#include "imagedev/cartslot.h"
#include "imagedev/snapquik.h"
#include "machine/ram.h"

View File

@ -8,7 +8,7 @@
#include "emu.h"
#include "cpu/m6502/m7501.h"
#include "machine/cbm_snqk.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"
#include "machine/mos6529.h"
#include "machine/mos6551.h"
#include "machine/mos8706.h"

View File

@ -8,7 +8,7 @@
#define PRIMO_H_
#include "imagedev/snapquik.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"
#include "sound/speaker.h"
#include "imagedev/cassette.h"

View File

@ -11,7 +11,7 @@
#include "cpu/m6502/m6510.h"
#include "imagedev/cartslot.h"
#include "machine/6522via.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"
#include "machine/petcass.h"
#include "machine/ram.h"
#include "machine/vcsctrl.h"

View File

@ -368,6 +368,34 @@ static C64H156_INTERFACE( ga_intf )
};
//-------------------------------------------------
// LEGACY_FLOPPY_OPTIONS( c1541 )
//-------------------------------------------------
static LEGACY_FLOPPY_OPTIONS_START( c1541 )
LEGACY_FLOPPY_OPTION( c1541, "g64", "Commodore 1541 GCR Disk Image", g64_dsk_identify, g64_dsk_construct, NULL, NULL )
LEGACY_FLOPPY_OPTION( c1541, "d64", "Commodore 1541 Disk Image", d64_dsk_identify, d64_dsk_construct, NULL, NULL )
LEGACY_FLOPPY_OPTIONS_END
//-------------------------------------------------
// floppy_interface c1551_floppy_interface
//-------------------------------------------------
static const floppy_interface c1551_floppy_interface =
{
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
FLOPPY_STANDARD_5_25_SSDD,
LEGACY_FLOPPY_OPTIONS_NAME(c1541),
"floppy_5_25",
NULL
};
//-------------------------------------------------
// MACHINE_DRIVER( c1551 )
//-------------------------------------------------
@ -382,7 +410,7 @@ static MACHINE_CONFIG_FRAGMENT( c1551 )
MCFG_TPI6525_ADD(M6523_0_TAG, tpi0_intf)
MCFG_TPI6525_ADD(M6523_1_TAG, tpi1_intf)
MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, c1541_floppy_interface)
MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, c1551_floppy_interface)
MCFG_64H156_ADD(C64H156_TAG, XTAL_16MHz, ga_intf)
MCFG_PLUS4_PASSTHRU_EXPANSION_SLOT_ADD()

View File

@ -22,7 +22,6 @@
#include "formats/g64_dsk.h"
#include "machine/64h156.h"
#include "machine/6525tpi.h"
#include "machine/c1541.h"
#include "machine/pla.h"
#include "machine/plus4exp.h"
@ -35,7 +34,7 @@
// ======================> c1551_device
class c1551_device : public device_t,
public device_plus4_expansion_card_interface
public device_plus4_expansion_card_interface
{
public:
// construction/destruction

View File

@ -11,7 +11,7 @@
#include "cpu/m6502/m4510.h"
#include "sound/mos6581.h"
#include "machine/6526cia.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"
#include "machine/ram.h"
#include "video/vic4567.h"
#include "imagedev/cassette.h"

View File

@ -15,7 +15,7 @@
/* Components */
#include "cpu/z80/z80.h"
#include "machine/cbmiec.h"
#include "bus/cbmiec/cbmiec.h"
#include "sound/speaker.h"
/* Devices */

View File

@ -476,6 +476,7 @@ MACHINES += PCCARD
# specify available bus cores
#-------------------------------------------------
BUSES += CBMIEC
BUSES += IEEE488
BUSES += ISBX
BUSES += S100
@ -1156,7 +1157,6 @@ $(MESSOBJ)/cbm.a: \
$(MESS_MACHINE)/c64/westermann.o \
$(MESS_MACHINE)/c64/xl80.o \
$(MESS_MACHINE)/c64/zaxxon.o\
$(MESS_MACHINE)/interpod.o \
$(MESS_DRIVERS)/vic10.o \
$(MESS_MACHINE)/vic10exp.o \
$(MESS_MACHINE)/vic10std.o \
@ -1177,7 +1177,6 @@ $(MESSOBJ)/cbm.a: \
$(MESS_MACHINE)/plus4_sid.o \
$(MESS_MACHINE)/plus4_std.o \
$(MESS_MACHINE)/mos8706.o \
$(MESS_MACHINE)/diag264_lb_iec.o \
$(MESS_MACHINE)/diag264_lb_tape.o \
$(MESS_MACHINE)/diag264_lb_user.o \
$(MESS_DRIVERS)/cbm2.o \
@ -1190,15 +1189,7 @@ $(MESSOBJ)/cbm.a: \
$(MESS_MACHINE)/c65.o \
$(MESS_DRIVERS)/c128.o \
$(MESS_MACHINE)/c128_comal80.o \
$(MESS_MACHINE)/cbmiec.o \
$(MESS_MACHINE)/c1541.o \
$(MESS_MACHINE)/c1551.o \
$(MESS_MACHINE)/c1571.o \
$(MESS_MACHINE)/c1581.o \
$(MESS_MACHINE)/serialbox.o \
$(MESS_MACHINE)/c64_nl10.o \
$(MESS_MACHINE)/cmdhd.o \
$(MESS_MACHINE)/fd2000.o \
$(MESS_DRIVERS)/clcd.o \
$(MESS_MACHINE)/64h156.o \
$(MESS_MACHINE)/mos8722.o \