Mercurial > hg > Members > kono > nitros9-code

changeset 2801:9ffe2daeb011 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reworked libraries to adhere to lwlink's naming specifications
author Boisy Pitre <boisy.pitre@nuance.com>
date Fri, 01 Feb 2013 15:49:39 -0600
parents 439531b77983
children 58ca94b06908
files defs/drivewire.d level1/modules/dwio.asm level2/coco3/cmds/makefile lib/alib/makefile lib/drivewire.as lib/dw.as lib/makefile
diffstat 7 files changed, 40 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/defs/drivewire.d	Fri Feb 01 05:34:01 2013 -0600
+++ b/defs/drivewire.d	Fri Feb 01 15:49:39 2013 -0600
@@ -51,6 +51,9 @@
 OP_SERGETSTAT equ 'D
 OP_SERSETSTAT equ 'D+128
 
+SS.Timer      equ   $81
+SS.EE         equ   $82
+
 * for dw vfm
 OP_VFM equ 'V+128
 
--- a/level1/modules/dwio.asm	Fri Feb 01 05:34:01 2013 -0600
+++ b/level1/modules/dwio.asm	Fri Feb 01 15:49:39 2013 -0600
@@ -499,9 +499,14 @@
                bne       loop
 
                ldx       ,s
-			lda   	P$State,x		get state of recipient
-			ora   	#Condem			set condemn bit
-			sta   	P$State,x		and set it back
+
+               ldb       #S$HUP
+               stb       P$Signal,x
+               os9       F$AProc
+
+*			lda   	P$State,x		get state of recipient
+*			ora   	#Condem			set condemn bit
+*			sta   	P$State,x		and set it back
 
 out            puls      x
                ldx       P$Queue,x
--- a/level2/coco3/cmds/makefile	Fri Feb 01 05:34:01 2013 -0600
+++ b/level2/coco3/cmds/makefile	Fri Feb 01 15:49:39 2013 -0600
@@ -6,12 +6,13 @@
 
 DEPENDS		= ./makefile
 AFLAGS          += --includedir=$(NITROS9DIR)/3rdparty/packages/basic09
+LFLAGS		+= -L$(NITROS9DIR)/lib
 ifdef	H6309
-LFLAGS		+= $(NITROS9DIR)/lib/sys6309l2.a 
+LFLAGS		+= -l6309l2
 else
-LFLAGS		+= $(NITROS9DIR)/lib/sys6809l2.a
+LFLAGS		+= -l6809l2
 endif
-LFLAGS		+= $(NITROS9DIR)/lib/net.a $(NITROS9DIR)/lib/alib.a 
+LFLAGS		+= -lnet -lalib -ldw
 
 CMDS		= asm attr backup binex build cmp cobbler copy cputype \
 		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
@@ -24,7 +25,7 @@
 CMDS_D2         = basic09 runb gfx2 gfx inkey syscall copy del echo format \
                 merge os9gen prompt tmode
 
-CMDS_DW		= inetd dw telnet
+CMDS_DW		= inetd dw telnet eeread eewrite
 
 SHELLMODS	= shellplus date deiniz echo iniz link load save unlink
 UTILPAK1	= attr build copy del deldir dir display list makdir mdir \
--- a/lib/alib/makefile	Fri Feb 01 05:34:01 2013 -0600
+++ b/lib/alib/makefile	Fri Feb 01 15:49:39 2013 -0600
@@ -39,12 +39,12 @@
 	to_sp.o to_non_sp.o memset.o rnd.o
 
 
-all:	../alib.a
+all:	../libalib.a
 
-../alib.a: $(MODS)
+../libalib.a: $(MODS)
 	lwar -c $@ $?
 
 dskclean: clean
 
 clean:
-	$(RM) *.o ../alib.a
+	$(RM) *.o ../libalib.a
--- a/lib/drivewire.as	Fri Feb 01 05:34:01 2013 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-               section   _constant
-               RMB       $81
-SS.Timer:      RMB       1                   Timer service
-SS.EE:         RMB       1                   EEPROM service
-               endsect
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/dw.as	Fri Feb 01 15:49:39 2013 -0600
@@ -0,0 +1,7 @@
+               section   _constant
+               RMB       $81
+SS.Timer:      RMB       1                   Timer service
+SS.EE:         RMB       1                   EEPROM service
+               endsect
+
+
--- a/lib/makefile	Fri Feb 01 05:34:01 2013 -0600
+++ b/lib/makefile	Fri Feb 01 15:49:39 2013 -0600
@@ -1,22 +1,23 @@
 include $(NITROS9DIR)/rules.mak
 
-SRC = os9s.as scfs.as rbfs.as pipes.as systype.as net.as drivewire.as
-
-all: sys6809l1.a sys6809l2.a sys6309l2.a net.a alib.a drivewire.a
+all: lib6809l1.a lib6809l2.a lib6309l2.a libnet.a libalib.a libdw.a
 
-sys6809l1.a: sys6809l1.o
-sys6809l2.a: sys6809l2.o
-sys6309l2.a: sys6309l2.o
-net.a: net.o
+lib6809l1.a: sys6809l1.o
+	lwar -c $@ $?
+
+lib6809l2.a: sys6809l2.o
+	lwar -c $@ $?
 
-sys6809l1.o: sys6809l1.as
-sys6809l2.o: sys6809l2.as
-sys6309l2.o: sys6309l2.as
-net.o: net.as
+lib6309l2.a: sys6309l2.o
+	lwar -c $@ $?
 
-drivewire.a: drivewire.o
+libnet.a: net.o
+	lwar -c $@ $?
 
-alib.a:
+libdw.a: dw.o
+	lwar -c $@ $?
+
+libalib.a:
 	cd alib; make
 
 clean: