Changeset 59

Timestamp:

11/01/09 14:00:18 (2 years ago)

Author:

brandonlw

Message:

Some dual booting clean-up

Location:

trunk

Files:

• page00/boot.asm (modified) (5 diffs)
• page1C/silentlink.asm (modified) (8 diffs)

trunk/page00/boot.asm

@@ -806 +806 @@
        ld hl,sTIOS-BootLoader+userMem
 $$:    B_CALL PutS
+       ld hl,5
+       ld (curRow),hl
+       ld hl,sInstructions-BootLoader+userMem
+       B_CALL PutS
        ld hl,6
        ld (curRow),hl
-       ld hl,sInstructions-BootLoader+userMem
+       ld hl,sInstructions2-BootLoader+userMem
        B_CALL PutS
        ld hl,7
@@ -821 +825 @@
        cp skDel
        jr z,ReceiveTIOS
+       cp sk0
+       jr z,DeleteOS
        ld hl,contrast
        cp skAdd
@@ -940 +946 @@
        B_CALL ClrLCDFull
        rst 00h
+DeleteOS:
+       call UniversalUnlockFlash-BootLoader+userMem
+       ld a,70h
+       ld b,0
+       ld de,4056h
+       B_CALL WriteAByte
+       ;Restart.
+       rst 00h
 ReceiveTIOS:
 ;We don't have a copy of the TI-OS, receive one
@@ -973 +987 @@
        ld a,70h
        out (memPageAPort),a
-       ld hl,(4000h)
-       inc hl
-       ld a,h
-       or l
+       ld a,(4000h+0056h)
+       ;HACK: be smarter about this...
+       cp 5Ah
+       jr z,$F
+       xor a
+       jr NZIfTIOSExists_1
+$$:    or 1
+NZIfTIOSExists_1:
        pop bc
        ld a,b
@@ -1191 +1209 @@
 sInstructions:
        DB LlBrack,"Y=] to switch",0CEh,0
+sInstructions2:
+       DB LlBrack,"0] to delete",0CEh,0
 sClearToCancel:
        DB LlBrack,"CLEAR] to exit",0

trunk/page1C/silentlink.asm

@@ -11 +11 @@
  EXTERN SetYAutoIncrementMode,SendContinue,ReceiveDataPacket,DispHexHL,PutC,receiveRestOfDataPacket
  EXTERN CopyToRAMPage,CopyRAMToFlashPage,EraseEOL,PowerOff,SendHCommand,IPutSB,IPutC,CheckForBootLoader
- EXTERN SetupPagedPtr,PagedGet,SendChecksumGetAcknowledge,RecAByteIO
+ EXTERN SetupPagedPtr,PagedGet,SendChecksumGetAcknowledge,RecAByteIO,cphlde,NZIf84PlusSeries
 
 keyscnlnk:
@@ -312 +312 @@
        ld (curRow),hl
        ld a,(ioData+8)
-       call DispHexA
+;       call DispHexA
        ld hl,(ioData+6)
-       call DispHexHL
+;       call DispHexHL
        call EraseEOL
        pop hl
@@ -386 +386 @@
        push af
        ld a,5
-       call IPutC
-       ex de,hl
-       call DispHexHL
+;       call IPutC
+       ex de,hl
+;       call DispHexHL
        ex de,hl
        ld a,d
@@ -394 +394 @@
        ld d,a
        ex de,hl
-       call DispHexHL
+;       call DispHexHL
        ex de,hl
        pop af
@@ -429 +429 @@
        ld hl,6
        ld (curRow),hl
-       call DispHexA
-       ex de,hl
-       call DispHexHL
+;       call DispHexA
+       ex de,hl
+;       call DispHexHL
        ex de,hl
        pop bc
        push bc
        pop hl
-       call DispHexHL
+;       call DispHexHL
        ld hl,appData
        B_CALL UnlockFlash
@@ -472 +472 @@
        ld hl,(0054h+8000h)
        ld (3FFEh+8000h),hl
-       ;While we're at it, mark the OS as valid
-       ld a,5Ah
-       ld (0056h+8000h),a
+       ;Find the jump to the boot code and modify it to be appropriate for the model
+       ld de,8000h
+       add hl,de
+       push hl
+       pop ix
+findBootCodeJumpLoop:
+       ld l,(ix+0)
+       ld h,(ix+1)
+       ld de,80D5h
+       call cphlde
+       jr z,$F
+       ld de,812Ch
+       jr z,$F
+       inc ix
+       push ix
+       pop bc
+       bit 6,b
+       jr z,findBootCodeJumpLoop
+       jr skipBootCodeJump
+$$:    ld de,812Ch
+       call NZIf84PlusSeries
+       jr nz,$F
+       ld de,80D5h
+$$:    ld (ix+0),e
+       ld (ix+1),d
+skipBootCodeJump:
        ;Find the page 0 routine for this OS
        ld a,7Bh
@@ -522 +545 @@
        dec c
        jr nz,$B
+       ;Mark the OS as valid
+       xor a
+       ld b,5Ah
+       ld de,0056h
+       B_CALL WriteAByte
        ld hl,0
        ld (curRow),hl
@@ -529 +557 @@
        ld a,81h
        out (7),a
-       call DispHexHL
+;       call DispHexHL
        ld a,'Y'
-       call PutC
+;       call PutC
        res indicOnly,(iy+indicFlags)
-       B_CALL GetKey
+;       B_CALL GetKey
        call SendAcknowledge
        ;Couldn't hurt to try to send another acknowledge, because TI Connect sucks