sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

endian: Make all endian related functions use the expicit type

Browse Source 
so the printf can give the unambiguous format specifier

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-10-18 16:42:33 +08:00 committed by Xiang Xiao
parent b95fd6a573
commit b7e14c7490
2 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/netinet/in.h
View File

@ -230,19 +230,12 @@
* for uIP: * for uIP:
*/ */
#ifdef CONFIG_ENDIAN_BIG #define HTONS htobe16
# define HTONS(ns) (ns) #define HTONL htobe32
# define HTONL(nl) (nl) #define HTONQ htobe64
# define HTONQ(nq) (nq) #define NTOHS be16toh
#else #define NTOHL be32toh
# define HTONS __swap_uint16 #define NTOHQ be64toh
# define HTONL __swap_uint32
# define HTONQ __swap_uint64
#endif
#define NTOHS(hs) HTONS(hs)
#define NTOHL(hl) HTONL(hl)
#define NTOHQ(hq) HTONQ(hq)
/**************************************************************************** /****************************************************************************
* Public Type Definitions * Public Type Definitions

56
include/sys/endian.h
View File

@ -52,7 +52,7 @@
/* Common byte swapping macros */ /* Common byte swapping macros */
#ifdef CONFIG_HAVE_BUILTIN_BSWAP16 #ifdef CONFIG_HAVE_BUILTIN_BSWAP16
# define __swap_uint16 __builtin_bswap16 # define __swap_uint16(n) ((uint16_t)__builtin_bswap16(n))
#else #else
# define __swap_uint16(n) \ # define __swap_uint16(n) \
(uint16_t)(((((uint16_t)(n)) & 0x00ff) << 8) | \ (uint16_t)(((((uint16_t)(n)) & 0x00ff) << 8) | \
@ -60,7 +60,7 @@
#endif #endif
#ifdef CONFIG_HAVE_BUILTIN_BSWAP32 #ifdef CONFIG_HAVE_BUILTIN_BSWAP32
# define __swap_uint32 __builtin_bswap32 # define __swap_uint32(n) ((uint32_t)__builtin_bswap32(n))
#else #else
# define __swap_uint32(n) \ # define __swap_uint32(n) \
(uint32_t)(((((uint32_t)(n)) & 0x000000ffUL) << 24) | \ (uint32_t)(((((uint32_t)(n)) & 0x000000ffUL) << 24) | \
@ -71,7 +71,7 @@
#ifdef CONFIG_HAVE_LONG_LONG #ifdef CONFIG_HAVE_LONG_LONG
# ifdef CONFIG_HAVE_BUILTIN_BSWAP64 # ifdef CONFIG_HAVE_BUILTIN_BSWAP64
# define __swap_uint64 __builtin_bswap64 # define __swap_uint64(n) ((uint64_t)__builtin_bswap64(n))
# else # else
# define __swap_uint64(n) \ # define __swap_uint64(n) \
(uint64_t)(((((uint64_t)(n)) & 0x00000000000000ffULL) << 56) | \ (uint64_t)(((((uint64_t)(n)) & 0x00000000000000ffULL) << 56) | \
@ -95,21 +95,21 @@
/* Big-endian byte order macros */ /* Big-endian byte order macros */
# define htobe16(n) (n) # define htobe16(n) ((uint16_t)(n))
# define htole16(n) __swap_uint16((uint16_t)n) # define htole16(n) __swap_uint16(n)
# define be16toh(n) (n) # define be16toh(n) ((uint16_t)(n))
# define le16toh(n) __swap_uint16((uint16_t)n) # define le16toh(n) __swap_uint16(n)
# define htobe32(n) (n) # define htobe32(n) ((uint32_t)(n))
# define htole32(n) __swap_uint32((uint32_t)n) # define htole32(n) __swap_uint32(n)
# define be32toh(n) (n) # define be32toh(n) ((uint32_t)(n))
# define le32toh(n) __swap_uint32(n) # define le32toh(n) __swap_uint32(n)
# ifdef CONFIG_HAVE_LONG_LONG # ifdef CONFIG_HAVE_LONG_LONG
# define htobe64(n) (n) # define htobe64(n) ((uint64_t)(n))
# define htole64(n) __swap_uint64((uint64_t)n) # define htole64(n) __swap_uint64(n)
# define be64toh(n) (n) # define be64toh(n) ((uint64_t)(n))
# define le64toh(n) __swap_uint64((uint64_t)n) # define le64toh(n) __swap_uint64(n)
# endif # endif
#else #else
@ -120,21 +120,21 @@
/* Little-endian byte order macros */ /* Little-endian byte order macros */
# define htobe16(n) __swap_uint16((uint16_t)n) # define htobe16(n) __swap_uint16(n)
# define htole16(n) (n) # define htole16(n) ((uint16_t)(n))
# define be16toh(n) __swap_uint16((uint16_t)n) # define be16toh(n) __swap_uint16(n)
# define le16toh(n) (n) # define le16toh(n) ((uint16_t)(n))
# define htobe32(n) __swap_uint32((uint32_t)n) # define htobe32(n) __swap_uint32(n)
# define htole32(n) (n) # define htole32(n) ((uint32_t)(n))
# define be32toh(n) __swap_uint32((uint32_t)n) # define be32toh(n) __swap_uint32(n)
# define le32toh(n) (n) # define le32toh(n) ((uint32_t)(n))
# ifdef CONFIG_HAVE_LONG_LONG # ifdef CONFIG_HAVE_LONG_LONG
# define htobe64(n) __swap_uint64((uint64_t)n) # define htobe64(n) __swap_uint64(n)
# define htole64(n) (n) # define htole64(n) ((uint64_t)(n))
# define be64toh(n) __swap_uint64((uint64_t)n) # define be64toh(n) __swap_uint64(n)
# define le64toh(n) (n) # define le64toh(n) ((uint64_t)(n))
# endif # endif
#endif #endif
@ -152,7 +152,7 @@
#define htolem16(x, v) (*(FAR uint16_t *)(x) = htole16(v)) #define htolem16(x, v) (*(FAR uint16_t *)(x) = htole16(v))
#define betoh32 be32toh #define betoh32 be32toh
#define letoh32 le32toh #define letoh32 le32toh
#define bemtoh32(x) htobe32(*(FAR uint32_t *)(x)) #define bemtoh32(x) betoh32(*(FAR uint32_t *)(x))
#define htobem32(x, v) (*(FAR uint32_t *)(x) = htobe32(v)) #define htobem32(x, v) (*(FAR uint32_t *)(x) = htobe32(v))
#define lemtoh32(x) letoh32(*(FAR uint32_t *)(x)) #define lemtoh32(x) letoh32(*(FAR uint32_t *)(x))
#define htolem32(x, v) (*(FAR uint32_t *)(x) = htole32(v)) #define htolem32(x, v) (*(FAR uint32_t *)(x) = htole32(v))
@ -160,7 +160,7 @@
#ifdef CONFIG_HAVE_LONG_LONG #ifdef CONFIG_HAVE_LONG_LONG
# define betoh64 be64toh # define betoh64 be64toh
# define letoh64 le64toh # define letoh64 le64toh
# define bemtoh64(x) htobe64(*(FAR uint64_t *)(x)) # define bemtoh64(x) betoh64(*(FAR uint64_t *)(x))
# define htobem64(x, v) (*(FAR uint64_t *)(x) = htobe64(v)) # define htobem64(x, v) (*(FAR uint64_t *)(x) = htobe64(v))
# define lemtoh64(x) letoh64(*(FAR uint64_t *)(x)) # define lemtoh64(x) letoh64(*(FAR uint64_t *)(x))
# define htolem64(x, v) (*(FAR uint64_t *)(x) = htole64(v)) # define htolem64(x, v) (*(FAR uint64_t *)(x) = htole64(v))