summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-07-06 15:38:29 -0700
committerKeith Packard <keithp@keithp.com>2011-07-06 15:48:34 -0700
commit86b41d4c2b8a9fa4507cdb75302e0cedebb103cb (patch)
tree642b59a0c1a56e9ffdae5cbccd172812daffcd38 /src
parent803bf106caf5d6b5ac12eb00a941647c7325edd1 (diff)
altos: Switch ao_sample.c __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
-rw-r--r--src/ao.h10
-rw-r--r--src/ao_sample.c18
2 files changed, 14 insertions, 14 deletions
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