X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=main.h;h=d28a3662502b13cf51fd567cf46dcd9dfbebfc73;hp=9ba70de77b9d7ee71171626507f49612d352c9de;hb=c552a01853bea12a3cd44e35be8c0df49ed7d7d0;hpb=9a43add2f0ed382ce1f180bba65fdc077d03b6fb

diff --git a/main.h b/main.h
index 9ba70de..d28a366 100644
--- a/main.h
+++ b/main.h
@@ -36,13 +36,8 @@
 #include <parse.h>
 #include <rdline.h>
 #include <timer.h>
+#include <xbee.h>
 
-#include "xbee_neighbor.h"
-#include "xbee_atcmd.h"
-#include "xbee_stats.h"
-#include "xbee_buf.h"
-#include "xbee_proto.h"
-#include "xbee.h"
 #include "cmdline.h"
 #include "callout.h"
 #include "rc_proto.h"
@@ -110,7 +105,7 @@ extern struct callout_manager cm;
 
 void bootloader(void);
 
-void xbee_rx(struct xbee_dev *dev, int channel, int type,
+void 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,