use callout from aversive

[protos/xbee-avr.git] / main.h

diff --git a/main.h b/main.h
index d28a366..f77a535 100644 (file)
--- a/main.h
+++ b/main.h
@@ -100,13 +100,13 @@ extern int xbee_raw;
 extern int xbee_hexdump;
 extern int xbee_debug;
 
-extern struct callout_manager cm;
+extern struct callout_mgr cm;
 
 
 void bootloader(void);
 
-void xbeeapp_rx(struct xbee_dev *dev, int channel, int type,
-            void *frame, unsigned len, void *opaque);
+int8_t xbeeapp_rx(struct xbee_dev *dev, int channel, int type,
+                 void *frame, unsigned len, void *opaque);
 int xbeeapp_send_atcmd(const char *atcmd_str,
                       void *param, unsigned param_len, int foreground,
                       int (*func)(void *frame, unsigned len, void *arg),