From a40a0ba3adb448dc66a90ce380335eb6b4bc0a30 Mon Sep 17 00:00:00 2001 From: dschmenk Date: Mon, 15 Aug 2016 22:13:37 -0700 Subject: [PATCH] Oops on the prodos library name --- src/inc/{prodos.plh => fileio.plh} | 2 +- src/libsrc/args.pla | 1 + src/libsrc/{prodos.pla => fileio.pla} | 2 ++ src/libsrc/sdfat.pla | 4 ++++ src/libsrc/spiport.pla | 2 +- src/makefile | 10 +++++----- src/samplesrc/fatget.pla | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) rename src/inc/{prodos.plh => fileio.plh} (89%) rename src/libsrc/{prodos.pla => fileio.pla} (99%) diff --git a/src/inc/prodos.plh b/src/inc/fileio.plh similarity index 89% rename from src/inc/prodos.plh rename to src/inc/fileio.plh index c632c8a..c545d41 100644 --- a/src/inc/prodos.plh +++ b/src/inc/fileio.plh @@ -1,4 +1,4 @@ -import prodos +import fileio const sysbuf = $0800 predef getpfx, setpfx, open, close, read, write, create, destroy, newline byte perr diff --git a/src/libsrc/args.pla b/src/libsrc/args.pla index 7c96ea7..f0a8e00 100644 --- a/src/libsrc/args.pla +++ b/src/libsrc/args.pla @@ -31,3 +31,4 @@ export def argFirst return argDelim(cmdline) end +done \ No newline at end of file diff --git a/src/libsrc/prodos.pla b/src/libsrc/fileio.pla similarity index 99% rename from src/libsrc/prodos.pla rename to src/libsrc/fileio.pla index 67097dc..633e404 100644 --- a/src/libsrc/prodos.pla +++ b/src/libsrc/fileio.pla @@ -95,3 +95,5 @@ export def newline(refnum, emask, nlchar) perr = syscall($C9, @params) return perr end + +done diff --git a/src/libsrc/sdfat.pla b/src/libsrc/sdfat.pla index c1d07ed..e365524 100644 --- a/src/libsrc/sdfat.pla +++ b/src/libsrc/sdfat.pla @@ -1,4 +1,8 @@ include "inc/spiport.plh" +import cmdsys + predef call, putc, puts, putln +end + // // FAT I/O object // diff --git a/src/libsrc/spiport.pla b/src/libsrc/spiport.pla index 2ac3f00..9d69106 100644 --- a/src/libsrc/spiport.pla +++ b/src/libsrc/spiport.pla @@ -1,5 +1,5 @@ import cmdsys - predef call, putc + predef call, putc, puts, putln end // // Bit banged spi over gameport diff --git a/src/makefile b/src/makefile index 7c1e36a..cc5cdf7 100644 --- a/src/makefile +++ b/src/makefile @@ -14,7 +14,7 @@ SPIPORT = SPIPORT\#FE1000 SDFAT = SDFAT\#FE1000 FATCAT = FATCAT\#FE1000 FATGET = FATGET\#FE1000 -PRODOS = PRODOS\#FE1000 +FILEIO = FILEIO\#FE1000 WIZNET = WIZNET\#FE1000 UTHERNET2= UTHERNET2\#FE1000 UTHERNET= UTHERNET\#FE1000 @@ -59,7 +59,7 @@ TXTTYPE = .TXT #SYSTYPE = \#FF2000 #TXTTYPE = \#040000 -all: $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVM03) $(CMD) $(ARGS) $(MEMMGR) $(MEMTEST) $(FIBER) $(SB) $(MON) $(ROD) $(SIEVE) $(UTHERNET2) $(UTHERNET) $(ETHERIP) $(INET) $(DHCP) $(HTTPD) $(ROGUE) $(ROGUEMAP) $(ROGUECOMBAT) $(ROGUEIO) $(HGR1) $(TONE) $(DGR) $(DGRTEST) $(PRODOS) $(PORTIO) $(SPIPORT) $(SDFAT) $(FATCAT) $(FATGET) +all: $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVM03) $(CMD) $(ARGS) $(MEMMGR) $(MEMTEST) $(FIBER) $(SB) $(MON) $(ROD) $(SIEVE) $(UTHERNET2) $(UTHERNET) $(ETHERIP) $(INET) $(DHCP) $(HTTPD) $(ROGUE) $(ROGUEMAP) $(ROGUECOMBAT) $(ROGUEIO) $(HGR1) $(TONE) $(DGR) $(DGRTEST) $(FILEIO) $(PORTIO) $(SPIPORT) $(SDFAT) $(FATCAT) $(FATGET) clean: -rm *FE1000 *FF2000 $(PLASM) $(PLVM) $(PLVM01) $(PLVM02) $(PLVM03) @@ -168,9 +168,9 @@ $(HTTPD): samplesrc/httpd.pla $(PLVM02) $(PLASM) ./$(PLASM) -AM < samplesrc/httpd.pla > samplesrc/httpd.a acme --setpc 4094 -o $(HTTPD) samplesrc/httpd.a -$(PRODOS): libsrc/prodos.pla $(PLVM02) $(PLASM) - ./$(PLASM) -AM < libsrc/prodos.pla > libsrc/prodos.a - acme --setpc 4094 -o $(PRODOS) libsrc/prodos.a +$(FILEIO): libsrc/fileio.pla $(PLVM02) $(PLASM) + ./$(PLASM) -AM < libsrc/fileio.pla > libsrc/fileio.a + acme --setpc 4094 -o $(FILEIO) libsrc/fileio.a $(TONE): libsrc/tone.pla $(PLVM02) $(PLASM) ./$(PLASM) -AM < libsrc/tone.pla > libsrc/tone.a diff --git a/src/samplesrc/fatget.pla b/src/samplesrc/fatget.pla index dc3e99a..2b3ea54 100644 --- a/src/samplesrc/fatget.pla +++ b/src/samplesrc/fatget.pla @@ -1,5 +1,5 @@ include "inc/cmdsys.plh" -include "inc/prodos.plh" +include "inc/fileio.plh" include "inc/args.plh" include "inc/sdfat.plh"