From 868aef14846ee82c2ea966ab6ce74c526c9cb106 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 12 Mar 2015 13:16:15 +0000 Subject: [PATCH] socz80: Add socz80 to the platforms --- Kernel/Makefile | 2 ++ Kernel/platform-socz80/Makefile | 2 +- Kernel/platform-socz80/devtty.c | 5 +++++ Kernel/platform-socz80/ethernet.c | 1 - Kernel/platform-socz80/fuzix.lnk | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Kernel/Makefile b/Kernel/Makefile index 2e951c9b..b560e17e 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -2,6 +2,7 @@ TARGET_LIST = platform-nc100 platform-micropack platform-pcw8256 platform-socz80 #export TARGET = 8086test #export TARGET = atarist +#export TARGET = bbcmicro #export TARGET = dragon #export TARGET = micropack #export TARGET = msx1 @@ -13,6 +14,7 @@ TARGET_LIST = platform-nc100 platform-micropack platform-pcw8256 platform-socz80 #export TARGET = pcw8256 #export TARGET = plus3 #export TARGET = px4plus +export TARGET = socz80 #export TARGET = tgl6502 #export TARGET = trs80 #export TARGET = ubee diff --git a/Kernel/platform-socz80/Makefile b/Kernel/platform-socz80/Makefile index fe786d97..c8d0ebcb 100644 --- a/Kernel/platform-socz80/Makefile +++ b/Kernel/platform-socz80/Makefile @@ -5,7 +5,7 @@ CSRCS += devices.c main.c ASRCS = crt0.s devrd_hw.s socz80.s ASRCS += tricks.s usermem.s commonmem.s -DSRCS = ../dev/devsd.c ../dev/mbr.c ../dev/blkdev.c +DSRCS = ../dev/devsd.c ../dev/mbr.c ../dev/blkdev.c ../dev/devsd_discard.c DOBJS = $(patsubst ../dev/%.c,%.rel, $(DSRCS)) COBJS = $(CSRCS:.c=.rel) diff --git a/Kernel/platform-socz80/devtty.c b/Kernel/platform-socz80/devtty.c index 791b8d33..6065ee2e 100644 --- a/Kernel/platform-socz80/devtty.c +++ b/Kernel/platform-socz80/devtty.c @@ -36,3 +36,8 @@ int tty_carrier(uint8_t minor) minor; return 1; } + +void tty_sleeping(uint8_t minor) +{ + minor; +} \ No newline at end of file diff --git a/Kernel/platform-socz80/ethernet.c b/Kernel/platform-socz80/ethernet.c index 23021ee7..48fe291a 100644 --- a/Kernel/platform-socz80/ethernet.c +++ b/Kernel/platform-socz80/ethernet.c @@ -358,7 +358,6 @@ int eth_ioctl(uint8_t minor, uarg_t arg, char *data) return -1; } -DISCARDABLE /* Initialize the Ethernet wing */ void deveth_init(void) { diff --git a/Kernel/platform-socz80/fuzix.lnk b/Kernel/platform-socz80/fuzix.lnk index bc7fb7fd..d9fcb3d1 100644 --- a/Kernel/platform-socz80/fuzix.lnk +++ b/Kernel/platform-socz80/fuzix.lnk @@ -35,6 +35,7 @@ devsys.rel platform-socz80/devlpr.rel platform-socz80/devtty.rel platform-socz80/devsd.rel +platform-socz80/devsd_discard.rel platform-socz80/blkdev.rel platform-socz80/mbr.rel platform-socz80/devsdspi.rel -- 2.34.1