diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-06 15:36:45 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-06 15:48:34 -0700 |
| commit | 5203ddaac692bfd82a01368da9fb66c25e9e14c1 (patch) | |
| tree | 2fc00fe00595835aa44cb65c8bf64e311c115eba | |
| parent | 62267144d189967fcd0724b6dfbdbab3cb6fb414 (diff) | |
altos: Switch ao_log.c and ao_log_big.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/ao.h | 2 | ||||
| -rw-r--r-- | src/ao_log.c | 2 | ||||
| -rw-r--r-- | src/ao_log_big.c | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -535,7 +535,7 @@ extern __pdata uint32_t ao_log_current_pos; extern __pdata uint32_t ao_log_end_pos; extern __pdata uint32_t ao_log_start_pos; extern __xdata uint8_t ao_log_running; -extern __xdata enum flight_state ao_log_state; +extern __pdata enum flight_state ao_log_state; /* required functions from the underlying log system */ diff --git a/src/ao_log.c b/src/ao_log.c index 71900490..80d7243d 100644 --- a/src/ao_log.c +++ b/src/ao_log.c @@ -21,7 +21,7 @@ __pdata uint32_t ao_log_current_pos; __pdata uint32_t ao_log_end_pos; __pdata uint32_t ao_log_start_pos; __xdata uint8_t ao_log_running; -__xdata enum flight_state ao_log_state; +__pdata enum flight_state ao_log_state; __xdata uint16_t ao_flight_number; void diff --git a/src/ao_log_big.c b/src/ao_log_big.c index 0c6cff85..74d94c4b 100644 --- a/src/ao_log_big.c +++ b/src/ao_log_big.c @@ -60,7 +60,7 @@ ao_log_dump_check_data(void) return 1; } -static __xdata uint8_t ao_log_adc_pos; +static __data uint8_t ao_log_adc_pos; /* a hack to make sure that ao_log_records fill the eeprom block in even units */ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_record))] ; @@ -72,7 +72,7 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_record))] ; void ao_log(void) { - uint16_t next_sensor, next_other; + __pdata uint16_t next_sensor, next_other; ao_storage_setup(); |