From: Keith Packard <keithp@keithp.com>
Date: Wed, 6 Jul 2011 22:38:29 +0000 (-0700)
Subject: altos: Switch ao_sample.c __xdata to __pdata
X-Git-Tag: 0.9.4.3~18
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=86b41d4c2b8a9fa4507cdb75302e0cedebb103cb

altos: Switch ao_sample.c __xdata to __pdata

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

diff --git a/src/ao.h b/src/ao.h
index c9a6970e..1919a259 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -803,13 +803,13 @@ extern __data uint8_t	ao_sample_adc;		/* Ring position of last processed sample
 extern __pdata int16_t	ao_sample_accel;	/* most recent accel sensor reading */
 #endif
 
-extern __xdata int16_t	ao_ground_pres;		/* startup pressure */
-extern __xdata int16_t	ao_ground_height;	/* MSL of ao_ground_pres */
+extern __pdata int16_t	ao_ground_pres;		/* startup pressure */
+extern __pdata int16_t	ao_ground_height;	/* MSL of ao_ground_pres */
 
 #if HAS_ACCEL
-extern __xdata int16_t	ao_ground_accel;	/* startup acceleration */
-extern __xdata int16_t 	ao_accel_2g;		/* factory accel calibration */
-extern __xdata int32_t	ao_accel_scale;		/* sensor to m/s² conversion */
+extern __pdata int16_t	ao_ground_accel;	/* startup acceleration */
+extern __pdata int16_t 	ao_accel_2g;		/* factory accel calibration */
+extern __pdata int32_t	ao_accel_scale;		/* sensor to m/s² conversion */
 #endif
 
 void ao_sample_init(void);
diff --git a/src/ao_sample.c b/src/ao_sample.c
index 84cf1e00..ac156646 100644
--- a/src/ao_sample.c
+++ b/src/ao_sample.c
@@ -37,21 +37,21 @@ __data uint8_t		ao_sample_adc;
  * Sensor calibration values
  */
 
-__xdata int16_t		ao_ground_pres;		/* startup pressure */
-__xdata int16_t		ao_ground_height;	/* MSL of ao_ground_pres */
+__pdata int16_t		ao_ground_pres;		/* startup pressure */
+__pdata int16_t		ao_ground_height;	/* MSL of ao_ground_pres */
 
 #if HAS_ACCEL
-__xdata int16_t		ao_ground_accel;	/* startup acceleration */
-__xdata int16_t		ao_accel_2g;		/* factory accel calibration */
-__xdata int32_t		ao_accel_scale;		/* sensor to m/s² conversion */
+__pdata int16_t		ao_ground_accel;	/* startup acceleration */
+__pdata int16_t		ao_accel_2g;		/* factory accel calibration */
+__pdata int32_t		ao_accel_scale;		/* sensor to m/s² conversion */
 #endif
 
-static __xdata uint8_t	ao_preflight;		/* in preflight mode */
+static __pdata uint8_t	ao_preflight;		/* in preflight mode */
 
-static __xdata uint16_t	nsamples;
-__xdata int32_t ao_sample_pres_sum;
+static __pdata uint16_t	nsamples;
+__pdata int32_t ao_sample_pres_sum;
 #if HAS_ACCEL
-__xdata int32_t ao_sample_accel_sum;
+__pdata int32_t ao_sample_accel_sum;
 #endif
 
 static void