Skip to content

Commit 4adee9f

Browse files
use timer 1 for clock and sleep functions
1 parent 9f35b8e commit 4adee9f

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

src/crt/crt0.src

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
assume adl=1
22

3-
mpTmr2Counter := 0F20010h
3+
mpTmr1Counter := 0F20000h
44
mpTmrCtrl := 0F20030h
55

6-
bTmr2Enable := 3
7-
bTmr2Crystal := 4
8-
bTmr2Overflow := 5
9-
bTmr2CountUp := 10
6+
bTmr1Enable := 0
7+
bTmr1Crystal := 1
8+
bTmr1Overflow := 2
9+
bTmr1CountUp := 9
1010

1111
public _errno
1212
_errno := $D008DC
@@ -114,30 +114,30 @@ fini_functions:
114114
section .init.clock
115115
public ___init_clock
116116
___init_clock:
117-
; Disable the timer and configure it to use the 32768Hz crystal timer, not
117+
; Disable timer 1 and configure it to use the 32768Hz crystal timer, not
118118
; generate an interurrupt on overflow, and count up.
119-
assert bTmr2CountUp / 8 = 1
119+
assert bTmr1CountUp / 8 = 1
120120
ld hl, mpTmrCtrl + 1
121-
set bTmr2CountUp - 8, (hl)
121+
set bTmr1CountUp - 8, (hl)
122122
dec hl
123-
assert bTmr2Enable / 8 = 0
124-
res bTmr2Enable, (hl)
125-
assert bTmr2Crystal / 8 = 0
126-
set bTmr2Crystal, (hl)
127-
assert bTmr2Overflow / 8 = 0
128-
res bTmr2Overflow, (hl)
123+
assert bTmr1Enable / 8 = 0
124+
res bTmr1Enable, (hl)
125+
assert bTmr1Crystal / 8 = 0
126+
set bTmr1Crystal, (hl)
127+
assert bTmr1Overflow / 8 = 0
128+
res bTmr1Overflow, (hl)
129129
; Set the counter to zero.
130-
assert mpTmrCtrl shr 8 = (mpTmr2Counter + 1) shr 8
131-
ld l, (mpTmr2Counter + 1) and $FF
130+
assert mpTmrCtrl shr 8 = (mpTmr1Counter + 1) shr 8
131+
ld l, (mpTmr1Counter + 1) and $FF
132132
ld de, 0
133133
ld (hl), de
134134
dec hl
135135
ld (hl), e
136136
; Enable the timer.
137-
assert bTmr2Enable / 8 = 0
138-
assert mpTmr2Counter shr 8 = mpTmrCtrl shr 8
137+
assert bTmr1Enable / 8 = 0
138+
assert mpTmr1Counter shr 8 = mpTmrCtrl shr 8
139139
ld l, mpTmrCtrl and $FF
140-
set bTmr2Enable, (hl)
140+
set bTmr1Enable, (hl)
141141

142142
section .text
143143
private ___rerun_handler

src/libc/clock.src

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
mpTmr2Counter := 0F20010h
1+
mpTmr1Counter := 0F20000h
22

33

44
assume adl=1
55

66
section .text
77
public _clock
88
_clock:
9-
assert mpTmr2Counter shr 8 and $FF = 0
9+
assert mpTmr1Counter shr 8 and $FF = 0
1010
; O: euhl = ticks
11-
assert mpTmr2Counter and $A7 = 0
11+
assert mpTmr1Counter and $A7 = 0
1212
; FO: s = 0, z = 0, h = 0, p/v = 0, n = 0, c = 0
1313
; CC: 79 + cc(_atomic_load_increasing_32)
1414
require ___init_clock
1515

16-
ld hl, mpTmr2Counter
16+
ld hl, mpTmr1Counter
1717
push hl
1818
call _atomic_load_increasing_32
1919
; ^ 48 + cc(_atomic_load_increasing_32) cc

0 commit comments

Comments
 (0)