kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-01-07 02:21:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify endianness and fix for unaligned reads (bug #3867)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5295 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-03-29 04:49:24 +00:00
parent bf940e8928
commit f966e5e186
22 changed files with 200 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/asterisk/endian.h Executable file
View File

@@ -0,0 +1,50 @@
/*
* Asterisk -- A telephony toolkit for Linux.
*
* Asterisk internal frame definitions.
*
* Copyright (C) 1999 - 2005, Digium, Inc.
*
* Mark Spencer <markster@digium.com>
*
* This program is free software, distributed under the terms of
* the GNU Lesser General Public License. Other components of
* Asterisk are distributed under The GNU General Public License
* only.
*/
#ifndef _ASTERISK_ENDIAN_H
#define _ASTERISK_ENDIAN_H
/*
* Autodetect system endianess
*/
#if defined( __OpenBSD__ )
# include <machine/types.h>
# include <sys/endian.h>
#elif defined( __FreeBSD__ ) || defined( __NetBSD__ )
# include <sys/types.h>
# include <sys/endian.h>
#elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__)
# include <machine/endian.h>
#elif defined ( SOLARIS )
# include <solaris-compat/compat.h>
#elif defined( __GNUC__ ) || defined( __GNU_LIBRARY__ )
# include <endian.h>
#if !defined(__APPLE__)
# include <byteswap.h>
#endif
#elif defined( linux )
# include <endian.h>
#endif
#ifndef BYTE_ORDER
#define BYTE_ORDER __BYTE_ORDER
#endif
#ifndef __BYTE_ORDER
#error Endianess needs to be defined
#endif
#endif /* _ASTERISK_ENDIAN_H */

40
include/asterisk/frame.h
View File

@@ -22,45 +22,7 @@ extern "C" {
#include <sys/types.h>
#include <sys/time.h>
#ifdef SOLARIS
#include "solaris-compat/compat.h"
#endif
/*
* Autodetect system endianess
*/
#ifndef __BYTE_ORDER
#ifdef __linux__
#include <endian.h>
#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
#if defined(__OpenBSD__)
#include <machine/types.h>
#endif /* __OpenBSD__ */
#include <machine/endian.h>
#define __BYTE_ORDER BYTE_ORDER
#define __LITTLE_ENDIAN LITTLE_ENDIAN
#define __BIG_ENDIAN BIG_ENDIAN
#else
#ifdef __LITTLE_ENDIAN__
#define __BYTE_ORDER __LITTLE_ENDIAN
#endif /* __LITTLE_ENDIAN */
#if defined(i386) || defined(__i386__)
#define __BYTE_ORDER __LITTLE_ENDIAN
#endif /* defined i386 */
#if defined(sun) && defined(unix) && defined(sparc)
#define __BYTE_ORDER __BIG_ENDIAN
#endif /* sun unix sparc */
#endif /* linux */
#endif /* __BYTE_ORDER */
#ifndef __BYTE_ORDER
#error Need to know endianess
#endif /* __BYTE_ORDER */
#include <asterisk/endian.h>
struct ast_codec_pref {
char order[32];

95
include/asterisk/unaligned.h Executable file
View File

@@ -0,0 +1,95 @@
/*
* Asterisk -- A telephony toolkit for Linux.
*
* Asterisk internal frame definitions.
*
* Copyright (C) 1999 - 2005, Digium, Inc.
*
* Mark Spencer <markster@digium.com>
*
* This program is free software, distributed under the terms of
* the GNU Lesser General Public License. Other components of
* Asterisk are distributed under The GNU General Public License
* only.
*/
#ifndef _ASTERISK_UNALIGNED_H
#define _ASTERISK_UNALIGNED_H
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
#ifdef __GNUC__
/* If we just tell GCC what's going on, we can trust it to behave optimally */
static inline unsigned int get_unaligned_uint32(void *p)
{
struct { unsigned int d; } __attribute__((packed)) *pp = (void *)p;
return pp->d;
}
static inline unsigned short get_unaligned_uint16(void *p)
{
struct { unsigned short d; } __attribute__((packed)) *pp = (void *)p;
return pp->d;
}
static inline void put_unaligned_uint32(void *p, unsigned int datum)
{
struct { unsigned int d; } __attribute__((packed)) *pp = (void *)p;
pp->d = datum;
}
static inline void put_unaligned_uint16(void *p, unsigned short datum)
{
struct { unsigned short d; } __attribute__((packed)) *pp = (void *)p;
pp->d = datum;
}
#elif defined(SOLARIS) && defined(__sparc__)
static inline unsigned int get_unaligned_uint32(void *p)
{
unsigned char *cp = p;
return (cp[0] << 24) | (cp[1] << 16) | (cp[2] << 8) | cp[3];
}
static inline unsigned short get_unaligned_uint16(void *p)
{
unsigned char *cp = p;
return (cp[0] << 8) | cp[1] ;
}
static inline void put_unaligned_uint32(void *p, unsigned int datum)
{
unsigned char *cp = p;
cp[0] = datum >> 24;
cp[1] = datum >> 16;
cp[2] = datum >> 8;
cp[3] = datum;
}
static inline void put_unaligned_uint16(void *p, unsigned int datum)
{
unsigned char *cp = p;
cp[0] = datum >> 8;
cp[1] = datum;
}
#else /* Not GCC, not Solaris/SPARC. Assume we can handle direct load/store. */
#define get_unaligned_uint32(p) (*((unsigned int *)(p)))
#define get_unaligned_uint16(p) (*((unsigned short *)(p)))
#define put_unaligned_uint32(p,d) do { unsigned int *__P = (p); *__P = d; } while(0)
#define put_unaligned_uint16(p,d) do { unsigned short *__P = (p); *__P = d; } while(0)
#endif
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
#endif /* _ASTERISK_UNALIGNED_H */