Changeset 25

Timestamp:

08/02/09 01:32:07 (3 years ago)

Author:

brandonlw

Message:

The last of the silent linking cleanup -- now we can finally start getting to the good stuff.

Location:

trunk

Files:

• includes/os2.inc (modified) (1 diff)
• page1C/silentlink.asm (modified) (6 diffs)

trunk/includes/os2.inc

@@ -84 +84 @@
 ;
 ioData                      EQU    867Dh
+;
+ioOP1                       EQU    867Fh ;where variable type and name typically is in a link packet
 ;
 ioNewData                   EQU    8689h

trunk/page1C/silentlink.asm

@@ -14 +14 @@
        call NZIf83Plus
        jr nz,$F
-       ld b,a
-       ld a,(9CAFh)
-       or a
-       ld a,b
-       jr nz,keyscnlnk1
 $$:    call CheckLinkLines
        jr nz,eiRet
-keyscnlnk1:
        ld a,(ioErrState)
        push af
@@ -28 +22 @@
        ld a,(ioFlag)
        push af
+       ;I haven't decided on what to do with this stuff yet.
        ld hl,ioFlag
        res 1,(hl)
@@ -39 +34 @@
        call APP_PUSH_ERRORH
        set indicOnly,(iy+indicFlags)
-       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)
+       ld a,(ioData)
        call ContinueGetByte
-       bit 5,(iy+3Dh)
-       jr z,kscnlnkGet3Bytes
-       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
        ld hl,cmdTable
@@ -102 +46 @@
        inc hl
        djnz $B
+       ;This is a command we don't recognize
+       ;TODO: for now, freak out
        ld a,(header+1)
        call DispHexA
@@ -154 +100 @@
 receivedVariableHeader:
        call ReceiveHeaderPacket
-       ld a,(867Fh)
+       ld a,(ioOP1)
        cp 23h
        jr z,receivingOS
+       ;Not accepting anything else for now
        ld de,1
        ld a,0Ch
@@ -170 +117 @@
        B_CALL MD5Init
        B_CALL ReceiveOS
+       ;We never return from this
 
 sendInfoPacket: