From 0bf5adbcf2b4beb32fc6082c58e56faa8b3e6e2d Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 1 Jan 2015 14:03:46 +0000 Subject: [PATCH] Kernel: remove remaining uzi references In particular we don't want any escaped UZI defines floating around in case we try and create any shared tools/libs with UZI180 or similar. --- Kernel/Makefile | 20 +++++++++++-------- Kernel/platform-6502test/Makefile | 2 +- .../platform-micropack/{uzi.lnk => fuzix.lnk} | 2 +- Kernel/platform-msx1/{uzi.lnk => fuzix.lnk} | 2 +- Kernel/platform-msx2/{uzi.lnk => fuzix.lnk} | 2 +- Kernel/platform-mtx/{uzi.lnk => fuzix.lnk} | 2 +- .../{uzi.lnk => fuzix.lnk} | 2 +- Kernel/platform-nc100/{uzi.lnk => fuzix.lnk} | 2 +- Kernel/platform-p112/{uzi.lnk => fuzix.lnk} | 2 +- .../platform-pcw8256/{uzi.lnk => fuzix.lnk} | 2 +- .../platform-px4plus/{uzi.lnk => fuzix.lnk} | 2 +- Kernel/platform-socz80/{uzi.lnk => fuzix.lnk} | 2 +- Kernel/platform-trs80/{uzi.lnk => fuzix.lnk} | 2 +- Kernel/platform-ubee/{uzi.lnk => fuzix.lnk} | 2 +- .../{uzi.lnk => fuzix.lnk} | 2 +- .../platform-z80pack/{uzi.lnk => fuzix.lnk} | 2 +- .../platform-z80pack32/{uzi.lnk => fuzix.lnk} | 2 +- Kernel/platform-zx128/{uzi.lnk => fuzix.lnk} | 2 +- Kernel/process.c | 2 +- 19 files changed, 30 insertions(+), 26 deletions(-) rename Kernel/platform-micropack/{uzi.lnk => fuzix.lnk} (97%) rename Kernel/platform-msx1/{uzi.lnk => fuzix.lnk} (98%) rename Kernel/platform-msx2/{uzi.lnk => fuzix.lnk} (98%) rename Kernel/platform-mtx/{uzi.lnk => fuzix.lnk} (98%) rename Kernel/platform-n8vem-mark4/{uzi.lnk => fuzix.lnk} (98%) rename Kernel/platform-nc100/{uzi.lnk => fuzix.lnk} (97%) rename Kernel/platform-p112/{uzi.lnk => fuzix.lnk} (97%) rename Kernel/platform-pcw8256/{uzi.lnk => fuzix.lnk} (98%) rename Kernel/platform-px4plus/{uzi.lnk => fuzix.lnk} (98%) rename Kernel/platform-socz80/{uzi.lnk => fuzix.lnk} (98%) rename Kernel/platform-trs80/{uzi.lnk => fuzix.lnk} (97%) rename Kernel/platform-ubee/{uzi.lnk => fuzix.lnk} (97%) rename Kernel/platform-z80pack-lite/{uzi.lnk => fuzix.lnk} (98%) rename Kernel/platform-z80pack/{uzi.lnk => fuzix.lnk} (97%) rename Kernel/platform-z80pack32/{uzi.lnk => fuzix.lnk} (97%) rename Kernel/platform-zx128/{uzi.lnk => fuzix.lnk} (97%) diff --git a/Kernel/Makefile b/Kernel/Makefile index ce277ee3..a2a3430c 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -142,6 +142,10 @@ version.c: makeversion tools/analysemap: tools/analysemap.c +tools/bihx: tools/bihx.c + +tools/binmunge: tools/binmunge.c + tools/memhogs: tools/analysemap cp tools/analysemap tools/memhogs @@ -164,16 +168,16 @@ cpm-loader/cpmload.bin: cpm-loader/cpmload.s cpm-loader/makecpmloader.c tools/makejv3: tools/makejv3.c ifneq (,$(filter $(CPU),z80 z180)) # matches CPU = z80 or z180 -uzi.ihx: target $(OBJS) platform-$(TARGET)/uzi.lnk - $(CROSS_LD) -n -k $(LIBZ80) -f platform-$(TARGET)/uzi.lnk +fuzix.ihx: target $(OBJS) platform-$(TARGET)/fuzix.lnk + $(CROSS_LD) -n -k $(LIBZ80) -f platform-$(TARGET)/fuzix.lnk -fuzix.bin: uzi.ihx tools/analysemap tools/memhogs tools/binman tools/bintomdv cpm-loader/cpmload.bin - tools/analysemap hogs.txt + tools/memhogs hogs.txt head -5 hogs.txt - makebin -s 65536 -p uzi.ihx >uzi.tmp - tools/binman uzi.tmp uzi.map fuzix.bin + makebin -s 65536 -p fuzix.ihx >fuzix.tmp + tools/binman fuzix.tmp fuzix.map fuzix.bin +make -C platform-$(TARGET) image else fuzix.bin: target $(OBJS) tools/decbdragon @@ -181,7 +185,7 @@ fuzix.bin: target $(OBJS) tools/decbdragon endif clean: - rm -f $(OBJS) $(JUNK) uzi.cdb uzi.com uzi.tmp platform fuzix.bin uzi.map uzi.noi uzi.ihx core *~ include/*~ version.c tools/make4x6 tools/analysemap tools/memhogs tools/binman hogs.txt hogs.txt.old tools/*~ + rm -f $(OBJS) $(JUNK) fuzix.cdb fuzix.com fuzix.tmp platform fuzix.bin fuzix.map fuzix.noi fuzix.ihx core *~ include/*~ version.c tools/make4x6 tools/analysemap tools/memhogs tools/binman hogs.txt hogs.txt.old tools/*~ +make -C platform-$(TARGET) clean +make -C cpm-loader clean diff --git a/Kernel/platform-6502test/Makefile b/Kernel/platform-6502test/Makefile index 4996fbca..818cf0eb 100644 --- a/Kernel/platform-6502test/Makefile +++ b/Kernel/platform-6502test/Makefile @@ -23,7 +23,7 @@ clean: rm -f $(OBJS) $(JUNK) core *~ image: - $(CROSS_LD) -o ../fuzix.bin --mapfile ../uzi.map -C ld65.cfg crt0.o commonmem.o \ + $(CROSS_LD) -o ../fuzix.bin --mapfile ../fuzix.map -C ld65.cfg crt0.o commonmem.o \ p6502.o ../start.o ../version.o ../lowlevel-6502.o \ tricks.o main.o ../timer.o ../kdata.o devrd.o devices.o \ ../devio.o ../filesys.o ../process.o ../inode.o ../syscall_fs.o \ diff --git a/Kernel/platform-micropack/uzi.lnk b/Kernel/platform-micropack/fuzix.lnk similarity index 97% rename from Kernel/platform-micropack/uzi.lnk rename to Kernel/platform-micropack/fuzix.lnk index 5388962f..58c63de6 100644 --- a/Kernel/platform-micropack/uzi.lnk +++ b/Kernel/platform-micropack/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _DISCARD=0x5000 -b _UDATA=0x5D00 -b _CODE=0x6000 diff --git a/Kernel/platform-msx1/uzi.lnk b/Kernel/platform-msx1/fuzix.lnk similarity index 98% rename from Kernel/platform-msx1/uzi.lnk rename to Kernel/platform-msx1/fuzix.lnk index 5fbc00bb..2310dae8 100644 --- a/Kernel/platform-msx1/uzi.lnk +++ b/Kernel/platform-msx1/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0000 -b _COMMONMEM=0xF000 -b _DISCARD=0xE000 diff --git a/Kernel/platform-msx2/uzi.lnk b/Kernel/platform-msx2/fuzix.lnk similarity index 98% rename from Kernel/platform-msx2/uzi.lnk rename to Kernel/platform-msx2/fuzix.lnk index b4ad701c..bfb5a283 100644 --- a/Kernel/platform-msx2/uzi.lnk +++ b/Kernel/platform-msx2/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0000 -b _BOOT=0x4000 -b _COMMONMEM=0xF000 diff --git a/Kernel/platform-mtx/uzi.lnk b/Kernel/platform-mtx/fuzix.lnk similarity index 98% rename from Kernel/platform-mtx/uzi.lnk rename to Kernel/platform-mtx/fuzix.lnk index 2310247f..fe78f67e 100644 --- a/Kernel/platform-mtx/uzi.lnk +++ b/Kernel/platform-mtx/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0100 -b _COMMONMEM=0xF000 -b _DISCARD=0xD800 diff --git a/Kernel/platform-n8vem-mark4/uzi.lnk b/Kernel/platform-n8vem-mark4/fuzix.lnk similarity index 98% rename from Kernel/platform-n8vem-mark4/uzi.lnk rename to Kernel/platform-n8vem-mark4/fuzix.lnk index 31c4371b..81b5c5e4 100644 --- a/Kernel/platform-n8vem-mark4/uzi.lnk +++ b/Kernel/platform-n8vem-mark4/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0088 -b _COMMONMEM=0xF000 -b _DISCARD=0xE000 diff --git a/Kernel/platform-nc100/uzi.lnk b/Kernel/platform-nc100/fuzix.lnk similarity index 97% rename from Kernel/platform-nc100/uzi.lnk rename to Kernel/platform-nc100/fuzix.lnk index 064f004d..4fbccf03 100644 --- a/Kernel/platform-nc100/uzi.lnk +++ b/Kernel/platform-nc100/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0 -b _COMMONMEM=0xF000 -b _DISCARD=0xE000 diff --git a/Kernel/platform-p112/uzi.lnk b/Kernel/platform-p112/fuzix.lnk similarity index 97% rename from Kernel/platform-p112/uzi.lnk rename to Kernel/platform-p112/fuzix.lnk index 73e89287..10794c78 100644 --- a/Kernel/platform-p112/uzi.lnk +++ b/Kernel/platform-p112/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0088 -b _COMMONMEM=0xF000 -b _DISCARD=0xE000 diff --git a/Kernel/platform-pcw8256/uzi.lnk b/Kernel/platform-pcw8256/fuzix.lnk similarity index 98% rename from Kernel/platform-pcw8256/uzi.lnk rename to Kernel/platform-pcw8256/fuzix.lnk index 3b60596c..cc5e6d0a 100644 --- a/Kernel/platform-pcw8256/uzi.lnk +++ b/Kernel/platform-pcw8256/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0000 -b _COMMONMEM=0xF000 -b _DISCARD=0xE000 diff --git a/Kernel/platform-px4plus/uzi.lnk b/Kernel/platform-px4plus/fuzix.lnk similarity index 98% rename from Kernel/platform-px4plus/uzi.lnk rename to Kernel/platform-px4plus/fuzix.lnk index 3d084584..f3763ef9 100644 --- a/Kernel/platform-px4plus/uzi.lnk +++ b/Kernel/platform-px4plus/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _DISCARD=0x4000 -b _UDATA=0xFD00 -b _CODE=0x6000 diff --git a/Kernel/platform-socz80/uzi.lnk b/Kernel/platform-socz80/fuzix.lnk similarity index 98% rename from Kernel/platform-socz80/uzi.lnk rename to Kernel/platform-socz80/fuzix.lnk index 3bb37ca0..550628fd 100644 --- a/Kernel/platform-socz80/uzi.lnk +++ b/Kernel/platform-socz80/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0088 -b _COMMONMEM=0xF000 -b _DISCARD=0xE000 diff --git a/Kernel/platform-trs80/uzi.lnk b/Kernel/platform-trs80/fuzix.lnk similarity index 97% rename from Kernel/platform-trs80/uzi.lnk rename to Kernel/platform-trs80/fuzix.lnk index 33854f5c..fb6e78d2 100644 --- a/Kernel/platform-trs80/uzi.lnk +++ b/Kernel/platform-trs80/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0100 -b _DISCARD=0xD000 -b _COMMONMEM=0xE800 diff --git a/Kernel/platform-ubee/uzi.lnk b/Kernel/platform-ubee/fuzix.lnk similarity index 97% rename from Kernel/platform-ubee/uzi.lnk rename to Kernel/platform-ubee/fuzix.lnk index b678a97e..b7a0f5d8 100644 --- a/Kernel/platform-ubee/uzi.lnk +++ b/Kernel/platform-ubee/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0100 -b _DISCARD=0xD000 -b _COMMONMEM=0xE800 diff --git a/Kernel/platform-z80pack-lite/uzi.lnk b/Kernel/platform-z80pack-lite/fuzix.lnk similarity index 98% rename from Kernel/platform-z80pack-lite/uzi.lnk rename to Kernel/platform-z80pack-lite/fuzix.lnk index 0d41e0d1..e2e25957 100644 --- a/Kernel/platform-z80pack-lite/uzi.lnk +++ b/Kernel/platform-z80pack-lite/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0088 -b _COMMONMEM=0xF000 -b _DISCARD=0xE000 diff --git a/Kernel/platform-z80pack/uzi.lnk b/Kernel/platform-z80pack/fuzix.lnk similarity index 97% rename from Kernel/platform-z80pack/uzi.lnk rename to Kernel/platform-z80pack/fuzix.lnk index 672ff64c..bad85c7a 100644 --- a/Kernel/platform-z80pack/uzi.lnk +++ b/Kernel/platform-z80pack/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0088 -b _COMMONMEM=0xF000 -b _DISCARD=0xE000 diff --git a/Kernel/platform-z80pack32/uzi.lnk b/Kernel/platform-z80pack32/fuzix.lnk similarity index 97% rename from Kernel/platform-z80pack32/uzi.lnk rename to Kernel/platform-z80pack32/fuzix.lnk index 9f6e9968..5b699d34 100644 --- a/Kernel/platform-z80pack32/uzi.lnk +++ b/Kernel/platform-z80pack32/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0088 -b _CODE3=0xC000 -b _COMMONMEM=0xF000 diff --git a/Kernel/platform-zx128/uzi.lnk b/Kernel/platform-zx128/fuzix.lnk similarity index 97% rename from Kernel/platform-zx128/uzi.lnk rename to Kernel/platform-zx128/fuzix.lnk index a0c6d6b2..2fcc88b0 100644 --- a/Kernel/platform-zx128/uzi.lnk +++ b/Kernel/platform-zx128/fuzix.lnk @@ -1,5 +1,5 @@ -mwxuy --i uzi.ihx +-i fuzix.ihx -b _CODE=0x0000 -b _COMMONMEM=0x5B00 -b _CODE2=0xC000 diff --git a/Kernel/process.c b/Kernel/process.c index 0b876698..7ced59cb 100644 --- a/Kernel/process.c +++ b/Kernel/process.c @@ -387,7 +387,7 @@ void unix_syscall(void) /* Fuzix saves the Stack Pointer and arguments in the * Assembly Language Function handler in lowlevel.s */ - if (udata.u_callno >= UZI_SYSCALL_COUNT) { + if (udata.u_callno >= FUZIX_SYSCALL_COUNT) { udata.u_error = EINVAL; } else { #ifdef DEBUG -- 2.34.1