diff options
| author | Keith Packard <keithp@keithp.com> | 2012-06-26 23:01:58 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-26 23:01:58 -0700 |
| commit | 03dc80d15a2f8fe9d7340351226dadd8bc3cfdb9 (patch) | |
| tree | c7b1e429181961dbdc5f2e701b22b6950abaa860 /src/stm/ao_led.c | |
| parent | f11f05c5d634de2a80c34d0d3dc93925980f52e6 (diff) | |
altos: Clean up usage of port parameters
Make stm port parameters always be pointers; this avoids the confusion
where some macros took '&port' and others took a bare 'port', and also
unifies code to run on other processors in a consistent fashion.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/stm/ao_led.c')
| -rw-r--r-- | src/stm/ao_led.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/stm/ao_led.c b/src/stm/ao_led.c index d649f3d7..ee313b6f 100644 --- a/src/stm/ao_led.c +++ b/src/stm/ao_led.c @@ -22,25 +22,28 @@ __pdata uint16_t ao_led_enable; void ao_led_on(uint16_t colors) { - LED_PORT.odr |= (colors & ao_led_enable); + LED_PORT->bsrr = (colors & ao_led_enable); } void ao_led_off(uint16_t colors) { - LED_PORT.odr &= ~(colors & ao_led_enable); + LED_PORT->bsrr = (uint32_t) (colors & ao_led_enable) << 16; } void ao_led_set(uint16_t colors) { - LED_PORT.odr = (LED_PORT.odr & ~(ao_led_enable)) | (colors & ao_led_enable); + uint16_t on = colors & ao_led_enable; + uint16_t off = ~colors & ao_led_enable; + + LED_PORT->bsrr = off << 16 | on; } void ao_led_toggle(uint16_t colors) { - LED_PORT.odr ^= (colors & ao_led_enable); + LED_PORT->odr ^= (colors & ao_led_enable); } void @@ -58,11 +61,11 @@ ao_led_init(uint16_t enable) stm_rcc.ahbenr |= (1 << LED_PORT_ENABLE); ao_led_enable = enable; - LED_PORT.odr &= ~enable; + LED_PORT->odr &= ~enable; for (bit = 0; bit < 16; bit++) { if (enable & (1 << bit)) { - stm_moder_set(&LED_PORT, bit, STM_MODER_OUTPUT); - stm_otyper_set(&LED_PORT, bit, STM_OTYPER_PUSH_PULL); + stm_moder_set(LED_PORT, bit, STM_MODER_OUTPUT); + stm_otyper_set(LED_PORT, bit, STM_OTYPER_PUSH_PULL); } } } |