Changeset 6

Timestamp:

07/25/09 00:18:16 (3 years ago)

Author:

brandonlw

Message:

Use our interrupt equates

Location:

trunk

Files:

• includes/os2.inc (modified) (2 diffs)
• page00/boot.asm (modified) (5 diffs)

trunk/includes/os2.inc

@@ -2831 +2831 @@
 
 ;======================================================================
-;           I/O equates                                                          
-;======================================================================
-;
-D0D1_bits       EQU  03h
-D0LD1L          EQU  03h
-D0LD1H          EQU  01h
-D0HD1L          EQU  02h
-D0HD1H          EQU  00h
-bport           EQU  0                  ; 4-BIT LINK PORT (I/O) 
+; I/O Equates                                                          
+;======================================================================
+bport                EQU    0      ;4-BIT LINK PORT (I/O) (or so TI says)
+D0D1_bits            EQU    03h
+D0LD1L               EQU    03h
+D0LD1H               EQU    01h
+D0HD1L               EQU    02h
+D0HD1H               EQU    00h
+usbStatusPort        EQU    55h
+usbEventPort         EQU    56h
 
 ;======================================================================
 ; Interrupt Equates
 ;======================================================================
-intrptEnPort         EQU    3         ;interrupt enable (in/out)
+interruptEnPort      EQU    3             ;interrupt enable
 iNormal              EQU    1011b
 INTERRUPT_MASK_ON    EQU    00000001b
@@ -2851 +2852 @@
 INTERRUPT_MASK_POWER EQU    00001000b
 INTERRUPT_MASK_LINK  EQU    00010000b
-
-;======================================================================
-;       Memory paging equates
-;======================================================================
-;
-memPageAPort    equ 6 ; memory page A (in/out)
-;
+interruptStatusPort  EQU    4             ;interrupt status
+INT_TRIGGER_ON       EQU    0
+INT_TRIGGER_HW1      EQU    1
+INT_TRIGGER_HW2      EQU    2
+INT_STATUS_ON        EQU    3
+INT_TRIGGER_LINK     EQU    4
+INT_TRIGGER_TIMER1   EQU    5
+INT_TRIGGER_TIMER2   EQU    6
+INT_TRIGGER_TIMER3   EQU    7
+
+;======================================================================
+; Memory Paging Equates
+;======================================================================
+memModePort          EQU    4
+memPageAPort         EQU    6 ;bank 1
+memPageBPort         EQU    7 ;bank 2
+memPageCPort         EQU    5 ;bank 3
+
 ;======================================================================
 ;       LCD Driver equates

trunk/page00/boot.asm

@@ -73 +73 @@
 ;003Ah:
 resumeInterruptHandler:
-       in a,(4)
-       bit 7,a
+       in a,(interruptStatusPort)
+       bit INT_TRIGGER_TIMER1,a
+       jp nz,firstCrystalTimerExpired
+       bit INT_TRIGGER_TIMER2,a
+       jp nz,secondCrystalTimerExpired
+       bit INT_TRIGGER_TIMER3,a
        jp nz,thirdCrystalTimerExpired
-       bit 5,a
-       jp nz,firstCrystalTimerExpired
-       bit 6,a
-       jp nz,secondCrystalTimerExpired
        jp continueInterruptHandler
 ;004Eh:
@@ -113 +113 @@
        ret
 ;0075h:
+;This is used as the hard-coded return point for BCALL/BJUMP routines.
        ex (sp),hl
        push af
@@ -125 +126 @@
        ex af,af'
        exx
-       in a,(55h)
+       in a,(usbStatusPort)
        xor 0FFh
        and 1Fh
@@ -131 +132 @@
        ;TODO: Do USB stuff
 continueInterruptHandler:
-       bit 2,a
+       bit INT_TRIGGER_HW2,a
        jr nz,secondHardwareTimerTriggered
-       bit 4,a
+       bit INT_TRIGGER_LINK,a
        jr nz,linkActivityDetected
        rra
@@ -142 +143 @@
 interruptReturnA:
        push af
-       ld a,8
-       out (3),a
-       pop af
-       out (3),a
+       ld a,INTERRUPT_MASK_POWER   ;keep calculator powered at least
+       out (interruptEnPort),a
+       pop af
+       out (interruptEnPort),a
 interruptReturnStandard:
-       ld a,0Bh
+       ld a,iNormal
        bit 0,(iy+16h)
        jr z,interruptDirectReturnA
 interruptReturnEnableTimer2:
-       add a,4
+       or INTERRUPT_MASK_HW2       ;enable hardware timer 2
 interruptDirectReturnA:
-       out (3),a
+       out (interruptEnPort),a
        ex af,af'
        exx
        ei
        reti
+
 firstCrystalTimerExpired:
 secondCrystalTimerExpired: