--- navit/navit/endianess.h 2012/08/22 17:01:27 30 +++ navit/navit/endianess.h 2013/02/04 17:41:59 31 @@ -1,4 +1,23 @@ /** + * ZANavi, Zoff Android Navigation system. + * Copyright (C) 2011-2012 Zoff + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +/** * Navit, a modular navigation system. * Copyright (C) 2005-2008 Navit Team * @@ -18,86 +37,97 @@ */ #ifndef __ENDIANESS_HANDLER__ - /* The following is based on xorg/xserver/GL/glx/glxbyteorder.h - * which is (c) IBM Corp. 2006,2007 and originally licensed under the following - * BSD-license. All modifications in navit are licensed under the GNU GPL as - * described in file "COPYRIGHT". - * - * Portions also from GNU C Library include/bits/byteswap.h Also licsend - * under the GPL. - * - * -------------------------- - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sub license, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS, THE AUTHORS, AND/OR THEIR SUPPLIERS BE LIABLE FOR - * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ +/* The following is based on xorg/xserver/GL/glx/glxbyteorder.h + * which is (c) IBM Corp. 2006,2007 and originally licensed under the following + * BSD-license. All modifications in navit are licensed under the GNU GPL as + * described in file "COPYRIGHT". + * + * Portions also from GNU C Library include/bits/byteswap.h Also licsend + * under the GPL. + * + * -------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sub license, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, THE AUTHORS, AND/OR THEIR SUPPLIERS BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ #if HAVE_BYTESWAP_H - /* machine dependent versions of byte swapping functions. GNU extension.*/ - #include +/* machine dependent versions of byte swapping functions. GNU extension.*/ +#include #elif defined(USE_SYS_ENDIAN_H) - #include +#include #elif defined(__APPLE__) - #include - #define __bswap_16 OSSwapInt16 - #define __bswap_32 OSSwapInt32 - #define __bswap_64 OSSwapInt64 +#include +#define __bswap_16 OSSwapInt16 +#define __bswap_32 OSSwapInt32 +#define __bswap_64 OSSwapInt64 #ifndef __BYTE_ORDER - #define __LITTLE_ENDIAN 1234 - #define __BIG_ENDIAN 4321 +#define __LITTLE_ENDIAN 1234 +#define __BIG_ENDIAN 4321 - #if defined(__LITTLE_ENDIAN__) - #define __BYTE_ORDER __LITTLE_ENDIAN - #elif defined(__BIG_ENDIAN__) - #define __BYTE_ORDER __BIG_ENDIAN - #else - #error "No endianness defined for Mac OS!" - #endif +#if defined(__LITTLE_ENDIAN__) +#define __BYTE_ORDER __LITTLE_ENDIAN +#elif defined(__BIG_ENDIAN__) +#define __BYTE_ORDER __BIG_ENDIAN +#else +#error "No endianness defined for Mac OS!" +#endif #endif #elif defined(_WIN32) || defined(__CEGCC__) - #define __BIG_ENDIAN 4321 - #define __LITTLE_ENDIAN 1234 - #define __BYTE_ORDER __LITTLE_ENDIAN +#define __BIG_ENDIAN 4321 +#define __LITTLE_ENDIAN 1234 +#define __BYTE_ORDER __LITTLE_ENDIAN #else - #define __bswap_16(__bsx) ((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8)) - #define __bswap_32(__bsx) ((((__bsx) & 0xff000000) >> 24) | \ +#define __bswap_16(__bsx) ((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8)) +#define __bswap_32(__bsx) ((((__bsx) & 0xff000000) >> 24) | \ (((__bsx) & 0x00ff0000) >> 8) |\ (((__bsx) & 0x0000ff00) << 8) | \ (((__bsx) & 0x000000ff) << 24)) - #endif #if __BYTE_ORDER == __BIG_ENDIAN - #define le16_to_cpu(x) __bswap_16 (x) - #define le32_to_cpu(x) __bswap_32 (x) - #define le64_to_cpu(x) __bswap_64 (x) - #define cpu_to_le16(x) __bswap_16 (x) - #define cpu_to_le32(x) __bswap_32 (x) - #define cpu_to_le64(x) __bswap_64 (x) +#define le16_to_cpu(x) __bswap_16 (x) +#define le32_to_cpu(x) __bswap_32 (x) +#define le64_to_cpu(x) __bswap_64 (x) +#define cpu_to_le16(x) __bswap_16 (x) +#define cpu_to_le32(x) __bswap_32 (x) +#define cpu_to_le64(x) __bswap_64 (x) #elif __BYTE_ORDER == __LITTLE_ENDIAN - #define le16_to_cpu(x) (x) - #define le32_to_cpu(x) (x) - #define cpu_to_le16(x) (x) - #define cpu_to_le32(x) (x) +#define le16_to_cpu(x) (x) +#define le32_to_cpu(x) (x) +#define cpu_to_le16(x) (x) +#define cpu_to_le32(x) (x) #else - #error "Unknown endianess" +// ------------------ ATTENTION !! CAUTION !! --------- +// ------------------ ATTENTION !! CAUTION !! --------- +// ------------------ ATTENTION !! CAUTION !! --------- +// +// #error "Unknown endianess" +// set LITTLE ENDIAN as default!!!!!! +// +// ------------------ ATTENTION !! CAUTION !! --------- +// ------------------ ATTENTION !! CAUTION !! --------- +#define le16_to_cpu(x) (x) +#define le32_to_cpu(x) (x) +#define cpu_to_le16(x) (x) +#define cpu_to_le32(x) (x) #endif #define __ENDIANESS_HANDLER__