kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00
Code Releases Activity

core: move NTOHL and friends into byteorder.h

Browse Source
This commit is contained in:
René Kijewski 2014-11-10 21:11:16 +01:00
parent 73dddfb601
commit 434d6a1f65
2 changed files with 85 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
core/include/byteorder.h
View File

@ -21,6 +21,10 @@
#include <stdint.h>
#if defined(__MACH__)
# include "clang_compat.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
@ -220,6 +224,54 @@ static inline uint32_t byteorder_swapl(uint32_t v);
*/
static inline uint64_t byteorder_swapll(uint64_t v);
/**
* @brief Convert from host byte order to network byte order, 16 bit.
* @see byteorder_htons()
* @param[in] v The integer to convert.
* @returns Converted integer.
*/
static inline uint16_t HTONS(uint16_t a);
/**
* @brief Convert from host byte order to network byte order, 32 bit.
* @see byteorder_htonl()
* @param[in] v The integer to convert.
* @returns Converted integer.
*/
static inline uint32_t HTONL(uint32_t a);
/**
* @brief Convert from host byte order to network byte order, 64 bit.
* @see byteorder_htonll()
* @param[in] v The integer to convert.
* @returns Converted integer.
*/
static inline uint64_t HTONLL(uint64_t a);
/**
* @brief Convert from network byte order to host byte order, 16 bit.
* @see byteorder_ntohs()
* @param[in] v The integer to convert.
* @returns Converted integer.
*/
static inline uint16_t NTOHS(uint16_t a);
/**
* @brief Convert from network byte order to host byte order, 32 bit.
* @see byteorder_ntohl()
* @param[in] v The integer to convert.
* @returns Converted integer.
*/
static inline uint32_t NTOHL(uint32_t a);
/**
* @brief Convert from network byte order to host byte order, 64 bit.
* @see byteorder_ntohll()
* @param[in] v The integer to convert.
* @returns Converted integer.
*/
static inline uint64_t NTOHLL(uint64_t a);
/* **************************** IMPLEMENTATION ***************************** */
@ -327,6 +379,39 @@ static inline uint64_t byteorder_ntohll(network_uint64_t v)
return _byteorder_swap(v.u64, ll);
}
static inline uint16_t HTONS(uint16_t a)
{
return byteorder_htons(a).u16;
}
static inline uint32_t HTONL(uint32_t a)
{
return byteorder_htonl(a).u32;
}
static inline uint64_t HTONLL(uint64_t a)
{
return byteorder_htonll(a).u64;
}
static inline uint16_t NTOHS(uint16_t a)
{
network_uint16_t input = { .u16 = a };
return byteorder_ntohs(input);
}
static inline uint32_t NTOHL(uint32_t a)
{
network_uint32_t input = { .u32 = a };
return byteorder_ntohl(input);
}
static inline uint64_t NTOHLL(uint64_t a)
{
network_uint64_t input = { .u64 = a };
return byteorder_ntohll(input);
}
#ifdef __cplusplus
}
#endif

34
sys/net/include/net_help.h
View File

@ -23,10 +23,6 @@
#include <string.h>
#include <stdint.h>
#if defined(__MACH__)
#include "clang_compat.h"
#endif
#include "byteorder.h"
#ifdef __cplusplus
@ -35,36 +31,6 @@ extern "C" {
#define BITSET(var,pos) ((var) & (1<<(pos)))
static inline uint16_t HTONS(uint16_t a)
{
return byteorder_htons(a).u16;
}
static inline uint32_t HTONL(uint32_t a)
{
return byteorder_htonl(a).u32;
}
static inline uint64_t HTONLL(uint64_t a)
{
return byteorder_htonll(a).u64;
}
static inline uint16_t NTOHS(uint16_t a)
{
return byteorder_ntohs(*(network_uint16_t *) &a);
}
static inline uint32_t NTOHL(uint32_t a)
{
return byteorder_ntohl(*(network_uint32_t *) &a);
}
static inline uint64_t NTOHLL(uint64_t a)
{
return byteorder_ntohll(*(network_uint64_t *) &a);
}
/**
* @brief Computes the Internet Checksum for *buf* with initial value *init*
*