Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Curt Coder 2013-10-20 15:35:36 +00:00
parent c49b925dfe
commit 9d32b2dd74
21 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.gitattributes vendored
View File

@ -361,6 +361,20 @@ src/emu/bus/isbx/compis_fdc.c svneol=native#text/plain
src/emu/bus/isbx/compis_fdc.h svneol=native#text/plain
src/emu/bus/isbx/isbx.c svneol=native#text/plain
src/emu/bus/isbx/isbx.h svneol=native#text/plain
src/emu/bus/s100/dj2db.c svneol=native#text/plain
src/emu/bus/s100/dj2db.h svneol=native#text/plain
src/emu/bus/s100/djdma.c svneol=native#text/plain
src/emu/bus/s100/djdma.h svneol=native#text/plain
src/emu/bus/s100/mm65k16s.c svneol=native#text/plain
src/emu/bus/s100/mm65k16s.h svneol=native#text/plain
src/emu/bus/s100/nsmdsa.c svneol=native#text/plain
src/emu/bus/s100/nsmdsa.h svneol=native#text/plain
src/emu/bus/s100/nsmdsad.c svneol=native#text/plain
src/emu/bus/s100/nsmdsad.h svneol=native#text/plain
src/emu/bus/s100/s100.c svneol=native#text/plain
src/emu/bus/s100/s100.h svneol=native#text/plain
src/emu/bus/s100/wunderbus.c svneol=native#text/plain
src/emu/bus/s100/wunderbus.h svneol=native#text/plain
src/emu/cheat.c svneol=native#text/plain
src/emu/cheat.h svneol=native#text/plain
src/emu/clifront.c svneol=native#text/plain
@ -7939,20 +7953,6 @@ src/mess/machine/rm380z.c svneol=native#text/plain
src/mess/machine/rmnimbus.c svneol=native#text/plain
src/mess/machine/rx01.c svneol=native#text/plain
src/mess/machine/rx01.h svneol=native#text/plain
src/mess/machine/s100.c svneol=native#text/plain
src/mess/machine/s100.h svneol=native#text/plain
src/mess/machine/s100_dj2db.c svneol=native#text/plain
src/mess/machine/s100_dj2db.h svneol=native#text/plain
src/mess/machine/s100_djdma.c svneol=native#text/plain
src/mess/machine/s100_djdma.h svneol=native#text/plain
src/mess/machine/s100_mm65k16s.c svneol=native#text/plain
src/mess/machine/s100_mm65k16s.h svneol=native#text/plain
src/mess/machine/s100_nsmdsa.c svneol=native#text/plain
src/mess/machine/s100_nsmdsa.h svneol=native#text/plain
src/mess/machine/s100_nsmdsad.c svneol=native#text/plain
src/mess/machine/s100_nsmdsad.h svneol=native#text/plain
src/mess/machine/s100_wunderbus.c svneol=native#text/plain
src/mess/machine/s100_wunderbus.h svneol=native#text/plain
src/mess/machine/s1410.c svneol=native#text/plain
src/mess/machine/s1410.h svneol=native#text/plain
src/mess/machine/s3c44b0.c svneol=native#text/plain

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

@ -23,3 +23,19 @@ ifneq ($(filter ISBX,$(BUSES)),)
BUSOBJS += $(BUSOBJ)/isbx/isbx.o
BUSOBJS += $(BUSOBJ)/isbx/compis_fdc.o
endif
#-------------------------------------------------
#
#@src/emu/bus/isbx.h,BUSES += S100
#-------------------------------------------------
ifneq ($(filter S100,$(BUSES)),)
BUSOBJS += $(BUSOBJ)/s100/s100.o
BUSOBJS += $(BUSOBJ)/s100/dj2db.o
BUSOBJS += $(BUSOBJ)/s100/djdma.o
BUSOBJS += $(BUSOBJ)/s100/mm65k16s.o
BUSOBJS += $(BUSOBJ)/s100/nsmdsa.o
BUSOBJS += $(BUSOBJ)/s100/nsmdsad.o
BUSOBJS += $(BUSOBJ)/s100/wunderbus.o
endif

2
src/mess/machine/s100_dj2db.c → src/emu/bus/s100/dj2db.c
View File

@ -17,7 +17,7 @@
*/
#include "s100_dj2db.h"
#include "dj2db.h"

3
src/mess/machine/s100_dj2db.h → src/emu/bus/s100/dj2db.h
View File

@ -14,9 +14,8 @@
#ifndef __S100_DJ2DB__
#define __S100_DJ2DB__
#include "emu.h"
#include "machine/s100.h"
#include "s100.h"
#include "machine/com8116.h"
#include "machine/wd_fdc.h"

2
src/mess/machine/s100_djdma.c → src/emu/bus/s100/djdma.c
View File

@ -9,7 +9,7 @@
**********************************************************************/
#include "s100_djdma.h"
#include "djdma.h"

3
src/mess/machine/s100_djdma.h → src/emu/bus/s100/djdma.h
View File

@ -14,10 +14,9 @@
#ifndef __S100_DJDMA__
#define __S100_DJDMA__
#include "emu.h"
#include "s100.h"
#include "cpu/z80/z80.h"
#include "machine/s100.h"

2
src/mess/machine/s100_mm65k16s.c → src/emu/bus/s100/mm65k16s.c
View File

@ -9,7 +9,7 @@
**********************************************************************/
#include "s100_mm65k16s.h"
#include "mm65k16s.h"

2
src/mess/machine/s100_mm65k16s.h → src/emu/bus/s100/mm65k16s.h
View File

@ -15,7 +15,7 @@
#define __S100_MM65K16S__
#include "emu.h"
#include "machine/s100.h"
#include "s100.h"

2
src/mess/machine/s100_nsmdsa.c → src/emu/bus/s100/nsmdsa.c
View File

@ -9,7 +9,7 @@
**********************************************************************/
#include "s100_nsmdsa.h"
#include "nsmdsa.h"

2
src/mess/machine/s100_nsmdsa.h → src/emu/bus/s100/nsmdsa.h
View File

@ -15,8 +15,8 @@
#define __S100_MDS_A__
#include "emu.h"
#include "s100.h"
#include "imagedev/floppy.h"
#include "machine/s100.h"

2
src/mess/machine/s100_nsmdsad.c → src/emu/bus/s100/nsmdsad.c
View File

@ -9,7 +9,7 @@
**********************************************************************/
#include "s100_nsmdsad.h"
#include "nsmdsad.h"

2
src/mess/machine/s100_nsmdsad.h → src/emu/bus/s100/nsmdsad.h
View File

@ -15,8 +15,8 @@
#define __S100_MDS_AD__
#include "emu.h"
#include "s100.h"
#include "imagedev/floppy.h"
#include "machine/s100.h"

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

@ -11,7 +11,7 @@
#include "emu.h"
#include "emuopts.h"
#include "machine/s100.h"
#include "s100.h"
//**************************************************************************

10
src/mess/machine/s100.h → src/emu/bus/s100/s100.h
View File

@ -273,4 +273,14 @@ public:
device_s100_card_interface *m_next;
};
// slot devices
#include "dj2db.h"
#include "djdma.h"
#include "mm65k16s.h"
#include "nsmdsa.h"
#include "nsmdsad.h"
#include "wunderbus.h"
#endif

2
src/mess/machine/s100_wunderbus.c → src/emu/bus/s100/wunderbus.c
View File

@ -9,7 +9,7 @@
**********************************************************************/
#include "s100_wunderbus.h"
#include "wunderbus.h"

2
src/mess/machine/s100_wunderbus.h → src/emu/bus/s100/wunderbus.h
View File

@ -15,9 +15,9 @@
#define __S100_WUNDERBUS__
#include "emu.h"
#include "s100.h"
#include "machine/ins8250.h"
#include "machine/pic8259.h"
#include "machine/s100.h"
#include "machine/serial.h"
#include "machine/upd1990a.h"

1
src/emu/emu.mak
View File

@ -29,6 +29,7 @@ OBJDIRS += \
$(EMUOBJ)/audio \
$(EMUOBJ)/bus \
$(EMUOBJ)/bus/isbx \
$(EMUOBJ)/bus/s100 \
$(EMUOBJ)/drivers \
$(EMUOBJ)/machine \
$(EMUOBJ)/layout \

4
src/mess/drivers/horizon.c
View File

@ -31,12 +31,10 @@
*/
#include "emu.h"
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
#include "machine/i8251.h"
#include "machine/serial.h"
#include "machine/s100.h"
#include "machine/s100_nsmdsa.h"
#include "machine/s100_nsmdsad.h"
#define Z80_TAG "z80"
#define I8251_L_TAG "3a"

7
src/mess/includes/mpz80.h
View File

@ -5,15 +5,10 @@
#ifndef __MPZ80__
#define __MPZ80__
#include "emu.h"
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
#include "machine/s100.h"
#include "machine/s100_dj2db.h"
#include "machine/s100_djdma.h"
#include "machine/s100_mm65k16s.h"
#include "machine/s100_wunderbus.h"
#define Z80_TAG "17a"
#define AM9512_TAG "17d"

2
src/mess/includes/xor100.h
View File

@ -6,13 +6,13 @@
#define __XOR100__
#include "emu.h"
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
#include "machine/com8116.h"
#include "machine/ctronics.h"
#include "machine/i8255.h"
#include "machine/i8251.h"
#include "machine/s100.h"
#include "machine/serial.h"
#include "machine/wd_fdc.h"
#include "machine/z80ctc.h"

8
src/mess/mess.mak
View File

@ -477,6 +477,7 @@ MACHINES += PCCARD
#-------------------------------------------------
BUSES += ISBX
BUSES += S100
#-------------------------------------------------
# this is the list of driver libraries that
@ -780,7 +781,6 @@ $(MESSOBJ)/shared.a: \
$(MESS_MACHINE)/null_modem.o\
$(MESS_MACHINE)/pc_kbdc.o \
$(MESS_MACHINE)/pc_lpt.o \
$(MESS_MACHINE)/s100.o \
$(MESS_MACHINE)/sa1403d.o \
$(MESS_MACHINE)/sed1200.o \
$(MESS_MACHINE)/serial.o \
@ -1630,10 +1630,6 @@ $(MESSOBJ)/mitsubishi.a: \
$(MESSOBJ)/morrow.a: \
$(MESS_DRIVERS)/mpz80.o \
$(MESS_MACHINE)/s100_dj2db.o\
$(MESS_MACHINE)/s100_djdma.o\
$(MESS_MACHINE)/s100_mm65k16s.o \
$(MESS_MACHINE)/s100_wunderbus.o \
$(MESSOBJ)/mos.a: \
$(MESS_DRIVERS)/kim1.o \
@ -1767,8 +1763,6 @@ $(MESSOBJ)/nokia.a: \
$(MESSOBJ)/northstar.a: \
$(MESS_DRIVERS)/horizon.o \
$(MESS_MACHINE)/s100_nsmdsa.o \
$(MESS_MACHINE)/s100_nsmdsad.o \
$(MESSOBJ)/novag.a: \
$(MESS_DRIVERS)/mk1.o \