Changeset 20

Timestamp:

08/01/09 23:56:02 (3 years ago)

Author:

brandonlw

Message:

 

Location:

trunk

Files:

• page01/01base.asm (modified) (5 diffs)
• page1C/1Cbase.asm (modified) (14 diffs)

trunk/page01/01base.asm

@@ -8 +8 @@
 
 GetKey:
+       res 5,(iy+3Dh)
        in a,(2)
        and 80h
        jr z,$F
-;       set linkAssistEnabled,(iy+linkAssistFlags)
-;       in a,(laStatusPort)
-;       xor a
-;       out (laEnPort),a
+       set linkAssistEnabled,(iy+linkAssistFlags)
+       in a,(laStatusPort)
+       xor a
+       out (laEnPort),a
        bit 0,(iy+3Eh)
        jr z,disableLA
@@ -31 +32 @@
 GetKeyMainLoop:
        call DisplayShift
-       call GetCSC
+restartKeyLoop:
        bit onInterrupt,(iy+onFlags)
        res onInterrupt,(iy+onFlags)
@@ -45 +46 @@
        ld a,(9CAFh)
        or a
-       ;jr z,isReceivingData
+       jr nz,isReceivingData
        bit 0,(iy+3Eh)
        jr z,$F
@@ -60 +61 @@
 isReceivingData:
        jr nz,receivingData
+       ld a,(9CB1h)
+       or a
+       jr z,restartKeyLoop
        jr GetKeyMainLoop
 receivingData:
@@ -70 +74 @@
        pop hl
        ld (curRow),hl
+       call GetCSC
        ld a,(kbdKey)
        or a

trunk/page1C/1Cbase.asm

@@ -53 +53 @@
        or a
        ld a,b
-;       jr nz,keyscnlnk1
+       jr nz,keyscnlnk1
 $$:    call CheckLinkLines
        jr nz,eiRet
@@ -75 +75 @@
        call APP_PUSH_ERRORH
        set indicOnly,(iy+indicFlags)
-       ld a,(ioData)
+       in a,(2)
+       and 80h
+       jr z,$F
+       ld a,(9CAFh)
+       or a
+       jr z,$F
+       dec a
+       ld (9CAFh),a
+       ld a,(9CB2h)
+       ld de,9CB2h
+       ld hl,9CB3h
+       ld bc,15
+       ldir
+       cp 41h
+       jr nz,keyscnlnkEnd
+       xor a
+       ld (9CAFh),a
+       ld a,(9CB2h)
+       jr kscnlnkGet3Bytes
+$$:    ld a,(ioData)
        call ContinueGetByte
-       call Get3Bytes
+       call DispHexA
+       push af
+       ld a,11
+       call PutC
+       pop af
+       bit 5,(iy+3Dh)
+       jr z,kscnlnkGet3Bytes
+       ld a,10
+       call PutC
+       in a,(2)
+       and 80h
+       jr z,keyscnlnkEnd
+$$:    in a,(9)
+       and 19h
+       jr z,disableLAEnd
+       ld a,(9CAFh)
+       cp 15
+       jr nc,keyscnlnkEnd
+       inc a
+       ld (9CAFh),a
+       call ContinueGetByte
+       ld hl,9CAFh
+       ld e,(hl)
+       ld d,0
+       ld hl,9CB1h
+       add hl,de
+       bit 5,(iy+3Dh)
+       jr nz,kscnlnkContinue
+       ld b,a
+       ld a,41h
+       ld (hl),a
+       inc hl
+       ld a,b
+       ld (hl),a
+       jr keyscnlnkEnd
+kscnlnkContinue:
+       ld (hl),a
+       jr $B
+kscnlnkGet3Bytes:
+;       call Get3Bytes
+       call RecAByteIO
+       ld (header+1),a
+       call DispHexA
+       ld a,12
+       call PutC
+       call RecAByteIO
+       ld (header+2),a
+       call RecAByteIO
+       ld (header+3),a
        ld hl,cmdTable
        ld b,(hl)
@@ -93 +160 @@
        ld a,7
        call PutC
-       call DispHexA
+       ld a,(header+1)
+       call DispHexA
+       di
+       halt
        jp JErrorNo
 $$:    call LdHLInd
@@ -100 +170 @@
        call SendAcknowledge
 keyscnlnkEnd:
-       call APP_POP_ERRORH
+$$:    call APP_POP_ERRORH
        jr $F
+disableLAEnd:
+       call DisableLinkAssist
+       jr $B
 keyscnlnkHandler:
        ld a,1
@@ -108 +181 @@
        call DispHexA
        ld a,(iy+3Eh)
-       call DispHexA
-       in a,(0Ah)
        call DispHexA
        in a,(9)
@@ -146 +217 @@
        DB 06h
        DW receivedVariableHeader
+       DB 87h
+       DW remoteControlPacket
 cmdTableEnd:
 
+remoteControlPacket:
+       call SendAcknowledge
+       jr keyscnlnkEnd
 receivedVariableHeader:
        ld a,99h
@@ -300 +376 @@
        or a
        sbc hl,de
-       jr c,$F
+       jr c,receiveRestOfDataPacket
        jp JErrorNo
 receiveRestOfDataPacket:
@@ -365 +441 @@
 ValidateChecksum:
        ld c,a
-       ld a,9Ah
-       call DispHexA
        in a,(statusPort)
        and STATUS_NON_83P_MASK
@@ -392 +466 @@
        or a
        sbc hl,bc
+       or a
+       ret
        jr nz,$F
        ret
@@ -485 +561 @@
        cp 08h
        jr z,Get3From4BytePacket
+       jr Get3From4BytePacket
        call RecAByteIO
        ld (header+1),a
@@ -495 +572 @@
        cp 2Dh
        jr z,$F
+       jr $F
        jp JErrorNo
 Get4BytesNC:
@@ -659 +737 @@
        jr z,$B
        in a,(0Ah)
-       call DispHexA
        ld c,a
        ld a,0
@@ -666 +743 @@
        jp z,JErrorNo
        in a,(0Ah)
-       call DispHexA
        ld c,a
        ld a,1
@@ -700 +776 @@
        set indicOnly,(iy+indicFlags)
        di
+       res 5,(iy+3Dh)
        call NZIf83Plus
        jr nz,cgbNoAssist