From 6a95bf151635f9351e94f15feff675317a1514c6 Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Tue, 30 May 2000 18:54:44 +0000 Subject: [PATCH] Endianess cleaning --- src/pcm/pcm_misc.c | 37 ++++++++++++------------------------- src/pcm/plugin/adpcm.c | 1 - src/pcm/plugin/alaw.c | 1 - src/pcm/plugin/copy.c | 1 - src/pcm/plugin/linear.c | 7 ++----- src/pcm/plugin/mulaw.c | 1 - src/pcm/plugin/rate.c | 1 - src/pcm/plugin/route.c | 7 ++----- 8 files changed, 16 insertions(+), 40 deletions(-) diff --git a/src/pcm/pcm_misc.c b/src/pcm/pcm_misc.c index 3eeddb59..b578df73 100644 --- a/src/pcm/pcm_misc.c +++ b/src/pcm/pcm_misc.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include "pcm_local.h" #endif @@ -249,54 +248,42 @@ u_int64_t snd_pcm_format_silence_64(int format) case SND_PCM_SFMT_U16_LE: case SND_PCM_SFMT_U24_LE: case SND_PCM_SFMT_U32_LE: -#if defined(LITTLE_ENDIAN) +#ifdef SND_LITTLE_ENDIAN return 0x8000800080008000UL; -#elif defined(BIG_ENDIAN) - return 0x0080008000800080UL; #else -#error "endian" + return 0x0080008000800080UL; #endif case SND_PCM_SFMT_U16_BE: case SND_PCM_SFMT_U24_BE: case SND_PCM_SFMT_U32_BE: -#if defined(LITTLE_ENDIAN) +#ifdef SND_LITTLE_ENDIAN return 0x0000008000000080UL; -#elif defined(BIG_ENDIAN) - return 0x8000000080000000UL; #else -#error "endian" + return 0x8000000080000000UL; #endif case SND_PCM_SFMT_FLOAT_LE: -#if defined(LITTLE_ENDIAN) +#ifdef SND_LITTLE_ENDIAN return (float)0.0; -#elif defined(BIG_ENDIAN) - return bswap_32((u_int32_t)((float)0.0)); #else -#error "endian" + return bswap_32((u_int32_t)((float)0.0)); #endif case SND_PCM_SFMT_FLOAT64_LE: -#if defined(LITTLE_ENDIAN) +#ifdef SND_LITTLE_ENDIAN return (double)0.0; -#elif defined(BIG_ENDIAN) - return bswap_64((u_int64_t)((double)0.0)); #else -#error "endian" + return bswap_64((u_int64_t)((double)0.0)); #endif case SND_PCM_SFMT_FLOAT_BE: -#if defined(LITTLE_ENDIAN) +#ifdef SND_LITTLE_ENDIAN return bswap_32((u_int32_t)((float)0.0)); -#elif defined(BIG_ENDIAN) - return (float)0.0; #else -#error "endian" + return (float)0.0; #endif case SND_PCM_SFMT_FLOAT64_BE: -#if defined(LITTLE_ENDIAN) +#ifdef SND_LITTLE_ENDIAN return bswap_64((u_int64_t)((double)0.0)); -#elif defined(BIG_ENDIAN) - return (double)0.0; #else -#error "endian" + return (double)0.0; #endif case SND_PCM_SFMT_IEC958_SUBFRAME_LE: case SND_PCM_SFMT_IEC958_SUBFRAME_BE: diff --git a/src/pcm/plugin/adpcm.c b/src/pcm/plugin/adpcm.c index cf2c16db..7cedfa45 100644 --- a/src/pcm/plugin/adpcm.c +++ b/src/pcm/plugin/adpcm.c @@ -51,7 +51,6 @@ IMA compatability project proceedings, Vol 2, Issue 2, May 1992. #include #include #include -#include #include #include "../pcm_local.h" diff --git a/src/pcm/plugin/alaw.c b/src/pcm/plugin/alaw.c index 1be3c2b4..0335ea31 100644 --- a/src/pcm/plugin/alaw.c +++ b/src/pcm/plugin/alaw.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include "../pcm_local.h" diff --git a/src/pcm/plugin/copy.c b/src/pcm/plugin/copy.c index 450fb3e6..f009ee5c 100644 --- a/src/pcm/plugin/copy.c +++ b/src/pcm/plugin/copy.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include "../pcm_local.h" diff --git a/src/pcm/plugin/linear.c b/src/pcm/plugin/linear.c index 6e232b30..5ad12562 100644 --- a/src/pcm/plugin/linear.c +++ b/src/pcm/plugin/linear.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include "../pcm_local.h" @@ -116,14 +115,12 @@ int conv_index(int src_format, int dst_format) sign = (snd_pcm_format_signed(src_format) != snd_pcm_format_signed(dst_format)); -#if __BYTE_ORDER == __LITTLE_ENDIAN +#ifdef SND_LITTLE_ENDIAN src_endian = snd_pcm_format_big_endian(src_format); dst_endian = snd_pcm_format_big_endian(dst_format); -#elif __BYTE_ORDER == __BIG_ENDIAN +#else src_endian = snd_pcm_format_little_endian(src_format); dst_endian = snd_pcm_format_little_endian(dst_format); -#else -#error "Unsupported endian..." #endif if (src_endian < 0) diff --git a/src/pcm/plugin/mulaw.c b/src/pcm/plugin/mulaw.c index af82c29a..4fad6704 100644 --- a/src/pcm/plugin/mulaw.c +++ b/src/pcm/plugin/mulaw.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include "../pcm_local.h" diff --git a/src/pcm/plugin/rate.c b/src/pcm/plugin/rate.c index 55d85400..f829b59e 100644 --- a/src/pcm/plugin/rate.c +++ b/src/pcm/plugin/rate.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include "../pcm_local.h" #endif diff --git a/src/pcm/plugin/route.c b/src/pcm/plugin/route.c index 3f191632..f403259c 100644 --- a/src/pcm/plugin/route.c +++ b/src/pcm/plugin/route.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include "../pcm_local.h" @@ -530,12 +529,10 @@ int getput_index(int format) int sign, width, endian; sign = !snd_pcm_format_signed(format); width = snd_pcm_format_width(format) / 8 - 1; -#if __BYTE_ORDER == __LITTLE_ENDIAN +#ifdef SND_LITTLE_ENDIAN endian = snd_pcm_format_big_endian(format); -#elif __BYTE_ORDER == __BIG_ENDIAN - endian = snd_pcm_format_little_endian(format); #else -#error "Unsupported endian..." + endian = snd_pcm_format_little_endian(format); #endif if (endian < 0) endian = 0; -- 2.47.1