projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
kernel
/
ao_host.h
diff --git
a/src/kernel/ao_host.h
b/src/kernel/ao_host.h
index a7fa5ec2fa4d498a1220093a86f4ea1579792fef..e2f14e7963a38333c3a2f8686130d99e27006f3e 100644
(file)
--- a/
src/kernel/ao_host.h
+++ b/
src/kernel/ao_host.h
@@
-41,16
+41,6
@@
struct ao_adc {
int16_t sense_m; /* main continuity sense */
};
int16_t sense_m; /* main continuity sense */
};
-#define __pdata
-#define __data
-#define __xdata
-#define __code
-#define __reentrant
-
-#define DATA_TO_XDATA(a) (a)
-#define PDATA_TO_XDATA(a) (a)
-#define CODE_TO_XDATA(a) (a)
-
enum ao_flight_state {
ao_flight_startup = 0,
ao_flight_idle = 1,
enum ao_flight_state {
ao_flight_startup = 0,
ao_flight_idle = 1,
@@
-111,7
+101,7
@@
ao_dump_state(void *wchan);
void
ao_sleep(void *wchan);
void
ao_sleep(void *wchan);
-const char
const
* const ao_state_names[] = {
+const char * const ao_state_names[] = {
"startup", "idle", "pad", "boost", "fast",
"coast", "drogue", "main", "landed", "invalid"
};
"startup", "idle", "pad", "boost", "fast",
"coast", "drogue", "main", "landed", "invalid"
};
@@
-131,6
+121,6
@@
struct ao_config {
struct ao_config ao_config = { 250, 16000 };
struct ao_config ao_config = { 250, 16000 };
-#define
ao_x
memcpy(d,s,c) memcpy(d,s,c)
-#define
ao_x
memset(d,v,c) memset(d,v,c)
-#define
ao_x
memcmp(d,s,c) memcmp(d,s,c)
+#define memcpy(d,s,c) memcpy(d,s,c)
+#define memset(d,v,c) memset(d,v,c)
+#define memcmp(d,s,c) memcmp(d,s,c)