X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=main.c;h=73a3409cb32a246c3b15487f4fe6a23d292e2155;hp=e9454c405bf6902bff2a1ae3dd67f64d9f45119f;hb=57895b3bb2fe0582c589685b7df34f3968b346ec;hpb=9a9b64112aee5ab26398b46cb13b7e49c292a355

diff --git a/main.c b/main.c
index e9454c4..73a3409 100644
--- a/main.c
+++ b/main.c
@@ -114,6 +114,8 @@ static void hexdump(const char *title, const void *buf, unsigned int len)
 static int parse_xmit_status(struct xbee_ctx *ctx,
 			     struct xbee_xmit_status_hdr *frame, unsigned len)
 {
+	(void)len;
+
 	if (ctx == NULL) {
 		printf_P(PSTR("no context\r\n"));
 		return -1;
@@ -144,7 +146,7 @@ static int dump_atcmd(struct xbee_ctx *ctx, struct xbee_atresp_hdr *frame,
 	       unsigned len)
 {
 	char atcmd_str[3];
-	struct xbee_atcmd_pgm *cmd_pgm;
+	const struct xbee_atcmd *cmd_pgm;
 	struct xbee_atcmd cmd;
 	union {
 		uint8_t u8;
@@ -228,9 +230,13 @@ 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);
+	unsigned int datalen;
 	struct rc_proto_hdr *rch = (struct rc_proto_hdr *) &recvframe->data;
 
+	if (len <  sizeof(*recvframe))
+		return -1;
+
+	datalen = len - sizeof(*recvframe);
 	if (datalen < sizeof(struct rc_proto_hdr))
 		return -1;
 
@@ -486,6 +492,9 @@ static void evt_timeout(struct callout_manager *cm, struct callout *clt,
 {
 	struct xbee_ctx *ctx = arg;
 
+	(void)cm;
+	(void)clt;
+
 	printf_P(PSTR("Timeout\r\n"));
 
 	/* restart command line */
@@ -520,22 +529,18 @@ void bootloader(void)
 	TIMSK1 = 0;
 	TIMSK2 = 0;
 	TIMSK3 = 0;
-	TIMSK4 = 0;
-	TIMSK5 = 0;
 	EIMSK = 0;
 	UCSR0B = 0;
 	UCSR1B = 0;
-	UCSR2B = 0;
-	UCSR3B = 0;
 	SPCR = 0;
 	TWCR = 0;
 	ACSR = 0;
 	ADCSRA = 0;
 
-	EIND = 1;
-	__asm__ __volatile__ ("ldi r31,0xf8\n");
-	__asm__ __volatile__ ("ldi r30,0x00\n");
-	__asm__ __volatile__ ("eijmp\n");
+	/* XXX */
+	/* __asm__ __volatile__ ("ldi r31,0xf8\n"); */
+	/* __asm__ __volatile__ ("ldi r30,0x00\n"); */
+	/* __asm__ __volatile__ ("eijmp\n"); */
 #endif
 }
 
@@ -592,6 +597,10 @@ static void do_led_blink(struct callout_manager *cm,
 {
 	static uint8_t a = 0;
 
+	(void)cm;
+	(void)clt;
+	(void)dummy;
+
 #ifdef USE_USB
 	if (a & 1)
 		LEDs_SetAllLEDs(0);
@@ -605,6 +614,7 @@ static void do_led_blink(struct callout_manager *cm,
 
 static void increment_ms(void *dummy)
 {
+	(void)dummy;
 	global_ms++;
 }