/* Convert a __data pointer into an __xdata pointer */
#define DATA_TO_XDATA(a) ((void __xdata *) ((uint8_t) (a) | 0xff00))
+/* Code and xdata use the same address space */
+#define CODE_TO_XDATA(a) ((__xdata void *) ((uint16_t) (a)))
+
+/* Pdata lives at the start of xdata */
+#define PDATA_TO_XDATA(a) ((void __xdata *) ((uint8_t) (a) | 0xf000))
+
/* Stack runs from above the allocated __data space to 0xfe, which avoids
* writing to 0xff as that triggers the stack overflow indicator
*/
/* ao_string.c */
void
-_ao_xmemcpy(__xdata uint8_t *dst, __xdata uint8_t *src, uint8_t count);
+_ao_xmemcpy(__xdata void *dst, __xdata void *src, uint8_t count);
-#define ao_xmemcpy(d,s,c) _ao_xmemcpy((__xdata uint8_t *) (d), (__xdata uint8_t *) (s), (c))
+#define ao_xmemcpy(d,s,c) _ao_xmemcpy(d,s,c)
void
-_ao_xmemset(__xdata uint8_t *dst, uint8_t value, uint8_t count);
+_ao_xmemset(__xdata void *dst, uint8_t value, uint8_t count);
-#define ao_xmemset(d,v,c) _ao_xmemset((__xdata uint8_t *) (d), (v), (c))
+#define ao_xmemset(d,v,c) _ao_xmemset(d,v,c)
int8_t
-_ao_xmemcmp(__xdata uint8_t *a, __xdata uint8_t *b, uint8_t count);
+_ao_xmemcmp(__xdata void *a, __xdata void *b, uint8_t count);
-#define ao_xmemcmp(d,s,c) _ao_xmemcmp((__xdata uint8_t *) (d), (__xdata uint8_t *) (s), (c))
+#define ao_xmemcmp(d,s,c) _ao_xmemcmp((d), (s), (c))
#endif /* _AO_ARCH_H_ */
#include "ao.h"
void
-_ao_xmemcpy(__xdata uint8_t *dst, __xdata uint8_t *src, uint8_t count)
+_ao_xmemcpy(__xdata void *dst, __xdata void *src, uint8_t count)
{
- while (count--)
- *dst++ = *src++;
+ while (count--) {
+ *(__xdata uint8_t *) dst = *(__xdata uint8_t *) src;
+ dst = (__xdata uint8_t *) dst + 1;
+ src = (__xdata uint8_t *) src + 1;
+ }
}
void
-_ao_xmemset(__xdata uint8_t *dst, uint8_t v, uint8_t count)
+_ao_xmemset(__xdata void *dst, uint8_t v, uint8_t count)
{
- while (count--)
- *dst++ = v;
+ while (count--) {
+ *(__xdata uint8_t *) dst = v;
+ dst = (__xdata uint8_t *) dst + 1;
+ }
}
int8_t
-_ao_xmemcmp(__xdata uint8_t *a, __xdata uint8_t *b, uint8_t count)
+_ao_xmemcmp(__xdata void *a, __xdata void *b, uint8_t count)
{
while (count--) {
- int8_t d = *a++ - *b++;
+ int8_t d = *(__xdata int8_t *) a - *(__xdata int8_t *) b;
if (d)
return d;
+ a = (__xdata int8_t *) a + 1;
+ b = (__xdata int8_t *) b + 1;
}
return 0;
}
#ifndef DATA_TO_XDATA
#define DATA_TO_XDATA(a) (a)
#endif
+#ifndef PDATA_TO_XDATA
+#define PDATA_TO_XDATA(a) (a)
+#endif
+#ifndef CODE_TO_XDATA
+#define CODE_TO_XDATA(a) (a)
+#endif
/* An AltOS task */
struct ao_task {
ao_config.main_deploy = AO_CONFIG_DEFAULT_MAIN_DEPLOY;
ao_config.radio_channel = AO_CONFIG_DEFAULT_RADIO_CHANNEL;
ao_xmemset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
- ao_xmemcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
+ ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
ao_config_dirty = 1;
}
#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,
telemetry.configuration.main_deploy = ao_config.main_deploy;
telemetry.configuration.flight_log_max = ao_config.flight_log_max >> 10;
ao_xmemcpy (telemetry.configuration.callsign,
- ao_config.callsign,
- AO_MAX_CALLSIGN);
+ ao_config.callsign,
+ AO_MAX_CALLSIGN);
ao_xmemcpy (telemetry.configuration.version,
- ao_version,
- AO_MAX_VERSION);
+ CODE_TO_XDATA(ao_version),
+ AO_MAX_VERSION);
ao_radio_send(&telemetry, sizeof (telemetry));
ao_telemetry_config_cur = ao_telemetry_config_max;
}
if (!ao_gps_error) {
ao_mutex_get(&ao_gps_mutex);
ao_gps_tick = ao_gps_next_tick;
- ao_xmemcpy(&ao_gps_data, &ao_gps_next, sizeof (ao_gps_data));
+ ao_xmemcpy(&ao_gps_data, PDATA_TO_XDATA(&ao_gps_next), sizeof (ao_gps_data));
ao_mutex_put(&ao_gps_mutex);
ao_wakeup(&ao_gps_data);
}
ao_gps_tracking_next.channels = 0;
else if (done) {
ao_mutex_get(&ao_gps_mutex);
- ao_xmemcpy(&ao_gps_tracking_data, &ao_gps_tracking_next,
- sizeof(ao_gps_tracking_data));
+ ao_xmemcpy(&ao_gps_tracking_data, PDATA_TO_XDATA(&ao_gps_tracking_next), sizeof(ao_gps_tracking_data));
ao_mutex_put(&ao_gps_mutex);
ao_wakeup(&ao_gps_tracking_data);
}