Changeset 36

Timestamp:

08/13/09 22:14:33 (2 years ago)

Author:

brandonlw

Message:

More attempts to get dual booting working...

Location:

trunk

Files:

• includes/os2.inc (modified) (1 diff)
• page00/boot.asm (modified) (3 diffs)
• page1C/silentlink.asm (modified) (1 diff)
• page1D/1Dbase.asm (modified) (4 diffs)

trunk/includes/os2.inc

@@ -26 +26 @@
 ; OS2 Entry Points
 ;======================================================================
+_GetCSC                     EQU 4018h
+_PutS                       EQU 450Ah
+_ClrLCDFull                 EQU 4540h
 _keyscnlnk                  EQU 4A1Ah
 _GetKey                     EQU 4972h

trunk/page00/boot.asm

@@ -493 +493 @@
        set apdAble,(iy+apdFlags)
        set apdRunning,(iy+apdFlags)
+       ld hl,0
+       ld (curRow),hl
+       ld a,70h
+       out (6),a
+       ld hl,(4000h)
+       call DispHexHL
 $$:    ld hl,6
        ld (curRow),hl
@@ -524 +530 @@
        res indicOnly,(iy+indicFlags)
        res curAble,(iy+curFlags)
-       call ClrLCDFull
+       B_CALL ClrLCDFull
        ld hl,0
        ld (curRow),hl
-       ld hl,sBoot
-       call PutS
+       ld hl,sBoot-BootLoader+userMem
+       B_CALL PutS
        ld hl,2
        ld (curRow),hl
-       call NZIfTIOSExists
-       jr nz,$F
-       ld hl,sStartTransfer
-       call PutS
-       jr ContinueBootLoader
-$$:    ld hl,sCurrently
-       call PutS
-       call IsOS2Running
-       ld hl,sOS2
-       jr z,$F
-       ld hl,sTIOS
-$$:    call PutS
+       call NZIfTIOSExists-BootLoader+userMem
+       jp z,ReceiveTIOS-BootLoader+userMem
+       ;We have the TI-OS, decide to make the switch or not
+$$:    ld hl,sCurrently-BootLoader+userMem
+       B_CALL PutS
+       call IsOS2Running-BootLoader+userMem
+       ld hl,sOS2-BootLoader+userMem
+       jr z,$F
+       ld hl,sTIOS-BootLoader+userMem
+$$:    B_CALL PutS
        ld hl,6
        ld (curRow),hl
-       ld hl,sInstructions
-       call PutS
-ContinueBootLoader:
+       ld hl,sInstructions-BootLoader+userMem
+       B_CALL PutS
        ld hl,7
        ld (curRow),hl
-       ld hl,sClearToCancel
-       call PutS
-       set receiveTIOS,(iy+linkFlags2)    ;receive the TI-OS to the extra pages instead of just jumping to the boot code
-BootLoaderKeyLoop:
-       B_CALL GetKey
-       cp skClear
-       jr z,$F
+       ld hl,sClearToCancel-BootLoader+userMem
+       B_CALL PutS
+bootSelectKeyLoop:
+       ei
+       B_CALL GetCSC
        cp skYEqu
        jr z,SwitchOS
-       jr BootLoaderKeyLoop
-$$:    call ClrLCDFull
-       jp TurnCalculatorOn
+       cp skClear
+       jr nz,bootSelectKeyLoop
+       ;We pressed CLEAR, just reset and boot whatever it is that we are
+       B_CALL ClrLCDFull
+       rst 00h
 SwitchOS:
        B_CALL UnlockFlash
@@ -578 +581 @@
        ;      Copy from the extra RAM pages to pages 68h-6Bh
        ;Restart.
+       B_CALL ClrLCDFull
        rst 00h
+ReceiveTIOS:
+;We don't have a copy of the TI-OS, receive one
+       ld hl,sStartTransfer-BootLoader+userMem
+       B_CALL PutS
+       ld hl,7
+       ld (curRow),hl
+       ld hl,sClearToCancel-BootLoader+userMem
+       B_CALL PutS
+       set receiveTIOS,(iy+linkFlags2)    ;receive the TI-OS to the extra pages instead of just jumping to the boot code
+BootLoaderKeyLoop:
+       B_CALL GetKey
+       cp skClear
+       jr z,$F
+       jr BootLoaderKeyLoop
+$$:    B_CALL ClrLCDFull
+       jp TurnCalculatorOn
 NZIfTIOSExists:
        in a,(memPageAPort)

trunk/page1C/silentlink.asm

@@ -383 +383 @@
        jr ReceiveOSPage
 $$:    call SendAcknowledge
+       ;Couldn't hurt to try to send another acknowledge, because TI Connect sucks
+       ld hl,tryAckAgainHandler
+       call APP_PUSH_ERRORH
+       call SendAcknowledge
+       call APP_POP_ERRORH
+tryAckAgainHandler:
 ;TODO: Patch the received TI-OS to not erase sector 70h (where we will be backed up)
-;TODO: Put the [X,T,theta,N] boot loader in page 0
+;TODO: Put the [X,T,theta,N] boot loader in page 0 (currently in the extra RAM pages)
        ;This loader needs to read the keypad for skGraphvar, and if it's being pressed, call:
-       ;      in a,(6)
-       ;      push af
        ;      ld a,70h
        ;      out (6),a
-       ;      call StartBootLoader+4000h
-       ;      pop af
-       ;      out (6),a
-       ;      ret
+       ;      jp StartBootLoader+4000h
+       ;Copy the extra RAM pages to sector 70h
+       ld a,04h
+       ld b,70h
+       ld c,4
+$$:    push af
+       push bc
+       call CopyRAMToFlashPage
+       pop bc
+       pop af
+       inc a
+       inc b
+       dec c
+       jr nz,$B
+       ld a,'D'
+       call PutC
        call APP_POP_ERRORH
        ;Seems like the most sensible thing to do after receiving the TI-OS is just shut off

trunk/page1D/1Dbase.asm

@@ -4 +4 @@
  PUBLIC _JErrorNo,_UnlockFlash,_GetKey
  EXTERN JErrorNo,UnlockFlash,GetKey,keyscnlnk,Rec1stByteNC,RecAByteIO
+ EXTERN ClrLCDFull,PutS,GetCSC
 
 ;4000h:
@@ -31 +32 @@
        DB 00h
 ;_GetCSC                        equ 4018h ;key board scan codes
-       DW 0000h
+_GetCSC:
+       DW GetCSC
        DB 00h
 ;_coorMon               equ 401Bh ;
@@ -1297 +1299 @@
        DB 00h
 ;_PutS                  equ 450Ah
-       DW 0000h
+_PutS:
+       DW PutS
        DB 00h
 ;_putpsb                        equ 450Dh
@@ -1350 +1353 @@
        DW 0000h
        DB 00h
-;_ClrLCDFull            equ 4540h
-       DW 0000h
+_ClrLCDFull:
+       DW ClrLCDFull
        DB 00h
 ;_ClrLCD                        equ 4543h