diff options
author | Bdale Garbee <bdale@gag.com> | 2018-10-20 01:18:12 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2018-10-20 01:18:12 -0600 |
commit | 0686a7b8aec524d81bda4c572549a3a068ce0eed (patch) | |
tree | 2e6061c834b99e3b9668be8b3cfb1627251365d3 /src/avr/ao_pwmin.c | |
parent | 6aa451ce81bfdfe679e3f9902043a5f0d235c745 (diff) | |
parent | cc528f1ff0271ec6488a1a7b91c731183502101e (diff) |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/avr/ao_pwmin.c')
-rw-r--r-- | src/avr/ao_pwmin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/avr/ao_pwmin.c b/src/avr/ao_pwmin.c index 5eb392a4..2d83380f 100644 --- a/src/avr/ao_pwmin.c +++ b/src/avr/ao_pwmin.c @@ -26,8 +26,8 @@ * project payload developed at Challenger Middle School. */ -volatile __data uint16_t ao_icp3_count = 0; -volatile __data uint16_t ao_icp3_last = 0; +volatile uint16_t ao_icp3_count = 0; +volatile uint16_t ao_icp3_last = 0; uint16_t ao_icp3(void) { @@ -39,7 +39,7 @@ uint16_t ao_icp3(void) } static void -ao_pwmin_display(void) __reentrant +ao_pwmin_display(void) { /* display the most recent value */ printf("icp 3: %5u\n", ao_icp3()); @@ -62,7 +62,7 @@ ISR(TIMER3_CAPT_vect) ao_icp3_last = ao_icp3_this; } -__code struct ao_cmds ao_pwmin_cmds[] = { +const struct ao_cmds ao_pwmin_cmds[] = { { ao_pwmin_display, "p\0PWM input" }, { 0, NULL }, }; |