From 4cad97e92500e90a459f510dec66ca6eae450c12 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Fri, 13 Feb 2015 22:46:43 +0000
Subject: [PATCH] msx2: bring in line with discard changes

---
 Kernel/platform-msx2/Makefile  | 28 ++++++++++++++++++------
 Kernel/platform-msx2/devices.c | 40 ----------------------------------
 Kernel/platform-msx2/fuzix.lnk |  2 ++
 Kernel/platform-msx2/main.c    |  5 -----
 4 files changed, 23 insertions(+), 52 deletions(-)

diff --git a/Kernel/platform-msx2/Makefile b/Kernel/platform-msx2/Makefile
index 3859f955..e60e9592 100644
--- a/Kernel/platform-msx2/Makefile
+++ b/Kernel/platform-msx2/Makefile
@@ -1,7 +1,10 @@
 
-CSRCS = ../dev/devsd.c ../dev/mbr.c ../dev/blkdev.c devfd.c devhd.c devlpr.c
+DSRCS = ../dev/devsd.c ../dev/mbr.c ../dev/blkdev.c 
+CSRCS = devfd.c devhd.c devlpr.c
 CSRCS += devices.c main.c devtty.c ../dev/rp5c01.c devrtc.c
-DSRCS = devmegasd.c
+COMMON_CSRCS = devmegasd.c
+DISCARD_CSRCS = discard.c
+DISCARD_DSRCS = ../dev/devsd_discard.c
 ASRCS = msx2.s crt0.s vdp.s
 ASRCS += tricks.s commonmem.s bootrom.s
 
@@ -10,21 +13,32 @@ CROSS_CCOPTS += -I../dev/
 COBJS = $(CSRCS:.c=.rel)
 AOBJS = $(ASRCS:.s=.rel)
 DOBJS = $(DSRCS:.c=.rel)
-OBJS  = $(COBJS) $(AOBJS) $(DOBJS)
+COMMON_COBJS = $(COMMON_CSRCS:.c=.rel)
+DISCARD_COBJS = $(DISCARD_CSRCS:.c=.rel)
+DISCARD_DOBJS = $(patsubst ../dev/%.c,%.rel, $(DISCARD_DSRCS))
+OBJS  = $(COBJS) $(AOBJS) $(DOBJS) $(DISCARD_COBJS) $(DISCARD_DOBJS) $(COMMON_COBJS)
 
 JUNK = $(CSRCS:.c=.lst) $(CSRCS:.c=.asm) $(CSRCS:.c=.sym) $(ASRCS:.s=.lst) $(ASRCS:.s=.sym) $(CSRCS:.c=.rst) $(ASRCS:.s=.rst)
 
 all:	$(OBJS)
 
-$(DOBJS): %.rel: %.c
-	$(CROSS_CC) $(CROSS_CCOPTS) --codeseg COMMONMEM -c $<
+$(AOBJS): %.rel: %.s
+	$(CROSS_AS) $(ASOPTS) $<
 
 $(COBJS): %.rel: %.c
 	$(CROSS_CC) $(CROSS_CCOPTS) --codeseg CODE2 -c $<
 
-$(AOBJS): %.rel: %.s
-	$(CROSS_AS) $(ASOPTS) $<
+$(COMMON_COBJS): %.rel: %.c
+	$(CROSS_CC) $(CROSS_CCOPTS) --codeseg COMMONMEM -c $<
+
+$(DOBJS): %.rel: ../dev/%.c
+	$(CROSS_CC) $(CROSS_CCOPTS) -c $<
+
+$(DISCARD_COBJS): %.rel: %.c
+	$(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEGDISC) -c $<
 
+$(DISCARD_DOBJS): %.rel: ../dev/%.c
+	$(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEGDISC) -c $<
 clean:
 	rm -f $(OBJS) $(JUNK)  core *~ 
 
diff --git a/Kernel/platform-msx2/devices.c b/Kernel/platform-msx2/devices.c
index 5ec5d79e..7a19fe62 100644
--- a/Kernel/platform-msx2/devices.c
+++ b/Kernel/platform-msx2/devices.c
@@ -13,8 +13,6 @@
 #include "msx2.h"
 #include <printf.h>
 
-extern int megasd_probe();
-
 struct devsw dev_tab[] =  /* The device driver switch table */
 {
   /* 0: /dev/fd		Floppy disc block devices */
@@ -40,41 +38,3 @@ bool validdev(uint16_t dev)
         return true;
 }
 
-DISCARDABLE
-
-void device_init(void)
-{
-#ifdef CONFIG_RTC
-    inittod();
-#endif
-
-    kprintf ("Running on a ");
-    if (machine_type == MACHINE_MSX1) {
-	kprintf("MSX1 not supported\n");
-	// hang!
-    } else if (machine_type == MACHINE_MSX2) {
-	kprintf("MSX2 ");
-    } else if (machine_type == MACHINE_MSX2P) {
-        kprintf("MSX2+ ");
-    } else if (machine_type == MACHINE_MSXTR) {
-	kprintf("MSX TurboR ");
-    }
-
-    if ((infobits & KBDTYPE_MASK) == KBDTYPE_JPN) {
-	kprintf("JP ");
-    } else {
-	kprintf("INT ");
-    }
-    if ((infobits & INTFREQ_MASK) == INTFREQ_60Hz) {
-	kprintf("60Hz\n");
-	ticks_per_dsecond = 6;
-    } else {
-	kprintf("50Hz\n");
-	ticks_per_dsecond = 5;
-    }
-
-    if (megasd_probe()) {
-        /* probe for megaflash rom sd */
-        devsd_init();
-    }
-}
diff --git a/Kernel/platform-msx2/fuzix.lnk b/Kernel/platform-msx2/fuzix.lnk
index d6a6bb4b..8abe5027 100644
--- a/Kernel/platform-msx2/fuzix.lnk
+++ b/Kernel/platform-msx2/fuzix.lnk
@@ -15,6 +15,7 @@ version.rel
 lowlevel-z80.rel
 platform-msx2/tricks.rel
 platform-msx2/main.rel
+platform-msx2/discard.rel
 timer.rel
 kdata.rel
 platform-msx2/devtty.rel
@@ -38,6 +39,7 @@ usermem.rel
 usermem_std-z80.rel
 platform-msx2/blkdev.rel
 platform-msx2/devsd.rel
+platform-msx2/devsd_discard.rel
 platform-msx2/devmegasd.rel
 platform-msx2/mbr.rel
 platform-msx2/devrtc.rel
diff --git a/Kernel/platform-msx2/main.c b/Kernel/platform-msx2/main.c
index c12826ab..99d0aacc 100644
--- a/Kernel/platform-msx2/main.c
+++ b/Kernel/platform-msx2/main.c
@@ -33,11 +33,6 @@ void pagemap_init(void)
     pagemap_add(4);
 }
 
-void map_init(void)
-{
-}
-
-
 void platform_interrupt(void)
 {
     kbd_interrupt();
-- 
2.34.1