Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 01:11:11 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(MESS) Apple II bus moving day (nw)

Browse Source
This commit is contained in:
R. Belmont 2013-10-22 16:45:06 +00:00
parent ef774dd504
commit cd6f73b9c7
66 changed files with 216 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
.gitattributes vendored
View File

@ -356,6 +356,60 @@ 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/a2bus/a2alfam2.c svneol=native#text/plain
src/emu/bus/a2bus/a2alfam2.h svneol=native#text/plain
src/emu/bus/a2bus/a2applicard.c svneol=native#text/plain
src/emu/bus/a2bus/a2applicard.h svneol=native#text/plain
src/emu/bus/a2bus/a2arcadebd.c svneol=native#text/plain
src/emu/bus/a2bus/a2arcadebd.h svneol=native#text/plain
src/emu/bus/a2bus/a2bus.c svneol=native#text/plain
src/emu/bus/a2bus/a2bus.h svneol=native#text/plain
src/emu/bus/a2bus/a2cffa.c svneol=native#text/plain
src/emu/bus/a2bus/a2cffa.h svneol=native#text/plain
src/emu/bus/a2bus/a2diskii.c svneol=native#text/plain
src/emu/bus/a2bus/a2diskii.h svneol=native#text/plain
src/emu/bus/a2bus/a2eauxslot.c svneol=native#text/plain
src/emu/bus/a2bus/a2eauxslot.h svneol=native#text/plain
src/emu/bus/a2bus/a2echoii.c svneol=native#text/plain
src/emu/bus/a2bus/a2echoii.h svneol=native#text/plain
src/emu/bus/a2bus/a2eext80col.c svneol=native#text/plain
src/emu/bus/a2bus/a2eext80col.h svneol=native#text/plain
src/emu/bus/a2bus/a2eramworks3.c svneol=native#text/plain
src/emu/bus/a2bus/a2eramworks3.h svneol=native#text/plain
src/emu/bus/a2bus/a2estd80col.c svneol=native#text/plain
src/emu/bus/a2bus/a2estd80col.h svneol=native#text/plain
src/emu/bus/a2bus/a2hsscsi.c svneol=native#text/plain
src/emu/bus/a2bus/a2hsscsi.h svneol=native#text/plain
src/emu/bus/a2bus/a2lang.c svneol=native#text/plain
src/emu/bus/a2bus/a2lang.h svneol=native#text/plain
src/emu/bus/a2bus/a2memexp.c svneol=native#text/plain
src/emu/bus/a2bus/a2memexp.h svneol=native#text/plain
src/emu/bus/a2bus/a2midi.c svneol=native#text/plain
src/emu/bus/a2bus/a2midi.h svneol=native#text/plain
src/emu/bus/a2bus/a2mockingboard.c svneol=native#text/plain
src/emu/bus/a2bus/a2mockingboard.h svneol=native#text/plain
src/emu/bus/a2bus/a2sam.c svneol=native#text/plain
src/emu/bus/a2bus/a2sam.h svneol=native#text/plain
src/emu/bus/a2bus/a2scsi.c svneol=native#text/plain
src/emu/bus/a2bus/a2scsi.h svneol=native#text/plain
src/emu/bus/a2bus/a2softcard.c svneol=native#text/plain
src/emu/bus/a2bus/a2softcard.h svneol=native#text/plain
src/emu/bus/a2bus/a2ssc.c svneol=native#text/plain
src/emu/bus/a2bus/a2ssc.h svneol=native#text/plain
src/emu/bus/a2bus/a2swyft.c svneol=native#text/plain
src/emu/bus/a2bus/a2swyft.h svneol=native#text/plain
src/emu/bus/a2bus/a2themill.c svneol=native#text/plain
src/emu/bus/a2bus/a2themill.h svneol=native#text/plain
src/emu/bus/a2bus/a2thunderclock.c svneol=native#text/plain
src/emu/bus/a2bus/a2thunderclock.h svneol=native#text/plain
src/emu/bus/a2bus/a2videoterm.c svneol=native#text/plain
src/emu/bus/a2bus/a2videoterm.h svneol=native#text/plain
src/emu/bus/a2bus/a2vulcan.c svneol=native#text/plain
src/emu/bus/a2bus/a2vulcan.h svneol=native#text/plain
src/emu/bus/a2bus/a2zipdrive.c svneol=native#text/plain
src/emu/bus/a2bus/a2zipdrive.h svneol=native#text/plain
src/emu/bus/a2bus/laser128.c svneol=native#text/plain
src/emu/bus/a2bus/laser128.h svneol=native#text/plain
src/emu/bus/abc1600/abc1600.c svneol=native#text/plain
src/emu/bus/abc1600/abc1600.h svneol=native#text/plain
src/emu/bus/abc1600/lux4105.c svneol=native#text/plain
@ -1809,6 +1863,8 @@ src/emu/machine/msm6242.c svneol=native#text/plain
src/emu/machine/msm6242.h svneol=native#text/plain
src/emu/machine/n68681.c svneol=native#text/plain
src/emu/machine/n68681.h svneol=native#text/plain
src/emu/machine/ncr5380n.c svneol=native#text/plain
src/emu/machine/ncr5380n.h svneol=native#text/plain
src/emu/machine/ncr539x.c svneol=native#text/plain
src/emu/machine/ncr539x.h svneol=native#text/plain
src/emu/machine/net_lib.c svneol=native#text/plain
@ -7472,58 +7528,6 @@ src/mess/machine/990_hd.c svneol=native#text/plain
src/mess/machine/990_hd.h svneol=native#text/plain
src/mess/machine/990_tap.c svneol=native#text/plain
src/mess/machine/990_tap.h svneol=native#text/plain
src/mess/machine/a2alfam2.c svneol=native#text/plain
src/mess/machine/a2alfam2.h svneol=native#text/plain
src/mess/machine/a2applicard.c svneol=native#text/plain
src/mess/machine/a2applicard.h svneol=native#text/plain
src/mess/machine/a2arcadebd.c svneol=native#text/plain
src/mess/machine/a2arcadebd.h svneol=native#text/plain
src/mess/machine/a2bus.c svneol=native#text/plain
src/mess/machine/a2bus.h svneol=native#text/plain
src/mess/machine/a2cffa.c svneol=native#text/plain
src/mess/machine/a2cffa.h svneol=native#text/plain
src/mess/machine/a2diskii.c svneol=native#text/plain
src/mess/machine/a2diskii.h svneol=native#text/plain
src/mess/machine/a2eauxslot.c svneol=native#text/plain
src/mess/machine/a2eauxslot.h svneol=native#text/plain
src/mess/machine/a2echoii.c svneol=native#text/plain
src/mess/machine/a2echoii.h svneol=native#text/plain
src/mess/machine/a2eext80col.c svneol=native#text/plain
src/mess/machine/a2eext80col.h svneol=native#text/plain
src/mess/machine/a2eramworks3.c svneol=native#text/plain
src/mess/machine/a2eramworks3.h svneol=native#text/plain
src/mess/machine/a2estd80col.c svneol=native#text/plain
src/mess/machine/a2estd80col.h svneol=native#text/plain
src/mess/machine/a2hsscsi.c svneol=native#text/plain
src/mess/machine/a2hsscsi.h svneol=native#text/plain
src/mess/machine/a2lang.c svneol=native#text/plain
src/mess/machine/a2lang.h svneol=native#text/plain
src/mess/machine/a2memexp.c svneol=native#text/plain
src/mess/machine/a2memexp.h svneol=native#text/plain
src/mess/machine/a2midi.c svneol=native#text/plain
src/mess/machine/a2midi.h svneol=native#text/plain
src/mess/machine/a2mockingboard.c svneol=native#text/plain
src/mess/machine/a2mockingboard.h svneol=native#text/plain
src/mess/machine/a2sam.c svneol=native#text/plain
src/mess/machine/a2sam.h svneol=native#text/plain
src/mess/machine/a2scsi.c svneol=native#text/plain
src/mess/machine/a2scsi.h svneol=native#text/plain
src/mess/machine/a2softcard.c svneol=native#text/plain
src/mess/machine/a2softcard.h svneol=native#text/plain
src/mess/machine/a2ssc.c svneol=native#text/plain
src/mess/machine/a2ssc.h svneol=native#text/plain
src/mess/machine/a2swyft.c svneol=native#text/plain
src/mess/machine/a2swyft.h svneol=native#text/plain
src/mess/machine/a2themill.c svneol=native#text/plain
src/mess/machine/a2themill.h svneol=native#text/plain
src/mess/machine/a2thunderclock.c svneol=native#text/plain
src/mess/machine/a2thunderclock.h svneol=native#text/plain
src/mess/machine/a2videoterm.c svneol=native#text/plain
src/mess/machine/a2videoterm.h svneol=native#text/plain
src/mess/machine/a2vulcan.c svneol=native#text/plain
src/mess/machine/a2vulcan.h svneol=native#text/plain
src/mess/machine/a2zipdrive.c svneol=native#text/plain
src/mess/machine/a2zipdrive.h svneol=native#text/plain
src/mess/machine/a7800.c svneol=native#text/plain
src/mess/machine/abc1600mac.c svneol=native#text/plain
src/mess/machine/abc1600mac.h svneol=native#text/plain
@ -7789,8 +7793,6 @@ src/mess/machine/keyboard.h svneol=native#text/plain
src/mess/machine/kr2376.c svneol=native#text/plain
src/mess/machine/kr2376.h svneol=native#text/plain
src/mess/machine/kramermc.c svneol=native#text/plain
src/mess/machine/laser128.c svneol=native#text/plain
src/mess/machine/laser128.h svneol=native#text/plain
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
@ -7857,8 +7859,6 @@ src/mess/machine/nascom1.c svneol=native#text/plain
src/mess/machine/nc.c svneol=native#text/plain
src/mess/machine/ncr5380.c svneol=native#text/plain
src/mess/machine/ncr5380.h svneol=native#text/plain
src/mess/machine/ncr5380n.c svneol=native#text/plain
src/mess/machine/ncr5380n.h svneol=native#text/plain
src/mess/machine/ncr5390.c svneol=native#text/plain
src/mess/machine/ncr5390.h svneol=native#text/plain
src/mess/machine/ne1000.c svneol=native#text/plain

0
src/mess/machine/a2alfam2.c → src/emu/bus/a2bus/a2alfam2.c
View File

2
src/mess/machine/a2alfam2.h → src/emu/bus/a2bus/a2alfam2.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_ALFAM2__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "sound/sn76496.h"
//**************************************************************************

0
src/mess/machine/a2applicard.c → src/emu/bus/a2bus/a2applicard.c
View File

2
src/mess/machine/a2applicard.h → src/emu/bus/a2bus/a2applicard.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_APPLICARD__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS

2
src/mess/machine/a2arcadebd.c → src/emu/bus/a2bus/a2arcadebd.c
View File

@ -12,7 +12,7 @@
*********************************************************************/
#include "emu.h"
#include "machine/a2arcadebd.h"
#include "a2arcadebd.h"
/***************************************************************************

2
src/mess/machine/a2arcadebd.h → src/emu/bus/a2bus/a2arcadebd.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_ARCADEBOARD__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "video/tms9928a.h"
#include "sound/ay8910.h"

2
src/mess/machine/a2bus.c → src/emu/bus/a2bus/a2bus.c
View File

@ -70,7 +70,7 @@
#include "emu.h"
#include "emuopts.h"
#include "machine/a2bus.h"
#include "a2bus.h"
//**************************************************************************

0
src/mess/machine/a2bus.h → src/emu/bus/a2bus/a2bus.h
View File

0
src/mess/machine/a2cffa.c → src/emu/bus/a2bus/a2cffa.c
View File

2
src/mess/machine/a2cffa.h → src/emu/bus/a2bus/a2cffa.h
View File

@ -11,7 +11,7 @@
#define __A2BUS_CFFA2__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "machine/ataintf.h"
//**************************************************************************

2
src/mess/machine/a2diskii.c → src/emu/bus/a2bus/a2diskii.c
View File

@ -12,7 +12,7 @@
#include "formats/ap2_dsk.h"
#include "machine/appldriv.h"
#include "machine/applefdc.h"
#include "machine/a2diskii.h"
#include "a2diskii.h"
/***************************************************************************

2
src/mess/machine/a2diskii.h → src/emu/bus/a2bus/a2diskii.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_DISKII__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS

2
src/mess/machine/a2eauxslot.c → src/emu/bus/a2bus/a2eauxslot.c
View File

@ -8,7 +8,7 @@
#include "emu.h"
#include "emuopts.h"
#include "machine/a2eauxslot.h"
#include "a2eauxslot.h"
//**************************************************************************

2
src/mess/machine/a2eauxslot.h → src/emu/bus/a2bus/a2eauxslot.h
View File

@ -12,7 +12,7 @@
#define __A2EAUXSLOT_H__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS

0
src/mess/machine/a2echoii.c → src/emu/bus/a2bus/a2echoii.c
View File

2
src/mess/machine/a2echoii.h → src/emu/bus/a2bus/a2echoii.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_ECHOII__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "sound/tms5220.h"
//**************************************************************************

2
src/mess/machine/a2eext80col.c → src/emu/bus/a2bus/a2eext80col.c
View File

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

2
src/mess/machine/a2eext80col.h → src/emu/bus/a2bus/a2eext80col.h
View File

@ -10,7 +10,7 @@
#define __A2EAUX_EXT80COL__
#include "emu.h"
#include "machine/a2eauxslot.h"
#include "a2eauxslot.h"
//**************************************************************************
// TYPE DEFINITIONS

2
src/mess/machine/a2eramworks3.c → src/emu/bus/a2bus/a2eramworks3.c
View File

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

2
src/mess/machine/a2eramworks3.h → src/emu/bus/a2bus/a2eramworks3.h
View File

@ -10,7 +10,7 @@
#define __A2EAUX_RAMWORKS3__
#include "emu.h"
#include "machine/a2eauxslot.h"
#include "a2eauxslot.h"
//**************************************************************************
// TYPE DEFINITIONS

2
src/mess/machine/a2estd80col.c → src/emu/bus/a2bus/a2estd80col.c
View File

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

2
src/mess/machine/a2estd80col.h → src/emu/bus/a2bus/a2estd80col.h
View File

@ -10,7 +10,7 @@
#define __A2EAUX_STD80COL__
#include "emu.h"
#include "machine/a2eauxslot.h"
#include "a2eauxslot.h"
//**************************************************************************
// TYPE DEFINITIONS

0
src/mess/machine/a2hsscsi.c → src/emu/bus/a2bus/a2hsscsi.c
View File

2
src/mess/machine/a2hsscsi.h → src/emu/bus/a2bus/a2hsscsi.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_HSSCSI__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "machine/ncr5380n.h"
//**************************************************************************

2
src/mess/machine/a2lang.c → src/emu/bus/a2bus/a2lang.c
View File

@ -12,7 +12,7 @@
#include "emu.h"
#include "includes/apple2.h"
#include "machine/a2lang.h"
#include "a2lang.h"
/***************************************************************************

2
src/mess/machine/a2lang.h → src/emu/bus/a2bus/a2lang.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_LANG__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS

0
src/mess/machine/a2memexp.c → src/emu/bus/a2bus/a2memexp.c
View File

2
src/mess/machine/a2memexp.h → src/emu/bus/a2bus/a2memexp.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_MEMEXP__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS

2
src/mess/machine/a2midi.c → src/emu/bus/a2bus/a2midi.c
View File

@ -8,7 +8,7 @@
#include "emu.h"
#include "includes/apple2.h"
#include "machine/a2midi.h"
#include "a2midi.h"
/***************************************************************************

2
src/mess/machine/a2midi.h → src/emu/bus/a2bus/a2midi.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_MIDI__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
#include "machine/serial.h"

2
src/mess/machine/a2mockingboard.c → src/emu/bus/a2bus/a2mockingboard.c
View File

@ -8,7 +8,7 @@
*********************************************************************/
#include "emu.h"
#include "machine/a2mockingboard.h"
#include "a2mockingboard.h"
/***************************************************************************

2
src/mess/machine/a2mockingboard.h → src/emu/bus/a2bus/a2mockingboard.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_MOCKINGBOARD__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "machine/6522via.h"
#include "sound/ay8910.h"
#include "sound/tms5220.h"

0
src/mess/machine/a2sam.c → src/emu/bus/a2bus/a2sam.c
View File

2
src/mess/machine/a2sam.h → src/emu/bus/a2bus/a2sam.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_SAM__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "sound/dac.h"
//**************************************************************************

0
src/mess/machine/a2scsi.c → src/emu/bus/a2bus/a2scsi.c
View File

2
src/mess/machine/a2scsi.h → src/emu/bus/a2bus/a2scsi.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_SCSI__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "machine/ncr5380n.h"
//**************************************************************************

0
src/mess/machine/a2softcard.c → src/emu/bus/a2bus/a2softcard.c
View File

2
src/mess/machine/a2softcard.h → src/emu/bus/a2bus/a2softcard.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_SOFTCARD__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS

2
src/mess/machine/a2ssc.c → src/emu/bus/a2bus/a2ssc.c
View File

@ -8,7 +8,7 @@
#include "emu.h"
#include "includes/apple2.h"
#include "machine/a2ssc.h"
#include "a2ssc.h"
#include "machine/terminal.h"
#include "machine/null_modem.h"
#include "machine/serial.h"

2
src/mess/machine/a2ssc.h → src/emu/bus/a2bus/a2ssc.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_SSC__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "machine/mos6551.h"
//**************************************************************************

2
src/mess/machine/a2swyft.c → src/emu/bus/a2bus/a2swyft.c
View File

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

2
src/mess/machine/a2swyft.h → src/emu/bus/a2bus/a2swyft.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_SWYFT__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS

0
src/mess/machine/a2themill.c → src/emu/bus/a2bus/a2themill.c
View File

2
src/mess/machine/a2themill.h → src/emu/bus/a2bus/a2themill.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_THEMILL__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS

0
src/mess/machine/a2thunderclock.c → src/emu/bus/a2bus/a2thunderclock.c
View File

2
src/mess/machine/a2thunderclock.h → src/emu/bus/a2bus/a2thunderclock.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_THUNDERCLOCK__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "machine/upd1990a.h"
//**************************************************************************

0
src/mess/machine/a2videoterm.c → src/emu/bus/a2bus/a2videoterm.c
View File

2
src/mess/machine/a2videoterm.h → src/emu/bus/a2bus/a2videoterm.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_VIDEOTERM__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "video/mc6845.h"
//**************************************************************************

0
src/mess/machine/a2vulcan.c → src/emu/bus/a2bus/a2vulcan.c
View File

2
src/mess/machine/a2vulcan.h → src/emu/bus/a2bus/a2vulcan.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_VULCAN__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "machine/ataintf.h"
//**************************************************************************

0
src/mess/machine/a2zipdrive.c → src/emu/bus/a2bus/a2zipdrive.c
View File

2
src/mess/machine/a2zipdrive.h → src/emu/bus/a2bus/a2zipdrive.h
View File

@ -12,7 +12,7 @@
#define __A2BUS_ZIPDRIVE__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
#include "machine/ataintf.h"
//**************************************************************************

0
src/mess/machine/laser128.c → src/emu/bus/a2bus/laser128.c
View File

2
src/mess/machine/laser128.h → src/emu/bus/a2bus/laser128.h
View File

@ -10,7 +10,7 @@
#define __A2BUS_LASER128__
#include "emu.h"
#include "machine/a2bus.h"
#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS

36
src/emu/bus/bus.mak
View File

@ -428,3 +428,39 @@ BUSOBJS += $(BUSOBJ)/wangpc/rtc.o
BUSOBJS += $(BUSOBJ)/wangpc/tig.o
BUSOBJS += $(BUSOBJ)/wangpc/wdc.o
endif
#-------------------------------------------------
#
#@src/emu/bus/a2bus/a2bus.h,BUSES += A2BUS
#-------------------------------------------------
ifneq ($(filter A2BUS,$(BUSES)),)
BUSOBJS += $(BUSOBJ)/a2bus/a2bus.o
BUSOBJS += $(BUSOBJ)/a2bus/a2lang.o
BUSOBJS += $(BUSOBJ)/a2bus/a2diskii.o
BUSOBJS += $(BUSOBJ)/a2bus/a2mockingboard.o
BUSOBJS += $(BUSOBJ)/a2bus/a2cffa.o
BUSOBJS += $(BUSOBJ)/a2bus/a2memexp.o
BUSOBJS += $(BUSOBJ)/a2bus/a2scsi.o
BUSOBJS += $(BUSOBJ)/a2bus/a2thunderclock.o
BUSOBJS += $(BUSOBJ)/a2bus/a2softcard.o
BUSOBJS += $(BUSOBJ)/a2bus/a2videoterm.o
BUSOBJS += $(BUSOBJ)/a2bus/a2ssc.o
BUSOBJS += $(BUSOBJ)/a2bus/a2swyft.o
BUSOBJS += $(BUSOBJ)/a2bus/a2eauxslot.o
BUSOBJS += $(BUSOBJ)/a2bus/a2themill.o
BUSOBJS += $(BUSOBJ)/a2bus/a2sam.o
BUSOBJS += $(BUSOBJ)/a2bus/a2alfam2.o
BUSOBJS += $(BUSOBJ)/a2bus/laser128.o
BUSOBJS += $(BUSOBJ)/a2bus/a2echoii.o
BUSOBJS += $(BUSOBJ)/a2bus/a2arcadebd.o
BUSOBJS += $(BUSOBJ)/a2bus/a2midi.o
BUSOBJS += $(BUSOBJ)/a2bus/a2vulcan.o
BUSOBJS += $(BUSOBJ)/a2bus/a2zipdrive.o
BUSOBJS += $(BUSOBJ)/a2bus/a2applicard.o
BUSOBJS += $(BUSOBJ)/a2bus/a2hsscsi.o
BUSOBJS += $(BUSOBJ)/a2bus/a2estd80col.o
BUSOBJS += $(BUSOBJ)/a2bus/a2eext80col.o
BUSOBJS += $(BUSOBJ)/a2bus/a2eramworks3.o
endif

1
src/emu/emu.mak
View File

@ -51,6 +51,7 @@ OBJDIRS += \
$(EMUOBJ)/bus/vidbrain \
$(EMUOBJ)/bus/vip \
$(EMUOBJ)/bus/wangpc \
$(EMUOBJ)/bus/a2bus \
$(EMUOBJ)/drivers \
$(EMUOBJ)/machine \
$(EMUOBJ)/layout \

9
src/emu/machine/machine.mak
View File

@ -1576,3 +1576,12 @@ $(MACHINEOBJ)/s3c2400.o: $(MACHINESRC)/s3c24xx.c
$(MACHINEOBJ)/s3c2410.o: $(MACHINESRC)/s3c24xx.c
$(MACHINEOBJ)/s3c2440.o: $(MACHINESRC)/s3c24xx.c
#-------------------------------------------------
#
#@src/emu/machine/ncr5380n.h,MACHINES += NCR5380N
#-------------------------------------------------
ifneq ($(filter NCR5380N,$(MACHINES)),)
MACHINEOBJS += $(MACHINEOBJ)/ncr5380n.o
endif

0
src/mess/machine/ncr5380n.c → src/emu/machine/ncr5380n.c
View File

4
src/mess/machine/ncr5380n.h → src/emu/machine/ncr5380n.h
View File

@ -6,8 +6,8 @@
*********************************************************************/
#ifndef NCR5380_H
#define NCR5380_H
#ifndef NCR5380N_H
#define NCR5380N_H
#include "machine/nscsi_bus.h"

52
src/mess/drivers/apple2.c
View File

@ -193,30 +193,30 @@ Apple 3.5 and Apple 5.25 drives - up to three devices
#include "sound/speaker.h"
#include "machine/ram.h"
#include "machine/a2bus.h"
#include "machine/a2lang.h"
#include "machine/a2diskii.h"
#include "machine/a2mockingboard.h"
#include "machine/a2cffa.h"
#include "machine/a2memexp.h"
#include "machine/a2scsi.h"
#include "machine/a2thunderclock.h"
#include "machine/a2softcard.h"
#include "machine/a2videoterm.h"
#include "machine/a2ssc.h"
#include "machine/a2swyft.h"
#include "machine/a2themill.h"
#include "machine/a2sam.h"
#include "machine/a2alfam2.h"
#include "machine/laser128.h"
#include "machine/a2echoii.h"
#include "machine/a2arcadebd.h"
#include "machine/a2midi.h"
#include "machine/a2zipdrive.h"
#include "machine/a2applicard.h"
#include "machine/a2estd80col.h"
#include "machine/a2eext80col.h"
#include "machine/a2eramworks3.h"
#include "bus/a2bus/a2bus.h"
#include "bus/a2bus/a2lang.h"
#include "bus/a2bus/a2diskii.h"
#include "bus/a2bus/a2mockingboard.h"
#include "bus/a2bus/a2cffa.h"
#include "bus/a2bus/a2memexp.h"
#include "bus/a2bus/a2scsi.h"
#include "bus/a2bus/a2thunderclock.h"
#include "bus/a2bus/a2softcard.h"
#include "bus/a2bus/a2videoterm.h"
#include "bus/a2bus/a2ssc.h"
#include "bus/a2bus/a2swyft.h"
#include "bus/a2bus/a2themill.h"
#include "bus/a2bus/a2sam.h"
#include "bus/a2bus/a2alfam2.h"
#include "bus/a2bus/laser128.h"
#include "bus/a2bus/a2echoii.h"
#include "bus/a2bus/a2arcadebd.h"
#include "bus/a2bus/a2midi.h"
#include "bus/a2bus/a2zipdrive.h"
#include "bus/a2bus/a2applicard.h"
#include "bus/a2bus/a2estd80col.h"
#include "bus/a2bus/a2eext80col.h"
#include "bus/a2bus/a2eramworks3.h"
/***************************************************************************
PARAMETERS
@ -835,8 +835,8 @@ static MACHINE_CONFIG_DERIVED( laba2p, apple2p )
MCFG_A2BUS_SLOT_REMOVE("sl3")
MCFG_A2BUS_SLOT_REMOVE("sl6")
MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl3", A2BUS_LAB_80COL, NULL)
MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl6", A2BUS_LAB_FDC, NULL)
// MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl3", A2BUS_LAB_80COL, NULL)
MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl6", A2BUS_IWM_FDC, NULL)
MACHINE_CONFIG_END
#endif

38
src/mess/drivers/apple2gs.c
View File

@ -57,24 +57,25 @@
#include "sound/speaker.h"
#include "machine/ram.h"
#include "machine/a2bus.h"
#include "machine/a2lang.h"
#include "machine/a2diskii.h"
#include "machine/a2mockingboard.h"
#include "machine/a2cffa.h"
#include "machine/a2memexp.h"
#include "machine/a2scsi.h"
#include "machine/a2thunderclock.h"
#include "machine/a2ssc.h"
#include "machine/a2softcard.h"
#include "machine/a2sam.h"
#include "machine/a2alfam2.h"
#include "machine/a2echoii.h"
#include "machine/a2arcadebd.h"
#include "machine/a2midi.h"
#include "machine/a2vulcan.h"
#include "machine/a2zipdrive.h"
//#include "machine/a2udrive.h"
#include "bus/a2bus/a2bus.h"
#include "bus/a2bus/a2lang.h"
#include "bus/a2bus/a2diskii.h"
#include "bus/a2bus/a2mockingboard.h"
#include "bus/a2bus/a2cffa.h"
#include "bus/a2bus/a2memexp.h"
#include "bus/a2bus/a2scsi.h"
#include "bus/a2bus/a2thunderclock.h"
#include "bus/a2bus/a2ssc.h"
#include "bus/a2bus/a2softcard.h"
#include "bus/a2bus/a2sam.h"
#include "bus/a2bus/a2alfam2.h"
#include "bus/a2bus/a2echoii.h"
#include "bus/a2bus/a2arcadebd.h"
#include "bus/a2bus/a2midi.h"
#include "bus/a2bus/a2vulcan.h"
#include "bus/a2bus/a2zipdrive.h"
//#include "bus/a2bus/a2udrive.h"
#include "bus/a2bus/a2hsscsi.h"
static const gfx_layout apple2gs_text_layout =
{
@ -315,6 +316,7 @@ static SLOT_INTERFACE_START(apple2_cards)
// SLOT_INTERFACE("softcard", A2BUS_SOFTCARD) /* Microsoft SoftCard */ // appears not to be IIgs compatible?
SLOT_INTERFACE("scsi", A2BUS_SCSI) /* Apple II SCSI Card */
SLOT_INTERFACE("hsscsi", A2BUS_HSSCSI) /* Apple II High-Speed SCSI Card */
SLOT_INTERFACE_END
static MACHINE_CONFIG_START( apple2gs, apple2gs_state )

8
src/mess/includes/apple2.h
View File

@ -9,8 +9,8 @@
#ifndef APPLE2_H_
#define APPLE2_H_
#include "machine/a2bus.h"
#include "machine/a2eauxslot.h"
#include "bus/a2bus/a2bus.h"
#include "bus/a2bus/a2eauxslot.h"
#include "machine/applefdc.h"
#include "machine/ram.h"
#include "imagedev/cassette.h"
@ -80,7 +80,8 @@ enum machine_type_t
APPLE_IIEPLUS, // Apple IIc/IIgs/IIc+ with permanent aux memory
TK2000, // Microdigital TK2000
LASER128, // Laser 128/128EX/128EX2
SPACE84 // "Space 84" with flipped text mode
SPACE84, // "Space 84" with flipped text mode
LABA2P // lab equipment (?) II Plus with flipped text mode
};
enum bank_disposition_t
@ -327,6 +328,7 @@ public:
DECLARE_MACHINE_START(tk2000);
DECLARE_MACHINE_START(laser128);
DECLARE_MACHINE_START(space84);
DECLARE_MACHINE_START(laba2p);
UINT32 screen_update_apple2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(apple2_interrupt);
DECLARE_WRITE8_MEMBER(a2bus_irq_w);

20
src/mess/machine/apple2.c
View File

@ -2226,6 +2226,26 @@ MACHINE_START_MEMBER(apple2_state,space84)
apple2_setup_memory(&mem_cfg);
}
MACHINE_START_MEMBER(apple2_state,laba2p)
{
apple2_memmap_config mem_cfg;
void *apple2cp_ce00_ram = NULL;
// II and II+ have no internal ROM or internal slot 3 h/w, so don't allow these states
m_flags_mask = VAR_INTCXROM|VAR_SLOTC3ROM;
m_machinetype = LABA2P;
apple2_init_common();
/* setup memory */
memset(&mem_cfg, 0, sizeof(mem_cfg));
mem_cfg.first_bank = 1;
mem_cfg.memmap = apple2_memmap_entries;
mem_cfg.auxmem = (UINT8*)apple2cp_ce00_ram;
apple2_setup_memory(&mem_cfg);
}
MACHINE_START_MEMBER(apple2_state,tk2000)
{
apple2_memmap_config mem_cfg;

30
src/mess/mess.mak
View File

@ -409,6 +409,7 @@ MACHINES += MOS8726
MACHINES += MSM5832
MACHINES += MSM58321
MACHINES += MSM6242
MACHINES += NCR5380N
MACHINES += NCR539x
MACHINES += NCR53C7XX
MACHINES += NMC9306
@ -504,6 +505,7 @@ BUSES += VIDBRAIN
BUSES += VCS
BUSES += VIP
BUSES += WANGPC
BUSES += A2BUS
#-------------------------------------------------
# this is the list of driver libraries that
@ -791,7 +793,6 @@ $(MESSOBJ)/shared.a: \
$(MESS_MACHINE)/mpu401.o \
$(MESS_MACHINE)/msm6222b.o \
$(MESS_MACHINE)/ncr5380.o \
$(MESS_MACHINE)/ncr5380n.o \
$(MESS_MACHINE)/ncr5390.o \
$(MESS_MACHINE)/ne1000.o \
$(MESS_MACHINE)/ne2000.o \
@ -934,33 +935,6 @@ $(MESSOBJ)/apple.a: \
$(MESS_MACHINE)/apple2gs.o \
$(MESS_DRIVERS)/apple2gs.o \
$(MESS_MACHINE)/ay3600.o \
$(MESS_MACHINE)/a2bus.o \
$(MESS_MACHINE)/a2lang.o \
$(MESS_MACHINE)/a2diskii.o \
$(MESS_MACHINE)/a2mockingboard.o \
$(MESS_MACHINE)/a2cffa.o \
$(MESS_MACHINE)/a2memexp.o \
$(MESS_MACHINE)/a2scsi.o \
$(MESS_MACHINE)/a2thunderclock.o \
$(MESS_MACHINE)/a2softcard.o \
$(MESS_MACHINE)/a2videoterm.o \
$(MESS_MACHINE)/a2ssc.o \
$(MESS_MACHINE)/a2swyft.o \
$(MESS_MACHINE)/a2eauxslot.o\
$(MESS_MACHINE)/a2themill.o \
$(MESS_MACHINE)/a2sam.o \
$(MESS_MACHINE)/a2alfam2.o \
$(MESS_MACHINE)/laser128.o \
$(MESS_MACHINE)/a2echoii.o \
$(MESS_MACHINE)/a2arcadebd.o\
$(MESS_MACHINE)/a2midi.o \
$(MESS_MACHINE)/a2vulcan.o \
$(MESS_MACHINE)/a2zipdrive.o\
$(MESS_MACHINE)/a2applicard.o \
$(MESS_MACHINE)/a2hsscsi.o \
$(MESS_MACHINE)/a2estd80col.o \
$(MESS_MACHINE)/a2eext80col.o \
$(MESS_MACHINE)/a2eramworks3.o \
$(MESS_MACHINE)/lisa.o \
$(MESS_DRIVERS)/lisa.o \
$(MESS_MACHINE)/nubus.o \

2
src/mess/video/apple2.c
View File

@ -114,7 +114,7 @@ inline void apple2_state::apple2_plot_text_character(bitmap_ind16 &bitmap, int x
chardata = &textgfx_data[(code * 8) % textgfx_datalen];
/* and finally, plot the character itself */
if (m_machinetype == SPACE84)
if ((m_machinetype == SPACE84) || (m_machinetype == LABA2P))
{
for (y = 0; y < 8; y++)
{