epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Mostly cosmetic changes.

Browse Source 
Added an ifdef test for FLOAT_WORD_ORDER in os/default/osdWireConfig.h
This commit is contained in:
Andrew Johnson
2007-08-28 16:42:45 +00:00
parent f9e64792e1
commit abd2a46c79
6 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libCom/osi/os/WIN32/osdWireConfig.h
View File

@@ -2,8 +2,8 @@
// WIN32 version of
// osdWireConfig.h
//
// Author Jeffrey O. Hill
// johill@lanl.gov
// Author Jeffrey O. Hill
// johill@lanl.gov
//
#ifndef osdWireConfig_h
@@ -13,4 +13,4 @@
#define EPICS_BYTE_ORDER EPICS_ENDIAN_LITTLE
#define EPICS_FLOAT_WORD_ORDER EPICS_BYTE_ORDER
#endif // ifdef osdWireConfig_h
#endif // ifdef osdWireConfig_h

38
src/libCom/osi/os/default/osdWireConfig.h
View File

@@ -2,8 +2,8 @@
// Default version of osdWireConfig.h that might
// work on UNIX like systems that define <sys/param.h>
//
// Author Jeffrey O. Hill
// johill@lanl.gov
// Author Jeffrey O. Hill
// johill@lanl.gov
//
#ifndef osdWireConfig_h
@@ -15,20 +15,20 @@
#ifdef __BYTE_ORDER
# if __BYTE_ORDER == __LITTLE_ENDIAN
# define EPICS_BYTE_ORDER EPICS_ENDIAN_LITTLE
# define EPICS_BYTE_ORDER EPICS_ENDIAN_LITTLE
# elif __BYTE_ORDER == __BIG_ENDIAN
# define EPICS_BYTE_ORDER EPICS_ENDIAN_BIG
# define EPICS_BYTE_ORDER EPICS_ENDIAN_BIG
# else
# error EPICS hasn’t been ported to run on the <sys/param.h> specified __BYTE_ORDER
# error EPICS hasnt been ported to run on the <sys/param.h> specified __BYTE_ORDER
# endif
#else
# ifdef BYTE_ORDER
# if BYTE_ORDER == LITTLE_ENDIAN
# define EPICS_BYTE_ORDER EPICS_ENDIAN_LITTLE
# define EPICS_BYTE_ORDER EPICS_ENDIAN_LITTLE
# elif BYTE_ORDER == BIG_ENDIAN
# define EPICS_BYTE_ORDER EPICS_ENDIAN_BIG
# define EPICS_BYTE_ORDER EPICS_ENDIAN_BIG
# else
# error EPICS hasn’t been ported to run on the <sys/param.h> specified BYTE_ORDER
# error EPICS hasnt been ported to run on the <sys/param.h> specified BYTE_ORDER
# endif
# else
# error <sys/param.h> doesnt specify __BYTE_ORDER or BYTE_ORDER - is an OS specific osdWireConfig.h needed?
@@ -37,20 +37,24 @@
#ifdef __FLOAT_WORD_ORDER
# if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN
# define EPICS_FLOAT_WORD_ORDER EPICS_ENDIAN_LITTLE
# define EPICS_FLOAT_WORD_ORDER EPICS_ENDIAN_LITTLE
# elif __FLOAT_WORD_ORDER == __BIG_ENDIAN
# define EPICS_FLOAT_WORD_ORDER EPICS_ENDIAN_BIG
# define EPICS_FLOAT_WORD_ORDER EPICS_ENDIAN_BIG
# else
# error EPICS hasn’t been ported to <sys/param.h> specified __FLOAT_WORD_ORDER
# error EPICS hasnt been ported to <sys/param.h> specified __FLOAT_WORD_ORDER
# endif
#else
# if FLOAT_WORD_ORDER == LITTLE_ENDIAN
# define EPICS_FLOAT_WORD_ORDER EPICS_ENDIAN_LITTLE
# elif FLOAT_WORD_ORDER == BIG_ENDIAN
# define EPICS_FLOAT_WORD_ORDER EPICS_ENDIAN_BIG
# ifdef FLOAT_WORD_ORDER
# if FLOAT_WORD_ORDER == LITTLE_ENDIAN
# define EPICS_FLOAT_WORD_ORDER EPICS_ENDIAN_LITTLE
# elif FLOAT_WORD_ORDER == BIG_ENDIAN
# define EPICS_FLOAT_WORD_ORDER EPICS_ENDIAN_BIG
# else
# error EPICS hasnt been ported to <sys/param.h> specified FLOAT_WORD_ORDER
# endif
# else
// make the assumption that if __FLOAT_WORD_ORDER and FLOAT_WORD_ORDER
// arent defined then weird fp ordered archs like arm nwfp aren't supported
// assume that if neither __FLOAT_WORD_ORDER nor FLOAT_WORD_ORDER are
// defined then weird fp ordered archs like arm nwfp aren't supported
# define EPICS_FLOAT_WORD_ORDER EPICS_BYTE_ORDER
# endif
#endif

19
src/libCom/osi/os/default/osdWireFormat.h
View File

@@ -1,25 +1,22 @@
/*************************************************************************\
* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
* National Laboratory.
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
*
*
/*
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
*
*
* Copyright, 2000, The Regents of the University of California.
*
*
* Author Jeffrey O. Hill
* johill@lanl.gov
*
*
* Author Jeffrey O. Hill
* johill@lanl.gov
*/
#ifndef osdWireFormat

8
src/libCom/osi/os/solaris/osdWireConfig.h
View File

@@ -2,8 +2,8 @@
// Solaris version of
// osdWireConfig.h
//
// Author Jeffrey O. Hill
// johill@lanl.gov
// Author Jeffrey O. Hill
// johill@lanl.gov
//
#ifndef osdWireConfig_h
@@ -12,9 +12,9 @@
#include <sys/isa_defs.h>
#if defined ( _LITTLE_ENDIAN )
# define EPICS_BYTE_ORDER EPICS_ENDIAN_LITTLE
# define EPICS_BYTE_ORDER EPICS_ENDIAN_LITTLE
#elif defined ( _BIG_ENDIAN )
# define EPICS_BYTE_ORDER EPICS_ENDIAN_BIG
# define EPICS_BYTE_ORDER EPICS_ENDIAN_BIG
#else
# error EPICS hasnt been ported to byte order specified by <sys/isa_defs.h> on Solaris
#endif

10
src/libCom/osi/os/vxWorks/osdWireConfig.h
View File

@@ -2,8 +2,8 @@
// vxWorks version of
// osdWireConfig.h
//
// Author Jeffrey O. Hill
// johill@lanl.gov
// Author Jeffrey O. Hill
// johill@lanl.gov
//
#ifndef osdWireConfig_h
@@ -12,11 +12,11 @@
#include <types/vxArch.h>
#if _BYTE_ORDER == _LITTLE_ENDIAN
# define EPICS_BYTE_ORDER EPICS_ENDIAN_LITTLE
# define EPICS_BYTE_ORDER EPICS_ENDIAN_LITTLE
#elif _BYTE_ORDER == _BIG_ENDIAN
# define EPICS_BYTE_ORDER EPICS_ENDIAN_BIG
# define EPICS_BYTE_ORDER EPICS_ENDIAN_BIG
#else
# error EPICS hasn’t been ported to _BYTE_ORDER specified by vxWorks <types/vxArch.h>
# error EPICS hasnt been ported to _BYTE_ORDER specified by vxWorks <types/vxArch.h>
#endif
// for now, assume that vxWorks doesnt run on weird arch like ARM NWFP

19
src/libCom/osi/osiWireFormat.h
View File

@@ -1,25 +1,22 @@
/*************************************************************************\
* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
* National Laboratory.
* Copyright (c) 2002 The Regents of the University of California, as
* Operator of Los Alamos National Laboratory.
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
*
*
/*
* L O S A L A M O S
* Los Alamos National Laboratory
* Los Alamos, New Mexico 87545
*
*
* Copyright, 2000, The Regents of the University of California.
*
*
* Author Jeffrey O. Hill
* johill@lanl.gov
*
*
* Author Jeffrey O. Hill
* johill@lanl.gov
*/
#ifndef osiWireFormat