diff options
| author | Keith Packard <keithp@keithp.com> | 2018-08-15 15:31:57 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2018-08-15 15:43:28 -0700 |
| commit | 2f61ef9a5046c39f4eeaaf741031bb6a9607b8a6 (patch) | |
| tree | a169db5da2429a5b303288cecdfc7dfc390d7ca0 /src/kernel/ao_log.c | |
| parent | cbe9cfd5eb5d19b7b9bf4bb75424e7592d708929 (diff) | |
altos: Switch global 'log' to 'ao_log_data'
Avoid conflicts with 'log' math function.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/kernel/ao_log.c')
| -rw-r--r-- | src/kernel/ao_log.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kernel/ao_log.c b/src/kernel/ao_log.c index f70c7232..5fb086ce 100644 --- a/src/kernel/ao_log.c +++ b/src/kernel/ao_log.c @@ -117,7 +117,7 @@ ao_log_erase_mark(void) * structure. */ -__xdata ao_log_type log; +__xdata ao_log_type ao_log_data; static uint8_t ao_log_csum(__xdata uint8_t *b) __reentrant @@ -154,7 +154,7 @@ ao_log_write(__xdata ao_log_type *log) __reentrant uint8_t ao_log_check_data(void) { - if (ao_log_csum((uint8_t *) &log) != 0) + if (ao_log_csum((uint8_t *) &ao_log_data) != 0) return 0; return 1; } @@ -162,7 +162,7 @@ ao_log_check_data(void) uint8_t ao_log_check_clear(void) { - uint8_t *b = (uint8_t *) &log; + uint8_t *b = (uint8_t *) &ao_log_data; uint8_t i; for (i = 0; i < sizeof (ao_log_type); i++) { @@ -176,17 +176,17 @@ int16_t ao_log_flight(uint8_t slot) { if (!ao_storage_read(ao_log_pos(slot), - &log, + &ao_log_data, sizeof (ao_log_type))) return -(int16_t) (slot + 1); if (ao_log_check_clear()) return 0; - if (!ao_log_check_data() || log.type != AO_LOG_FLIGHT) + if (!ao_log_check_data() || ao_log_data.type != AO_LOG_FLIGHT) return -(int16_t) (slot + 1); - return log.u.flight.flight; + return ao_log_data.u.flight.flight; } #endif |