From 7154b4c68d057391b6207ab4d2e93d05a9c04344 Mon Sep 17 00:00:00 2001 From: nifi Date: Thu, 14 Jan 2010 19:14:47 +0000 Subject: [PATCH] Removed references to irq, which is not used with the new sensor APIs --- platform/cooja/Makefile.cooja | 4 ++-- platform/cooja/dev/irq.c | 36 ----------------------------------- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 platform/cooja/dev/irq.c diff --git a/platform/cooja/Makefile.cooja b/platform/cooja/Makefile.cooja index 63c98e352..511f56ba2 100644 --- a/platform/cooja/Makefile.cooja +++ b/platform/cooja/Makefile.cooja @@ -1,4 +1,4 @@ -# $Id: Makefile.cooja,v 1.35 2009/10/28 13:39:15 nifi Exp $ +# $Id: Makefile.cooja,v 1.36 2010/01/14 19:14:47 nifi Exp $ ## The COOJA Simulator Contiki platform Makefile ## @@ -50,7 +50,7 @@ CONTIKI_APP_OBJ = $(CONTIKI_APP).co COOJA = $(CONTIKI)/platform/$(TARGET) CONTIKI_TARGET_DIRS = . dev lib sys cfs net -COOJA_BASE = simEnvChange.c irq.c cooja_mt.c cooja_mtarch.c rtimer-arch.c slip.c +COOJA_BASE = simEnvChange.c cooja_mt.c cooja_mtarch.c rtimer-arch.c slip.c COOJA_INTFS = beep.c button-sensor.c ip.c leds-arch.c moteid.c \ pir-sensor.c rs232.c vib-sensor.c \ diff --git a/platform/cooja/dev/irq.c b/platform/cooja/dev/irq.c deleted file mode 100644 index d1e2ae169..000000000 --- a/platform/cooja/dev/irq.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2006, 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. - * - * $Id: irq.c,v 1.1 2006/08/21 12:11:20 fros4943 Exp $ - */ - -void -irq_init(void) -{ -} -