From 091483c1503046bfb99f5b846891e7e9c7ace652 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Sun, 7 Feb 2010 07:43:35 +0000 Subject: [PATCH] Added dummy watchdog functions for all AVR platforms --- cpu/avr/Makefile.avr | 6 +-- {platform/micaz => cpu/avr}/watchdog.c | 2 +- platform/avr-raven/watchdog.c | 62 -------------------------- platform/micaz/Makefile.micaz | 3 +- 4 files changed, 5 insertions(+), 68 deletions(-) rename {platform/micaz => cpu/avr}/watchdog.c (97%) delete mode 100644 platform/avr-raven/watchdog.c diff --git a/cpu/avr/Makefile.avr b/cpu/avr/Makefile.avr index c46a15b8b..5b6bd103a 100644 --- a/cpu/avr/Makefile.avr +++ b/cpu/avr/Makefile.avr @@ -1,4 +1,4 @@ -# $Id: Makefile.avr,v 1.17 2009/09/07 12:02:58 joxe Exp $ +# $Id: Makefile.avr,v 1.18 2010/02/07 07:43:35 adamdunkels Exp $ ### Check if we are running under Windows @@ -23,7 +23,7 @@ CONTIKI_CPU=$(CONTIKI)/cpu/avr ### These directories will be searched for the specified source files ### TARGETLIBS are platform-specific routines in the contiki library path CONTIKI_CPU_DIRS = . dev -AVR = clock.c mtarch.c eeprom.c flash.c rs232.c leds-arch.c +AVR = clock.c mtarch.c eeprom.c flash.c rs232.c leds-arch.c watchdog.c ELFLOADER = elfloader.c elfloader-avr.c symtab-avr.c TARGETLIBS = random.c leds.c @@ -63,7 +63,7 @@ ifdef COFFEE_FILES #if files are defined force definition of COFF endif endif COFFEE_ADDRESS1 = $(shell echo $$(( $(COFFEE_ADDRESS) + 1 ))) - CONTIKI_TARGET_SOURCEFILES += cfs-coffee.c cfs-coffee-arch.c watchdog.c + CONTIKI_TARGET_SOURCEFILES += cfs-coffee.c cfs-coffee-arch.c CFLAGS += -DCOFFEE_FILES=$(COFFEE_FILES) -DCOFFEE_ADDRESS=$(COFFEE_ADDRESS) ifneq ($(COFFEE_ADDRESS), DEFAULT) LDFLAGS+= -Wl,--section-start=.coffeefiles=$(COFFEE_ADDRESS) diff --git a/platform/micaz/watchdog.c b/cpu/avr/watchdog.c similarity index 97% rename from platform/micaz/watchdog.c rename to cpu/avr/watchdog.c index 926715d31..23c9b2c22 100644 --- a/platform/micaz/watchdog.c +++ b/cpu/avr/watchdog.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: watchdog.c,v 1.1 2010/02/02 17:04:18 adamdunkels Exp $ + * @(#)$Id: watchdog.c,v 1.1 2010/02/07 07:43:35 adamdunkels Exp $ */ /* Dummy watchdog routines for the Raven 1284p */ diff --git a/platform/avr-raven/watchdog.c b/platform/avr-raven/watchdog.c deleted file mode 100644 index 6882a9571..000000000 --- a/platform/avr-raven/watchdog.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2005, Swedish Institute of Computer Science - * 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 Institute 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 INSTITUTE 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 INSTITUTE 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. - * - * This file is part of the Contiki operating system. - * - * @(#)$Id: watchdog.c,v 1.1 2009/07/14 19:23:22 dak664 Exp $ - */ - - /* Dummy watchdog routines for the Raven 1284p */ -#include "dev/watchdog.h" - -/*---------------------------------------------------------------------------*/ -void -watchdog_init(void) -{ -} -/*---------------------------------------------------------------------------*/ -void -watchdog_start(void) -{ -} -/*---------------------------------------------------------------------------*/ -void -watchdog_periodic(void) -{ -} -/*---------------------------------------------------------------------------*/ -void -watchdog_stop(void) -{ -} -/*---------------------------------------------------------------------------*/ -void -watchdog_reboot(void) -{ -} -/*---------------------------------------------------------------------------*/ diff --git a/platform/micaz/Makefile.micaz b/platform/micaz/Makefile.micaz index 6e35beb73..3b6dacee0 100755 --- a/platform/micaz/Makefile.micaz +++ b/platform/micaz/Makefile.micaz @@ -6,8 +6,7 @@ SENSOR_BOARD_SOURCEFILES = mts300.c CONTIKI_TARGET_SOURCEFILES += rs232.c cfs-eeprom.c contiki-micaz-main.c \ leds-arch.c cc2420.c init-net-rime.c node-id.c \ - clock.c spi.c cc2420-arch.c rtimer-arch.c ds2401.c \ - watchdog.c + clock.c spi.c cc2420-arch.c rtimer-arch.c ds2401.c CONTIKI_TARGET_SOURCEFILES += $(SENSOR_BOARD_SOURCEFILES)