Add the following functions/macros to support byte order conversions and

device drivers for bus system with other endinesses than the CPU (using
interfaces compatible to NetBSD):

- bwap16() and bswap32(). These have optimized implementations on some
  architectures; for those that don't, there exist generic implementations.
- macros to convert from a certain byte order to host byte order and vice
  versa, using a naming scheme like le16toh(), htole16().
  These are implemented using the bswap functions.
- stream bus space access functions, which do not perform a byte order
  conversion (while the normal access functions would if the bus endianess
  differs from the CPU endianess).

htons(), htonl(), ntohs() and ntohl() are implemented using the new
functions above for kernel usage. None of the above interfaces is currently
exported to user land.

Make use of the new functions in a few places where local implementations
of the same functionality existed.

Reviewed by:	mike, bde
Tested on alpha by:	mike

1 files changed, 6 insertions, 19 deletions

diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h
index 7428ee3..4076422 100644
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
@@ -58,12 +58,12 @@
 #define	BYTE_ORDER	LITTLE_ENDIAN
 #endif /* ! _POSIX_SOURCE */
 
+#ifdef _KERNEL
 #ifdef __GNUC__
 
-__BEGIN_DECLS
-
+#define	_BSWAP32_DEFINED
 static __inline __uint32_t
-__htonl(__uint32_t __x)
+__bswap32(__uint32_t __x)
 {
 #if defined(_KERNEL) && (defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)) && !defined(I386_CPU)
 	__asm ("bswap %0" : "+r" (__x));
@@ -76,29 +76,16 @@ __htonl(__uint32_t __x)
 	return __x;
 }
 
+#define	_BSWAP16_DEFINED
 static __inline __uint16_t
-__htons(__uint16_t __x)
+__bswap16(__uint16_t __x)
 {
 	__asm ("xchgb %h0, %b0" : "+q" (__x));
 
 	return __x;
 }
 
-static __inline __uint32_t
-__ntohl(__uint32_t __x)
-{
-
-	return (__htonl(__x));
-}
-
-static __inline __uint16_t
-__ntohs(__uint16_t __x)
-{
-
-	return (__htons(__x));
-}
-
-__END_DECLS
+#endif /* _KERNEL */
 
 #endif /* __GNUC__ */