diff --git a/core/lib/print-stats.c b/core/lib/print-stats.c index 24092fd85..8119271f9 100644 --- a/core/lib/print-stats.c +++ b/core/lib/print-stats.c @@ -44,12 +44,7 @@ #include -#ifdef __AVR__ -#include -#define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args) -#else #define PRINTA(...) printf(__VA_ARGS__) -#endif /*---------------------------------------------------------------------------*/ void diff --git a/core/net/net-debug.h b/core/net/net-debug.h index a4c6a3313..27d2b4cc4 100644 --- a/core/net/net-debug.h +++ b/core/net/net-debug.h @@ -54,29 +54,16 @@ void net_debug_lladdr_print(const uip_lladdr_t *addr); #define DEBUG_FULL DEBUG_ANNOTATE | DEBUG_PRINT /* PRINTA will always print if the debug routines are called directly */ -#ifdef __AVR__ -#include -#define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args) -#else #define PRINTA(...) printf(__VA_ARGS__) -#endif #if (DEBUG) & DEBUG_ANNOTATE -#ifdef __AVR__ -#define ANNOTATE(FORMAT,args...) printf_P(PSTR(FORMAT),##args) -#else #define ANNOTATE(...) printf(__VA_ARGS__) -#endif #else #define ANNOTATE(...) #endif /* (DEBUG) & DEBUG_ANNOTATE */ #if (DEBUG) & DEBUG_PRINT -#ifdef __AVR__ -#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) -#else #define PRINTF(...) printf(__VA_ARGS__) -#endif #define PRINTLLADDR(lladdr) net_debug_lladdr_print(lladdr) #else #define PRINTF(...) diff --git a/core/sys/energest.h b/core/sys/energest.h index a8f445b65..8296041b3 100644 --- a/core/sys/energest.h +++ b/core/sys/energest.h @@ -90,37 +90,7 @@ extern energest_t energest_leveldevice_current_leveltime[ENERGEST_CONF_LEVELDEVI energest_current_time[type] = RTIMER_NOW(); \ energest_current_mode[type] = 1; \ } while(0) -#ifdef __AVR__ -/* Handle 16 bit rtimer wraparound */ -#define ENERGEST_OFF(type) if(energest_current_mode[type] != 0) do { \ - if (RTIMER_NOW() < energest_current_time[type]) energest_total_time[type].current += RTIMER_ARCH_SECOND; \ - energest_total_time[type].current += (rtimer_clock_t)(RTIMER_NOW() - \ - energest_current_time[type]); \ - energest_current_mode[type] = 0; \ - } while(0) -#define ENERGEST_OFF_LEVEL(type,level) do { \ - if (RTIMER_NOW() < energest_current_time[type]) energest_total_time[type].current += RTIMER_ARCH_SECOND; \ - energest_leveldevice_current_leveltime[level].current += (rtimer_clock_t)(RTIMER_NOW() - \ - energest_current_time[type]); \ - energest_current_mode[type] = 0; \ - } while(0) - -#define ENERGEST_SWITCH(type_off, type_on) do { \ - rtimer_clock_t energest_local_variable_now = RTIMER_NOW(); \ - if(energest_current_mode[type_off] != 0) { \ - if (energest_local_variable_now < energest_current_time[type_off]) { \ - energest_total_time[type_off].current += RTIMER_ARCH_SECOND; \ - } \ - energest_total_time[type_off].current += (rtimer_clock_t)(energest_local_variable_now - \ - energest_current_time[type_off]); \ - energest_current_mode[type_off] = 0; \ - } \ - energest_current_time[type_on] = energest_local_variable_now; \ - energest_current_mode[type_on] = 1; \ - } while(0) - -#else #define ENERGEST_OFF(type) if(energest_current_mode[type] != 0) do { \ energest_total_time[type].current += (rtimer_clock_t)(RTIMER_NOW() - \ energest_current_time[type]); \ @@ -143,7 +113,6 @@ extern energest_t energest_leveldevice_current_leveltime[ENERGEST_CONF_LEVELDEVI energest_current_time[type_on] = energest_local_variable_now; \ energest_current_mode[type_on] = 1; \ } while(0) -#endif #else /* ENERGEST_CONF_ON */ #define ENERGEST_ON(type) do { } while(0) diff --git a/drivers/dev/cc2420/cc2420.c b/drivers/dev/cc2420/cc2420.c index 07e5a3f8d..29072b504 100644 --- a/drivers/dev/cc2420/cc2420.c +++ b/drivers/dev/cc2420/cc2420.c @@ -37,10 +37,6 @@ #include "contiki.h" -#if defined(__AVR__) -#include -#endif - #include "dev/leds.h" #include "dev/spi.h" #include "cc2420.h" diff --git a/examples/cfs-coffee/Makefile b/examples/cfs-coffee/Makefile index bb10e2657..71c9a8e0e 100644 --- a/examples/cfs-coffee/Makefile +++ b/examples/cfs-coffee/Makefile @@ -3,8 +3,4 @@ CONTIKI = ../.. all: test-cfs test-coffee example-coffee -ifeq ($(TARGET),avr-raven) - COFFEE_FILES = 4 -endif - include $(CONTIKI)/Makefile.include diff --git a/examples/ipv6/rpl-border-router/Makefile b/examples/ipv6/rpl-border-router/Makefile index 873d8c9ff..c231e1622 100644 --- a/examples/ipv6/rpl-border-router/Makefile +++ b/examples/ipv6/rpl-border-router/Makefile @@ -11,7 +11,6 @@ PROJECT_SOURCEFILES += slip-bridge.c #WITH_WEBSERVER=webserver-name will use /apps/webserver-name if it can be #found in the /apps, /drivers//platform/$(TARGET)/apps/, or current directory (in that order). # WITH_WEBSERVER=webserver for /apps/webserver -# WITH_WEBSERVER=raven-webserver for /drivers/platform/avr-raven/apps/raven-webserver/ #make clean before changing webservers! #Note /apps/webserver contains a 2500 byte style sheet which is a severe test diff --git a/examples/sensniff/avr-rss2/avr-rss2-io.h b/examples/sensniff/avr-rss2/avr-rss2-io.h deleted file mode 100644 index b92467511..000000000 --- a/examples/sensniff/avr-rss2/avr-rss2-io.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2016, George Oikonomou - http://www.spd.gr - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/*---------------------------------------------------------------------------*/ -#ifndef AVR_RSS2_IO_H_ -#define AVR_RSS2_IO_H_ -/*---------------------------------------------------------------------------*/ -#include "contiki-conf.h" -#include "dev/rs232.h" - -#define sensniff_io_byte_out(b) rs232_send(0, b) -#define sensniff_io_flush() -#define sensniff_io_set_input(b) rs232_set_input(RS232_PORT_0, b) -/*---------------------------------------------------------------------------*/ -#endif /* AVR_RSS2_IO_H_ */ -/*---------------------------------------------------------------------------*/ diff --git a/examples/sensniff/avr-rss2/target-conf.h b/examples/sensniff/avr-rss2/target-conf.h deleted file mode 100644 index c524b7c6e..000000000 --- a/examples/sensniff/avr-rss2/target-conf.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016, George Oikonomou - http://www.spd.gr - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/*---------------------------------------------------------------------------*/ -#ifndef TARGET_CONF_H_ -#define TARGET_CONF_H_ -/*---------------------------------------------------------------------------*/ -#define SENSNIFF_IO_DRIVER_H "avr-rss2/avr-rss2-io.h" -#define RS232_BAUDRATE USART_BAUD_500000 -/*---------------------------------------------------------------------------*/ -#endif /* TARGET_CONF_H_ */ -/*---------------------------------------------------------------------------*/ diff --git a/examples/sensniff/cc2530dk/Makefile.cc2530dk b/examples/sensniff/cc2530dk/Makefile.cc2530dk deleted file mode 100644 index 35c94610a..000000000 --- a/examples/sensniff/cc2530dk/Makefile.cc2530dk +++ /dev/null @@ -1 +0,0 @@ -HAVE_BANKING = 1 diff --git a/examples/sensniff/cc2530dk/target-conf.h b/examples/sensniff/cc2530dk/target-conf.h deleted file mode 100644 index 69e405390..000000000 --- a/examples/sensniff/cc2530dk/target-conf.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2016, George Oikonomou - http://www.spd.gr - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/*---------------------------------------------------------------------------*/ -#ifndef TARGET_CONF_H_ -#define TARGET_CONF_H_ -/*---------------------------------------------------------------------------*/ -/* Change to 0 to build for the SmartRF + cc2530 EM */ -#define MODELS_CONF_CC2531_USB_STICK 1 -/*---------------------------------------------------------------------------*/ -/* Don't change below this line */ -#define ADC_SENSOR_CONF_ON 0 -#define LPM_CONF_MODE 0 -#define UART0_CONF_HIGH_SPEED 1 -#define UART0_RTSCTS 1 -#define UART0_CONF_WITH_INPUT 1 -#define USB_SERIAL_CONF_BUFFERED 1 -/*---------------------------------------------------------------------------*/ -#define SENSNIFF_IO_DRIVER_H "pool/cc2530-cc2531-io.h" -/*---------------------------------------------------------------------------*/ -#endif /* TARGET_CONF_H_ */ -/*---------------------------------------------------------------------------*/ diff --git a/examples/sensniff/ev-aducrf101mkxz/ev-aducrf101mkxz-io.h b/examples/sensniff/ev-aducrf101mkxz/ev-aducrf101mkxz-io.h deleted file mode 100644 index 883e5e598..000000000 --- a/examples/sensniff/ev-aducrf101mkxz/ev-aducrf101mkxz-io.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2016, George Oikonomou - http://www.spd.gr - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/*---------------------------------------------------------------------------*/ -#ifndef EV_ADUCRF101MKXZ_IO_H_ -#define EV_ADUCRF101MKXZ_IO_H_ -/*---------------------------------------------------------------------------*/ -#include "contiki-conf.h" -#include "dev/uart.h" -/*---------------------------------------------------------------------------*/ -#define sensniff_io_byte_out(b) uart_put(b) -#define sensniff_io_flush() -#define sensniff_io_set_input(f) uart_set_input(f) -/*---------------------------------------------------------------------------*/ -#endif /* EV_ADUCRF101MKXZ_IO_H_ */ -/*---------------------------------------------------------------------------*/ diff --git a/examples/sensniff/ev-aducrf101mkxz/target-conf.h b/examples/sensniff/ev-aducrf101mkxz/target-conf.h deleted file mode 100644 index bd3e518d7..000000000 --- a/examples/sensniff/ev-aducrf101mkxz/target-conf.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2016, George Oikonomou - http://www.spd.gr - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/*---------------------------------------------------------------------------*/ -#ifndef TARGET_CONF_H_ -#define TARGET_CONF_H_ -/*---------------------------------------------------------------------------*/ -#define SENSNIFF_IO_DRIVER_H "ev-aducrf101mkxz/ev-aducrf101mkxz-io.h" -/*---------------------------------------------------------------------------*/ -#endif /* TARGET_CONF_H_ */ -/*---------------------------------------------------------------------------*/ diff --git a/examples/sensniff/z1/target-conf.h b/examples/sensniff/z1/target-conf.h deleted file mode 100644 index 6e3db2b48..000000000 --- a/examples/sensniff/z1/target-conf.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016, George Oikonomou - http://www.spd.gr - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/*---------------------------------------------------------------------------*/ -#ifndef TARGET_CONF_H_ -#define TARGET_CONF_H_ -/*---------------------------------------------------------------------------*/ -#define MSP430_IO_CONF_USE_UART1 0 -#define UART0_CONF_BAUD_RATE 460800 -/*---------------------------------------------------------------------------*/ -#define SENSNIFF_IO_DRIVER_H "pool/msp430-io.h" -/*---------------------------------------------------------------------------*/ -#endif /* TARGET_CONF_H_ */ -/*---------------------------------------------------------------------------*/