diff options
| author | Bdale Garbee <bdale@gag.com> | 2018-10-20 01:18:12 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2018-10-20 01:18:12 -0600 |
| commit | 0686a7b8aec524d81bda4c572549a3a068ce0eed (patch) | |
| tree | 2e6061c834b99e3b9668be8b3cfb1627251365d3 /src/test | |
| parent | 6aa451ce81bfdfe679e3f9902043a5f0d235c745 (diff) | |
| parent | cc528f1ff0271ec6488a1a7b91c731183502101e (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ao_aes_test.c | 6 | ||||
| -rw-r--r-- | src/test/ao_eeprom_read.h | 6 | ||||
| -rw-r--r-- | src/test/ao_flight_test.c | 12 | ||||
| -rw-r--r-- | src/test/ao_gps_test_skytraq.c | 4 | ||||
| -rw-r--r-- | src/test/ao_gps_test_ublox.c | 4 | ||||
| -rw-r--r-- | src/test/ao_int64_test.c | 4 | ||||
| -rw-r--r-- | src/test/ao_ms5607_convert_test.c | 4 |
7 files changed, 10 insertions, 30 deletions
diff --git a/src/test/ao_aes_test.c b/src/test/ao_aes_test.c index 135c6f1a..e1ed5728 100644 --- a/src/test/ao_aes_test.c +++ b/src/test/ao_aes_test.c @@ -16,11 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#define __pdata -#define __data -#define __xdata -#define __code -#define __reentrant +#define const #include <string.h> #include <stdio.h> diff --git a/src/test/ao_eeprom_read.h b/src/test/ao_eeprom_read.h index 03c327ca..afaadb1e 100644 --- a/src/test/ao_eeprom_read.h +++ b/src/test/ao_eeprom_read.h @@ -15,11 +15,7 @@ #ifndef _AO_EEPROM_READ_H_ #define _AO_EEPROM_READ_H_ -#define __pdata -#define __data -#define __xdata -#define __code -#define __reentrant +#define const #include <stdint.h> #include <stdio.h> diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c index 746a6814..6d007575 100644 --- a/src/test/ao_flight_test.c +++ b/src/test/ao_flight_test.c @@ -119,11 +119,7 @@ struct ao_adc { #endif -#define __pdata -#define __data -#define __xdata -#define __code -#define __reentrant +#define const #define HAS_FLIGHT 1 #define HAS_IGNITE 1 @@ -231,8 +227,8 @@ ao_gps_angle(void) extern enum ao_flight_state ao_flight_state; -#define FALSE 0 -#define TRUE 1 +#define false 0 +#define true 1 volatile struct ao_data ao_data_ring[AO_DATA_RING]; volatile uint8_t ao_data_head; @@ -362,7 +358,7 @@ struct ao_ms5607_prom ao_ms5607_prom; struct ao_config ao_config; -#define DATA_TO_XDATA(x) (x) +#define x (x) extern int16_t ao_ground_accel, ao_flight_accel; diff --git a/src/test/ao_gps_test_skytraq.c b/src/test/ao_gps_test_skytraq.c index 61e7905a..11c54601 100644 --- a/src/test/ao_gps_test_skytraq.c +++ b/src/test/ao_gps_test_skytraq.c @@ -83,8 +83,8 @@ struct ao_gps_tracking_orig { #define ao_telemetry_satellite ao_gps_tracking_orig #define ao_telemetry_satellite_info ao_gps_sat_orig -extern __xdata struct ao_telemetry_location ao_gps_data; -extern __xdata struct ao_telemetry_satellite ao_gps_tracking_data; +extern struct ao_telemetry_location ao_gps_data; +extern struct ao_telemetry_satellite ao_gps_tracking_data; uint8_t ao_gps_mutex; diff --git a/src/test/ao_gps_test_ublox.c b/src/test/ao_gps_test_ublox.c index 05334bbf..0833e4f6 100644 --- a/src/test/ao_gps_test_ublox.c +++ b/src/test/ao_gps_test_ublox.c @@ -89,8 +89,8 @@ struct ao_telemetry_satellite { #define ao_gps_tracking_orig ao_telemetry_satellite #define ao_gps_sat_orig ao_telemetry_satellite_info -extern __xdata struct ao_telemetry_location ao_gps_data; -extern __xdata struct ao_telemetry_satellite ao_gps_tracking_data; +extern struct ao_telemetry_location ao_gps_data; +extern struct ao_telemetry_satellite ao_gps_tracking_data; uint8_t ao_gps_mutex; diff --git a/src/test/ao_int64_test.c b/src/test/ao_int64_test.c index d329f67b..c7a4891f 100644 --- a/src/test/ao_int64_test.c +++ b/src/test/ao_int64_test.c @@ -16,10 +16,6 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#define __data -#define __pdata -#define __xdata -#define __reentrant #include <ao_int64.h> #include <ao_int64.c> diff --git a/src/test/ao_ms5607_convert_test.c b/src/test/ao_ms5607_convert_test.c index 4876d21e..7708c331 100644 --- a/src/test/ao_ms5607_convert_test.c +++ b/src/test/ao_ms5607_convert_test.c @@ -16,10 +16,6 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#define __xdata -#define __data -#define __pdata -#define __reentrant #include <stdint.h> #include <ao_ms5607.h> |