Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a70bce authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Remove unused big-endian cruft." am: c21c0ac7 am: 768a8df3 am: 82e15285

am: ca84f1dd

Change-Id: Ibc1bc06f72015130cd856b2dbf0e3ee2d4a206c0
parents 39ab0b11 ca84f1dd
Loading
Loading
Loading
Loading
+15 −51
Original line number Diff line number Diff line
@@ -14,10 +14,17 @@
 * limitations under the License.
 */

//
#pragma once

#ifndef _LIBS_UTILS_BYTE_ORDER_H
#define _LIBS_UTILS_BYTE_ORDER_H
/*
 * If you're looking for a portable <endian.h> that's available on Android,
 * Linux, macOS, and Windows, see <android-base/endian.h> instead.
 *
 * Nothing in this file is useful because all supported Android ABIs are
 * little-endian and all our code that runs on the host assumes that the host is
 * also little-endian. What pretense at big-endian support exists is completely
 * untested and unlikely to actually work.
 */

#include <stdint.h>
#include <sys/types.h>
@@ -27,55 +34,12 @@
#include <netinet/in.h>
#endif

/*
 * These macros are like the hton/ntoh byte swapping macros,
 * except they allow you to swap to and from the "device" byte
 * order.  The device byte order is the endianness of the target
 * device -- for the ARM CPUs we use today, this is little endian.
 *
 * Note that the byte swapping functions have not been optimized
 * much; performance is currently not an issue for them since the
 * intent is to allow us to avoid byte swapping on the device.
 */

static inline uint32_t android_swap_long(uint32_t v)
{
    return (v<<24) | ((v<<8)&0x00FF0000) | ((v>>8)&0x0000FF00) | (v>>24);
}

static inline uint16_t android_swap_short(uint16_t v)
{
    return (v<<8) | (v>>8);
}

#define DEVICE_BYTE_ORDER LITTLE_ENDIAN

#if BYTE_ORDER == DEVICE_BYTE_ORDER
/* TODO: move this cruft to frameworks/. */

#define dtohl(x) (x)
#define dtohs(x) (x)
#define htodl(x) (x)
#define htods(x) (x)

#else

#define	dtohl(x)	(android_swap_long(x))
#define	dtohs(x)	(android_swap_short(x))
#define	htodl(x)	(android_swap_long(x))
#define	htods(x)	(android_swap_short(x))

#endif

#if BYTE_ORDER == LITTLE_ENDIAN
#define fromlel(x) (x)
#define fromles(x) (x)
#define tolel(x) (x)
#define toles(x) (x)
#else
#define fromlel(x) (android_swap_long(x))
#define fromles(x) (android_swap_short(x))
#define tolel(x) (android_swap_long(x))
#define toles(x) (android_swap_short(x))
#endif

#endif // _LIBS_UTILS_BYTE_ORDER_H