X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=rc_proto.c;h=442eb909347be1c7666cfafb22a14ef6afde03e1;hp=be30c39b231dc207296086342de08276cca2a11f;hb=e39c5d534eaa4d29fea56d7851343612fdab9a23;hpb=a53014b7f52462e163a7d7ac64866aa75977422f

diff --git a/rc_proto.c b/rc_proto.c
index be30c39..442eb90 100644
--- a/rc_proto.c
+++ b/rc_proto.c
@@ -41,6 +41,7 @@
 
 #include "callout.h"
 #include "rc_proto.h"
+#include "xbee_user.h"
 #include "main.h"
 
 /* */
@@ -51,12 +52,17 @@ struct rc_proto_power_levels {
 static struct rc_proto_power_levels power_levels[MAX_POWER_LEVEL];
 
 /* update power level when we receive the answer from DB */
-static int update_power_level(void *frame, unsigned len, void *arg)
+static int8_t update_power_level(int8_t retcode, void *frame, unsigned len,
+	void *arg)
 {
 	struct xbee_atresp_hdr *atresp = (struct xbee_atresp_hdr *)frame;
 	int level = (intptr_t)arg;
 	uint8_t db;
 
+	/* nothing more to do, error is already logged by xbee_user */
+	if (retcode < 0)
+		return retcode;
+
 	/* XXX check if this test is correct */
 	if (len < sizeof(struct xbee_atresp_hdr) + sizeof(uint8_t)) {
 		/* XXX stats */
@@ -73,26 +79,25 @@ static int update_power_level(void *frame, unsigned len, void *arg)
 void rc_proto_rx_power_probe(int power_level)
 {
 	(void)power_level;
-	xbeeapp_send_atcmd("DB", NULL, 0, 0, update_power_level, NULL);
+	xbeeapp_send_atcmd("DB", NULL, 0, update_power_level, NULL);
 }
 
 /* send a hello message */
-// XXX iovec for xbee ?
 int8_t rc_proto_send_hello(uint64_t addr, void *data, uint8_t data_len)
 {
-	struct {
-		struct rc_proto_echo_req hdr;
-		char buf[XBEE_MAX_FRAME_LEN - sizeof(struct rc_proto_echo_req)];
-	} frame;
+	struct rc_proto_echo_req hdr;
+	struct xbee_msg msg;
 
-	if (data_len > sizeof(frame.buf))
-		return -1;
+	hdr.type = RC_PROTO_HELLO;
+	hdr.datalen = data_len;
+
+	msg.iovlen = 2;
+	msg.iov[0].buf = &hdr;
+	msg.iov[0].len = sizeof(hdr);
+	msg.iov[1].buf = data;
+	msg.iov[1].len = data_len;
 
-	frame.hdr.type = RC_PROTO_HELLO;
-	frame.hdr.datalen = data_len;
-	memcpy(frame.buf, data, data_len);
-	return xbeeapp_send_msg(addr, &frame,
-				data_len + sizeof(struct rc_proto_echo_req), 1);
+	return xbeeapp_send_msg(addr, &msg, NULL, NULL);
 }