diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 449b3780..00096ed3 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt index 7d7b3550..8eb808f2 100644 --- a/DRV/MOUSE.DRV.S.txt +++ b/DRV/MOUSE.DRV.S.txt @@ -119,7 +119,6 @@ FD.DEV.NAME .AZ "MOU7" * Driver Code *-------------------------------------- ZPIOCTL .EQ ZPDRV -ZPTmpPtr1 .EQ ZPDRV+2 *-------------------------------------- DRV.CS.START cld jmp (.1,x) @@ -133,14 +132,43 @@ DRV.CS.START cld .DA CLOSE .DA A2osX.BADCALL .DA A2osX.BADCALL -L.DEVSTAT .DA DEVSTAT .DA 0 end or relocation *-------------------------------------- -STATUS >LDYA L.DEVSTAT +STATUS >STYA ZPIOCTL + + ldy #S.IOCTL.STATCODE + lda (ZPIOCTL),y + beq .1 + + cmp #S.IOCTL.STATCODE.GETDIB + bne STATUS.DCB + + ldx #S.DIB-1 + .HS 2C bit abs +.1 ldx #3 + + ldy #S.IOCTL.BUFPTR + lda (ZPIOCTL),y + sta .3+1 + iny + lda (ZPIOCTL),y + sta .3+2 + +.2 lda DIB,x +.3 sta $ffff,x SELF MODIFIED + dex + bpl .2 + clc rts + +STATUS.DCB + +STATUS.9 lda #MLI.E.BADCTL + sec + rts *-------------------------------------- -READBLOCK >STYA ZPTmpPtr1 +READBLOCK >STYA ZPIOCTL stz READBLOCK.S+1 Reset Flags @@ -159,19 +187,19 @@ READBLOCK >STYA ZPTmpPtr1 ldy #S.MOUSE.X1 lda MOUSEXLOx,x - sta (ZPTmpPtr1),y + sta (ZPIOCTL),y iny lda MOUSEXHIx,x - sta (ZPTmpPtr1),y + sta (ZPIOCTL),y iny lda MOUSEYLOx,x - sta (ZPTmpPtr1),y + sta (ZPIOCTL),y iny lda MOUSEYHIx,x - sta (ZPTmpPtr1),y + sta (ZPIOCTL),y lda #S.MOUSE.S.MOVE tsb READBLOCK.S+1 @@ -236,7 +264,7 @@ READBLOCK >STYA ZPTmpPtr1 ldy #S.MOUSE.X2+3 .5 lda SrcDrag-S.MOUSE.X2,y - sta (ZPTmpPtr1),y + sta (ZPIOCTL),y dey bpl .5 @@ -246,7 +274,7 @@ READBLOCK.S lda #$ff SELF MODIFIED beq .9 ldy #S.MOUSE.S - sta (ZPTmpPtr1),y + sta (ZPIOCTL),y clc rts @@ -254,7 +282,7 @@ READBLOCK.S lda #$ff SELF MODIFIED sec rts *-------------------------------------- -CONTROL >STYA ZPTmpPtr1 +CONTROL >STYA ZPIOCTL php sei @@ -305,19 +333,19 @@ CLOSE php *-------------------------------------- * PRIVATE *-------------------------------------- -SETCLAMP lda (ZPTmpPtr1),y +SETCLAMP lda (ZPIOCTL),y sta LOCLAMPLO iny - lda (ZPTmpPtr1),y + lda (ZPIOCTL),y sta LOCLAMPHI iny - lda (ZPTmpPtr1),y + lda (ZPIOCTL),y sta HICLAMPLO iny - lda (ZPTmpPtr1),y + lda (ZPIOCTL),y sta HICLAMPHI txa @@ -334,14 +362,13 @@ DEVSLOT0n .BS 1 bDblClick .BS 1 SrcDrag .BS 4 *-------------------------------------- -DEVSTAT .DA #0 +DIB .DA #0 .DA #0,#0,#0 >PSTR "Apple II Mouse" .BS 2 .DA #S.DIB.T.XY .DA #0 - .DA #0 - .DA #91 + .DA K.VER *-------------------------------------- DRV.END MAN diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt index 25c4e43c..621b06d2 100644 --- a/DRV/UTHERNET.DRV.S.txt +++ b/DRV/UTHERNET.DRV.S.txt @@ -185,7 +185,6 @@ DRV.CS.START cld .DA CLOSE .DA READ .DA WRITE - .DA A2osX.BADCALL IRQ .DA 0 end or relocation *-------------------------------------- STATUS >STYA ZPIOCTL diff --git a/SYS/KERNEL.S.MEM.txt b/SYS/KERNEL.S.MEM.txt index 4f12f0e5..27f875b4 100644 --- a/SYS/KERNEL.S.MEM.txt +++ b/SYS/KERNEL.S.MEM.txt @@ -476,7 +476,7 @@ K.NewStr >STYA .1+1 .8 pla ply - clc +* clc .9 rts */-------------------------------------- * # SListGetByID diff --git a/SYS/KERNEL.S.PS.txt b/SYS/KERNEL.S.PS.txt index 6b0d20ac..e872bbe6 100644 --- a/SYS/KERNEL.S.PS.txt +++ b/SYS/KERNEL.S.PS.txt @@ -343,7 +343,7 @@ PS.LoadBIN.YA jsr BIN.Load bcs .9 ldy #S.PS.ZP.STACK+1 - sta (ZPPtr3),y save pStack HI...(LO alredy set to Stack TOP) + sta (ZPPtr3),y save pStack HI...(LO already set to Stack TOP) txa ldy #S.PS.hSS