projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: eliminate ao_wake_task
[fw/altos]
/
src
/
ao.h
diff --git
a/src/ao.h
b/src/ao.h
index 5b174947c57ba893a74ae56e43dacffbaf132f92..9682e42fb33c9cde8d69122f632acd0f969ecb81 100644
(file)
--- a/
src/ao.h
+++ b/
src/ao.h
@@
-69,10
+69,6
@@
ao_sleep(__xdata void *wchan);
void
ao_wakeup(__xdata void *wchan);
void
ao_wakeup(__xdata void *wchan);
-/* Wake up a specific task */
-void
-ao_wake_task(__xdata struct ao_task *task);
-
/* set an alarm to go off in 'delay' ticks */
void
ao_alarm(uint16_t delay);
/* set an alarm to go off in 'delay' ticks */
void
ao_alarm(uint16_t delay);
@@
-391,14
+387,10
@@
ao_cmd_init(void);
* ao_dma.c
*/
* ao_dma.c
*/
-/* Allocate a DMA channel. the 'done' parameter will be set
- * when the dma is finished or aborted and will be used to
- * wakeup any waiters
+/* Allocate a DMA channel. the 'done' parameter will be set when the
+ * dma is finished and will be used to wakeup any waiters
*/
*/
-#define AO_DMA_DONE 1
-#define AO_DMA_ABORTED 2
-
uint8_t
ao_dma_alloc(__xdata uint8_t * done);
uint8_t
ao_dma_alloc(__xdata uint8_t * done);
@@
-838,6
+830,15
@@
struct ao_telemetry {
struct ao_gps_tracking_data gps_tracking;
};
struct ao_gps_tracking_data gps_tracking;
};
+/*
+ * ao_radio_recv tacks on rssi and status bytes
+ */
+struct ao_telemetry_recv {
+ struct ao_telemetry telemetry;
+ int8_t rssi;
+ uint8_t status;
+};
+
/* Set delay between telemetry reports (0 to disable) */
#define AO_TELEMETRY_INTERVAL_PAD AO_MS_TO_TICKS(1000)
/* Set delay between telemetry reports (0 to disable) */
#define AO_TELEMETRY_INTERVAL_PAD AO_MS_TO_TICKS(1000)
@@
-880,22
+881,16
@@
void
ao_radio_set_rdf(void);
void
ao_radio_set_rdf(void);
void
-ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant;
-
-struct ao_radio_recv {
- struct ao_telemetry telemetry;
- int8_t rssi;
- uint8_t status;
-};
+ao_radio_send(__xdata void *data, uint8_t size) __reentrant;
uint8_t
uint8_t
-ao_radio_recv(__xdata
struct ao_radio_recv *recv
) __reentrant;
+ao_radio_recv(__xdata
void *data, uint8_t size
) __reentrant;
void
void
-ao_radio_r
df(int ms
);
+ao_radio_r
ecv_abort(void
);
void
void
-ao_radio_
abort(void
);
+ao_radio_
rdf(int ms
);
void
ao_radio_rdf_abort(void);
void
ao_radio_rdf_abort(void);