Changeset 57

Timestamp:

11/01/09 02:29:06 (2 years ago)

Author:

brandonlw

Message:

We can actually swap in OS 1.18 now!

Location:

trunk

Files:

• includes/os2.inc (modified) (1 diff)
• page00/boot.asm (modified) (7 diffs)
• page00/home.asm (modified) (2 diffs)
• page00/util.asm (modified) (2 diffs)
• page1C/silentlink.asm (modified) (1 diff)

trunk/includes/os2.inc

@@ -409 +409 @@
 statusIsSE84P        EQU    7
 STATUS_NON_83P_MASK  EQU    80h
+STATUS_84P_SERIES_MASK      EQU    00100000b
 
 ;======================================================================

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
+ 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
@@ -133 +133 @@
        ex af,af'
        exx
+       call NZIf84PlusSeries
+       jr z,resumeInterruptHandler
        in a,(usbStatusPort)
        xor 0FFh
@@ -224 +226 @@
        exx
        ei
-       reti
+       ret ;i
 secondHardwareTimerTriggered:
 ;This only fires when enableHW2Timer,(iy+interruptFlags) is set, and that's only done by _getKey.
@@ -525 +527 @@
        set apdAble,(iy+apdFlags)
        set apdRunning,(iy+apdFlags)
+       set batteriesGood,(iy+interruptFlags)
        xor a
        ld (menuCurrent),a
@@ -756 +759 @@
        nop
        nop
-       ld a,0BFh
+       ld a,0EFh
        out (1),a
        nop
@@ -762 +765 @@
        nop
        in a,(1)
-       and 0FEh
+       and 07Fh
        ld a,0FFh
        out (1),a
@@ -774 +777 @@
 ;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,(OS2Marker)
+       or a
        ld hl,BootLoader
-       ld de,userMem
+       jr z,$F
+       ld hl,BootLoader+4000h
+$$:    ld de,userMem
        ld bc,BootLoaderEnd-BootLoader
        ldir

trunk/page00/home.asm

@@ -49 +49 @@
        pop hl
        ld (curRow),hl
+       cp kGraph
+       jr z,killOtherOS
        cp kYequ
        ret nz
@@ -83 +85 @@
        set curAble,(iy+curFlags)
        ret
+killOtherOS:
+       B_CALL UnlockFlash
+       ld a,70h
+       B_CALL EraseFlashPage
+       ret
 

trunk/page00/util.asm

@@ -3 +3 @@
 
  PUBLIC _APP_PUSH_ERRORH,_APP_POP_ERRORH,PushRealO1,Mov9ToOP1,FPAdd,LCDDelay
- PUBLIC CopyFlashPage,ATimes16,CalculateOSChecksum
+ PUBLIC CopyFlashPage,ATimes16,CalculateOSChecksum,Is84P,NZIf84PlusSeries
  PUBLIC Placeholder005Fh,Placeholder0006h,Placeholder004Eh,Placeholder0003h,Placeholder0035h
  PUBLIC outputPage,NZIf83Plus,ZIfSlowSpeed,GetBytePaged,MakeOffPageCall,CopyToRAMPage
@@ -624 +624 @@
        ret
 
+NZIf84PlusSeries:
+       push bc
+       push af
+       in a,(statusPort)
+       and STATUS_84P_SERIES_MASK
+       pop bc
+       ld a,b
+       pop bc
+       ret
+

trunk/page1C/silentlink.asm

@@ -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 page 0 routine for this OS
        ld a,7Bh