Changeset 24

Timestamp:

08/02/09 01:27:02 (3 years ago)

Author:

brandonlw

Message:

More linking cleanup

Location:

trunk

Files:

• includes/os2.inc (modified) (1 diff)
• page00/boot.asm (modified) (1 diff)
• page1C/linklow.asm (modified) (10 diffs)
• page1C/linkprotocol.asm (modified) (8 diffs)
• page1C/linkutil.asm (modified) (1 diff)
• page1C/silentlink.asm (modified) (1 diff)

trunk/includes/os2.inc

@@ -123 +123 @@
 offPageCallPage             EQU    9C83h
 offPageCallAddress          EQU    9C84h
+laTimer                     EQU    9C86h
 ;
 linkDelay                   EQU    9CACh

trunk/page00/boot.asm

@@ -273 +273 @@
        call nz,CheckLowBatteriesTurnOff
        set turnOffIfLowBatteriesFound,(iy+batteryCheckFlags)
+$$:    ld a,(laTimer)
+       or a
+       jr z,$F
+       dec a
+       ld (laTimer),a
 $$:    bit indicRun,(iy+indicFlags)
        call nz,AnimateRunIndicator

trunk/page1C/linklow.asm

@@ -11 +11 @@
        di
        call ReceiveByteToC
-       call RecAByteIO_1
-       ret c
-       ret nz
-       jr z,RecAByteIO
-RecAByteIO_1:
-;I think this is a TI-Keyboard routine, let it fail
-       cp 1
-       ld a,c
-;       jr nz,$F
-       cp 0E0h
-       ret nz
-       scf
+       ld a,c
        ret
 ReceiveByteToC:
@@ -29 +18 @@
        call NZIf83Plus
        jr z,ReceiveLAByteToC
-       ld de,0FFFh
+       ld de,0FFFFh
        jr startReceiveLoop
 receiveLoop:
@@ -74 +63 @@
        jr nz,$B
 $$:    djnz receiveByteLoop
-       ld a,0
+       xor a
        ret
 RBTC_1:ld a,2
@@ -93 +82 @@
        call ResetLATimeout
 $$:    xor a
-       ld (9C86h),a
+       ld (laTimer),a
        call NZIfTimeout
        jp nz,JErrorNo
-       in a,(9)
+       in a,(laStatusPort)
        bit 6,a
        jr nz,$F
        and 11h
        jr z,$B
-       in a,(0Ah)
+       in a,(laReceivePort)
        ld c,a
        ld a,0
@@ -107 +96 @@
 $$:    and 11h
        jp z,JErrorNo
-       in a,(0Ah)
+       in a,(laReceivePort)
        ld c,a
        ld a,1
@@ -115 +104 @@
        di
        res indicOnly,(iy+indicFlags)
-       ld a,5
+       ld a,lcdXAutoIncrementMode
        out (LCDinstPort),a
        ei
@@ -124 +113 @@
        ld a,c
        ret
-$$:    bit 4,(iy+9)
+$$:    bit onInterrupt,(iy+onFlags)
        jp nz,JErrorNo
        call HandleLinkKeyActivity
@@ -136 +125 @@
        ret
 LAReceiveByteToC:
-       bit 4,(iy+9)
+       bit onInterrupt,(iy+onFlags)
        jp nz,JErrorNo
        call HandleLinkKeyActivity
-       in a,(9)
+       in a,(laStatusPort)
        and 58h
        jr z,LAReceiveByteToC
@@ -148 +137 @@
        set indicOnly,(iy+indicFlags)
        di
-       res 5,(iy+3Dh)
        call NZIf83Plus
        jr nz,cgbNoAssist
        di
-       call ReceiveLAByteToC
-       ret
+       jr ReceiveLAByteToC
 cgbNoAssist:
        ld b,8
-       call ReceiveByteToC_Ready
-       ret
+       jr ReceiveByteToC_Ready
 
 Send4Bytes:
@@ -239 +225 @@
 sendByteLA_1:
        ld a,0FAh
-       ld (9C86h),a
-       in a,(9)
+       ld (laTimer),a
+       in a,(laStatusPort)
        bit 5,a
        jr z,$F
        ld a,c
-       out (0Dh),a
+       out (laSendPort),a
        ret
 $$:    call NZIfTimeout

trunk/page1C/linkprotocol.asm

@@ -71 +71 @@
 
 SendSkipExitPacket:
-       ld hl,867Ch
+       ld hl,header+8
        ld (hl),a
        ld a,36h
@@ -78 +78 @@
 ReceiveHeaderPacket:
        xor a
-       ld (ioNewData-1),a
+       ld (header+8),a
        ld (ioNewData),a
        ld hl,ioData
@@ -96 +96 @@
        jr receiveRestOfDataPacket
 GetSmallDataPacket:
-       ld hl,ioData-1
+       ld hl,header+8
 $$:    ld (iMathPtr5),hl
        ld hl,(header+2)
@@ -117 +117 @@
        ld hl,(iMathPtr5)
 receiveDataLoop:
-       in a,(4)
-       bit 3,a
+       in a,(interruptStatusPort)
+       bit INT_STATUS_ON,a
        jr z,JErrorNo
        push bc
@@ -133 +133 @@
        inc a
        ld (pagedCount),a
-       cp 16
+       cp 16                       ;buffer 16 bytes at a time
        call z,SaveFlashBytes
        jr receiveDataContinue
@@ -152 +152 @@
        ld a,(pagedCount)
        or a
-       call nz,SaveFlashBytes
+       call nz,SaveFlashBytes      ;flush out the buffer
 receiveDataDone:
        call RecAByteIO
@@ -188 +188 @@
        or a
        sbc hl,bc
-       or a
-       ret    ;UH?!
        jr nz,$F
        ret
@@ -205 +203 @@
        ei
        jr ReceiveAcknowledge
+

trunk/page1C/linkutil.asm

@@ -42 +42 @@
        jr Send4Bytes
 
-       Get4BytesNC:
+Get4BytesNC:
        call Rec1stByteNC
 Get3Bytes:

trunk/page1C/silentlink.asm

@@ -132 +132 @@
        di
        res indicOnly,(iy+indicFlags)
-       ld a,5
+       ld a,lcdXAutoIncrementMode
        out (LCDinstPort),a
 eiRet: ei