From: Keith Packard <keithp@keithp.com>
Date: Wed, 6 Jul 2011 22:36:45 +0000 (-0700)
Subject: altos: Switch ao_log.c and ao_log_big.c __xdata to __pdata
X-Git-Tag: 0.9.4.3~21
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=5203ddaac692bfd82a01368da9fb66c25e9e14c1

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 40466123..c9a6970e 100644
--- 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 __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();