Kernel 0.94

INC/IO.D2.I.txt

@@ -2,7 +2,7 @@ NEW
   AUTO 3,1
 				.LIST OFF
 *--------------------------------------
-IO.D2.SeekTime	.EQ 110
+IO.D2.SeekTime	.EQ 200
 *--------------------------------------
 IO.D2.Ph0Off	.EQ $C080
 IO.D2.Ph0On		.EQ $C081

INC/LIBTCPIP.I.txt

@@ -1,7 +1,6 @@
 NEW
   AUTO 3,1
 				.LIST OFF	
-				.OP	65C02
 *--------------------------------------
 K.ARPCACHE.SIZE .EQ 8
 K.DNSCACHE.SIZE .EQ 8

LIB/LIBBLKDEV.S.BB.txt

@@ -306,30 +306,11 @@ BB.Seek			lda BB.HdrTrk			get track we're on
 				sta BB.TargetQTrack
 
 .1				lda BB.CurrentQTrack
-				pha
-				
-				and #6
-				ora BB.Slotn0
-				tax
-
-				pla
-				pha
-				
-				inc
-				and #6
-				ora BB.Slotn0
-				tay
-				
-				lda IO.D2.Ph0On,x
-				lda IO.D2.Ph0On,y
-				
-				jsr BB.WaitSeekTime
-				
-				pla
-				
 				cmp	BB.TargetQTrack
 				beq .8
 
+				jsr BB.AllPhasesOff
+				
 				bcs .2
 
 * Current < Target, must move in
@@ -344,8 +325,34 @@ BB.Seek			lda BB.HdrTrk			get track we're on
 
 				sta BB.CurrentQTrack
 
-				lda IO.D2.Ph0Off,x
+				pha
-				lda IO.D2.Ph0Off,y
+				
+				and #6
+				ora BB.Slotn0
+				tax
+
+				pla
+				
+				bcs .3
+
+* Current < Target, must move in
+
+				inc
+
+				.HS B0					BCS
+
+* Current > Target, must move out
+
+.3				dec
+
+				and #6
+				ora BB.Slotn0
+				tay
+				
+				lda IO.D2.Ph0On,x
+				lda IO.D2.Ph0On,y
+				
+				jsr BB.WaitSeekTime
 				bra .1
 
 .8				jsr BB.Wait25600usec
@@ -353,10 +360,10 @@ BB.Seek			lda BB.HdrTrk			get track we're on
 				bcs BB.Read				ALWAYS
 *--------------------------------------
 BB.AllPhasesOff	ldx BB.Slotn0
-				lda IO.D2.Ph0Off,x
+				bit IO.D2.Ph0Off,x
-				lda IO.D2.Ph1Off,x
+				bit IO.D2.Ph1Off,x
-				lda IO.D2.Ph2Off,x
+				bit IO.D2.Ph2Off,x
-				lda IO.D2.Ph3Off,x
+				bit IO.D2.Ph3Off,x
 				rts
 *--------------------------------------
 BB.WaitSeekTime	lda #IO.D2.SeekTime

LIB/LIBBLKDEV.S.D2.txt

@@ -69,31 +69,16 @@ D2MoveHead		>PULLB MoveTo
 				clc
 .9				rts
 
-D2MoveHead.1	
+D2MoveHead.1	ldx Slotn0
+				ldy Slotn0
+				
 .1				lda	MoveFrom
-				pha
-				
-				and #6
-				ora Slotn0
-				tax
-
-				pla
-				pha
-				inc
-				and #6
-				ora Slotn0
-				tay
-				
-				lda IO.D2.Ph0On,x
-				lda IO.D2.Ph0On,y
-				
-				lda #IO.D2.SeekTime
-				jsr D2.Wait100usecA
-				
-				pla
 				cmp MoveTo
 				beq	.7
 
+				bit IO.D2.Ph0Off,x
+				ldx IO.D2.Ph0Off,y
+
 				bcs	.2
 
 * Current < Target, must move in
@@ -108,14 +93,41 @@ D2MoveHead.1
 
 				sta MoveFrom
 				
-				lda IO.D2.Ph0Off,y
+				pha
-				lda IO.D2.Ph0Off,x
+				
+				and #6
+				ora Slotn0
+				tax
+
+				pla
+
+				bcs	.3
+
+* Current < Target, must move in
+					
+				inc
+
+				.HS B0					BCS
+
+* Current > Target, must move out
+
+.3				dec
+
+				and #6
+				ora Slotn0
+				tay
+				
+				lda IO.D2.Ph0On,x
+				lda IO.D2.Ph0On,y
+				
+				lda #IO.D2.SeekTime
+				jsr D2.Wait100usecA
 				bra .1
 				
 .7				jsr D2.Wait25600usec
 
-				lda IO.D2.Ph0Off,y
 				lda IO.D2.Ph0Off,x
+				lda IO.D2.Ph0Off,y
 				rts
 *--------------------------------------
 D2.Wait25600usec

LIB/LIBTCPIP.S.txt

@@ -372,5 +372,5 @@ HST.SScanF		.AZ "%d.%d.%d.%d"
 IP.ID			.BS 2
 *--------------------------------------
 MAN
-SAVE USR/SRC/LIB/LIBTCPIP.S
+SAVE usr/src/lib/libtcpip.s
 ASM

ProDOS.FX/ProDOS.S.XRW.txt

@@ -724,50 +724,38 @@ XRW.Read.RTS	rts
 * A = target track
 *--------------------------------------
 XRW.Seek		ldx XRW.UnitIndex
-				cmp XRW.D2Trk-1,x
-				beq XRW.Read.RTS
 				
 				pha						save target track
 				
 				jsr XRW.Trk2Qtrk
 				sta XRW.TargetQTrack
+
 			.DO XRW.DEBUG=1
 			jsr	XRW.DEBUG3
 			.FIN
+
 				lda XRW.D2Trk-1,x
 
 				jsr XRW.Trk2Qtrk
 				sta XRW.CurrentQTrack
+
 			.DO XRW.DEBUG=1
 			jsr	XRW.DEBUG2
 			.FIN
+
 				pla
 				sta XRW.D2Trk-1,x		will be current track at the end
 
+				ldx A2L
+				ldy A2L
+
 .1				lda XRW.CurrentQTrack
-				pha
-
-				and #6
-				ora A2L
-				tax
-
-				pla
-				pha
-				
-				inc
-				and #6
-				ora A2L
-				tay
-				
-				lda IO.D2.Ph0On,x
-				lda IO.D2.Ph0On,y
-				
-				jsr XRW.WaitSeekTime
-
-				pla
 				cmp	XRW.TargetQTrack
 				beq	.7
 
+				bit IO.D2.Ph0Off,x
+				ldx IO.D2.Ph0Off,y
+				
 				bcs	.2
 
 * Current < Target, must move in
@@ -782,15 +770,37 @@ XRW.Seek		ldx XRW.UnitIndex
 
 				sta XRW.CurrentQTrack
 
-				lda IO.D2.Ph0Off,y
+				pha
-				lda IO.D2.Ph0Off,x
+
+				and #6
+				ora A2L
+				tax
+
+				pla
+
+				bcs	.3
+
+* Current < Target, must move in
+					
+				inc
+
+				.HS B0					BCS
+
+* Current > Target, must move out
+
+.3				dec
+
+				and #6
+				ora A2L
+				tay
+				
+				lda IO.D2.Ph0On,x
+				lda IO.D2.Ph0On,y
+				
+				jsr XRW.WaitSeekTime
 				bra .1
 
 .7				jsr XRW.Wait25600usec
-
-				lda IO.D2.Ph0Off,y
-				lda IO.D2.Ph0Off,x
-				rts
 *--------------------------------------
 XRW.AllPhasesOff
 				ldx A2L

SBIN/HTTPD.S.txt

@@ -27,7 +27,6 @@ hLineBuf		.BS 1
 
 hSrvSocket		.BS 1
 TimeOut			.BS 1
-
 hSrvName		.BS 1
 ZPSrvNamePtr	.BS 2
 hRootdir		.BS 1
@@ -36,9 +35,9 @@ ZPRootDirPtr	.BS 2
 ZPRequestPtr	.BS 2
 ZPnRequestLen	.BS 2
 ZPLinePtr		.BS 2
-
 ZPRepPtr		.BS 2
 
+
 ZS.END			.ED
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -334,6 +333,14 @@ CS.RUN.SERVER	lda hSrvSocket
 				>SYSCALL PrintF
 
 				jsr CS.RUN.CLIENT
+
+				>PUSHW L.MSG.SKTCLOSE
+				>PUSHB.G CLN.hSocket
+				>PUSHBI 1
+				>SYSCALL printf
+				
+				>LDA.G CLN.hSocket
+				>LIBCALL hLIBTCPIP,LIBTCPIP.Shutdown
 				
 .8				clc
 .9
@@ -352,7 +359,6 @@ CS.RUN.CLIENT	>LDYAI 1024
 				>STA.G REQ.hReq
 				>STA.G REQ.KeepAlive
 				>STA.G REQ.hFile
-				>STA.G REQ.hBuf
 
 .1				>SLEEP
 
@@ -413,14 +419,6 @@ CS.RUN.CLIENT	>LDYAI 1024
 .99				>LDA.G REP.hBuf
 				>SYSCALL freemem
 				
-				>PUSHW L.MSG.SKTCLOSE
-				>PUSHB.G CLN.hSocket
-				>PUSHBI 1
-				>SYSCALL printf
-				
-				>LDA.G CLN.hSocket
-				>LIBCALL hLIBTCPIP,LIBTCPIP.Shutdown
-
 				rts
 *--------------------------------------
 CS.RUN.REQ.GetReq
@@ -811,13 +809,12 @@ SA.LOCAL		.DA #AF.INET			S.SOCKADDR.AF
 DS.START
 REQ.FullPath	.BS MLI.MAXPATH+1
 REQ.Stat		.BS S.STAT
+CLN.hSocket		.BS 1
 REQ.hReq		.BS 1
 REQ.hFile		.BS 1
-REQ.hBuf		.BS 1
 REQ.MimeType	.BS 1
 REQ.KeepAlive	.BS 1
 REP.hBuf		.BS 1
-CLN.hSocket		.BS 1
 DS.END
 				.ED
 *--------------------------------------

SRV/WWW/index.html

@@ -10,9 +10,10 @@ NEW
   <img src="A2osX.logo.png">
   <h1>A2osX HTTPD Demo</h1>
   <p>This is a paragraph.</p>
+  <br><img src="kansasfest.png">
+  <p>This is another paragraph.</p>
   <br><a href="hello.html">Hello</a>
   <br><a href="main.html">Main</a>
-  <br><img src="KANSASFEST.PNG">
 </body>
 
 </html>

SYS/KERNEL.S.MEM.txt

@@ -343,7 +343,7 @@ K.FreeMem.ERR	>PUSHWI K.FreeMem.MSG
 				>PUSHBI 2
 				
 .1				>SYSCALL2 printf
-
+			>DEBUGOA
 				lda #E.INVH
 				sec
 				rts