altos: Switch ao_log.c and ao_log_big.c __xdata to __pdata

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/ao.h b/src/ao.h
index 40466123659120b3a419eda293ee33c62c5721b3..c9a6970e8c3ac0c1ec4b39386200f3dd06d0a5bd 100644 (file)
--- a/src/ao.h
+++ b/src/ao.h
@@ -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 __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 */
 
 
 /* required functions from the underlying log system */
 

diff --git a/src/ao_log.c b/src/ao_log.c
index 7190049066fac1b74046aaab28f85fd0bfbfba87..80d7243d8c632a1c6062fbe63b43f9249629081f 100644 (file)
--- 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;
 __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
 __xdata uint16_t ao_flight_number;
 
 void

diff --git a/src/ao_log_big.c b/src/ao_log_big.c
index 0c6cff85835d3727318a298e9537a97df51ae80d..74d94c4baae9802855e2bb6acb233d2a38a16cb5 100644 (file)
--- a/src/ao_log_big.c
+++ b/src/ao_log_big.c
@@ -60,7 +60,7 @@ ao_log_dump_check_data(void)
        return 1;
 }
 
        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))] ;
 
 /* 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)
 {
 void
 ao_log(void)
 {

-       uint16_t        next_sensor, next_other;
+       __pdata uint16_t        next_sensor, next_other;

 
        ao_storage_setup();
 
 
        ao_storage_setup();