From 5240c1195e7139e0e35e812e50bb8ea1e46323aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Fri, 17 Nov 2017 08:09:39 +0100 Subject: [PATCH] Kernel 0.9.1 : GUI, debugging.... --- .Floppies/A2OSX.BOOT.po | Bin 143360 -> 143360 bytes .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes .Floppies/A2OSX.SRC.po | Bin 819200 -> 819200 bytes DRV/DHGR.DRV.S.BLT.txt | 13 +++++++++---- DRV/DHGR.DRV.S.PIX.txt | 6 ++++-- DRV/MOUSE.DRV.S.txt | 30 +++++++++++++++--------------- INC/LIBGUI.I.txt | 2 +- SBIN/GUI.S.txt | 6 +++--- 8 files changed, 32 insertions(+), 25 deletions(-) diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po index a57610945bc7ab6fea2a38a6c2a5b222af1ce860..fff3b4b198ee2bc7e1b6fdd3326939d9116900f4 100644 GIT binary patch delta 5669 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 LkQnT_^aSx=H$#ns diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 2bc9e118fd582042e52c28a1b78c51818b2f5f04..9138b795eea13f9831b9d624902fb4ca4da6d4ff 100644 GIT binary patch delta 1849 zcmbVNeN0nV6us-9iIs zeHtC)(v#<4leU_`+xrzhN=Lbg`fJ~(3}v$$BAUYU25}6;9fN&*NsVF27@Xn9honWw z_C<&wcvIm96|#DD;7JF3DAT(VJQ;u;nFM%S8Cu~EJ$iWF zpXp5p^Y3m#lvx>&$hd8UEHl$UrP9^gu_MQO9PdSrT*7|G%((qI^IQBdyM^G@LS!xO z=REfySYZ%H*Ld!OPY+USmV=kJm>pI>UmiWpk58_G_KC>29BomkV2-fGAZj>rScH+e zshr35H?ldJI8Pssgas0Eg%0+~;ttx3Dst4Zg`Za#cw`T)k`PM1xnKGWz-K4L~|p zIt|$+K>AfKcWEs|(k@#ToCp{*LuhirMu;2diJNALf~R;cM}EF=Gw5a3tx_0jpZE*1 zYZmD*`fNba7gABqrePJWv^d*_SJ62dCpB!Pw9ee&B4_XLi*%f&=L@=@{&I$)QB~jV z>#Vvd0UhAduM>7aD7n8SZxX5w{&Wt zO+AexSVV(5;pl6)D3YjNM*4T4*(3y;jk>*=1Fb}}6Rmup#U#8t2B#i?7=~`tVP8gS zU;hByb@gFb`T*92p<)a!PlTrA%S3MYt8*P#!^$04%gP;SW91ICvyyG01&leCp+=^i z3Q&zql=^e!t{h>M+OiYqYxD?Bq7(QWmT(v&ED|A?K4VUyToDOuV>zMX7eO#g}{F(B3x#X7-ZZQ(DXGraPMZ`73~ zGF407V!IVR6eg1nUvssI%<8&ptRUm8G@W2pCQ{wY@in$vPd-_?ML^6N delta 1844 zcmbVNeQZ-z6n`Jx)^%U6v>oLm;Xe9Bj~SNN(RGUxzaZNpU^rX)nXwW(G&9Q*u!FXtoncma%Zv#QMeWQO3L7Sxj524e5_RBMy{{e1qJQ{tlk?uW z=bYcYC+Gamdu})9c5~+^WmJ*UJ0;ss6)L?uGTx#z%D(#83%g{uz z`yGndt6Q8qcTl0S2D`WP$wH)-{1B`6BA?KttI3d1m7X*RV<2oDjBw@88}i1WgNqM| z3p`sEcz8aT2bam1HON4q08qU?sD^+F&|y7x9FxbE2J#_6b-O}V=u+FlGW!8Mo|xcq%9|M2C5bu=v9(hZCBa32s~kdrRBT13)@k$D>MEQio|4W619yT^`|QZ0{cEAc5;G?2&{dJgsK4`DU-E069V!3utH zqd_PJaf?A%3p{dRqYeC@TOpArZZ!xcAZ{`UcHnVXIo_ut%hRT)RQIUVVoZ*UBZgDN z;6=SL%oP;_rmuJmiq--quhe@RBnr=4=3}rgZH-OM+c2&Kgz_}do(A#(>s-OYTxlsR zkziMBFw{Qz7ti*zr|*f+24r6Mmsw<1B&Hy}j}8N=^41TRQ8u-g999)%TGp&--M@36 z)48X0{bq;v#Bf8;R}__DiHywBk*_bYOiLEAM^`A#aNF)iokscU=-nfucggYxkNCWszFT}3by zJ%G9(wXyilIcTdZX%1UX<-k#98YPfG3~Kq7mrz+En^9s?4>X(jXtPmUuODz>tqE(D z11%>0jWIYr4#G|7COX|pOo)bY@Yglmg#2+>eG@i~!THJ99cjYw*uOYO%UV{VrIVFt z>0%{Xx>?aR&&!G`%nj`;^Q}A-9WnT&P9~GmWXmJm_6>#(j*oDme28V1u9G%q*OHX+ ze-Gn|fB3HT|4~h6sA&~J_(+CI_AwMi_RDtBGc-k1U)V#>l4lxeihBP8sT~*UX`1Y( z5776?e)%)>H0fn1`GqE0uHMl`Oc66!+R!=l1^OKkL{NzW4C>j22(gyy{m5hOkzM=_ zg}L!tD3X$zOE`GMM diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index b1b0edd2af5b88c0efe15b82944ab95c4be86984..7be8c960ce94bfa1cca9d7f50a2ebc336feb46e8 100644 GIT binary patch delta 1914 zcmZvcT~HHO6vxjld&80}G{A=Nr4~adSPcoFMXdsXh?MZ1Dq1TpfeMNtk_e(sWs8M= zSXw}HySBB(3VrEJ>vV=Z*^dW0O#5J+>03Y4wlBW);$R3UcUx;gqJ)mKQYK$KtqREVxP8t(&;|qgcJY{}T|oBZ zQffCiswj{HpwVAe`8*mG40o0<2?J#Z$P2hG9|CQtk5Tzf1hKXY6SH2_w`}n2>+-hw z>I0B|7{4dbr`n30dmyVPY1xU(M?f1MQE<7^3Hb`;ekOU64agNST3VG4duY_BKUY<;QBI;WaKIJ1}!8)}nOs$fs zRm1XXDtE!=Rzm&Q%Q7&9!Qpa71_L-}r`Q>d0~y8YIb-yPQr?n|TlV&!L`oOf#_7E> ze&hBtdRrRZ2YenNXE8YQoG#USJKO6TJry9ote;saj#pwQ$9dXO%5N#1&`&~7msLIU z(LnMFmb6ULf4ricbAd4-+pBT5DaJOfv%QvJs{q^UF}B@rB(c58*e>c)m&d2Gk+)El zXVw6GI|f+$P7>hk8h~?H!8DJJtI!*FDGqm;!9{d9nt-bW+q*iPmIQZ&!M&$T|2K}j z&)_~-1MX@JPWdni?xQu}78u+$gsY6OITSzE$0XxAY*HJs2~FJ|FNlk}YF>hbb}<(H z3B4g0?oG9e%k61BE;P+)MNNw;s`1C07<&O?RNiD7Wi<2W3KC=+LFLqnD0dZr33*C=h_m<(n zuw$v#^c`tswh}Q)PjU^k$S7rJFgs-Ta1VxWX{2tWv^fWzkhwrCi^YdFkAvK#$D=XE z;+tU_>|VNPl#00)W~C)*t+>Rjwk=_`?Ygk8gWfLY3%O4ECx#i&2VuRB=G*yo24;GB z`xw8KckZVPCaIk3rngN}RVEr8`%-sZmuK(h(_lYHzqj+n+#&k6ozFF(vw`z4%_!l^ z)6mA4L2W!jXCty^EqkpmV(t}GG(#U`0 Cg)?;k delta 1978 zcmZvdT~HHO6vxkAcEctCCc%XS6s;yfK?w=q7ZxQzL@XZ>DAg+BnxsO7BqmXzUuMNZ zKdcqCT-Ua?TJ@nXZO0ihb;hwi&|&O@I@9SxpX|qUrY~(@JL5yo%`SzEWF~WG&z}1~ zzkBA~|E5wksZ`C^$9Ym^y?BzpLW-@omkHO+mdiF^KL`9acp&PiEf}A*OwL+3{FC&o zC1=}1TQUJ+Iam2zc@^ZZagRAoPMt`~NkSq|>~ilAF224^|YK_oGZ)R@^9a0CTt%Zp!m52v~Br=p8$J3`a38mZ#Ms25- z+qpJ6@_^WB{XO198s4B&<9rDnxW^mBW;q_JZfgss58mS+3Eb&)^(=pfOw92UbHc=& zVP-CuJF_wwuK;rb++NT0P-GNDtTGfC0|5&`@d^599VyB`i7g8s!aPLmO`NxotgOSqk`rMZfeLWHMfa>DRo$nwj%eGZ zl(utmqM)E;(P`xJB3EY8Gz}2P86lFM(MjKCq!SwHdLu67#78N}<5F|>j&pi*hYCbaGKw}W^? zi&}2NeC%u{`xgC%H~cXX5N86$0WW&zq^uazvSRx2?kV#o{Y)D{*o;-|Tb|(@-`mv< ztG0p~j>eUaXe8=p7dx?G?DUw@po~OA%4U%2m!RH;dgAk$8wf%JJ``^U_eQ#Sqzr7P z%6CxT-<&jEM69bD5rh`n({VmMl)phcQHIj=!Va1ZqqmKhDmU}K)*EQIk|Sa`T}pK)JY1A=!)@Z z9F}*oSg8@sk3E(J=wl~Y!R?`cIZ3&Jncd1BTIwQY1~fY;d6AvZMm&AA&qb=am*|9x z)LHjxoo@2=_;+m>1=l|MgNr!1{q!Ffu^X5RdirTWIjJ@t)GTGq0DZbkTx~!DgcUOT zOt78_A_#{u;tkSs<-}tR={^)@AC)oi9-$90oR0>mS%3!|L)z@>HmF+wS|C_;>sz>3 g=zJhWo|y@7M>Dg#0^N^wR`&t)z(p;+Rgf3|4=99Bng9R* diff --git a/DRV/DHGR.DRV.S.BLT.txt b/DRV/DHGR.DRV.S.BLT.txt index 1eccb9fe..6ecf0c65 100644 --- a/DRV/DHGR.DRV.S.BLT.txt +++ b/DRV/DHGR.DRV.S.BLT.txt @@ -58,13 +58,18 @@ BITBLT >LDYA CB.CACHE+S.CB.SrcPtr sta ZPBMMaskPtr+1 lda CB.Cache+S.CB.X1 + pha and #7 we have to shift right!!! tax + pla + + lsr CB.Cache+S.CB.X1+1 + ror + lsr CB.Cache+S.CB.X1+1 + ror + lsr CB.Cache+S.CB.X1+1 + ror - lda CB.Cache+S.CB.X1+1 - lsr - lsr - lsr pha clc adc ZPBMDataPtr diff --git a/DRV/DHGR.DRV.S.PIX.txt b/DRV/DHGR.DRV.S.PIX.txt index f1e57870..0311cef1 100644 --- a/DRV/DHGR.DRV.S.PIX.txt +++ b/DRV/DHGR.DRV.S.PIX.txt @@ -51,7 +51,8 @@ SETPIXEL.MONO ldx CB.Cache+S.CB.X1+1 Get X Hi byte.... .2 ldy $ffff,x MOD7 : x = X.LO, y = X MOD 7 lda CB.Cache+S.CB.OP - beq .5 + + bne .5 lda (ZPBasePtr) XOR eor Mono.Masks,y y = mod 7 @@ -83,8 +84,9 @@ SETPIXEL.C16 lda CB.Cache+S.CB.X1 asl times 2 (range 0->38) ldx CB.Cache+S.CB.Y1 +* clc adc BASEL,x setup line Base Ptr (cc by asl) - sta ZPBasePtr ZPBasePtr now point to first of... + sta ZPBasePtr ZPBasePtr now point to first of... lda BASEH,x sta ZPBasePtr+1 ...the 4 columns diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt index e10a2bab..612b2460 100644 --- a/DRV/MOUSE.DRV.S.txt +++ b/DRV/MOUSE.DRV.S.txt @@ -88,21 +88,8 @@ Dev.Detect >LDYA L.MSG.DETECT bne .3 dex bpl .2 - bra .4 -.3 inc ZPTmpPtr1+1 no match, try next slot.... lda ZPTmpPtr1+1 - cmp #$C8 - bne .1 - - >LDYA L.MSG.DETECT.KO - >SYSCALL PrintF.YA - - lda #MLI.E.NODEV - sec - rts - -.4 lda ZPTmpPtr1+1 sta DEVSLOTCn and #$0F sta DEVSLOT0n @@ -119,9 +106,22 @@ Dev.Detect >LDYA L.MSG.DETECT >SYSCALL PrintF.YA clc rts + +.3 inc ZPTmpPtr1+1 no match, try next slot.... + lda ZPTmpPtr1+1 + cmp #$C8 + bne .1 + + >LDYA L.MSG.DETECT.KO + >SYSCALL PrintF.YA + + lda #MLI.E.NODEV + sec + rts + *-------------------------------------- CS.END -MSG.DETECT >CSTR "Apple Mouse Card/IIc Mouse Driver.\r\n" +MSG.DETECT >CSTR "Apple Mouse Driver.\r\n" MSG.DETECT.OK >CSTR "Mouse Installed As Device : %s\r\n" MSG.DETECT.KO >CSTR "No Mouse Found.\r\n" DEVSIG.Offset .HS 05070B0CFB @@ -202,7 +202,7 @@ READBLOCK >STYA ZPTmpPtr1 iny lda MOUSEYLOx,x - sta (ZPTmpPtr1),y + sta (ZPTmpPtr1),y iny lda MOUSEYHIx,x diff --git a/INC/LIBGUI.I.txt b/INC/LIBGUI.I.txt index e6e763d6..a26e3445 100644 --- a/INC/LIBGUI.I.txt +++ b/INC/LIBGUI.I.txt @@ -15,9 +15,9 @@ S.CB.CMD.FILLRECT .EQ 8 S.CB.CMD.BITBLT .EQ 10 S.CB.CMD.DRAWLINE .EQ 12 S.CB.OP .EQ 1 +S.CB.OP.XOR .EQ %00000000 screen EOR bitmap -> Screen S.CB.OP.SET .EQ %00000001 replace screen with bitmap S.CB.OP.ORA .EQ %00000010 combine screen & bitmap -> Screen -S.CB.OP.XOR .EQ %00000011 screen EOR bitmap -> Screen S.CB.OP.SAVE .EQ %00010000 Save Screen to DstPtr before painting S.CB.OP.AND .EQ %00100000 Apply BitMap mask before painting S.CB.OP.COLOR .EQ %01000000 Assume BitMap is COLOR diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index 25e264e9..5af1bdc9 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -310,7 +310,7 @@ DrawLines.CB .DA #S.CB.CMD.DRAWLINE .DA 191+191 .DA #S.CB.CMD.DRAWLINE - .DA #S.CB.OP.ORA + .DA #S.CB.OP.XOR .DA #S.CB.MODE.MONO .DA #1 .DA 90 @@ -329,8 +329,8 @@ DrawLines.CB .DA #S.CB.CMD.DRAWLINE .DA #S.CB.CMD.DRAWLINE .DA #S.CB.OP.ORA - .DA #S.CB.MODE.MONO - .DA #1 + .DA #S.CB.MODE.C16 + .DA #15 .DA 110 .DA 0 .DA 559