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

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

Browse Source
This commit is contained in:
Curt Coder 2013-10-20 16:00:54 +00:00
parent 2013a62515
commit d1d368c26c
34 changed files with 67 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.gitattributes vendored
View File

@ -357,6 +357,24 @@ 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/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
src/emu/bus/ieee488/c2040.h svneol=native#text/plain
src/emu/bus/ieee488/c8280.c svneol=native#text/plain
src/emu/bus/ieee488/c8280.h svneol=native#text/plain
src/emu/bus/ieee488/d9060.c svneol=native#text/plain
src/emu/bus/ieee488/d9060.h svneol=native#text/plain
src/emu/bus/ieee488/d9060hd.c svneol=native#text/plain
src/emu/bus/ieee488/d9060hd.h svneol=native#text/plain
src/emu/bus/ieee488/hardbox.c svneol=native#text/plain
src/emu/bus/ieee488/hardbox.h svneol=native#text/plain
src/emu/bus/ieee488/ieee488.c svneol=native#text/plain
src/emu/bus/ieee488/ieee488.h svneol=native#text/plain
src/emu/bus/ieee488/shark.c svneol=native#text/plain
src/emu/bus/ieee488/shark.h svneol=native#text/plain
src/emu/bus/ieee488/softbox.c svneol=native#text/plain
src/emu/bus/ieee488/softbox.h svneol=native#text/plain
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
@ -7250,10 +7268,6 @@ 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/c2031.c svneol=native#text/plain
src/mess/machine/c2031.h svneol=native#text/plain
src/mess/machine/c2040.c svneol=native#text/plain
src/mess/machine/c2040.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
@ -7403,8 +7417,6 @@ 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/c8280.c svneol=native#text/plain
src/mess/machine/c8280.h svneol=native#text/plain
src/mess/machine/cbm2_24k.c svneol=native#text/plain
src/mess/machine/cbm2_24k.h svneol=native#text/plain
src/mess/machine/cbm2_graphic.c svneol=native#text/plain
@ -7489,10 +7501,6 @@ src/mess/machine/cx4fn.inc svneol=native#text/plain
src/mess/machine/cx4oam.inc svneol=native#text/plain
src/mess/machine/cx4ops.inc svneol=native#text/plain
src/mess/machine/cybiko.c svneol=native#text/plain
src/mess/machine/d9060.c svneol=native#text/plain
src/mess/machine/d9060.h svneol=native#text/plain
src/mess/machine/d9060hd.c svneol=native#text/plain
src/mess/machine/d9060hd.h svneol=native#text/plain
src/mess/machine/dai.c svneol=native#text/plain
src/mess/machine/dccons.c svneol=native#text/plain
src/mess/machine/dec_lk201.c svneol=native#text/plain
@ -7556,8 +7564,6 @@ src/mess/machine/gba_rom.h svneol=native#text/plain
src/mess/machine/gba_slot.c svneol=native#text/plain
src/mess/machine/gba_slot.h svneol=native#text/plain
src/mess/machine/genpc.c svneol=native#text/plain
src/mess/machine/hardbox.c svneol=native#text/plain
src/mess/machine/hardbox.h svneol=native#text/plain
src/mess/machine/hd63450.c svneol=native#text/plain
src/mess/machine/hd63450.h svneol=native#text/plain
src/mess/machine/hd64610.c svneol=native#text/plain
@ -7573,8 +7579,6 @@ src/mess/machine/i82439tx.c svneol=native#text/plain
src/mess/machine/i82439tx.h svneol=native#text/plain
src/mess/machine/i8271.c svneol=native#text/plain
src/mess/machine/i8271.h svneol=native#text/plain
src/mess/machine/ieee488.c svneol=native#text/plain
src/mess/machine/ieee488.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
@ -7984,8 +7988,6 @@ 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/shark.c svneol=native#text/plain
src/mess/machine/shark.h svneol=native#text/plain
src/mess/machine/smartmed.c svneol=native#text/plain
src/mess/machine/smartmed.h svneol=native#text/plain
src/mess/machine/smc92x4.c svneol=native#text/plain
@ -8033,8 +8035,6 @@ src/mess/machine/sns_sufami.c svneol=native#text/plain
src/mess/machine/sns_sufami.h svneol=native#text/plain
src/mess/machine/sns_upd.c svneol=native#text/plain
src/mess/machine/sns_upd.h svneol=native#text/plain
src/mess/machine/softbox.c svneol=native#text/plain
src/mess/machine/softbox.h svneol=native#text/plain
src/mess/machine/sonydriv.c svneol=native#text/plain
src/mess/machine/sonydriv.h svneol=native#text/plain
src/mess/machine/sorcerer.c svneol=native#text/plain

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

@ -16,7 +16,25 @@ BUSOBJ = $(EMUOBJ)/bus
#-------------------------------------------------
#
#@src/emu/bus/isbx.h,BUSES += ISBX
#@src/emu/bus/ieee488/ieee488.h,BUSES += IEEE488
#-------------------------------------------------
ifneq ($(filter IEEE488,$(BUSES)),)
BUSOBJS += $(BUSOBJ)/ieee488/ieee488.o
BUSOBJS += $(BUSOBJ)/ieee488/c2031.o
BUSOBJS += $(BUSOBJ)/ieee488/c2040.o
BUSOBJS += $(BUSOBJ)/ieee488/c8280.o
BUSOBJS += $(BUSOBJ)/ieee488/d9060.o
BUSOBJS += $(BUSOBJ)/ieee488/d9060hd.o
BUSOBJS += $(BUSOBJ)/ieee488/softbox.o
BUSOBJS += $(BUSOBJ)/ieee488/hardbox.o
BUSOBJS += $(BUSOBJ)/ieee488/shark.o
endif
#-------------------------------------------------
#
#@src/emu/bus/isbx/isbx.h,BUSES += ISBX
#-------------------------------------------------
ifneq ($(filter ISBX,$(BUSES)),)
@ -27,7 +45,7 @@ endif
#-------------------------------------------------
#
#@src/emu/bus/isbx.h,BUSES += S100
#@src/emu/bus/s100/s100.h,BUSES += S100
#-------------------------------------------------
ifneq ($(filter S100,$(BUSES)),)

0
src/mess/machine/c2031.c → src/emu/bus/ieee488/c2031.c
View File

2
src/mess/machine/c2031.h → src/emu/bus/ieee488/c2031.h
View File

@ -15,12 +15,12 @@
#define __C2031__
#include "emu.h"
#include "ieee488.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/flopdrv.h"
#include "machine/64h156.h"
#include "machine/6522via.h"
#include "machine/c1541.h"
#include "machine/ieee488.h"

0
src/mess/machine/c2040.c → src/emu/bus/ieee488/c2040.c
View File

2
src/mess/machine/c2040.h → src/emu/bus/ieee488/c2040.h
View File

@ -15,6 +15,7 @@
#define __C2040__
#include "emu.h"
#include "ieee488.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m6504.h"
#include "imagedev/flopdrv.h"
@ -22,7 +23,6 @@
#include "formats/g64_dsk.h"
#include "machine/6522via.h"
#include "machine/6532riot.h"
#include "machine/ieee488.h"
#include "machine/mos6530.h"

0
src/mess/machine/c8280.c → src/emu/bus/ieee488/c8280.c
View File

2
src/mess/machine/c8280.h → src/emu/bus/ieee488/c8280.h
View File

@ -16,9 +16,9 @@
#include "emu.h"
#include "ieee488.h"
#include "cpu/m6502/m6502.h"
#include "machine/6532riot.h"
#include "machine/ieee488.h"
#include "machine/wd_fdc.h"

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

@ -10,9 +10,9 @@
**********************************************************************/
#include "d9060.h"
#include "d9060hd.h"
#include "machine/scsibus.h"
#include "machine/scsicb.h"
#include "machine/d9060hd.h"

3
src/mess/machine/d9060.h → src/emu/bus/ieee488/d9060.h
View File

@ -25,12 +25,11 @@
#ifndef __D9060__
#define __D9060__
#include "emu.h"
#include "ieee488.h"
#include "cpu/m6502/m6502.h"
#include "machine/6522via.h"
#include "machine/6532riot.h"
#include "machine/ieee488.h"
#include "machine/scsicb.h"

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

@ -4,7 +4,7 @@
*/
#include "emu.h"
#include "machine/d9060hd.h"
#include "d9060hd.h"
// device type definition
const device_type D9060HD = &device_creator<d9060hd_device>;

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

0
src/mess/machine/hardbox.c → src/emu/bus/ieee488/hardbox.c
View File

2
src/mess/machine/hardbox.h → src/emu/bus/ieee488/hardbox.h
View File

@ -15,11 +15,11 @@
#define __PET_HARDBOX__
#include "emu.h"
#include "ieee488.h"
#include "cpu/z80/z80.h"
#include "imagedev/harddriv.h"
#include "includes/corvushd.h"
#include "machine/i8255.h"
#include "machine/ieee488.h"
#include "machine/serial.h"

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

14
src/mess/machine/ieee488.h → src/emu/bus/ieee488/ieee488.h
View File

@ -250,13 +250,13 @@ extern const device_type IEEE488_SLOT;
// slot devices
#include "machine/c2031.h"
#include "machine/c2040.h"
#include "machine/c8280.h"
#include "machine/d9060.h"
#include "machine/hardbox.h"
#include "machine/shark.h"
#include "machine/softbox.h"
#include "c2031.h"
#include "c2040.h"
#include "c8280.h"
#include "d9060.h"
#include "hardbox.h"
#include "shark.h"
#include "softbox.h"
SLOT_INTERFACE_EXTERN( cbm_ieee488_devices );

0
src/mess/machine/shark.c → src/emu/bus/ieee488/shark.c
View File

2
src/mess/machine/shark.h → src/emu/bus/ieee488/shark.h
View File

@ -17,9 +17,9 @@
#define __SHARK__
#include "emu.h"
#include "ieee488.h"
#include "cpu/i8085/i8085.h"
#include "imagedev/harddriv.h"
#include "machine/ieee488.h"
#include "machine/serial.h"

0
src/mess/machine/softbox.c → src/emu/bus/ieee488/softbox.c
View File

2
src/mess/machine/softbox.h → src/emu/bus/ieee488/softbox.h
View File

@ -15,13 +15,13 @@
#define __PET_SOFTBOX__
#include "emu.h"
#include "ieee488.h"
#include "cpu/z80/z80.h"
#include "imagedev/harddriv.h"
#include "includes/corvushd.h"
#include "machine/com8116.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/ieee488.h"
#include "machine/serial.h"

1
src/emu/emu.mak
View File

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

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

@ -6,6 +6,7 @@
#define __P500__
#include "emu.h"
#include "bus/ieee488/ieee488.h"
#include "cpu/m6502/m6509.h"
#include "cpu/i86/i86.h"
#include "machine/cbm_snqk.h"
@ -14,7 +15,6 @@
#include "machine/cbm2user.h"
#include "machine/ds75160a.h"
#include "machine/ds75161a.h"
#include "machine/ieee488.h"
#include "machine/mos6526.h"
#include "machine/mos6551.h"
#include "machine/petcass.h"

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

@ -13,7 +13,7 @@
#include "sound/beep.h"
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "machine/ieee488.h"
#include "bus/ieee488/ieee488.h"
#include "machine/ram.h"
#include "machine/wd17xx.h"
#include "imagedev/flopdrv.h"

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

@ -6,12 +6,12 @@
#define __PET__
#include "emu.h"
#include "bus/ieee488/ieee488.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/cartslot.h"
#include "machine/6522via.h"
#include "machine/6821pia.h"
#include "machine/cbm_snqk.h"
#include "machine/ieee488.h"
#include "machine/petcass.h"
#include "machine/petexp.h"
#include "machine/petuser.h"

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

@ -6,7 +6,7 @@
#include "machine/ctronics.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/ieee488.h"
#include "bus/ieee488/ieee488.h"
#include "machine/pit8253.h"
#include "machine/pic8259.h"
#include "machine/ram.h"

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

@ -12,7 +12,7 @@
#include "machine/com8116.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/ieee488.h"
#include "bus/ieee488/ieee488.h"
#include "machine/imi5000h.h"
#include "machine/serial.h"

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

@ -11,7 +11,7 @@
#include "machine/ram.h"
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "machine/ieee488.h"
#include "bus/ieee488/ieee488.h"
#include "machine/ram.h"
#include "sound/speaker.h"
#include "video/vector.h"

1
src/mess/includes/vic20.h
View File

@ -12,7 +12,6 @@
#include "imagedev/cartslot.h"
#include "machine/6522via.h"
#include "machine/cbmiec.h"
#include "machine/ieee488.h"
#include "machine/petcass.h"
#include "machine/ram.h"
#include "machine/vcsctrl.h"

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

@ -21,7 +21,7 @@
#include "machine/ram.h"
#include "machine/ctronics.h"
#include "machine/6522via.h"
#include "machine/ieee488.h"
#include "bus/ieee488/ieee488.h"
#include "machine/mc6852.h"
#include "machine/pit8253.h"
#include "machine/pic8259.h"

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

@ -7,7 +7,7 @@
#include "cpu/z80/z80.h"
#include "machine/i8155.h"
#include "machine/i8251.h"
#include "machine/ieee488.h"
#include "bus/ieee488/ieee488.h"
#include "machine/ram.h"
#include "machine/serial.h"
#include "machine/wd_fdc.h"

4
src/mess/machine/c64/ieee488.h
View File

@ -14,12 +14,10 @@
#ifndef __C64_IEEE488__
#define __C64_IEEE488__
#include "emu.h"
#include "bus/ieee488/ieee488.h"
#include "machine/6525tpi.h"
#include "machine/c64/exp.h"
#include "machine/ieee488.h"
#include "video/mc6845.h"

2
src/mess/machine/interpod.h
View File

@ -15,12 +15,12 @@
#define __INTERPOD__
#include "emu.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"
#include "machine/ieee488.h"

3
src/mess/machine/vic1112.h
View File

@ -16,11 +16,10 @@
#ifndef __VIC1112__
#define __VIC1112__
#include "emu.h"
#include "bus/ieee488/ieee488.h"
#include "cpu/m6502/m6502.h"
#include "machine/6522via.h"
#include "machine/ieee488.h"
#include "machine/vic20exp.h"

10
src/mess/mess.mak
View File

@ -476,6 +476,7 @@ MACHINES += PCCARD
# specify available bus cores
#-------------------------------------------------
BUSES += IEEE488
BUSES += ISBX
BUSES += S100
@ -753,15 +754,6 @@ $(MESSOBJ)/shared.a: \
$(MESS_MACHINE)/dp8390.o \
$(MESS_MACHINE)/hd63450.o \
$(MESS_MACHINE)/i8271.o \
$(MESS_MACHINE)/ieee488.o \
$(MESS_MACHINE)/c2031.o \
$(MESS_MACHINE)/c2040.o \
$(MESS_MACHINE)/c8280.o \
$(MESS_MACHINE)/d9060.o \
$(MESS_MACHINE)/d9060hd.o \
$(MESS_MACHINE)/softbox.o \
$(MESS_MACHINE)/hardbox.o \
$(MESS_MACHINE)/shark.o \
$(MESS_MACHINE)/imi5000h.o \
$(MESS_MACHINE)/kb3600.o \
$(MESS_MACHINE)/keyboard.o \