From 97aa4da1984025f9054dac74495e1c209979e60b Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Thu, 17 Sep 2015 11:01:24 +0200 Subject: [PATCH] net_help: remove net_help module Its functionality is now divided up into several helper modules that are already used through-out RIOT. --- Makefile.dep | 5 --- sys/net/crosslayer/net_help/Makefile | 1 - sys/net/crosslayer/net_help/net_help.c | 55 -------------------------- sys/net/include/net_help.h | 54 ------------------------- 4 files changed, 115 deletions(-) delete mode 100644 sys/net/crosslayer/net_help/Makefile delete mode 100644 sys/net/crosslayer/net_help/net_help.c delete mode 100644 sys/net/include/net_help.h diff --git a/Makefile.dep b/Makefile.dep index 6f58e65ec6ad..2da1f975d113 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -266,10 +266,6 @@ ifneq (,$(filter posix,$(USEMODULE))) USEMODULE += vtimer endif -ifneq (,$(filter cbor,$(USEMODULE))) - USEMODULE += net_help -endif - ifneq (,$(filter vtimer,$(USEMODULE))) USEMODULE += xtimer USEMODULE += timex @@ -292,7 +288,6 @@ endif ifneq (,$(filter fib,$(USEMODULE))) USEMODULE += universal_address USEMODULE += xtimer - USEMODULE += net_help endif ifneq (,$(filter oonf_common,$(USEMODULE))) diff --git a/sys/net/crosslayer/net_help/Makefile b/sys/net/crosslayer/net_help/Makefile deleted file mode 100644 index 48422e909a47..000000000000 --- a/sys/net/crosslayer/net_help/Makefile +++ /dev/null @@ -1 +0,0 @@ -include $(RIOTBASE)/Makefile.base diff --git a/sys/net/crosslayer/net_help/net_help.c b/sys/net/crosslayer/net_help/net_help.c deleted file mode 100644 index 9a2741d1a4f4..000000000000 --- a/sys/net/crosslayer/net_help/net_help.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2013 Freie Universität Berlin. - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @{ - * @file - * @brief Providing implementation for prototypes defined in net_help.h. - * @author Oliver Gesch - */ - -#include -#include -#include "thread.h" - -#include "net_help.h" - -uint16_t net_help_csum(uint16_t sum, uint8_t *buf, uint16_t len) -{ - int count = len >> 1; - - if (count) { - uint16_t carry = 0; - - do { - uint16_t t = (*buf << 8) + *(buf + 1); - count--; - buf += 2; - sum += carry; - sum += t; - carry = (t > sum); - } while (count); - - sum += carry; - } - - if (len & 1) { - uint16_t u = (*buf << 8); - sum += (*buf << 8); - - if (sum < u) { - sum++; - } - } - - return sum; -} - -/** - * @} - */ diff --git a/sys/net/include/net_help.h b/sys/net/include/net_help.h deleted file mode 100644 index cc6c79784806..000000000000 --- a/sys/net/include/net_help.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2014 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @defgroup net_help Net help - * @ingroup net - * @brief Helper functions for networking as byte order conversions and checksum calculations - * @{ - * - * @file - * - * @author Oliver Gesch - */ - -#ifndef __NET_HELP_H -#define __NET_HELP_H - -#include -#include - -#include "byteorder.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define BITSET(var,pos) ((var) & (1<<(pos))) - -/** - * @brief Computes the Internet Checksum for *buf* with initial value *init* - * - * @see - * RFC 1071 - * - * - * @param[in] init Initial value for the checksum (0 in most cases) - * @param[in] buf A byte array to calculate the checksum of - * @param[in] buf_len Length of *buf* - * - * @return The Internet Checksum of *buf* with initial value *init* - */ -uint16_t net_help_csum(uint16_t init, uint8_t *buf, uint16_t buf_len); - -#ifdef __cplusplus -} -#endif - -/** @} */ -#endif /* __NET_HELP_H */