From owner-p4-projects@FreeBSD.ORG  Fri Jan  4 16:37:40 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4FEBE16A46D; Fri,  4 Jan 2008 16:37:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1466F16A46B
	for <perforce@FreeBSD.org>; Fri,  4 Jan 2008 16:37:40 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 05BCE13C455
	for <perforce@FreeBSD.org>; Fri,  4 Jan 2008 16:37:40 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m04Gbdcq016596
	for <perforce@FreeBSD.org>; Fri, 4 Jan 2008 16:37:39 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m04GbdT4016593
	for perforce@freebsd.org; Fri, 4 Jan 2008 16:37:39 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Fri, 4 Jan 2008 16:37:39 GMT
Message-Id: <200801041637.m04GbdT4016593@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 132493 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jan 2008 16:37:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=132493

Change 132493 by gonzo@gonzo_jeeves on 2008/01/04 16:37:32

	o Rempove NTOHL/NTOHS/etc... macroses, they came from NetBSD land
	o Add definition for __ntohl/__ntohs/etc... macroses for LE build
	o Some cosmetics

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#5 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#5 (text+ko) ====

@@ -111,33 +111,21 @@
 /*
  * Define the order of 32-bit words in 64-bit words.
  */
-#if _BYTE_ORDER == LITTLE_ENDIAN
-#define	_QUAD_HIGHWORD	1
-#define	_QUAD_LOWWORD	0
-#endif
- 
 #if _BYTE_ORDER == BIG_ENDIAN
 #define	_QUAD_HIGHWORD	0
 #define	_QUAD_LOWWORD	1
-#endif
-
-#if _BYTE_ORDER == BIG_ENDIAN
 #define	__htonl(x)	((__uint32_t)(x))
 #define	__htons(x)	((__uint16_t)(x))
 #define	__ntohl(x)	((__uint32_t)(x))
 #define	__ntohs(x)	((__uint16_t)(x))
-#endif
-
-
-/*
- * Macros for network/external number representation conversion.
- */
-
-#define	NTOHL(x)	(x) = __ntohl((x))
-#define	NTOHS(x)	(x) = __ntohs((x))
-#define	HTONQ(x)	(x) = __htonq((x))
-#define	HTONL(x)	(x) = __htonl((x))
-#define	HTONS(x)	(x) = __htons((x))
+#else
+#define	_QUAD_HIGHWORD	1
+#define	_QUAD_LOWWORD	0
+#define __ntohl(x)        (__bswap32(x))
+#define __ntohs(x)        (__bswap16(x))
+#define __htonl(x)        (__bswap32(x))
+#define __htons(x)        (__bswap16(x))
+#endif /* _BYTE_ORDER == BIG_ENDIAN */
 
 #endif /* !_POSIX_SOURCE */
 #endif /* !_MACHINE_ENDIAN_H_ */