Changeset 35

Timestamp:

08/05/09 02:59:44 (3 years ago)

Author:

brandonlw

Message:

We can now receive a copy of the TI-OS and save it to pages 04h-07h and 74h-7Bh (pages 00h-03h are redirected to pages 70h-73h, and 7Ch-7Dh to 6Ah-6Bh)
Now we just need the boot loader and TI-OS patches to allow on-the-fly dual booting
And direct USB support so everyone can use it...

Location:

trunk

Files:

• page00/boot.asm (modified) (5 diffs)
• page00/display.asm (modified) (2 diffs)
• page00/util.asm (modified) (1 diff)
• page1C/linkprotocol.asm (modified) (1 diff)
• page1C/silentlink.asm (modified) (12 diffs)

trunk/page00/boot.asm

@@ -473 +473 @@
        call ReadKeypad
        cp skGraphvar
-       jr z,StartBootLoader
+       call z,StartBootLoader
 $$:    set indicRun,(iy+indicFlags)
        ld hl,1
@@ -512 +512 @@
 
 StartBootLoader:
-;TODO: this whole thing eventually needs to run from sector 70h or wherever I back myself up to
+;This is called in two places:     during OS2 boot (we're on page 0)
+;                                  while on page 70h and we're temporarily swapped in
+;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
+       ld hl,BootLoader
+       ld de,userMem
+       ld bc,BootLoaderEnd-BootLoader
+       ldir
+       jp userMem
+BootLoader:
        res indicOnly,(iy+indicFlags)
        res curAble,(iy+curFlags)
@@ -552 +561 @@
        jr BootLoaderKeyLoop
 $$:    call ClrLCDFull
-       jr TurnCalculatorOn
+       jp TurnCalculatorOn
 SwitchOS:
+       B_CALL UnlockFlash
+       ;NOTE: this loader of the loader needs to execute as if it were either from here or page 70h.
+       ;TODO: Uh...not yet!
        ;Copy a loader to RAM which does the following:
        ;      Back up sector 0 to the extra RAM pages
@@ -566 +578 @@
        ;      Copy from the extra RAM pages to pages 68h-6Bh
        ;Restart.
-       ;NOTE: this loader of the loader needs to execute as if it were either from here or page 70h.
-       ;TODO: Uh...not yet!
-       call ClrLCDFull
-       jr TurnCalculatorOn
+       rst 00h
 NZIfTIOSExists:
        in a,(memPageAPort)
@@ -601 +610 @@
        DB "enable dual     "
        DB "booting.",0
+BootLoaderEnd:
 

trunk/page00/display.asm

@@ -3 +3 @@
 
  PUBLIC AnimateRunIndicator,DispHexA,PutS,PutC,curBlink,SaveOScreen,DispHexHL,EraseEOL,ClrLCDFull
- PUBLIC _LCD_COMMAND,SetXAutoIncrementMode,SetYAutoIncrementMode
+ PUBLIC _LCD_COMMAND,SetXAutoIncrementMode,SetYAutoIncrementMode,IPutSB
  EXTERN IsAtEditTail,IsAtBtm,LCDDelay
 
@@ -11 +11 @@
        call LCDDelay
        out (LCDinstPort),a
+       ret
+
+IPutSB:
+       push bc
+       ld a,(hl)
+       inc hl
+       call PutC
+       pop bc
+       djnz IPutSB
        ret
 

trunk/page00/util.asm

@@ -7 +7 @@
  PUBLIC CopyRAMToFlashPage
  PUBLIC BCALL,BJUMP,JErrorNo,SetupPagedPtr,PagedGet,EraseRAMPage
- EXTERN Page0Call,UpdateAPD,PowerOff,GetCSC
+ EXTERN Page0Call,UpdateAPD,PowerOff,GetCSC,PutC
 
  include "includes\os2.inc"

trunk/page1C/linkprotocol.asm

@@ -6 +6 @@
 
  PUBLIC SendCommandA,ReceiveHeaderPacket,SendSkipExitPacket,SendCAndAddToChecksum,SendContinue,ReceiveDataPacket
- PUBLIC receiveRestOfDataPacket
+ PUBLIC receiveRestOfDataPacket,SendHCommand
  EXTERN SetupPagedPtr,EnableLinkAssist,Send4Bytes,PagedGet,SendAByte,Get4BytesNC,JErrorNo
  EXTERN SendCByte,RecAByteIO,SaveFlashBytes,SendAcknowledge

trunk/page1C/silentlink.asm

@@ -10 +10 @@
  EXTERN Send4Bytes,SendCAndAddToChecksum,LCDDelay,_LCD_COMMAND,SendAByte,SetXAutoIncrementMode,EraseRAMPage
  EXTERN SetYAutoIncrementMode,SendContinue,ReceiveDataPacket,DispHexHL,PutC,receiveRestOfDataPacket
- EXTERN CopyToRAMPage,CopyRAMToFlashPage,EraseEOL,PowerOff
+ EXTERN CopyToRAMPage,CopyRAMToFlashPage,EraseEOL,PowerOff,SendHCommand,IPutSB
 
 keyscnlnk:
@@ -51 +51 @@
        ;This is a command we don't recognize
        ;TODO: for now, freak out
+       ld a,5
+       call PutC
        ld a,(header+1)
        call DispHexA
@@ -94 +96 @@
        DB 06h
        DW receivedVariableHeader
+       DB 0A2h
+       DW receivedRequestToSend
        DB 87h
        DW remoteControlPacket
@@ -101 +105 @@
        DW keyscnlnkEnd
 cmdTableEnd:
+
+receivedRequestToSend:
+       call receiveRestOfDataPacket
+       ld a,(ioOP1)
+       cp 19h
+       jr z,sendDirectoryContentsResponse
+       ld a,6
+       call PutC
+       ld a,0A2h
+       call DispHexA
+       ld hl,ioOP1
+       ld b,11
+       call IPutSB
+       ld a,6
+       call PutC
+       jr keyscnlnkEnd
+sendDirectoryContentsResponse:
+;TODO: actually implement the directory contents response
+       ld hl,22000
+       ld (ioData),hl
+       ld a,15h
+       ld hl,2
+       call SendCommandA
+       ld h,92h
+       call SendHCommand
+       jr keyscnlnkEnd
 
 screenshotPacket:
@@ -163 +193 @@
        jr z,receivingOS
        ;Not accepting anything else for now
+       call DispHexA
        ld de,1
        ld a,0Ch
@@ -170 +201 @@
        bit receiveTIOS,(iy+linkFlags2)
        jr z,ReceiveNewOS
+       B_CALL UnlockFlash
        ;Wipe the extra RAM pages
        ld a,84h
@@ -246 +278 @@
        push af
        push hl
+       call DispHexHL       ;*** TESTING
        ld b,a
        ld a,(appSearchPage)
@@ -300 +333 @@
        jr dataWritten
 $$:    ;Is this page 7Ch or 7Dh? If so, change it to 6Ah or 6Bh
-       push af
-       ld a,6
-       call PutC
-       pop af
        cp 7Ch
        ld b,6Ah
@@ -316 +345 @@
        ld b,3Bh
        jr z,translatePage
+       cp 3Ah
+       jr z,checkAddress
+       cp 7Ah
+       jr z,checkAddress
 $$:    ;Just write it
-       pop bc
+       ld hl,6
+       ld (curRow),hl
+       call DispHexA
+       ex de,hl
+       call DispHexHL
+       ex de,hl
+       pop bc
+       push bc
+       pop hl
+       call DispHexHL
        ld hl,appData
        B_CALL WriteFlash
@@ -324 +366 @@
        ld a,b
        jr $B
+checkAddress:
+       push de
+       ld hl,4200h
+       or a
+       sbc hl,de
+       pop de
+       jr c,$B
+       jr z,$B
+       ;Skip writes to 7A:4000h and 7A:4100h
 dataWritten:
        call Get4BytesNC
@@ -332 +383 @@
        jr ReceiveOSPage
 $$:    call SendAcknowledge
-;Patch the received TI-OS to not erase sector 70h (where we will be backed up)
-;Put the [X,T,theta,N] boot loader in page 0
+;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
+       ;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
        call APP_POP_ERRORH
        ;Seems like the most sensible thing to do after receiving the TI-OS is just shut off
@@ -358 +418 @@
        call SendAcknowledge
        ld hl,ioData
-       ld (hl),OS2_VERSION_MAJOR
-       inc hl
-       ld (hl),OS2_VERSION_MINOR
+       ld (hl),2 ;OS2_VERSION_MAJOR
+       inc hl
+       ld (hl),22h ;OS2_VERSION_MINOR
        inc hl
        B_CALL GetBootVer