From 0965c5e88ae1ad55a91bfd90df0a9827e452bf23 Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Tue, 1 Apr 2014 13:10:45 +0000 Subject: [PATCH] (MESS) Moved teleprinter back to mess/machine. (nw) --- .gitattributes | 4 ++-- src/emu/bus/bus.mak | 1 - src/{emu/bus/rs232 => mess/machine}/teleprinter.c | 0 src/{emu/bus/rs232 => mess/machine}/teleprinter.h | 0 src/mess/mess.mak | 1 + 5 files changed, 3 insertions(+), 3 deletions(-) rename src/{emu/bus/rs232 => mess/machine}/teleprinter.c (100%) rename src/{emu/bus/rs232 => mess/machine}/teleprinter.h (100%) diff --git a/.gitattributes b/.gitattributes index dae3c786fab..594bb1fc641 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1166,8 +1166,6 @@ src/emu/bus/rs232/rs232.c svneol=native#text/plain src/emu/bus/rs232/rs232.h svneol=native#text/plain src/emu/bus/rs232/ser_mouse.c svneol=native#text/plain src/emu/bus/rs232/ser_mouse.h svneol=native#text/plain -src/emu/bus/rs232/teleprinter.c svneol=native#text/plain -src/emu/bus/rs232/teleprinter.h svneol=native#text/plain src/emu/bus/rs232/terminal.c svneol=native#text/plain src/emu/bus/rs232/terminal.h svneol=native#text/plain src/emu/bus/s100/dj2db.c svneol=native#text/plain @@ -8615,6 +8613,8 @@ src/mess/machine/swim.h svneol=native#text/plain src/mess/machine/swtpc09.c svneol=native#text/plain src/mess/machine/tandy2kb.c svneol=native#text/plain src/mess/machine/tandy2kb.h svneol=native#text/plain +src/mess/machine/teleprinter.c svneol=native#text/plain +src/mess/machine/teleprinter.h svneol=native#text/plain src/mess/machine/thomflop.c svneol=native#text/plain src/mess/machine/thomflop.h svneol=native#text/plain src/mess/machine/thomson.c svneol=native#text/plain diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak index eae4cf3dd69..e95447ba6fc 100644 --- a/src/emu/bus/bus.mak +++ b/src/emu/bus/bus.mak @@ -706,7 +706,6 @@ BUSOBJS += $(BUSOBJ)/rs232/keyboard.o BUSOBJS += $(BUSOBJ)/rs232/null_modem.o BUSOBJS += $(BUSOBJ)/rs232/rs232.o BUSOBJS += $(BUSOBJ)/rs232/ser_mouse.o -BUSOBJS += $(BUSOBJ)/rs232/teleprinter.o BUSOBJS += $(BUSOBJ)/rs232/terminal.o endif diff --git a/src/emu/bus/rs232/teleprinter.c b/src/mess/machine/teleprinter.c similarity index 100% rename from src/emu/bus/rs232/teleprinter.c rename to src/mess/machine/teleprinter.c diff --git a/src/emu/bus/rs232/teleprinter.h b/src/mess/machine/teleprinter.h similarity index 100% rename from src/emu/bus/rs232/teleprinter.h rename to src/mess/machine/teleprinter.h diff --git a/src/mess/mess.mak b/src/mess/mess.mak index 37d3fcfa5e5..da5e9c918b0 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -850,6 +850,7 @@ $(MESSOBJ)/shared.a: \ $(MESS_MACHINE)/microdrv.o \ $(MESS_MACHINE)/smartmed.o \ $(MESS_MACHINE)/sonydriv.o \ + $(MESS_MACHINE)/teleprinter.o \ $(MESS_MACHINE)/z80bin.o \ #-------------------------------------------------