From 405a6b0e9ec2bb01c36226d8c81b3441de50641a Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@etchedpixels.co.uk>
Date: Sun, 23 Nov 2014 00:07:38 +0000
Subject: [PATCH] z80pack: Move devfd somewhere common

Begin folding all the common z80pack bits together
---
 Kernel/{platform-z80pack => dev/z80pack}/devfd.c | 2 ++
 Kernel/{platform-z80pack => dev/z80pack}/devfd.h | 0
 Kernel/platform-z80pack/Makefile                 | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)
 rename Kernel/{platform-z80pack => dev/z80pack}/devfd.c (99%)
 rename Kernel/{platform-z80pack => dev/z80pack}/devfd.h (100%)

diff --git a/Kernel/platform-z80pack/devfd.c b/Kernel/dev/z80pack/devfd.c
similarity index 99%
rename from Kernel/platform-z80pack/devfd.c
rename to Kernel/dev/z80pack/devfd.c
index 2399e55a..0a00f29b 100644
--- a/Kernel/platform-z80pack/devfd.c
+++ b/Kernel/dev/z80pack/devfd.c
@@ -82,6 +82,7 @@ static int fd_transfer(bool is_read, uint8_t minor, uint8_t rawflag)
         block = udata.u_offset >> BLKSHIFT;
         block_xfer = dlen >> 7;		/* We want this in 128 byte sectors */
         map = 1;
+#ifdef SWAPDEV
     } else if (rawflag == 2) {		/* Swap device special */
         dlen = swapcnt;
         dptr = (uint16_t)swapbase;
@@ -96,6 +97,7 @@ static int fd_transfer(bool is_read, uint8_t minor, uint8_t rawflag)
          *	must be prepared to switch common segment as well during
          *	a swap, or to perform mapping games using the banks
          */
+#endif
     } else { /* rawflag == 0 */
         dptr = (uint16_t)udata.u_buf->bf_data;
         block = udata.u_buf->bf_blk;
diff --git a/Kernel/platform-z80pack/devfd.h b/Kernel/dev/z80pack/devfd.h
similarity index 100%
rename from Kernel/platform-z80pack/devfd.h
rename to Kernel/dev/z80pack/devfd.h
diff --git a/Kernel/platform-z80pack/Makefile b/Kernel/platform-z80pack/Makefile
index 5ac3aff9..d18f5367 100644
--- a/Kernel/platform-z80pack/Makefile
+++ b/Kernel/platform-z80pack/Makefile
@@ -1,5 +1,5 @@
 
-CSRCS = devlpr.c devtty.c devfd.c
+CSRCS = devlpr.c devtty.c ../dev/z80pack/devfd.c
 CSRCS += devices.c main.c
 
 ASRCS = crt0.s z80pack.s
@@ -9,6 +9,8 @@ COBJS = $(CSRCS:.c=.rel)
 AOBJS = $(ASRCS:.s=.rel)
 OBJS  = $(COBJS) $(AOBJS)
 
+CROSS_CCOPTS += -I../dev/z80pack/
+
 JUNK = $(CSRCS:.c=.lst) $(CSRCS:.c=.asm) $(CSRCS:.c=.sym) $(ASRCS:.s=.lst) $(ASRCS:.s=.sym) $(CSRCS:.c=.rst) $(ASRCS:.s=.rst)
 
 all:	$(OBJS)
-- 
2.34.1