Changeset 61

Timestamp:

11/08/09 21:15:02 (2 years ago)

Author:

brandonlw

Message:

Dual booting now works!

Files:

• trunk/page00/boot.asm (modified) (4 diffs)

trunk/page00/boot.asm

@@ -841 +841 @@
        ld hl,sClearToCancel-BootLoader+userMem
        B_CALL PutS
+       ld a,iNormal
+       out (interruptEnPort),a
 bootSelectKeyLoop:
        ei
        B_CALL GetCSC
        cp skYEqu
-       jr z,SwitchOS
+       jp z,SwitchOS-BootLoader+userMem
        cp skDel
-       jr z,ReceiveTIOS
+       jp z,ReceiveTIOS-BootLoader+userMem
        cp sk0
-       jr z,DeleteOS
+       jp z,DeleteOS-BootLoader+userMem
        ld hl,contrast
        cp skAdd
@@ -859 +861 @@
        ;We pressed CLEAR, just reset and boot whatever it is that we are
 ;       B_CALL ClrLCDFull
+       di
+       ld hl,0
+       ld (RAMChecksum),hl
+       ld a,lcdTurnOff
+       out (LCDinstPort),a
        xor a
        out (memPageBPort),a
        rst 00h
+contrastDown:
+       dec (hl)
+       jr $F
 contrastUp:
        inc (hl)
-$$:    call SetContrast
+$$:    ld a,(contrast)
+       add a,18h
+       or 0C0h
+$$:    push af
+       in a,(2)
+       and 80h
+       jr z,$F
+       in a,(2)
+       and 2
+       jr z,$B
+$$:    pop af
+       out (LCDinstPort),a
        jr bootSelectKeyLoop
-contrastDown:
-       dec (hl)
-       jr $B
 SwitchOS:
        B_CALL ClrLCDFull
@@ -969 +987 @@
        jr nz,$B
        ;Restart.
+       di
        ld hl,0
        ld (RAMChecksum),hl
 ;       B_CALL ClrLCDFull
 ;       B_CALL PowerOff
+       ld a,lcdTurnOff
+       out (LCDinstPort),a
        rst 00h
 DeleteOS:
@@ -981 +1002 @@
        B_CALL WriteAByte
        ;Restart.
+       di
+       ld hl,0
+       ld (RAMChecksum),hl
+       ld a,lcdTurnOff
+       out (LCDinstPort),a
        xor a
        out (memPageBPort),a