Changeset 60

Timestamp:

11/08/09 18:23:13 (3 years ago)

Author:

brandonlw

Message:

More attempts to stabilize dual booting

Location:

trunk

Files:

• includes/os2.inc (modified) (1 diff)
• page00/boot.asm (modified) (17 diffs)
• page00/display.asm (modified) (3 diffs)
• page00/home.asm (modified) (2 diffs)
• page1C/silentlink.asm (modified) (6 diffs)
• page1D/1Dbase.asm (modified) (3 diffs)

trunk/includes/os2.inc

@@ -41 +41 @@
 _keyscnlnk                  EQU 4A1Ah
 _GetKey                     EQU 4972h
+_LCD_DRIVERON               EQU 4978h
 _MemClear                   EQU 4C30h
 _Rec1stByteNC               EQU 4EFDh
 _RecAByteIO                 EQU 4F03h
+_PowerOff                   EQU 5008h
 _UnlockFlash                EQU 7000h
 

trunk/page00/boot.asm

@@ -6 +6 @@
  PUBLIC LdHLInd,BCALLRoutine,CheckForBootLoader,OS2Marker,AppInit,JForceCmdNoChar,JForceCmd
  EXTERN PutS,PutC,ifastcopy,CallUSBActivityHook,CheckLowBatteriesTurnOff,SaveOScreen
- EXTERN RunLinkActivityHook,HandleLinkKeyActivity,ResetStacks,_LCD_DRIVERON,NZIf84PlusSeries
+ EXTERN RunLinkActivityHook,HandleLinkKeyActivity,ResetStacks,LCD_DRIVERON,NZIf84PlusSeries
  EXTERN _APP_PUSH_ERRORH,_APP_POP_ERRORH,FindSym,PushRealO1,Mov9ToOP1,FPAdd,OP1ToOP2,LCDDelay
  EXTERN Placeholder005Fh,Placeholder0006h,Placeholder004Eh,Placeholder0003h,Placeholder0035h
@@ -18 +18 @@
 
 ;0000h:
-boot:  jp BootCalculator
+boot:  jp JumpToBootCode
 ;0003h:
        jp Placeholder0003h
@@ -418 +418 @@
        ret
 
+JumpToBootCode:
+       in a,(statusPort)
+       and STATUS_NON_83P_MASK
+       ld a,1Fh
+       jr z,$F
+       ld a,3
+       out (0Eh),a ;not sure yet
+       ld a,7Fh
+$$:    out (memPageAPort),a
+       ld a,7
+       out (4),a
+       ld hl,812Ch
+       in a,(statusPort)
+       and STATUS_84P_SERIES_MASK
+       jr nz,$F
+       ld hl,80D5h
+$$:    jp (hl)
+       xor a
 BootCalculator:
        di
@@ -494 +512 @@
        ld a,17h ;default contrast level
        ld (contrast),a
-       call _LCD_DRIVERON
+       call LCD_DRIVERON
        ld hl,0800h
        ld (winTop),hl
@@ -520 +538 @@
        call APP_PUSH_ERRORH
        ld (onSP),sp
-       call _LCD_DRIVERON
+       call LCD_DRIVERON
        set onRunning,(iy+onFlags)
        res indicOnly,(iy+indicFlags)
@@ -552 +570 @@
        ld (RAMChecksum),de
 TurnCalculatorOn:
-       call _LCD_DRIVERON
+       call LCD_DRIVERON
        set onRunning,(iy+onFlags)
        res indicOnly,(iy+indicFlags)
@@ -765 +783 @@
        nop
        in a,(1)
-       and 07Fh
+       bit 7,a
        ld a,0FFh
        out (1),a
@@ -777 +795 @@
 ;We need to put a loader in RAM and call that, which might return and we're good, or it'll switch OSes.
 ;TODO: this whole thing needs to run from RAM and depend on neither OS (or both, you might say)
+       ld a,81h
+       out (memPageBPort),a
+       xor a
+       out (memPageCPort),a
        ld a,(OS2Marker)
        or a
@@ -787 +809 @@
        jp userMem
 BootLoader:
+       B_CALL LCD_DRIVERON
        res indicOnly,(iy+indicFlags)
        res curAble,(iy+curFlags)
@@ -796 +819 @@
        ld hl,2
        ld (curRow),hl
-       call NZIfTIOSExists-BootLoader+userMem
+       call DoesSecondOSExist-BootLoader+userMem
        jp z,ReceiveTIOS-BootLoader+userMem
        ;We have the TI-OS, decide to make the switch or not
@@ -835 +858 @@
        jr nz,bootSelectKeyLoop
        ;We pressed CLEAR, just reset and boot whatever it is that we are
-       B_CALL ClrLCDFull
+;       B_CALL ClrLCDFull
+       xor a
+       out (memPageBPort),a
        rst 00h
 contrastUp:
@@ -944 +969 @@
        jr nz,$B
        ;Restart.
-       B_CALL ClrLCDFull
+       ld hl,0
+       ld (RAMChecksum),hl
+;       B_CALL ClrLCDFull
+;       B_CALL PowerOff
        rst 00h
 DeleteOS:
@@ -953 +981 @@
        B_CALL WriteAByte
        ;Restart.
+       xor a
+       out (memPageBPort),a
        rst 00h
 ReceiveTIOS:
@@ -965 +995 @@
        ld hl,2
        ld (curRow),hl
-       call NZIfTIOSExists-BootLoader+userMem
+       call DoesSecondOSExist-BootLoader+userMem
        ld hl,sStartTransfer2-BootLoader+userMem
        jr nz,$F
@@ -982 +1012 @@
 $$:    B_CALL ClrLCDFull
        jp TurnCalculatorOn
-NZIfTIOSExists:
+DoesSecondOSExist:
        in a,(memPageAPort)
        push af
@@ -992 +1022 @@
        jr z,$F
        xor a
-       jr NZIfTIOSExists_1
+       jr DoesSecondOSExist_1
 $$:    or 1
-NZIfTIOSExists_1:
+DoesSecondOSExist_1:
        pop bc
        ld a,b
@@ -1214 +1244 @@
        DB LlBrack,"CLEAR] to exit",0
 sStartTransfer:
-       DB "TI-OS not found."
+       DB "OS not found.   "
 sStartTransfer2:
-       DB "Send TI-OS now  "
-       DB "to enable dual  "
-       DB "booting.",0
+       DB "Send secondary  "
+       DB "OS now to enable"
+       DB "dual booting.",0
 sSwitching:
        DB "Switching...",0

trunk/page00/display.asm

@@ -4 +4 @@
  PUBLIC AnimateRunIndicator,DispHexA,PutS,PutC,curBlink,SaveOScreen,DispHexHL,EraseEOL,ClrLCDFull
  PUBLIC _LCD_COMMAND,SetXAutoIncrementMode,SetYAutoIncrementMode,IPutSB,PutMap,ClrScrnFull,ClrTxtShd
- PUBLIC saveTR,restoreTR,showCursor,CursorOff,CursorOn,hideCursor,RunIndicOn,IPutC,_LCD_DRIVERON
+ PUBLIC saveTR,restoreTR,showCursor,CursorOff,CursorOn,hideCursor,RunIndicOn,IPutC,LCD_DRIVERON
  PUBLIC RestoreTextShadow,rstrpartialWin,savepartialWin,PutPS
  EXTERN IsAtEditTail,IsAtBtm,LCDDelay,ATimes16,NZIf83Plus,_GetCharacterBitmap
@@ -52 +52 @@
        ret
 
-_LCD_DRIVERON:
+LCD_DRIVERON:
        ld a,40h
        call LCDDelay
@@ -193 +193 @@
        cp b
        jr nc,$B
-       ei
+;       ei
        nop
        pop af

trunk/page00/home.asm

@@ -51 +51 @@
        cp kGraph
        jr z,killOtherOS
+       cp kWindow
+       jr z,writeByte
        cp kYequ
        ret nz
@@ -90 +92 @@
        B_CALL EraseFlashPage
        ret
+writeByte:
+       B_CALL UnlockFlash
+       ld hl,(curRow)
+       push hl
+       ld hl,0
+       ld (curRow),hl
+       call GetHexA
+       push af
+       call GetHexHL
+       push hl
+       call GetHexA
+       ld b,a
+       pop de
+       pop af
+       B_CALL WriteAByte
+       pop hl
+       ld (curRow),hl
+       ret
 

trunk/page1C/silentlink.asm

@@ -315 +315 @@
        ld hl,(ioData+6)
 ;       call DispHexHL
-       call EraseEOL
+;       call EraseEOL
        pop hl
        ld (curRow),hl
@@ -337 +337 @@
        push af
        push hl
-       call DispHexHL       ;*** TESTING
+;       call DispHexHL       ;*** TESTING
        ld b,a
        ld a,(appSearchPage)
@@ -473 +473 @@
        ld (3FFEh+8000h),hl
        ;Find the jump to the boot code and modify it to be appropriate for the model
-       ld de,8000h
-       add hl,de
+       ld hl,8000h
        push hl
        pop ix
@@ -546 +545 @@
        jr nz,$B
        ;Mark the OS as valid
-       xor a
+       ld a,70h
        ld b,5Ah
-       ld de,0056h
+       ld de,4056h
        B_CALL WriteAByte
        ld hl,0
@@ -558 +557 @@
        out (7),a
 ;       call DispHexHL
-       ld a,'Y'
+;       ld a,'Y'
 ;       call PutC
        res indicOnly,(iy+indicFlags)
@@ -571 +570 @@
        call APP_POP_ERRORH
        ;Seems like the most sensible thing to do after receiving the TI-OS is just shut off
-       call PowerOff
 receiveTIOSHandler:
        jr keyscnlnkEnd

trunk/page1D/1Dbase.asm

@@ -5 +5 @@
  EXTERN JErrorNo,UnlockFlash,GetKey,keyscnlnk,Rec1stByteNC,RecAByteIO,MemClear,ClrTxtShd
  EXTERN ClrLCDFull,PutS,GetCSC,CursorOff,CursorOn,hideCursor,showCursor,ClrScrnFull,KeyToString
- EXTERN JForceCmdNoChar,JForceCmd
+ EXTERN JForceCmdNoChar,JForceCmd,PowerOff,LCD_DRIVERON
 
 ;4000h:
@@ -2434 +2434 @@
        DW 0000h
        DB 00h
-;_LCD_DRIVERON          equ 4978h 
-       DW 0000h
+_LCD_DRIVERON:
+       DW LCD_DRIVERON
        DB 00h
 ;_DFMIN2                        equ 497Bh
@@ -4114 +4114 @@
        DW 0000h
        DB 00h
-;_PowerOff              equ 5008h
-       DW 0000h
+_PowerOff:
+       DW PowerOff
        DB 00h
 ;_GetKeyRetOff          equ 500Bh ;same as getkey, only returns kOff if 2nd+on is pressed