X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=main.c;h=c6f13e3715dee230db91032bf872529e68e1b394;hp=0d5cad65d3558c8456c7eab9d8bb35128a094730;hb=d590ebe19bfe60a544717606a0ff2b348cc32229;hpb=4989a2c76e8fa25667663a215709f9366747fcad

diff --git a/main.c b/main.c
index 0d5cad6..c6f13e3 100644
--- a/main.c
+++ b/main.c
@@ -237,6 +237,7 @@ int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
 		return -1;
 
 	switch (rch->type) {
+#if 0
 		case RC_PROTO_TYPE_CHANNEL: {
 			struct rc_proto_channel *rcc =
 				(struct rc_proto_channel *) recvframe->data;
@@ -263,6 +264,7 @@ int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
 
 			break;
 		}
+#endif
 		default:
 			return -1;
 	}
@@ -271,7 +273,7 @@ int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
 }
 
 /* socat /dev/ttyUSB0,raw,echo=0,b115200 /dev/ttyACM1,raw,echo=0,b115200 */
-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)
 {
 	struct xbee_ctx *ctx = opaque;
@@ -377,7 +379,7 @@ static int xbeeapp_send(struct xbee_ctx *ctx, int type, void *buf, unsigned len,
 
 	/* register a channel */
 	channel = xbee_register_channel(xbee_dev, XBEE_CHANNEL_ANY,
-					xbee_rx, NULL);
+					xbeeapp_rx, NULL);
 	if (channel < 0) {
 		printf_P(PSTR("cannot send: no free channel\r\n"));
 		return -1;
@@ -395,8 +397,7 @@ static int xbeeapp_send(struct xbee_ctx *ctx, int type, void *buf, unsigned len,
 		hexdump("xmit frame", buf, len);
 
 	/* transmit the frame on this channel */
-	ret = xbee_proto_xmit(xbee_dev, channel, type, buf,
-			      len);
+	ret = xbee_tx(xbee_dev, channel, type, buf, len);
 	if (ret < 0) {
 		printf_P(PSTR("cannot send\r\n"));
 		xbee_unregister_channel(xbee_dev, channel);
@@ -574,7 +575,7 @@ void xbee_mainloop(void)
 		else {
 			if (xbee_cmdline_input_enabled)
 				cmdline_poll();
-			xbee_proto_rx(xbee_dev);
+			xbee_rx(xbee_dev);
 		}
 	}
 }
@@ -657,7 +658,7 @@ int main(void)
 
 	/* register default channel with a callback */
 	if (xbee_register_channel(xbee_dev, XBEE_DEFAULT_CHANNEL,
-				  xbee_rx, NULL) < 0) {
+				  xbeeapp_rx, NULL) < 0) {
 		fprintf(stderr, "cannot register default channel\n");
 		return -1;
 	}