diff options
author | Thomas Huth <thuth@linux.vnet.ibm.com> | 2011-06-29 13:18:28 +0200 |
---|---|---|
committer | Thomas Huth <thuth@linux.vnet.ibm.com> | 2011-10-12 08:43:12 +0200 |
commit | 2e2e4cae3728d7c4565cae90e687555a7df1af12 (patch) | |
tree | 39ccc9ef131065739b5a1343c53598bb0927dcf8 /clients | |
parent | b94bde008b0d49ec4bfe933e110d0952d032ac28 (diff) | |
download | SLOF-2e2e4cae3728d7c4565cae90e687555a7df1af12.zip SLOF-2e2e4cae3728d7c4565cae90e687555a7df1af12.tar.gz SLOF-2e2e4cae3728d7c4565cae90e687555a7df1af12.tar.bz2 |
Move functions for byte-swapping into common header file.
The byte-swapping functions were scattered all over the source tree, now they
are merged into a new common header file called byteswap.h.
Signed-off-by: <thuth@linux.vnet.ibm.com>
Diffstat (limited to 'clients')
-rw-r--r-- | clients/net-snk/include/endian.h | 46 | ||||
-rw-r--r-- | clients/net-snk/kernel/Makefile | 2 | ||||
-rw-r--r-- | clients/net-snk/kernel/endian.c | 30 |
3 files changed, 1 insertions, 77 deletions
diff --git a/clients/net-snk/include/endian.h b/clients/net-snk/include/endian.h deleted file mode 100644 index b4b9a94..0000000 --- a/clients/net-snk/include/endian.h +++ /dev/null @@ -1,46 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2004, 2008 IBM Corporation - * All rights reserved. - * This program and the accompanying materials - * are made available under the terms of the BSD License - * which accompanies this distribution, and is available at - * http://www.opensource.org/licenses/bsd-license.php - * - * Contributors: - * IBM Corporation - initial implementation - *****************************************************************************/ - - -#ifndef MY_ENDIAN_H -#define MY_ENDIAN_H - -#include <stdint.h> - -extern inline uint16_t bswap_16 (uint16_t x); -extern inline uint32_t bswap_32 (uint32_t x); -extern inline uint64_t bswap_64 (uint64_t x); -#define CPU_BIG_ENDIAN - -#ifndef CPU_BIG_ENDIAN -#define cpu_to_le64(x) (x) -#define cpu_to_le32(x) (x) -#define cpu_to_le16(x) (x) -#define cpu_to_be16(x) bswap_16(x) -#define cpu_to_be32(x) bswap_32(x) -#define le64_to_cpu(x) (x) -#define le32_to_cpu(x) (x) -#define le16_to_cpu(x) (x) -#define be32_to_cpu(x) bswap_32(x) -#else -#define cpu_to_le64(x) bswap_64(x) -#define cpu_to_le32(x) bswap_32(x) -#define cpu_to_le16(x) bswap_16(x) -#define cpu_to_be16(x) (x) -#define cpu_to_be32(x) (x) -#define le64_to_cpu(x) bswap_64(x) -#define le32_to_cpu(x) bswap_32(x) -#define le16_to_cpu(x) bswap_16(x) -#define be32_to_cpu(x) (x) -#endif - -#endif diff --git a/clients/net-snk/kernel/Makefile b/clients/net-snk/kernel/Makefile index 976d851..807bb3e 100644 --- a/clients/net-snk/kernel/Makefile +++ b/clients/net-snk/kernel/Makefile @@ -17,7 +17,7 @@ ifndef TOP endif include $(TOP)/make.rules -OBJS = init.o systemcall.o crt0.o endian.o timer.o modules.o +OBJS = init.o systemcall.o crt0.o timer.o modules.o OBJS2 = entry.o lowmem.o all: kernel.o diff --git a/clients/net-snk/kernel/endian.c b/clients/net-snk/kernel/endian.c deleted file mode 100644 index 04182f5..0000000 --- a/clients/net-snk/kernel/endian.c +++ /dev/null @@ -1,30 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2004, 2008 IBM Corporation - * All rights reserved. - * This program and the accompanying materials - * are made available under the terms of the BSD License - * which accompanies this distribution, and is available at - * http://www.opensource.org/licenses/bsd-license.php - * - * Contributors: - * IBM Corporation - initial implementation - *****************************************************************************/ - - -#include "endian.h" - -inline uint16_t bswap_16 (uint16_t x) -{ - return ((x&0xff00) >> 8) | ((x&0xff) << 8); -} - -inline uint32_t bswap_32 (uint32_t x) -{ - return bswap_16((x&0xffff0000) >> 16) | (bswap_16(x&0xffff) << 16); -} - -inline uint64_t bswap_64 (uint64_t x) -{ - return (unsigned long long) bswap_32((x&0xffffffff00000000ULL) >> 32) | - (unsigned long long) bswap_32(x&0xffffffffULL) << 32; -} |