From 3cb93f7df7442e80eb09e580d1746abd5492596a Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sun, 29 Oct 2017 01:21:21 +0000 Subject: [PATCH] Remove obsolete files and code --- examples/slip-radio/Makefile | 3 - examples/slip-radio/slip-radio-mc1322x.c | 61 -------------------- examples/slip-radio/slip-radio-rf230.c | 72 ------------------------ examples/slip-radio/slip-radio.c | 5 -- 4 files changed, 141 deletions(-) delete mode 100644 examples/slip-radio/slip-radio-mc1322x.c delete mode 100644 examples/slip-radio/slip-radio-rf230.c diff --git a/examples/slip-radio/Makefile b/examples/slip-radio/Makefile index f4bd8ca35..d2bfa7680 100644 --- a/examples/slip-radio/Makefile +++ b/examples/slip-radio/Makefile @@ -12,9 +12,6 @@ PROJECT_SOURCEFILES += slip-net.c ifeq ($(TARGET),sky) PROJECT_SOURCEFILES += slip-radio-cc2420.c slip-radio-sky-sensors.c endif -ifeq ($(TARGET),nooliberry) - PROJECT_SOURCEFILES += slip-radio-rf230.c -endif # custom net layer, but with IPv6 enabled MAKE_NET = MAKE_NET_IPV6 diff --git a/examples/slip-radio/slip-radio-mc1322x.c b/examples/slip-radio/slip-radio-mc1322x.c deleted file mode 100644 index da518b11c..000000000 --- a/examples/slip-radio/slip-radio-mc1322x.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2011, 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. - * - * Sets up some commands for the MC1322x radio chip. - */ - -#include "contiki.h" -#include "mc1322x.h" -#include "cmd.h" -#include - -int -cmd_handler_mc1322x(const uint8_t *data, int len) -{ - if(data[0] == '!') { - if(data[1] == 'C') { - printf("mc1322x_cmd: setting channel: %d\n", data[2]); - set_channel(data[2]-11); - return 1; - } - } else if(data[0] == '?') { - if(data[1] == 'C') { - uint8_t buf[4]; - printf("mc1322x_cmd: getting channel: %d\n", data[2]); - buf[0] = '!'; - buf[1] = 'C'; - //Not implemented in MACA driver - buf[2] = 0; - cmd_send(buf, 3); - return 1; - } - } - return 0; -} diff --git a/examples/slip-radio/slip-radio-rf230.c b/examples/slip-radio/slip-radio-rf230.c deleted file mode 100644 index 67c3ecc33..000000000 --- a/examples/slip-radio/slip-radio-rf230.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2011, 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. - * - * Sets up some commands for the RF230 radio. - */ - -#include "contiki.h" -#include "cmd.h" - -#include "radio/rf230/radio.h" -#include "radio/rf230bb/rf230bb.h" - - -#define DEBUG 0 -#if DEBUG -#include -#define PRINTF(FORMAT,args...) printf_P(PSTR(FORMAT),##args) -#define PRINTSHORT(FORMAT,args...) printf_P(PSTR(FORMAT),##args) -#else -#define PRINTF(...) -#define PRINTSHORT(...) -#endif - -int -cmd_handler_rf230(const uint8_t *data, int len) -{ - if(data[0] == '!') { - if(data[1] == 'C') { - PRINTF("CMD: Setting channel: %d\n", data[2]); - rf230_set_channel(data[2]); - return 1; - } - } else if(data[0] == '?') { - if(data[1] == 'C') { - uint8_t buf[4]; - PRINTF("CMD: Getting channel: %d\n", data[2]); - buf[0] = '!'; - buf[1] = 'C'; - buf[2] = rf230_get_channel(); - cmd_send(buf, 3); - return 1; - } - } - return 0; -} diff --git a/examples/slip-radio/slip-radio.c b/examples/slip-radio/slip-radio.c index 193ec44aa..c81ea55f1 100644 --- a/examples/slip-radio/slip-radio.c +++ b/examples/slip-radio/slip-radio.c @@ -60,12 +60,7 @@ int packet_pos; static int slip_radio_cmd_handler(const uint8_t *data, int len); -#if CONTIKI_TARGET_NOOLIBERRY -int cmd_handler_rf230(const uint8_t *data, int len); -#else /* Leave CC2420 as default */ int cmd_handler_cc2420(const uint8_t *data, int len); -#endif /* CONTIKI_TARGET */ - /*---------------------------------------------------------------------------*/ #ifdef CMD_CONF_HANDLERS CMD_HANDLERS(CMD_CONF_HANDLERS);