From: Alan Cox <alan@linux.intel.com>
Date: Mon, 26 Nov 2018 13:45:56 +0000 (+0000)
Subject: zxdiv: move devinput into dev/zx
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=546308a9a0adb7f9644dff070eb226c8a2964c18;p=FUZIX.git

zxdiv: move devinput into dev/zx

Again these devices are shared across the clones
---

diff --git a/Kernel/platform-zxdiv/devinput.c b/Kernel/dev/zx/devinput.c
similarity index 100%
rename from Kernel/platform-zxdiv/devinput.c
rename to Kernel/dev/zx/devinput.c
diff --git a/Kernel/platform-zxdiv/devinput.h b/Kernel/dev/zx/devinput.h
similarity index 100%
rename from Kernel/platform-zxdiv/devinput.h
rename to Kernel/dev/zx/devinput.h
diff --git a/Kernel/platform-zxdiv/Makefile b/Kernel/platform-zxdiv/Makefile
index 87289914..7120444b 100644
--- a/Kernel/platform-zxdiv/Makefile
+++ b/Kernel/platform-zxdiv/Makefile
@@ -1,8 +1,8 @@
-CSRCS = devtty.c devices.c main.c bank128.c devinput.c
+CSRCS = devtty.c devices.c main.c bank128.c
 CDSRCS = discard.c
 DSRCS = ../dev/devide.c ../dev/devsd.c ../dev/blkdev.c
 DDSRCS = ../dev/devide_discard.c ../dev/devsd_discard.c ../dev/mbr.c
-DZSRCS = ../dev/zx/divide.c ../dev/zx/divmmc.c ../dev/zx/zxkeyboard.c
+DZSRCS = ../dev/zx/divide.c ../dev/zx/divmmc.c ../dev/zx/zxkeyboard.c ../dev/zx/devinput.c
 DDZSRCS =
 ASRCS = crt0.s zx128.s zxvideo.s
 ASRCS += tricks.s commonmem.s loader-divide.s
@@ -16,7 +16,7 @@ DZOBJS = $(patsubst ../dev/zx/%.c,%.rel, $(DZSRCS))
 DDZOBJS = $(patsubst ../dev/zx/%.c,%.rel, $(DDZSRCS))
 OBJS  = $(COBJS) $(CDOBJS) $(AOBJS) $(DOBJS) $(DDOBJS) $(DZOBJS) $(DDZOBJS)
 
-CROSS_CCOPTS += -I../dev/
+CROSS_CCOPTS += -I../dev/ -I../dev/zx/
 
 CROSS_CC_SEG3 = --codeseg CODE3