From 272933d2d42dbd3f09c32e17b7f8b1146bccba01 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Tue, 20 Jun 2017 09:21:15 +0200 Subject: [PATCH] Remove old log library --- core/sys/log.h | 45 -------------------- drivers/cpu/native/net/wpcap.c | 13 ++++-- drivers/platform/cooja/sys/log.c | 1 - drivers/platform/jn516x/Makefile.jn516x | 2 +- drivers/platform/jn516x/lib/log.c | 56 ------------------------- drivers/platform/sky/contiki-sky-main.c | 8 ---- 6 files changed, 10 insertions(+), 115 deletions(-) delete mode 100644 core/sys/log.h delete mode 100644 drivers/platform/jn516x/lib/log.c diff --git a/core/sys/log.h b/core/sys/log.h deleted file mode 100644 index c6bc24737..000000000 --- a/core/sys/log.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2004, 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. - * - * Author: Adam Dunkels - * - */ -#ifndef LOG_H_ -#define LOG_H_ - -#include "contiki-conf.h" - -#if LOG_CONF_ENABLED -void log_message(const char *part1, const char *part2); -#else /* LOG_CONF_ENABLED */ -#define log_message(p1, p2) -#endif /* LOG_CONF_ENABLED */ - -#endif /* LOG_H_ */ diff --git a/drivers/cpu/native/net/wpcap.c b/drivers/cpu/native/net/wpcap.c index 301b07d91..7d3e94247 100644 --- a/drivers/cpu/native/net/wpcap.c +++ b/drivers/cpu/native/net/wpcap.c @@ -55,7 +55,12 @@ #endif #include "contiki-net.h" -#include "sys/log.h" + +#if LOG_CONF_ENABLED +void log_message(const char *part1, const char *part2); +#else /* LOG_CONF_ENABLED */ +#define log_message(p1, p2) +#endif /* LOG_CONF_ENABLED */ #include "net/wpcap.h" @@ -155,7 +160,7 @@ HMODULE wpcap; static struct pcap *pcap; -/* uip_lladdr is defined in uip.c. It is not used in uip6.c. +/* uip_lladdr is defined in uip.c. It is not used in uip6.c. * If needed for some purpose it can be defined here */ #if NETSTACK_CONF_WITH_IPV6 @@ -350,7 +355,7 @@ init_pcap(struct in_addr addr) struct pcap_if *interfaces; struct pcap_addr *paddr; char error[256]; - + if(pcap_findalldevs(&interfaces, error) == -1) { error_exit(error); } @@ -624,7 +629,7 @@ wpcap_poll(void) PRINTF("SIN: Discarding echoed packet\n"); return 0; } - + /* To implement multihop, ignore packets to us from specified source macs */ // printf("ethtype=%x %x",*(packet+2*UIP_LLADDR_LEN),*(packet+2*UIP_LLADDR_LEN+1)); diff --git a/drivers/platform/cooja/sys/log.c b/drivers/platform/cooja/sys/log.c index 9d6318f6f..32b064335 100644 --- a/drivers/platform/cooja/sys/log.c +++ b/drivers/platform/cooja/sys/log.c @@ -31,7 +31,6 @@ #include #include #include -#include "sys/log.h" #include "lib/simEnvChange.h" #define IMPLEMENT_PRINTF 1 diff --git a/drivers/platform/jn516x/Makefile.jn516x b/drivers/platform/jn516x/Makefile.jn516x index 757477ed7..930075e29 100644 --- a/drivers/platform/jn516x/Makefile.jn516x +++ b/drivers/platform/jn516x/Makefile.jn516x @@ -82,7 +82,7 @@ OBJDUMP:=$(CROSS_COMPILE)-objdump ARCH = jn516x-ccm-star.c exceptions.c rtimer-arch.c rtimer-arch-slow.c \ slip_uart0.c clock.c micromac-radio.c \ - mtarch.c node-id.c watchdog.c log.c slip.c sprintf.c + mtarch.c node-id.c watchdog.c slip.c sprintf.c # Default uart0 for printf and slip TARGET_WITH_UART0 ?= 1 TARGET_WITH_UART1 ?= 0 diff --git a/drivers/platform/jn516x/lib/log.c b/drivers/platform/jn516x/lib/log.c deleted file mode 100644 index adf85ec1a..000000000 --- a/drivers/platform/jn516x/lib/log.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2015, SICS Swedish ICT. - * 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. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 OS - * - */ - -#include -#include - -#include "net/ip/uip.h" -#include "sys/log.h" - -/*---------------------------------------------------------------------------*/ -#if LOG_CONF_ENABLED -void -log_message(char *m1, char *m2) -{ - printf("%s%s\n", m1, m2); -} -#endif /* LOG_CONF_ENABLED */ -/*---------------------------------------------------------------------------*/ -#if UIP_LOGGING -void -uip_log(char *m) -{ - printf("uip_log: %s\n", m); -} -#endif /* UIP_LOGGING */ -/*---------------------------------------------------------------------------*/ diff --git a/drivers/platform/sky/contiki-sky-main.c b/drivers/platform/sky/contiki-sky-main.c index a1a9a8faa..6a1dca6a4 100644 --- a/drivers/platform/sky/contiki-sky-main.c +++ b/drivers/platform/sky/contiki-sky-main.c @@ -392,11 +392,3 @@ main(int argc, char **argv) return 0; } -/*---------------------------------------------------------------------------*/ -#if LOG_CONF_ENABLED -void -log_message(char *m1, char *m2) -{ - printf("%s%s\n", m1, m2); -} -#endif /* LOG_CONF_ENABLED */