diff --git a/platform/esb/Makefile.esb b/platform/esb/Makefile.esb index b19cccfc8..c38456e0e 100644 --- a/platform/esb/Makefile.esb +++ b/platform/esb/Makefile.esb @@ -1,10 +1,10 @@ -# $Id: Makefile.esb,v 1.11 2008/07/11 15:27:57 nifi Exp $ +# $Id: Makefile.esb,v 1.12 2008/09/29 12:38:18 joxe Exp $ SENSORS = sensors.c irq.c button-sensor.c pir-sensor.c vib-sensor.c \ sound-sensor.c radio-sensor.c ctsrts-sensor.c battery-sensor.c \ temperature-sensor.c ESB = ir.c beep.c ds1629.c tr1001-uip.c tr1001-gcr.c gcr.c \ - esb-sensors.c node-id.c eeprom.c energest-arch.c + esb-sensors.c node-id.c eeprom.c CFS_EEPROM = cfs-eeprom.c CFS_COFFEE = cfs-coffee.c cfs-coffee-arch.c diff --git a/platform/esb/energest-arch.c b/platform/esb/energest-arch.c deleted file mode 100644 index 033db8fa2..000000000 --- a/platform/esb/energest-arch.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2007, 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: energest-arch.c,v 1.3 2008/07/04 02:58:58 nvt-se Exp $ - */ - -/** - * \file - * Architecture (board) dependent code for energy estimation - * \author - * Adam Dunkels - */ - -#include "sys/clock.h" -#include "sys/energest.h" -#include "sys/rtimer.h" - -#define DEC2FIX(h,d) ((h << 6) + (unsigned long)(0.64 * d)) -/*#define DEC2FIX(h, d) (h << 8)*/ - -/*---------------------------------------------------------------------------*/ -unsigned long -energest_arch_current_estimate(void) -{ - return - energest_type_time(ENERGEST_TYPE_CPU) * DEC2FIX(1,1) + - energest_type_time(ENERGEST_TYPE_LPM) * DEC2FIX(1,0) + - energest_type_time(ENERGEST_TYPE_LED_GREEN) * DEC2FIX(6,36) + - energest_type_time(ENERGEST_TYPE_LED_YELLOW) * DEC2FIX(3,46) + - energest_type_time(ENERGEST_TYPE_LED_RED) * DEC2FIX(3,69) + - energest_type_time(ENERGEST_TYPE_SENSORS) * DEC2FIX(3,76) + - energest_type_time(ENERGEST_TYPE_TRANSMIT) * DEC2FIX(5,1) + - energest_type_time(ENERGEST_TYPE_LISTEN) * DEC2FIX(4,8); -} -/*---------------------------------------------------------------------------*/ -unsigned short -energest_arch_now(void) -{ - unsigned long time; - -#define ENERGEST_USE_CLOCK_TIME 0 - -#if ENERGEST_USE_CLOCK_TIME - time = clock_time(); -#else - time = rtimer_arch_now(); -#endif - - - return time; -} -/*---------------------------------------------------------------------------*/ diff --git a/platform/sky/Makefile.sky b/platform/sky/Makefile.sky index b6190fef2..7274682f0 100644 --- a/platform/sky/Makefile.sky +++ b/platform/sky/Makefile.sky @@ -1,9 +1,9 @@ -# $Id: Makefile.sky,v 1.17 2008/07/02 08:47:05 adamdunkels Exp $ +# $Id: Makefile.sky,v 1.18 2008/09/29 12:38:18 joxe Exp $ ARCH=msp430.c leds.c watchdog.c light.c spi.c ds2411.c \ xmem.c i2c.c sht11.c battery-sensor.c \ - cc2420.c cc2420-aes.c cc2420-arch.c irq.c energest-arch.c \ + cc2420.c cc2420-aes.c cc2420-arch.c irq.c \ node-id.c sensors.c button-sensor.c cfs-coffee.c \ radio-sensor.c uart1.c uip-ipchksum.c \ #slip.c slip_uart1.c diff --git a/platform/sky/energest-arch.c b/platform/sky/energest-arch.c deleted file mode 100644 index 83cc09895..000000000 --- a/platform/sky/energest-arch.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2007, 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: energest-arch.c,v 1.5 2008/07/03 23:59:20 adamdunkels Exp $ - */ - -/** - * \file - * Architecture (board) dependent code for energy estimation - * \author - * Adam Dunkels - */ - -#include "sys/energest.h" - -#include "sys/clock.h" -#include "sys/rtimer.h" - -#define DEC2FIX(h,d) ((h * 64L) + (unsigned long)((d * 64L) / 1000L)) - -/*---------------------------------------------------------------------------*/ -#if 0 -unsigned long -energest_arch_current_estimate(void) -{ - return /* The voltage is 3 V */ /* The DEC2FIX() stuff is - the current */ - (3 * (energest_type_time(ENERGEST_TYPE_CPU) * DEC2FIX(1L,800L) + - energest_type_time(ENERGEST_TYPE_LPM) * DEC2FIX(0L,545L) + - energest_type_time(ENERGEST_TYPE_LED_GREEN) * DEC2FIX(4L,600L) + /* Not measured */ - energest_type_time(ENERGEST_TYPE_LED_YELLOW) * DEC2FIX(4L,600L) + /* Not measured */ - energest_type_time(ENERGEST_TYPE_LED_RED) * DEC2FIX(4L,600L) + - energest_type_time(ENERGEST_TYPE_SENSORS) * DEC2FIX(6L,000L) + /* Not measured */ - energest_type_time(ENERGEST_TYPE_TRANSMIT) * DEC2FIX(17L,700L) + - energest_type_time(ENERGEST_TYPE_LISTEN) * DEC2FIX(20L,000L))) / - (64 * ENERGEST_SECOND / 1000); - return 0; -} -#endif -/*---------------------------------------------------------------------------*/ -unsigned short -energest_arch_now(void) -{ - unsigned long time; - -#define ENERGEST_USE_CLOCK_TIME 0 - -#if ENERGEST_USE_CLOCK_TIME - time = clock_time(); -#else - time = rtimer_arch_now(); -#endif - - - return time; -} -/*---------------------------------------------------------------------------*/ diff --git a/tools/sky/check-size b/tools/sky/check-size index c367682df..aca64c8e5 100755 --- a/tools/sky/check-size +++ b/tools/sky/check-size @@ -8,7 +8,7 @@ @{$rime{$_}} = (0, 0) foreach (@rime); @sky = ( "battery-sensor", "button-sensor", "cfs-xmem", "clock", - "contiki-sky-main", "ds2411", "energest-arch", "flash", "msp430", + "contiki-sky-main", "ds2411", "flash", "msp430", "mtarch", "i2c", "leds-arch", "light", "radio-sensor", "sht11", "simple-cc2420-arch", "simple-cc2420", "spi", "slip",