From c0cf69ecbd1ac1c0fd1469925a924fe5b94e3815 Mon Sep 17 00:00:00 2001 From: Niclas Finne Date: Tue, 13 Dec 2011 17:35:04 +0100 Subject: [PATCH] fixed compiler warnings --- examples/z1/test-adxl345.c | 5 ++++- platform/z1/contiki-z1-main.c | 1 + platform/z1/dev/xmem.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/z1/test-adxl345.c b/examples/z1/test-adxl345.c index b2b95d10d..32c29c786 100644 --- a/examples/z1/test-adxl345.c +++ b/examples/z1/test-adxl345.c @@ -43,7 +43,10 @@ #include #include "contiki.h" #include "serial-shell.h" -#include "adxl345.h" +#include "shell-ps.h" +#include "shell-file.h" +#include "shell-text.h" +#include "dev/adxl345.h" #define LED_INT_ONTIME CLOCK_SECOND/2 #define ACCM_READ_INTERVAL CLOCK_SECOND diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c index a8bcc0aa1..40731f5e3 100644 --- a/platform/z1/contiki-z1-main.c +++ b/platform/z1/contiki-z1-main.c @@ -45,6 +45,7 @@ #include "net/netstack.h" #include "net/mac/frame802154.h" #include "dev/button-sensor.h" +#include "dev/adxl345.h" #if WITH_UIP6 #include "net/uip-ds6.h" diff --git a/platform/z1/dev/xmem.c b/platform/z1/dev/xmem.c index f2bd1632b..888648046 100644 --- a/platform/z1/dev/xmem.c +++ b/platform/z1/dev/xmem.c @@ -189,7 +189,7 @@ xmem_pread(void *_p, int size, unsigned long offset) return size; } /*---------------------------------------------------------------------------*/ -static const char * +static const unsigned char * program_page(unsigned long offset, const unsigned char *p, int nbytes) { const unsigned char *end = p + nbytes;