[rtems-libbsd commit] Move __bswap64()

[Sebastian Huber]

Module:    rtems-libbsd
Branch:    master
Commit:    2f52893f7089b688b72565a9222a947921bceb1b
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=2f52893f7089b688b72565a9222a947921bceb1b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Apr 18 17:14:02 2012 +0200

Move __bswap64()

Add copyright notice of FreeBSD "sys/powerpc/include/endian.h".  Change
license to BSD.

---

 freebsd/sys/endian.h              |   16 --------------
 rtemsbsd/freebsd/machine/endian.h |   41 +++++++++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/freebsd/sys/endian.h b/freebsd/sys/endian.h
index 19e1ff2..5c95d74 100644
--- a/freebsd/sys/endian.h
+++ b/freebsd/sys/endian.h
@@ -197,20 +197,4 @@ le64enc(void *pp, uint64_t u)
 	le32enc(p + 4, u >> 32);
 }
 
-/*
- * In FreeBSD, this can be CPU specific but most targets use this
- * implementation.
- *
- * This is from the powerpc implementation.
- */
-static __inline uint64_t
-__bswap64(uint64_t _x)
-{
-
-        return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
-            ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
-            ((_x << 24) & ((__uint64_t)0xff << 40)) |
-            ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
-}
-
 #endif	/* _SYS_ENDIAN_HH_ */
diff --git a/rtemsbsd/freebsd/machine/endian.h b/rtemsbsd/freebsd/machine/endian.h
index 1b8128d..3f197a4 100644
--- a/rtemsbsd/freebsd/machine/endian.h
+++ b/rtemsbsd/freebsd/machine/endian.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2009, 2010 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2009-2012 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Obere Lagerstr. 30
@@ -15,9 +15,32 @@
  *  Germany
  *  <rtems at embedded-brains.de>
  *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.com/license/LICENSE.
+ * Copyright (c) 1987, 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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 _RTEMS_BSD_MACHINE_ENDIAN_H
@@ -45,4 +68,14 @@
 #define __ntohl(x)  __bswap32(x)
 #define __ntohs(x)  __bswap16(x)
 
+static __inline uint64_t
+__bswap64(uint64_t _x)
+{
+
+        return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
+            ((_x >> 8) & 0xff000000) | ((_x << 8) & ((uint64_t)0xff << 32)) |
+            ((_x << 24) & ((uint64_t)0xff << 40)) |
+            ((_x << 40) & ((uint64_t)0xff << 48)) | ((_x << 56)));
+}
+
 #endif /* _RTEMS_BSD_MACHINE_ENDIAN_H */