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

This commit is contained in:
Curt Coder 2013-10-20 19:31:44 +00:00
parent cc9274b5ba
commit d2236708b3
34 changed files with 37970 additions and 271 deletions

52
.gitattributes vendored
View File

@ -1,6 +1,8 @@
* text=auto !eol
artwork/aperture.png -text
artwork/white.png -text
/depend_emu.mak svneol=native#text/plain
/depend_mess.mak svneol=native#text/plain
docs/SDL.txt svneol=native#text/plain
docs/config.txt svneol=native#text/plain
docs/hlsl.txt svneol=native#text/plain
@ -356,6 +358,30 @@ src/emu/attotime.c svneol=native#text/plain
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/abcbus/abc890.c svneol=native#text/plain
src/emu/bus/abcbus/abc890.h svneol=native#text/plain
src/emu/bus/abcbus/abcbus.c svneol=native#text/plain
src/emu/bus/abcbus/abcbus.h svneol=native#text/plain
src/emu/bus/abcbus/dos.c svneol=native#text/plain
src/emu/bus/abcbus/dos.h svneol=native#text/plain
src/emu/bus/abcbus/fd2.c svneol=native#text/plain
src/emu/bus/abcbus/fd2.h svneol=native#text/plain
src/emu/bus/abcbus/hdc.c svneol=native#text/plain
src/emu/bus/abcbus/hdc.h svneol=native#text/plain
src/emu/bus/abcbus/lux10828.c svneol=native#text/plain
src/emu/bus/abcbus/lux10828.h svneol=native#text/plain
src/emu/bus/abcbus/lux21046.c svneol=native#text/plain
src/emu/bus/abcbus/lux21046.h svneol=native#text/plain
src/emu/bus/abcbus/sio.c svneol=native#text/plain
src/emu/bus/abcbus/sio.h svneol=native#text/plain
src/emu/bus/abcbus/slutprov.c svneol=native#text/plain
src/emu/bus/abcbus/slutprov.h svneol=native#text/plain
src/emu/bus/abcbus/turbo.c svneol=native#text/plain
src/emu/bus/abcbus/turbo.h svneol=native#text/plain
src/emu/bus/abcbus/uni800.c svneol=native#text/plain
src/emu/bus/abcbus/uni800.h svneol=native#text/plain
src/emu/bus/abcbus/xebec.c svneol=native#text/plain
src/emu/bus/abcbus/xebec.h svneol=native#text/plain
src/emu/bus/adamnet/adamnet.c svneol=native#text/plain
src/emu/bus/adamnet/adamnet.h svneol=native#text/plain
src/emu/bus/adamnet/ddp.c svneol=native#text/plain
@ -7355,30 +7381,8 @@ src/mess/machine/abc800kb.c svneol=native#text/plain
src/mess/machine/abc800kb.h svneol=native#text/plain
src/mess/machine/abc80kb.c svneol=native#text/plain
src/mess/machine/abc80kb.h svneol=native#text/plain
src/mess/machine/abc830.c svneol=native#text/plain
src/mess/machine/abc830.h svneol=native#text/plain
src/mess/machine/abc890.c svneol=native#text/plain
src/mess/machine/abc890.h svneol=native#text/plain
src/mess/machine/abc99.c svneol=native#text/plain
src/mess/machine/abc99.h svneol=native#text/plain
src/mess/machine/abc_dos.c svneol=native#text/plain
src/mess/machine/abc_dos.h svneol=native#text/plain
src/mess/machine/abc_fd2.c svneol=native#text/plain
src/mess/machine/abc_fd2.h svneol=native#text/plain
src/mess/machine/abc_hdc.c svneol=native#text/plain
src/mess/machine/abc_hdc.h svneol=native#text/plain
src/mess/machine/abc_sio.c svneol=native#text/plain
src/mess/machine/abc_sio.h svneol=native#text/plain
src/mess/machine/abc_slutprov.c svneol=native#text/plain
src/mess/machine/abc_slutprov.h svneol=native#text/plain
src/mess/machine/abc_turbo.c svneol=native#text/plain
src/mess/machine/abc_turbo.h svneol=native#text/plain
src/mess/machine/abc_uni800.c svneol=native#text/plain
src/mess/machine/abc_uni800.h svneol=native#text/plain
src/mess/machine/abc_xebec.c svneol=native#text/plain
src/mess/machine/abc_xebec.h svneol=native#text/plain
src/mess/machine/abcbus.c svneol=native#text/plain
src/mess/machine/abcbus.h svneol=native#text/plain
src/mess/machine/abckb.c svneol=native#text/plain
src/mess/machine/abckb.h svneol=native#text/plain
src/mess/machine/ac1.c svneol=native#text/plain
@ -7701,10 +7705,6 @@ src/mess/machine/lh5810.c svneol=native#text/plain
src/mess/machine/lh5810.h svneol=native#text/plain
src/mess/machine/lisa.c svneol=native#text/plain
src/mess/machine/llc.c svneol=native#text/plain
src/mess/machine/lux10828.c svneol=native#text/plain
src/mess/machine/lux10828.h svneol=native#text/plain
src/mess/machine/lux21046.c svneol=native#text/plain
src/mess/machine/lux21046.h svneol=native#text/plain
src/mess/machine/lux4105.c svneol=native#text/plain
src/mess/machine/lux4105.h svneol=native#text/plain
src/mess/machine/lviv.c svneol=native#text/plain

16940
depend_emu.mak Normal file

File diff suppressed because it is too large Load Diff

20951
depend_mess.mak Normal file

File diff suppressed because it is too large Load Diff

View File

@ -14,9 +14,8 @@
#ifndef __ABC890__
#define __ABC890__
#include "emu.h"
#include "machine/abcbus.h"
#include "abcbus.h"

View File

@ -181,18 +181,18 @@ public:
extern const device_type ABCBUS_SLOT;
// ABC bus slot devices
#include "machine/abc890.h"
#include "machine/abc_dos.h"
#include "machine/abc_fd2.h"
#include "machine/abc_hdc.h"
#include "machine/abc_uni800.h"
#include "machine/abc_sio.h"
#include "machine/abc_slutprov.h"
#include "machine/abc_turbo.h"
#include "machine/abc_xebec.h"
#include "machine/lux10828.h"
#include "machine/lux21046.h"
// slot devices
#include "abc890.h"
#include "dos.h"
#include "fd2.h"
#include "hdc.h"
#include "lux10828.h"
#include "lux21046.h"
#include "uni800.h"
#include "sio.h"
#include "slutprov.h"
#include "turbo.h"
#include "xebec.h"
SLOT_INTERFACE_EXTERN( abcbus_cards );

View File

@ -57,7 +57,7 @@ Notes:
*/
#include "abc_dos.h"
#include "dos.h"

View File

@ -14,9 +14,8 @@
#ifndef __ABC_DOS__
#define __ABC_DOS__
#include "emu.h"
#include "machine/abcbus.h"
#include "abcbus.h"

View File

@ -39,7 +39,7 @@ Notes:
*/
#include "abc_fd2.h"
#include "fd2.h"

View File

@ -14,11 +14,10 @@
#ifndef __ABC_FD2__
#define __ABC_FD2__
#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/abcbus.h"
#include "machine/wd_fdc.h"
#include "machine/z80pio.h"

View File

@ -9,7 +9,7 @@
*********************************************************************/
#include "abc_hdc.h"
#include "hdc.h"

View File

@ -14,11 +14,10 @@
#ifndef __ABC_HDC__
#define __ABC_HDC__
#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/abcbus.h"
#include "machine/scsibus.h"
#include "machine/scsicb.h"
#include "machine/scsihd.h"

View File

@ -14,11 +14,10 @@
#ifndef __LUXOR_55_10828__
#define __LUXOR_55_10828__
#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/abcbus.h"
#include "machine/wd_fdc.h"
#include "machine/z80pio.h"

View File

@ -14,11 +14,10 @@
#ifndef __LUXOR_55_21046__
#define __LUXOR_55_21046__
#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/abcbus.h"
#include "machine/wd_fdc.h"
#include "machine/z80dma.h"

View File

@ -30,7 +30,7 @@ Notes:
*/
#include "abc_sio.h"
#include "sio.h"

View File

@ -5,7 +5,6 @@
#ifndef __ABC_SIO__
#define __ABC_SIO__
#include "emu.h"
#include "abcbus.h"
#include "machine/z80ctc.h"

View File

@ -1,6 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
#include "abc_slutprov.h"
#include "slutprov.h"

View File

@ -5,7 +5,6 @@
#ifndef __ABC_SLUTPROV__
#define __ABC_SLUTPROV__
#include "emu.h"
#include "abcbus.h"

View File

@ -9,7 +9,7 @@
*********************************************************************/
#include "abc_turbo.h"
#include "turbo.h"

View File

@ -14,13 +14,12 @@
#ifndef __TURBO_KONTROLLER__
#define __TURBO_KONTROLLER__
#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "formats/basicdsk.h"
#include "imagedev/flopdrv.h"
#include "machine/abcbus.h"

View File

@ -31,7 +31,7 @@ Notes:
*/
#include "abc_uni800.h"
#include "uni800.h"

View File

@ -5,7 +5,6 @@
#ifndef __ABC_UNI800__
#define __ABC_UNI800__
#include "emu.h"
#include "abcbus.h"

View File

@ -9,7 +9,7 @@
*********************************************************************/
#include "abc_xebec.h"
#include "xebec.h"

View File

@ -14,11 +14,10 @@
#ifndef __ABC_XEBEC__
#define __ABC_XEBEC__
#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/abcbus.h"
#include "machine/scsibus.h"
#include "machine/scsicb.h"
#include "machine/scsihd.h"

View File

@ -14,6 +14,27 @@ BUSSRC = $(EMUSRC)/bus
BUSOBJ = $(EMUOBJ)/bus
#-------------------------------------------------
#
#@src/emu/bus/abcbus/abcbus.h,BUSES += ABCBUS
#-------------------------------------------------
ifneq ($(filter ABCBUS,$(BUSES)),)
BUSOBJS += $(BUSOBJ)/abcbus/abcbus.o
BUSOBJS += $(BUSOBJ)/abcbus/abc890.o
BUSOBJS += $(BUSOBJ)/abcbus/dos.o
BUSOBJS += $(BUSOBJ)/abcbus/fd2.o
BUSOBJS += $(BUSOBJ)/abcbus/hdc.o
BUSOBJS += $(BUSOBJ)/abcbus/lux10828.o
BUSOBJS += $(BUSOBJ)/abcbus/lux21046.o
BUSOBJS += $(BUSOBJ)/abcbus/uni800.o
BUSOBJS += $(BUSOBJ)/abcbus/sio.o
BUSOBJS += $(BUSOBJ)/abcbus/slutprov.o
BUSOBJS += $(BUSOBJ)/abcbus/turbo.o
BUSOBJS += $(BUSOBJ)/abcbus/xebec.o
endif
#-------------------------------------------------
#
#@src/emu/bus/adamnet/adamnet.h,BUSES += ADAMNET

View File

@ -28,6 +28,7 @@ OBJDIRS += \
$(EMUOBJ)/debugint \
$(EMUOBJ)/audio \
$(EMUOBJ)/bus \
$(EMUOBJ)/bus/abcbus \
$(EMUOBJ)/bus/adamnet \
$(EMUOBJ)/bus/c64 \
$(EMUOBJ)/bus/cbmiec \

View File

@ -9,16 +9,14 @@
#ifndef __ABC80__
#define __ABC80__
#include "emu.h"
#include "bus/abcbus/abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "imagedev/flopdrv.h"
#include "imagedev/printer.h"
#include "imagedev/cassette.h"
#include "machine/abcbus.h"
#include "machine/abc80kb.h"
#include "machine/abc830.h"
#include "machine/keyboard.h"
#include "machine/ram.h"
#include "machine/serial.h"

View File

@ -5,18 +5,16 @@
#ifndef __ABC800__
#define __ABC800__
#define MODERN_DRIVER_INIT
#include "emu.h"
#include "bus/abcbus/abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "cpu/mcs48/mcs48.h"
#include "imagedev/cassette.h"
#include "machine/abckb.h"
#include "machine/abc800kb.h"
#include "machine/abc830.h"
#include "machine/abcbus.h"
#include "machine/e0516.h"
#include "machine/serial.h"
#include "machine/z80ctc.h"

View File

@ -1,142 +0,0 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
/*
Luxor ABC 830
Type Size Tracks Sides Sectors/track Sectors Speed Drives
ABC-830 Floppy 160 KB 40 1 16 640 250 Kbps MPI 51, BASF 6106
Floppy 80 KB 40 1 8 320 250 Kbps Scandia Metric FD2
ABC-832 Floppy 640 KB 80 2 16 2560 250 Kbps Micropolis 1015, Micropolis 1115, BASF 6118
ABC-834 Floppy 640 KB 80 2 16 2560 250 Kbps Teac FD 55 F
ABC-838 Floppy 1 MB 77 2 25 3978 500 Kbps BASF 6104, BASF 6115
ABC-850 Floppy 640 KB 80 2 16 2560 250 Kbps TEAC FD 55 F, BASF 6136
HDD 10 MB 320 4 32 40960 5 Mbps Rodime 202, BASF 6186
ABC-852 Floppy 640 KB 80 2 16 2560 250 Kbps TEAC FD 55 F, BASF 6136
HDD 20 MB 615 4 32 78720 5 Mbps NEC 5126
Streamer 45 MB 9 90 Kbps Archive 5945-C (tape: DC300XL 450ft)
ABC-856 Floppy 640 KB 80 2 16 2560 250 Kbps TEAC FD 55 F
HDD 64 MB 1024 8 32 262144 5 Mbps Micropolis 1325
Streamer 45 MB 9 90 Kbps Archive 5945-C (tape: DC300XL 450ft)
*/
#include "abc830.h"
//**************************************************************************
// FLOPPY CONFIGURATIONS
//**************************************************************************
//-------------------------------------------------
// floppy_interface abc830_floppy_interface
//-------------------------------------------------
static LEGACY_FLOPPY_OPTIONS_START( abc830 )
// NOTE: Real ABC 830 (160KB) disks use a 7:1 sector interleave.
// Specify INTERLEAVE([7]) below if you prefer the physical layout.
LEGACY_FLOPPY_OPTION(abc830, "dsk", "Luxor ABC 830", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([40])
SECTORS([16])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTIONS_END
const floppy_interface abc830_floppy_interface =
{
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
FLOPPY_STANDARD_5_25_SSDD_40,
LEGACY_FLOPPY_OPTIONS_NAME(abc830),
"abc830",
NULL
};
//-------------------------------------------------
// floppy_interface abc832_floppy_interface
//-------------------------------------------------
static LEGACY_FLOPPY_OPTIONS_START( abc832 )
LEGACY_FLOPPY_OPTION(abc832, "dsk", "Luxor ABC 832/834", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([2])
TRACKS([80])
SECTORS([16])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTIONS_END
const floppy_interface abc832_floppy_interface =
{
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
FLOPPY_STANDARD_5_25_DSDD,
LEGACY_FLOPPY_OPTIONS_NAME(abc832),
"abc832",
NULL
};
//-------------------------------------------------
// floppy_interface abc838_floppy_interface
//-------------------------------------------------
static LEGACY_FLOPPY_OPTIONS_START( abc838 )
LEGACY_FLOPPY_OPTION(abc838, "dsk", "Luxor ABC 838", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([2])
TRACKS([77])
SECTORS([26])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTIONS_END
const floppy_interface abc838_floppy_interface =
{
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
FLOPPY_STANDARD_8_DSDD,
LEGACY_FLOPPY_OPTIONS_NAME(abc838),
"abc838",
NULL
};
//-------------------------------------------------
// floppy_interface fd2_floppy_interface
//-------------------------------------------------
static LEGACY_FLOPPY_OPTIONS_START( fd2 )
// NOTE: FD2 cannot be used with the Luxor controller card,
// it has a proprietary one. This is just for reference.
LEGACY_FLOPPY_OPTION(fd2, "dsk", "Scandia Metric FD2", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([40])
SECTORS([8])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTIONS_END
const floppy_interface fd2_floppy_interface =
{
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
FLOPPY_STANDARD_5_25_SSSD,
LEGACY_FLOPPY_OPTIONS_NAME(fd2),
"floppy_5_25",
NULL
};

View File

@ -1,46 +0,0 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
#pragma once
#ifndef __ABC830__
#define __ABC830__
#include "emu.h"
#include "formats/basicdsk.h"
#include "imagedev/flopdrv.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
#define MCFG_ABC830_ADD() \
MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(abc830_floppy_interface)
#define MCFG_ABC832_ADD() \
MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(abc832_floppy_interface)
#define MCFG_ABC834_ADD() \
MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(abc832_floppy_interface)
#define MCFG_ABC838_ADD() \
MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(abc838_floppy_interface)
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
// floppy configuration
extern const floppy_interface abc830_floppy_interface;
extern const floppy_interface abc832_floppy_interface;
extern const floppy_interface abc834_floppy_interface;
extern const floppy_interface abc838_floppy_interface;
extern const floppy_interface fd2_floppy_interface;
#endif

View File

@ -477,6 +477,7 @@ MACHINES += MOS8726
# specify available bus cores
#-------------------------------------------------
BUSES += ABCBUS
BUSES += ADAMNET
BUSES += C64
BUSES += CBMIEC
@ -1467,21 +1468,9 @@ $(MESSOBJ)/luxor.a: \
$(MESS_MACHINE)/abc800kb.o \
$(MESS_VIDEO)/abc802.o \
$(MESS_VIDEO)/abc806.o \
$(MESS_MACHINE)/abcbus.o \
$(MESS_MACHINE)/abc_dos.o \
$(MESS_MACHINE)/abc_fd2.o \
$(MESS_MACHINE)/abc_hdc.o \
$(MESS_MACHINE)/abc_uni800.o\
$(MESS_MACHINE)/abc_sio.o \
$(MESS_MACHINE)/abc_slutprov.o \
$(MESS_MACHINE)/abc_turbo.o \
$(MESS_MACHINE)/abc_xebec.o \
$(MESS_MACHINE)/abckb.o \
$(MESS_MACHINE)/abc77.o \
$(MESS_MACHINE)/abc99.o \
$(MESS_MACHINE)/lux10828.o \
$(MESS_MACHINE)/lux21046.o \
$(MESS_MACHINE)/abc890.o \
$(MESS_DRIVERS)/abc1600.o \
$(MESS_MACHINE)/abc1600_bus.o \
$(MESS_MACHINE)/abc1600mac.o \