diff --git a/.Floppies/A2OSX.BLANK.woz b/.Floppies/A2OSX.BLANK.woz index 7a07aaa5..2f744bca 100644 Binary files a/.Floppies/A2OSX.BLANK.woz and b/.Floppies/A2OSX.BLANK.woz differ diff --git a/.Floppies/A2OSX.BOOT.woz b/.Floppies/A2OSX.BOOT.woz index 78ba19d5..358580b1 100644 Binary files a/.Floppies/A2OSX.BOOT.woz and b/.Floppies/A2OSX.BOOT.woz differ diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 47f75a4f..863f9e69 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/A2OSX.TEST.po b/.Floppies/A2OSX.TEST.po index 69f607e2..0ac1f10b 100644 Binary files a/.Floppies/A2OSX.TEST.po and b/.Floppies/A2OSX.TEST.po differ diff --git a/A2osX.S.txt b/A2osX.S.txt index e030cfe3..0dd844ab 100644 --- a/A2osX.S.txt +++ b/A2osX.S.txt @@ -214,13 +214,17 @@ A2osX.ScreenDLGR sta SETALTCHAR sta CLRHIRES sta SETMIXED - sta CLRTEXT sta SET80DISP sta SET80STORE + + bit RDIOUDIS sta SETIOUDIS sta SETDHIRES + bmi .10 sta CLRIOUDIS +.10 sta CLRTEXT + lda #A2osX.LOGOLOAD+S.BM sta TmpPtr1 lda /A2osX.LOGOLOAD+S.BM diff --git a/BIN/BMP2PIX.S.txt b/BIN/BMP2PIX.S.txt index 6d514d35..bdcded24 100644 --- a/BIN/BMP2PIX.S.txt +++ b/BIN/BMP2PIX.S.txt @@ -5,11 +5,11 @@ NEW .OR $2000 .TF bin/bmp2pix *-------------------------------------- - .INB INC/MACROS.I - .INB INC/A2OSX.I - .INB INC/IO.I - .INB INC/GFX.I - .INB INC/LIBGUI.I + .INB inc/macros.i + .INB inc/a2osx.i + .INB inc/io.i + .INB inc/gfx.i + .INB inc/libgui.i *-------------------------------------- S.BMP.SIG .EQ 0 S.BMP.SIZE .EQ 2 @@ -646,7 +646,7 @@ SCR.BASEH .HS 04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07.04.04.05.05.06.06 *-------------------------------------- CS.END *-------------------------------------- - .INB USR/SRC/SHARED/X.TWIST.G + .INB usr/src/shared/x.twist.g *-------------------------------------- OptionList >PSTR "Vv" OptionVars .DA #bVerbose,#bVerbose @@ -710,5 +710,5 @@ DS.END .ED *-------------------------------------- MAN -SAVE USR/SRC/BIN/BMP2PIX.S +SAVE usr/src/bin/bmp2pix.s ASM diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt index 903a7872..77f78659 100644 --- a/BIN/FORMAT.S.txt +++ b/BIN/FORMAT.S.txt @@ -321,20 +321,26 @@ CS.RUN.LL.DISKII >SLEEP + >PUSHB DSSS0000 + >LIBCALL hLIBBLKDEV,LIBBLKDEV.D2Recalibrate + bcs CS.RUN.LL.RTS + + >SLEEP + ldx #16 jsr CS.RUN.ZeroPtr1 16 sectors filled with 0, give some time to spin up - >PUSHB DSSS0000 - >LIBCALL hLIBBLKDEV,LIBBLKDEV.D2Recalibrate - bcs .9 - stz CurTrack - stz CurQTrack lda TrkCnt sta Counter -.1 >SLEEP + ldx #0 + +.1 jsr CS.RUN.SeekToX + bcs .9 + + >SLEEP >PUSHW L.MSG.LLDISK2 >PUSHB CurTrack @@ -363,8 +369,7 @@ CS.RUN.LL.DISKII tax - jsr CS.RUN.SeekToX - bcc .1 + bra .1 .9 pha jsr CS.RUN.MotorOff @@ -372,11 +377,7 @@ CS.RUN.LL.DISKII sec rts -.8 -* ldx #0 -* jsr CS.RUN.SeekToX - - >PUSHW L.MSG.CRLF +.8 >PUSHW L.MSG.CRLF >PUSHBI 0 >SYSCALL PrintF bcs .9 diff --git a/BIN/IRC.S.txt b/BIN/IRC.S.txt index 2d32fdd0..e2ea964f 100644 --- a/BIN/IRC.S.txt +++ b/BIN/IRC.S.txt @@ -273,7 +273,7 @@ CS.RUN.LOOP >SLEEP beq .77 lda $427 - eor #$80 + eor #$C0 sta $427 bra .2 @@ -475,7 +475,9 @@ CS.RUN.NICK >LDYA L.MSG.NICK bra .1 -.8 clc +.8 lda #"N" + sta $427 + clc .9 rts *-------------------------------------- CS.RUN.USER >LDYA L.MSG.USER @@ -517,7 +519,9 @@ CS.RUN.USER >LDYA L.MSG.USER bra .1 -.8 clc +.8 lda #"U" + sta $427 + clc .9 rts *-------------------------------------- CS.RUN.JOIN >LDYA L.MSG.JOIN @@ -599,7 +603,7 @@ CS.RUN.REQ jsr CS.RUN.SPLITMSG *-------------------------------------- CS.RUN.CMD.JOIN sec ror bJoin - lda #'J' + lda #"J" sta $427 clc rts @@ -979,7 +983,7 @@ IRC.PONG .AZ "PONG %s\r\n" IRC.PRIVMSG .AZ "PRIVMSG %s :%s\r\n" *-------------------------------------- SEQ.INIT .AZ "\ec\e(B\e)0\e[?7l\e[2;20r\e[22;1H\e[?7h" -SEQ.BAR .AZ "\e7\e[%d;1H\e[7m\e[37;40m%80s\e[0m\e8" +SEQ.BAR .AZ "\e7\e[%d;1H\e[7m\e[37;40m%79s\e[0m\e8" SEQ.TXTCLR .AZ "\e[22;1H\e[K\r\n\e[K\r\n\e[K\e[22;1H" SEQ.PRIVMSG .AZ "\e7\e[20;1H\r\n\e[7m%s:\e[0m%s\e8" SEQ.DUMPMSG .AZ "\e7\e[20;1H\r\n\e[7m%s \e[0m%s %s %s\e8" diff --git a/LIB/LIBBLKDEV.S.D2.txt b/LIB/LIBBLKDEV.S.D2.txt index c6c4eebc..03c15f2e 100644 --- a/LIB/LIBBLKDEV.S.D2.txt +++ b/LIB/LIBBLKDEV.S.D2.txt @@ -16,7 +16,19 @@ D2MotorControl >PULLB MotorOn tax lda $C000,x -* clc + jsr D2.Wait25600usec + jsr D2.Wait25600usec + jsr D2.Wait25600usec + jsr D2.Wait25600usec + jsr D2.Wait25600usec + jsr D2.Wait25600usec + jsr D2.Wait25600usec + jsr D2.Wait25600usec + jsr D2.Wait25600usec + jsr D2.Wait25600usec + jsr D2.Wait25600usec + jsr D2.Wait25600usec + clc .9 rts */-------------------------------------- @@ -37,7 +49,7 @@ D2Recalibrate >PULLB DrvSlt ldy #168 - ldx Slotn0 +* ldx Slotn0 .1 lda IO.D2.Ph0Off,x @@ -57,15 +69,17 @@ D2Recalibrate >PULLB DrvSlt lda #IO.D2.SeekTime jsr D2.Wait100usecA - cpy #0 + tya bne .1 + jsr D2.Wait25600usec jsr D2.Wait25600usec jsr D2.Wait25600usec ldx Slotn0 lda IO.D2.Ph0Off,x + jsr D2.Wait25600usec jsr D2.Wait25600usec jsr D2.Wait25600usec @@ -80,6 +94,7 @@ D2MoveHead >PULLB MoveTo bcs .9 jsr D2MoveHead.1 + jsr D2.Wait25600usec clc .9 rts @@ -92,7 +107,7 @@ D2MoveHead.1 pla cmp MoveTo - beq D2.AllPhasesOff + beq .8 bcs .2 @@ -116,6 +131,8 @@ D2MoveHead.1 lda #IO.D2.SeekTime jsr D2.Wait100usecA bra .1 + +.8 jsr D2.Wait25600usec *-------------------------------------- D2.AllPhasesOff ldx Slotn0 lda IO.D2.Ph0Off,x diff --git a/ProDOS.FX/ProDOS.S.XRW.txt b/ProDOS.FX/ProDOS.S.XRW.txt index 5bb00cda..59b31b21 100644 --- a/ProDOS.FX/ProDOS.S.XRW.txt +++ b/ProDOS.FX/ProDOS.S.XRW.txt @@ -129,8 +129,8 @@ L5362 lda IO.D2.DrvSel1,x L5372 lda A4L make sure this command needs seeking. beq L537C branch if status check. - lda XRW.ReqTrack get destination track - jsr XRW.Seek and go to it. +* lda XRW.ReqTrack get destination track +* jsr XRW.Seek and go to it. * now at desired track. was the motor already on ? @@ -723,8 +723,8 @@ XRW.Read.RTS rts * A = target track *-------------------------------------- XRW.Seek ldx XRW.UnitIndex -* cmp XRW.D2Trk-1,x -* beq XRW.Read.RTS + cmp XRW.D2Trk-1,x + beq XRW.Read.RTS pha save target track @@ -750,7 +750,7 @@ XRW.Seek ldx XRW.UnitIndex pla cmp XRW.TargetQTrack - beq XRW.AllPhasesOff + beq .8 bcs .2 @@ -771,6 +771,8 @@ XRW.Seek ldx XRW.UnitIndex jsr XRW.AllPhasesOff jsr XRW.WaitSeekTime bra .1 + +.8 jsr XRW.Wait25600usec *-------------------------------------- XRW.AllPhasesOff ldx A2L diff --git a/SBIN/NETWORKD.S.txt b/SBIN/NETWORKD.S.txt index eeac0f24..96a79422 100644 --- a/SBIN/NETWORKD.S.txt +++ b/SBIN/NETWORKD.S.txt @@ -249,11 +249,8 @@ CS.RUN >PUSHB DevID >SYSCALL GetMemPtr >STYA pBuf - lda (pBuf) - cmp #$ff - beq .23 - cmp #1 - beq .23 + jsr CS.RUN.FILTER + bcs .23 >PUSHW L.MSG.DBG @@ -261,10 +258,10 @@ CS.RUN >PUSHB DevID .22 >PUSHB (pBuf),y iny - cpy #50 + cpy #54 bne .22 - >PUSHBI 50 + >PUSHBI 54 >SYSCALL printf .23 .FIN @@ -285,11 +282,10 @@ CS.RUN >PUSHB DevID bra .1 .2 .DO DBG=1 - lda (pBuf) - cmp #$ff - beq .33 - cmp #1 - beq .33 + jsr CS.RUN.FILTER + + bcs .33 + >LDYA L.MSG.DBG.REJECT >SYSCALL puts .33 .FIN @@ -299,6 +295,23 @@ CS.RUN >PUSHB DevID .8 clc rts +*-------------------------------------- + .DO DBG=1 +CS.RUN.FILTER lda (pBuf) + cmp #$ff + beq .9 + dec + beq .9 + ldy #S.ETH.EII.TYPE+1 + lda (pBuf),y + bne .9 + + clc + rts + +.9 sec + rts + .FIN *-------------------------------------- CS.DOEVENT lda (pEvent) bpl .9 @@ -351,9 +364,9 @@ MSG.LIB .AZ "NETWORKD:Loading %s ...\r\n" MSG.EXEC .AZ "NETWORKD:Running %s ...\r\n" ETCNETWORK .AZ "${BOOT}etc/network" .DO DBG=1 -MSG.DBG .AS "FRM %h%h%h%h%h%h.%h%h%h%h%h%h.%h%h\r\n" - .AS " %h%h.%h%h%h%h%h%h.%h%h%h%h %d.%d.%d.%d %d.%d.%d.%d\r\n" - .AZ " %h%h%h%h%h%h%h%h.%h%h%h%h%h%h%h%h\r\n" +MSG.DBG .AS "FRM ETH:%h%h%h%h%h%h.%h%h%h%h%h%h.%h%h\r\n" + .AS " IP :%h%h.%h%h.%h%h.%h%h.%h [%d] (%h%h) %d.%d.%d.%d>%d.%d.%d.%d\r\n" + .AZ " TCP:%D>%D %h%h%h%h %h%h%h%h %h %b [%h%h] (%h%h) %h%h\r\n" MSG.DBG.REJECT .AZ "Rejected" .FIN *-------------------------------------- diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt index 24eab3d1..a17ac725 100644 --- a/SYS/KERNEL.S.INIT.txt +++ b/SYS/KERNEL.S.INIT.txt @@ -120,11 +120,13 @@ Kernel.Init3 sta SETALTZP sta SET80DISP sta SET80STORE sta CLRPAGE2 + bit RDIOUDIS sta SETIOUDIS sta SETDHIRES + bmi .10 sta CLRIOUDIS - jsr MemMgrInit +.10 jsr MemMgrInit >LDYAI S.PS Select Process 0 (Kernel) jsr K.GetMem0 @@ -502,8 +504,6 @@ CPU.Init.6502 >PUSHWI MSG.CPU nop (2) nop (2) nop (2) - nop (2) - nop (2) inc A2osX.RANDOM16 (6) bne .5 (2*)