New endian.h design. All architectures now use a common file for the bulk

part.  Some ports can optimize the swap operations.  This also means the
general API is extended with swap16, swap32, htobe16, htobe32, betoh16,
betoh32, htole16, htole32, letoh16 and letoh32.

1 files changed, 20 insertions, 73 deletions

diff --git a/sys/arch/powerpc/include/endian.h b/sys/arch/powerpc/include/endian.h
index 979a90f125d..12e3e5ca950 100644
--- a/sys/arch/powerpc/include/endian.h
+++ b/sys/arch/powerpc/include/endian.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: endian.h,v 1.8 1997/10/13 10:53:43 pefo Exp $ */
+/*	$OpenBSD: endian.h,v 1.9 1997/11/09 23:05:15 niklas Exp $ */
 
-/*
- * Copyright (c) 1997 Per Fogelstrom
- * 
+/*-
+ * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,79 +13,26 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed under OpenBSD by
- *	Per Fogelstrom, Opsycon AB, Sweden.
+ *	This product includes software developed by Niklas Hallqvist.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- *
- */
-
-#ifndef	_MACHINE_ENDIAN_H_
-#define	_MACHINE_ENDIAN_H_
-
-#ifndef	_POSIX_SOURCE
-
-#define _QUAD_HIGHWORD	0
-#define _QUAD_LOWWORD	1
-
-/*
- * Byte order definition. Byte numbers given in increasing address order.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
  */
-#define	LITTLE_ENDIAN	1234	/* LSB first: i386, NS32K */
-#define	BIG_ENDIAN	4321	/* MSB first: M68K */
-#define	PDP_ENDIAN	3412	/* LSB first in word, MSW first in long */
-
-#define	BYTE_ORDER	BIG_ENDIAN
-
-#include <sys/cdefs.h>
-
-typedef u_int32_t in_addr_t;                      
-typedef u_int16_t in_port_t;
-
-__BEGIN_DECLS
-u_int32_t       htonl __P((u_int32_t));
-u_int16_t       htons __P((u_int16_t));
-u_int32_t       ntohl __P((u_int32_t));
-u_int16_t       ntohs __P((u_int16_t));
-__END_DECLS
-
-/*
- * Macros for network/external number representation conversion where
- * network/external is defined to be in BIG_ENDIAN byte order.
- *
- * *NOTE* That the macros are supposed to work on the arrgument (x) and
- * thus should *NOT* be used in assignments such as 'foo=HTONS(bar)'.
- */
-#if BYTE_ORDER == BIG_ENDIAN && !defined(lint)
-#define	ntohl(x)	(x)
-#define	ntohs(x)	(x)
-#define	htonl(x)	(x)
-#define	htons(x)	(x)
-
-#define	NTOHL(x)	(void) (x)
-#define	NTOHS(x)	(void) (x)
-#define	HTONL(x)	(void) (x)
-#define	HTONS(x)	(void) (x)
 
-#else
+#ifndef _POWERPC_ENDIAN_H_
+#define _POWERPC_ENDIAN_H_
 
-#define	NTOHL(x)	(x) = ntohl((u_int32_t)x)
-#define	NTOHS(x)	(x) = ntohs((u_int16_t)x)
-#define	HTONL(x)	(x) = htonl((u_int32_t)x)
-#define	HTONS(x)	(x) = htons((u_int16_t)x)
-#endif
+#define BYTE_ORDER 4321
+#include <sys/endian.h>
 
-#endif	/* _POSIX_SOURCE */
-#endif	/* _MACHINE_ENDIAN_H_ */
+#endif /* _POWERPC_ENDIAN_H_ */