From 3537472fa1054b7c3c03422de13016392a3cf410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Mon, 23 Nov 2015 15:54:30 +0100 Subject: [PATCH] Post #4 bug fix 1:task switching now handles pDev properly. --- A2OSX.BOOT.DSK | Bin 143360 -> 143360 bytes A2OSX.SRC.po | Bin 819200 -> 819200 bytes A2osX.STARTUP.txt | 6 +-- DRV/CONSOLE.DRV.S.txt | 86 +++++++++++++----------------------------- DRV/DHGR.DRV.S.txt | 68 ++++++++++++++++----------------- DRV/MOUSE.DRV.S.txt | 25 ++---------- SBIN/GUI.S.txt | 8 ++-- SBIN/SHELL.S.txt | 9 +++-- SYS/KERNEL.S.TSK.txt | 13 ++++--- SYS/KERNEL.S.txt | 9 +---- 10 files changed, 84 insertions(+), 140 deletions(-) diff --git a/A2OSX.BOOT.DSK b/A2OSX.BOOT.DSK index 256ff6fbe515d2fc1345feba707f52d7c9dcb5c6..8a6693a7b1c7c57e5e89348420dc2e52e4a04649 100644 GIT binary patch delta 7064 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 diff --git a/A2OSX.SRC.po b/A2OSX.SRC.po index 0d3bc7cefbc0a7ca6c8583fdfa85234b95c343d3..4515550508db95af676b453ee375142499cf8227 100644 GIT binary patch delta 21277 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 Xd-R!UN1xG;J~RF3GkK?;G2i=t7kXWB delta 21410 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 L.MSG.DETECT - >SYSCALL SYS.SysScrPPSTRYA + >SYSCALL SYS.PSTROutYA lda A2osX.SCREENS ora #A2osX.SCREENS.G @@ -42,7 +42,7 @@ Dev.Detect >LDYA L.MSG.DETECT clc rts CS.END -MSG.DETECT >PSTRING "\nApple IIe/IIc DoubleHGR Driver." +MSG.DETECT >PSTRING "\nApple IIe/IIc DHGR Driver.\n" *-------------------------------------- * Device Header (16 Bytes) *-------------------------------------- @@ -74,11 +74,6 @@ L.DEVINFO .DA DEVINFO OPEN lda #A2osX.SCREENS.G >SYSCALL SYS.ScreenSelectA - sta SETHIRES - lda RD80STORE - pha - sta SET80STORE prepare for page switching - ldx #192 .81 dex @@ -92,7 +87,7 @@ OPEN lda #A2osX.SCREENS.G * lda #$00 ldy #39 - sta SETPAGE2 + sta SETWRITEAUX .82 sta (ZPBASE),y dey bpl .82 @@ -101,19 +96,14 @@ OPEN lda #A2osX.SCREENS.G * lda #$00 ldy #39 - sta CLRPAGE2 + sta CLRWRITEAUX .83 sta (ZPBASE),y dey bpl .83 txa bne .81 - - pla - bmi .84 - - sta CLR80STORE -.84 clc + clc rts *-------------------------------------- GETEVENT lda A2osX.ASCREEN @@ -148,10 +138,7 @@ GETINFO >LDYA L.DEVINFO * PULLB = Y * PULLB = Color (if not xor) *-------------------------------------- -SETPIXEL sta SETHIRES - sta SET80STORE prepare for page switching - - >PULLA Pull Mode +SETPIXEL >PULLA Pull Mode and #$FF bpl SETPIXEL.1 @@ -174,11 +161,9 @@ SETPIXEL.XOR >PULLYA Y=X.LO,A=X.HI .3 lsr tay bcs .4 odd=main ram - sta SETPAGE2 - bra .5 -.4 sta CLRPAGE2 - -.5 >PULLA Pull Y + sta SETWRITEAUX + sta SETREADAUX +.4 >PULLA Pull Y tax lda BASEL,x setup line Base Ptr sta ZPBASE @@ -188,6 +173,9 @@ SETPIXEL.XOR >PULLYA Y=X.LO,A=X.HI lda (ZPBASE),y eor Mono.Masks,x sta (ZPBASE),y + + sta CLRWRITEAUX + sta CLRREADAUX rts *-------------------------------------- SETPIXEL.1 lsr @@ -212,11 +200,9 @@ SETPIXEL.1 lsr .3 lsr tay bcs .4 odd=main ram - sta SETPAGE2 - bra .5 -.4 sta CLRPAGE2 - -.5 phx + sta SETWRITEAUX + sta SETREADAUX +.4 phx >PULLA Pull Y tax lda BASEL,x setup line Base Ptr @@ -232,12 +218,16 @@ SETPIXEL.1 lsr lda (ZPBASE),y and Mono.NMasks,x includes And $7F for mono sta (ZPBASE),y + sta CLRWRITEAUX + sta CLRREADAUX rts .6 lda (ZPBASE),y and #$7F switch back this byte to mono ora Mono.Masks,x sta (ZPBASE),y + sta CLRWRITEAUX + sta CLRREADAUX rts *-------------------------------------- SETPIXEL.COLOR >PULLA Get X.LO... @@ -282,7 +272,9 @@ SETPIXEL.COLOR >PULLA Get X.LO... and Color.Pixels,y apply color sta GBYTE - sta SETPAGE2 + sta SETWRITEAUX + sta SETREADAUX + lda (ZPBASE) and Color.NMasks,x reset existing pixel, ora GBYTE @@ -296,7 +288,9 @@ SETPIXEL.COLOR >PULLA Get X.LO... and Color.Pixels,y apply color sta GBYTE - sta CLRPAGE2 + sta CLRWRITEAUX + sta CLRREADAUX + lda (ZPBASE) and Color.NMasks,x reset existing pixel, ora GBYTE @@ -311,7 +305,9 @@ SETPIXEL.COLOR >PULLA Get X.LO... and Color.Pixels,y apply color sta GBYTE - sta SETPAGE2 + sta SETWRITEAUX + sta SETREADAUX + lda (ZPBASE) and Color.NMasks,x reset existing pixel, ora GBYTE @@ -325,13 +321,17 @@ SETPIXEL.COLOR >PULLA Get X.LO... and Color.Pixels,y apply color sta GBYTE - sta CLRPAGE2 + sta SETWRITEAUX + sta SETREADAUX + lda (ZPBASE) and Color.NMasks,x reset existing pixel, ora GBYTE sta (ZPBASE) -.8 rts +.8 sta CLRWRITEAUX + sta CLRREADAUX + rts *-------------------------------------- GETPIXEL *-------------------------------------- diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt index 151db151..8ffbba40 100644 --- a/DRV/MOUSE.DRV.S.txt +++ b/DRV/MOUSE.DRV.S.txt @@ -114,7 +114,7 @@ Dev.Detect >LDYA L.MSG.DETECT rts *-------------------------------------- CS.END -MSG.DETECT >PSTRING "Apple Mouse Card/IIc Mouse Driver." +MSG.DETECT >PSTRING "Apple Mouse Card/IIc Mouse Driver.\n" MSG.DETECT.OK >PSTRING "Mouse Installed As Device : " MSG.DETECT.KO >PSTRING "No Mouse Found.\n" *-------------------------------------- @@ -143,11 +143,6 @@ OPEN php to read IIe ROM ID bytes sei - - lda RD80STORE - pha - sta CLR80STORE - lda #1 Enable, Polling mode ldy #SETMOUSE jsr GOMOUSE @@ -180,11 +175,7 @@ OPEN ldy #HOMEMOUSE jsr GOMOUSE - pla - bpl .1 - sta SET80STORE - -.1 plp + plp clc rts @@ -196,10 +187,6 @@ GETEVENT lda A2osX.ASCREEN php sei - lda RD80STORE - pha - sta CLR80STORE - ldy #READMOUSE jsr GOMOUSE @@ -243,11 +230,7 @@ GETEVENT lda A2osX.ASCREEN lda MOUSEYHIx,x sta (pEvent),y - pla - bpl .5 - sta SET80STORE - -.5 plp + plp ldy #S.EVT.DATALO lda (pEvent),y beq .9 @@ -293,8 +276,8 @@ DEVSIG.Offset .HS 05070B0CFB DEVSIG.Value .HS 38180120D6 DEVSIG.Length .EQ DEVSIG.Value-DEVSIG.Offset DEVSLOT0n .BS 1 -DEVSLOTCn .BS 1 DEVSLOTn0 .BS 1 +DEVSLOTCn .BS 1 *-------------------------------------- DEVINFO .DA #S.DEVINFO.TYPE.XY MAN diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index 26db6b86..17b06762 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -55,18 +55,18 @@ CS.INIT >LDYA L.DEVNAME.GFX .20 stx hDevMouse >STYA pDevMouse - lda #A2osX.SCREENS.G - >SYSCALL SYS.ScreenSelectA - ldx #DEVMGR.OPEN jsr GoDevGFX bcs * + lda #A2osX.SCREENS.G + >SYSCALL SYS.ScreenSelectA + ldx #DEVMGR.OPEN jsr GoDevMouse bcs * - jmp .8 +* jmp .8 lda #2 sta BW diff --git a/SBIN/SHELL.S.txt b/SBIN/SHELL.S.txt index b314a032..15fe7d04 100644 --- a/SBIN/SHELL.S.txt +++ b/SBIN/SHELL.S.txt @@ -53,8 +53,7 @@ J.INTCMDS .DA EXEC.CMD.CD .DA EXEC.CMD.TYPE .DA 0 *-------------------------------------- -CS.INIT >DEBUG - >LDYA L.LIBSTR +CS.INIT >LDYA L.LIBSTR >SYSCALL SYS.LoadLibYA bcs .9 sta hLIBSTR @@ -162,8 +161,10 @@ CS.RUN lda #0 rts .81 jsr CloseTxtFile - bra .8 - + ldy #bExitOnEOF + lda (pData),y + beq .8 + lda #0 .99 sec rts *-------------------------------------- diff --git a/SYS/KERNEL.S.TSK.txt b/SYS/KERNEL.S.TSK.txt index aeea637c..68a69ae2 100644 --- a/SYS/KERNEL.S.TSK.txt +++ b/SYS/KERNEL.S.TSK.txt @@ -58,7 +58,13 @@ S.TskMgrInit stz TSKMGR.LASTID ldy #S.PS.hPREFIX sta TskMgr.Table,y -S.TskMgrInit.Env +S.TskMgrInit.Env + + jsr S.SelectProcess0 + + ldx #DEVMGR.OPEN + jsr pDevJmp + >PUSHWI TmpBuffer256 push ENV value >PUSHWI ENV.A2osX push ENV name jsr S.SetEnvVarP @@ -78,11 +84,6 @@ S.TskMgrInit.Env >PUSHWI ENV.DRV jsr S.SetEnvVarP bcs .9 - - jsr S.SelectProcess0 - - ldx #DEVMGR.OPEN - jsr pDevJmp .9 rts *-------------------------------------- diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt index 66e50d88..5eb94771 100644 --- a/SYS/KERNEL.S.txt +++ b/SYS/KERNEL.S.txt @@ -199,8 +199,6 @@ Kernel.Init sei jsr S.TskMgrInit bcs * - >DEBUG - >LDYAI MSG.Init jsr S.PSTROutYA @@ -215,12 +213,10 @@ Kernel.Init sei ply get back ARGS in Y phy pha A=CMH, save for discard - >DEBUG + jsr S.CreateProcessYA bcs * - >DEBUG - pla jsr S.FreeMemA pla @@ -228,8 +224,6 @@ Kernel.Init sei >LDYAI MSG.Init.OK jsr S.PSTROutYA - >DEBUG - *-------------------------------------- S.KernelRun jsr S.TskMgrRun bcs .98 @@ -345,7 +339,6 @@ S.ScreenSelectA and A2osX.SCREENS Screen is available ? sta SETHIRES sta CLR80STORE sta CLRPAGE2 - sta SET80STORE sta SETIOUDIS sta SETDHIRES