X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=main.c;h=272090f12aa4ca5fa47a0b814789a7047e7ff10c;hp=b6014db2a1ddfb8f1c31e77b4daca5094fc7fdf7;hb=6bef00254dd5299a966d73a5d6ab3ce561e93745;hpb=d6014994e06ebe952d51bef2e36a795f624c4b4d

diff --git a/main.c b/main.c
index b6014db..272090f 100644
--- a/main.c
+++ b/main.c
@@ -114,7 +114,7 @@ static int parse_xmit_status(struct xbee_ctx *ctx,
 	}
 
 	/* see if it matches a xmit query (atcmd_query must be NULL) */
-	if (ctx->atcmd_query[0] == '\0') {
+	if (ctx->atcmd_query[0] != '\0') {
 		printf("invalid response 2\n");
 		return -1;
 	}
@@ -219,7 +219,7 @@ static int dump_atcmd(struct xbee_ctx *ctx, struct xbee_atresp_hdr *frame,
 int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
 {
 	int datalen = len - sizeof(*recvframe);
-	struct rc_proto_hdr *rch = (struct rc_proto_hdr *) recvframe;
+	struct rc_proto_hdr *rch = (struct rc_proto_hdr *) &recvframe->data;
 
 	if (datalen < sizeof(struct rc_proto_hdr))
 		return -1;
@@ -231,7 +231,7 @@ int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
 			break;
 		case RC_PROTO_TYPE_RANGE: {
 			struct rc_proto_range *rcr =
-				(struct rc_proto_range *) recvframe;
+				(struct rc_proto_range *) recvframe->data;
 
 			if (datalen != sizeof(struct rc_proto_range))
 				return -1;