diff options
| author | mike <mike@FreeBSD.org> | 2002-03-09 21:02:16 +0000 |
|---|---|---|
| committer | mike <mike@FreeBSD.org> | 2002-03-09 21:02:16 +0000 |
| commit | b8cc0d1207ca0471e0fc9e82c60e6e0c76b9dd98 (patch) | |
| tree | 1d205aa43b36510bc014a26a35c058748d42812d /sys/ia64/include | |
| parent | d2f6ffc283d7b4755bbd498ac25b9dee0663b09e (diff) | |
| download | FreeBSD-src-b8cc0d1207ca0471e0fc9e82c60e6e0c76b9dd98.zip FreeBSD-src-b8cc0d1207ca0471e0fc9e82c60e6e0c76b9dd98.tar.gz | |
o Don't require long long support in bswap64() functions.
o In i386's <machine/endian.h>, macros have some advantages over
inlines, so change some inlines to macros.
o In i386's <machine/endian.h>, ungarbage collect word_swap_int()
(previously __uint16_swap_uint32), it has some uses on i386's with
PDP endianness.
Submitted by: bde
o Move a comment up in <machine/endian.h> that was accidentially moved
down a few revisions ago.
o Reenable userland's use of optimized inline-asm versions of
byteorder(3) functions.
o Fix ordering of prototypes vs. redefinition of byteorder(3)
functions, so that the non-GCC (libc asm) case has proper
prototypes.
o Add proper prototypes for byteorder(3) functions in <sys/param.h>.
o Prevent redundant duplicate prototypes by making use of the
_BYTEORDER_PROTOTYPED define.
o Move the bswap16(), bswap32(), bswap64() C functions into MD space
for platforms in which asm versions don't exist. This significantly
reduces the complexity of some things at the cost of duplicate code.
Reviewed by: bde
Diffstat (limited to 'sys/ia64/include')
| -rw-r--r-- | sys/ia64/include/endian.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sys/ia64/include/endian.h b/sys/ia64/include/endian.h index fe927a2..826fa54 100644 --- a/sys/ia64/include/endian.h +++ b/sys/ia64/include/endian.h @@ -47,11 +47,11 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 +#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#ifndef _POSIX_SOURCE #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ #define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ #define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ @@ -59,10 +59,8 @@ #define BYTE_ORDER LITTLE_ENDIAN #endif /* !_POSIX_SOURCE */ -#ifdef _KERNEL #ifdef __GNUC__ -#define _BSWAP64_DEFINED static __inline __uint64_t __bswap64(__uint64_t __x) { @@ -72,7 +70,6 @@ __bswap64(__uint64_t __x) return __r; } -#define _BSWAP32_DEFINED static __inline __uint32_t __bswap32(__uint32_t __x) { @@ -80,7 +77,6 @@ __bswap32(__uint32_t __x) return (__bswap64(__x) >> 32); } -#define _BSWAP16_DEFINED static __inline __uint16_t __bswap16(__uint16_t __x) { @@ -88,14 +84,11 @@ __bswap16(__uint16_t __x) return (__bswap64(__x) >> 48); } -#else /* !__GNUC__ */ -/* XXX: use the libkern versions for now; these might go away soon. */ -#define _BSWAP16_DEFINED -__uint16_t __bswap16(__uint16_t); -#define _BSWAP32_DEFINED -__uint32_t __bswap32(__uint32_t); #endif /* __GNUC__ */ -#endif /* _KERNEL */ +#define __htonl(x) __bswap32(x) +#define __htons(x) __bswap16(x) +#define __ntohl(x) __bswap32(x) +#define __ntohs(x) __bswap16(x) #endif /* !_MACHINE_ENDIAN_H_ */ |
