mirror of
https://github.com/espressif/esp-idf
synced 2025-03-09 09:09:10 -04:00
fix(wpa_supplicant): remove duplicated code (endian.h) that exists in newlib component
This commit is contained in:
Alexey Lapshin
parent
bfe3511493
commit
22a38779fb
@ -1,226 +0,0 @@
|
|||||||
/*-
|
|
||||||
* Copyright (c) 2002 Thomas Moestl <tmm@FreeBSD.org>
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
|
|
||||||
*
|
|
||||||
* $FreeBSD$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _ENDIAN_H_
|
|
||||||
#define _ENDIAN_H_
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include "byteswap.h"
|
|
||||||
|
|
||||||
#ifndef BIG_ENDIAN
|
|
||||||
#define BIG_ENDIAN 4321
|
|
||||||
#endif
|
|
||||||
#ifndef LITTLE_ENDIAN
|
|
||||||
#define LITTLE_ENDIAN 1234
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef BYTE_ORDER
|
|
||||||
#ifdef __IEEE_LITTLE_ENDIAN
|
|
||||||
#define BYTE_ORDER LITTLE_ENDIAN
|
|
||||||
#else
|
|
||||||
#define BYTE_ORDER BIG_ENDIAN
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define _UINT8_T_DECLARED
|
|
||||||
#ifndef _UINT8_T_DECLARED
|
|
||||||
typedef __uint8_t uint8_t;
|
|
||||||
#define _UINT8_T_DECLARED
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define _UINT16_T_DECLARED
|
|
||||||
#ifndef _UINT16_T_DECLARED
|
|
||||||
typedef __uint16_t uint16_t;
|
|
||||||
#define _UINT16_T_DECLARED
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define _UINT32_T_DECLARED
|
|
||||||
#ifndef _UINT32_T_DECLARED
|
|
||||||
typedef __uint32_t uint32_t;
|
|
||||||
#define _UINT32_T_DECLARED
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define _UINT64_T_DECLARED
|
|
||||||
#ifndef _UINT64_T_DECLARED
|
|
||||||
typedef __uint64_t uint64_t;
|
|
||||||
#define _UINT64_T_DECLARED
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* General byte order swapping functions.
|
|
||||||
*/
|
|
||||||
#define bswap16(x) __bswap16(x)
|
|
||||||
#define bswap32(x) __bswap32(x)
|
|
||||||
#define bswap64(x) __bswap64(x)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Host to big endian, host to little endian, big endian to host, and little
|
|
||||||
* endian to host byte order functions as detailed in byteorder(9).
|
|
||||||
*/
|
|
||||||
#if BYTE_ORDER == _LITTLE_ENDIAN
|
|
||||||
#define htobe16(x) bswap16((x))
|
|
||||||
#define htobe32(x) bswap32((x))
|
|
||||||
#define htobe64(x) bswap64((x))
|
|
||||||
#define htole16(x) ((uint16_t)(x))
|
|
||||||
#define htole32(x) ((uint32_t)(x))
|
|
||||||
#define htole64(x) ((uint64_t)(x))
|
|
||||||
|
|
||||||
#define be16toh(x) bswap16((x))
|
|
||||||
#define be32toh(x) bswap32((x))
|
|
||||||
#define be64toh(x) bswap64((x))
|
|
||||||
#define le16toh(x) ((uint16_t)(x))
|
|
||||||
#define le32toh(x) ((uint32_t)(x))
|
|
||||||
#define le64toh(x) ((uint64_t)(x))
|
|
||||||
|
|
||||||
#else /* _BYTE_ORDER != _LITTLE_ENDIAN */
|
|
||||||
#define htobe16(x) ((uint16_t)(x))
|
|
||||||
#define htobe32(x) ((uint32_t)(x))
|
|
||||||
#define htobe64(x) ((uint64_t)(x))
|
|
||||||
#define htole16(x) bswap16((x))
|
|
||||||
#define htole32(x) bswap32((x))
|
|
||||||
#define htole64(x) bswap64((x))
|
|
||||||
|
|
||||||
#define be16toh(x) ((uint16_t)(x))
|
|
||||||
#define be32toh(x) ((uint32_t)(x))
|
|
||||||
#define be64toh(x) ((uint64_t)(x))
|
|
||||||
#define le16toh(x) bswap16((x))
|
|
||||||
#define le32toh(x) bswap32((x))
|
|
||||||
#define le64toh(x) bswap64((x))
|
|
||||||
#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
|
|
||||||
|
|
||||||
/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
|
|
||||||
#define INLINE __inline__
|
|
||||||
|
|
||||||
static INLINE uint16_t
|
|
||||||
be16dec(const void *pp)
|
|
||||||
{
|
|
||||||
uint8_t const *p = (uint8_t const *)pp;
|
|
||||||
|
|
||||||
return ((p[0] << 8) | p[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE uint32_t
|
|
||||||
be32dec(const void *pp)
|
|
||||||
{
|
|
||||||
uint8_t const *p = (uint8_t const *)pp;
|
|
||||||
|
|
||||||
return (((unsigned)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE uint64_t
|
|
||||||
be64dec(const void *pp)
|
|
||||||
{
|
|
||||||
uint8_t const *p = (uint8_t const *)pp;
|
|
||||||
|
|
||||||
return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4));
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE uint16_t
|
|
||||||
le16dec(const void *pp)
|
|
||||||
{
|
|
||||||
uint8_t const *p = (uint8_t const *)pp;
|
|
||||||
|
|
||||||
return ((p[1] << 8) | p[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE uint32_t
|
|
||||||
le32dec(const void *pp)
|
|
||||||
{
|
|
||||||
uint8_t const *p = (uint8_t const *)pp;
|
|
||||||
|
|
||||||
return (((unsigned)p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE uint64_t
|
|
||||||
le64dec(const void *pp)
|
|
||||||
{
|
|
||||||
uint8_t const *p = (uint8_t const *)pp;
|
|
||||||
|
|
||||||
return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p));
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE void
|
|
||||||
be16enc(void *pp, uint16_t u)
|
|
||||||
{
|
|
||||||
uint8_t *p = (uint8_t *)pp;
|
|
||||||
|
|
||||||
p[0] = (u >> 8) & 0xff;
|
|
||||||
p[1] = u & 0xff;
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE void
|
|
||||||
be32enc(void *pp, uint32_t u)
|
|
||||||
{
|
|
||||||
uint8_t *p = (uint8_t *)pp;
|
|
||||||
|
|
||||||
p[0] = (u >> 24) & 0xff;
|
|
||||||
p[1] = (u >> 16) & 0xff;
|
|
||||||
p[2] = (u >> 8) & 0xff;
|
|
||||||
p[3] = u & 0xff;
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE void
|
|
||||||
be64enc(void *pp, uint64_t u)
|
|
||||||
{
|
|
||||||
uint8_t *p = (uint8_t *)pp;
|
|
||||||
|
|
||||||
be32enc(p, (uint32_t)(u >> 32));
|
|
||||||
be32enc(p + 4, (uint32_t)(u & 0xffffffffU));
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE void
|
|
||||||
le16enc(void *pp, uint16_t u)
|
|
||||||
{
|
|
||||||
uint8_t *p = (uint8_t *)pp;
|
|
||||||
|
|
||||||
p[0] = u & 0xff;
|
|
||||||
p[1] = (u >> 8) & 0xff;
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE void
|
|
||||||
le32enc(void *pp, uint32_t u)
|
|
||||||
{
|
|
||||||
uint8_t *p = (uint8_t *)pp;
|
|
||||||
|
|
||||||
p[0] = u & 0xff;
|
|
||||||
p[1] = (u >> 8) & 0xff;
|
|
||||||
p[2] = (u >> 16) & 0xff;
|
|
||||||
p[3] = (u >> 24) & 0xff;
|
|
||||||
}
|
|
||||||
|
|
||||||
static INLINE void
|
|
||||||
le64enc(void *pp, uint64_t u)
|
|
||||||
{
|
|
||||||
uint8_t *p = (uint8_t *)pp;
|
|
||||||
|
|
||||||
le32enc(p, (uint32_t)(u & 0xffffffffU));
|
|
||||||
le32enc(p + 4, (uint32_t)(u >> 32));
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* _ENDIAN_H_ */
|
|
||||||
@ -550,7 +550,6 @@ components/wpa_supplicant/esp_supplicant/src/esp_wpa_err.h
|
|||||||
components/wpa_supplicant/include/utils/wpa_debug.h
|
components/wpa_supplicant/include/utils/wpa_debug.h
|
||||||
components/wpa_supplicant/include/utils/wpabuf.h
|
components/wpa_supplicant/include/utils/wpabuf.h
|
||||||
components/wpa_supplicant/port/include/byteswap.h
|
components/wpa_supplicant/port/include/byteswap.h
|
||||||
components/wpa_supplicant/port/include/endian.h
|
|
||||||
components/wpa_supplicant/port/include/os.h
|
components/wpa_supplicant/port/include/os.h
|
||||||
components/wpa_supplicant/port/os_xtensa.c
|
components/wpa_supplicant/port/os_xtensa.c
|
||||||
components/wpa_supplicant/src/ap/ap_config.c
|
components/wpa_supplicant/src/ap/ap_config.c
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user