I just made a CVS snapshot:
http://cars.uchicago.edu/software/pub/streamHEAD.tgz
Mark
________________________________
From: Patrick Thomas [mailto:[email protected]]
Sent: Wed 9/23/2009 12:09 AM
To: Mark Rivers
Cc: [email protected]
Subject: Re: building streamdevice with epics 3.14.11
Thank you, that include seems to fix it. How would I go about getting a
copy of this latest snapshot? Can I download it somewhere?
Mark Rivers wrote:
> Hi Patrick,
>
> Sorry, I missed one change that I made for 3.14.11 when I diff the CVS diff. Here it is:
>
> Index: StreamDevice-2-4/src/devwaveformStream.c
> ===================================================================
> RCS file: /net/beams-nfs/export/local/cvs/support/stream/StreamDevice-2-4/src/devwaveformStream.c,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- StreamDevice-2-4/src/devwaveformStream.c 2008/11/24 18:07:33 1.1
> +++ StreamDevice-2-4/src/devwaveformStream.c 2009/08/28 23:42:17 1.2
> @@ -19,6 +19,7 @@
> ***************************************************************/
>
> #include "devStream.h"
> +#include <errlog.h>
> #include <waveformRecord.h>
> #include <string.h>
> #include <epicsExport.h>
>
> Needing to include "errlog.h" in code that previously did not include it is one of the most common changes needed when upgrading to 3.14.11.
>
> For completeness I am appending all changes I've made from 2-4 to fix errors and compiler warnings when building on 64-bits.
>
> Mark
>
> corvette:~/devel/stream/2-4>cvs diff -rR2-4
> ? configure/RELEASE.win32-x86-debug
> cvs server: tag R2-4 is not in file .cvsignore
> Index: StreamDevice-2-4/src/AsynDriverInterface.cc
> ===================================================================
> RCS file: /net/beams-nfs/export/local/cvs/support/stream/StreamDevice-2-4/src/AsynDriverInterface.cc,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- StreamDevice-2-4/src/AsynDriverInterface.cc 2008/11/24 18:07:33 1.1
> +++ StreamDevice-2-4/src/AsynDriverInterface.cc 2009/09/01 18:40:37 1.2
> @@ -129,9 +129,11 @@
> "asynSuccess", "asynTimeout", "asynOverflow", "asynError"
> };
>
> +#ifndef NO_TEMPORARY
> static const char* eomReasonStr[] = {
> "NONE", "CNT", "EOS", "CNT+EOS", "END", "CNT+END", "EOS+END", "CNT+EOS+END"
> };
> +#endif
>
> class AsynDriverInterface : StreamBusInterface
> #ifdef EPICS_3_14
> @@ -663,6 +665,16 @@
> clientName(), pasynUser->errorMessage);
> writeCallback(StreamIoFault);
> return;
> + case asynDisconnected:
> + error("%s: asynDisconnected in write: %s\n",
> + clientName(), pasynUser->errorMessage);
> + writeCallback(StreamIoFault);
> + return;
> + case asynDisabled:
> + error("%s: asynDisabled in write: %s\n",
> + clientName(), pasynUser->errorMessage);
> + writeCallback(StreamIoFault);
> + return;
> }
> }
>
> @@ -922,6 +934,15 @@
> clientName(), pasynUser->errorMessage);
> readCallback(StreamIoFault, buffer, received);
> break;
> + case asynDisconnected:
> + error("%s: asynDisconnected in read: %s\n",
> + clientName(), pasynUser->errorMessage);
> + readCallback(StreamIoFault, buffer, received);
> + return;
> + case asynDisabled:
> + error("%s: asynDisabled in read: %s\n",
> + clientName(), pasynUser->errorMessage);
> + readCallback(StreamIoFault, buffer, received);
> }
> if (!readMore) break;
> if (readMore > 0)
> Index: StreamDevice-2-4/src/ChecksumConverter.cc
> ===================================================================
> RCS file: /net/beams-nfs/export/local/cvs/support/stream/StreamDevice-2-4/src/ChecksumConverter.cc,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- StreamDevice-2-4/src/ChecksumConverter.cc 2008/11/24 18:07:33 1.1
> +++ StreamDevice-2-4/src/ChecksumConverter.cc 2009/09/01 18:41:28 1.2
> @@ -542,9 +542,9 @@
> debug("ChecksumConverter %s: output to check: \"%s\"\n",
> checksumMap[fnum].name, output.expand(start,length)());
>
> - sum = checksumMap[fnum].xorout ^ checksumMap[fnum].func(
> + sum = checksumMap[fnum].xorout ^ (checksumMap[fnum].func(
> reinterpret_cast<uchar*>(output(start)), length,
> - checksumMap[fnum].init) & mask[checksumMap[fnum].bytes];
> + checksumMap[fnum].init) & mask[checksumMap[fnum].bytes]);
>
> debug("ChecksumConverter %s: output checksum is 0x%lX\n",
> checksumMap[fnum].name, sum);
> @@ -603,9 +603,9 @@
> return -1;
> }
>
> - sum = checksumMap[fnum].xorout ^ checksumMap[fnum].func(
> + sum = checksumMap[fnum].xorout ^ (checksumMap[fnum].func(
> reinterpret_cast<uchar*>(input(start)), length,
> - checksumMap[fnum].init) & mask[checksumMap[fnum].bytes];
> + checksumMap[fnum].init) & mask[checksumMap[fnum].bytes]);
>
> debug("ChecksumConverter %s: input checksum is 0x%0*lX\n",
> checksumMap[fnum].name, 2*checksumMap[fnum].bytes, sum);
> Index: StreamDevice-2-4/src/devwaveformStream.c
> ===================================================================
> RCS file: /net/beams-nfs/export/local/cvs/support/stream/StreamDevice-2-4/src/devwaveformStream.c,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- StreamDevice-2-4/src/devwaveformStream.c 2008/11/24 18:07:33 1.1
> +++ StreamDevice-2-4/src/devwaveformStream.c 2009/08/28 23:42:17 1.2
> @@ -19,6 +19,7 @@
> ***************************************************************/
>
> #include "devStream.h"
> +#include <errlog.h>
> #include <waveformRecord.h>
> #include <string.h>
> #include <epicsExport.h>
> Index: configure/RELEASE
> ===================================================================
> RCS file: /net/beams-nfs/export/local/cvs/support/stream/configure/RELEASE,v
> retrieving revision 1.3
> diff -u -r1.3 RELEASE
> --- configure/RELEASE 2008/10/24 19:36:49 1.3
> +++ configure/RELEASE 2009/09/23 04:39:45
> @@ -9,11 +9,11 @@
> # module defined in the RELEASE file is rebuilt.
>
> SUPPORT=/corvette/home/epics/devel
> -ASYN=/corvette/home/epics/devel/asyn/4-10
> -CALC=/corvette/home/epics/devel/calc/2-6-5beta
> -SSCAN=/corvette/home/epics/devel/sscan/2-6-2
> +ASYN=/corvette/home/epics/devel/asyn/4-13
> +CALC=/corvette/home/epics/devel/calc/2-8
> +SSCAN=/corvette/home/epics/devel/sscan/2-6-6
>
> # EPICS_BASE usually appears last so other apps can override stuff:
> -EPICS_BASE=/corvette/usr/local/epics/base-3.14.10
> +EPICS_BASE=/corvette/usr/local/epics/base-3.14.11
>
> TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
> Index: configure/RELEASE.win32-x86
> ===================================================================
> RCS file: /net/beams-nfs/export/local/cvs/support/stream/configure/RELEASE.win32-x86,v
> retrieving revision 1.3
> diff -u -r1.3 RELEASE.win32-x86
> --- configure/RELEASE.win32-x86 2008/10/24 19:36:49 1.3
> +++ configure/RELEASE.win32-x86 2009/09/23 04:39:45
> @@ -9,10 +9,10 @@
> # module defined in the RELEASE file is rebuilt.
>
> SUPPORT=J:/epics/devel
> -ASYN=J:/epics/devel/asyn/4-10
> -CALC=J:/epics/devel/calc/2-6-5beta
> -SSCAN=J:/epics/devel/sscan/2-6-2
> +ASYN=J:/epics/devel/asyn/4-13
> +CALC=J:/epics/devel/calc/2-8
> +SSCAN=J:/epics/devel/sscan/2-6-6
> # EPICS_BASE usually appears last so other apps can override stuff:
> -EPICS_BASE=H:/epics/base-3.14.10
> +EPICS_BASE=H:/epics/base-3.14.11
>
> TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
>
> ________________________________
>
> From: Patrick Thomas [mailto:[email protected]]
> Sent: Tue 9/22/2009 11:30 PM
> To: Mark Rivers
> Cc: [email protected]
> Subject: Re: building streamdevice with epics 3.14.11
>
>
>
> Sorry, forgot to cc this to tech-talk.
>
> I am also using 2-4, on linux-x86-64.
>
> I get the following error:
>
> make -C ./src install make[1]: Entering directory
> `/users/thomas/test/modules/StreamDevice/StreamDevice-2-4/src'
> make -C O.linux-x86_64 -f ../Makefile TOP=../../.. T_A=linux-x86_64 install
> make[2]: Entering directory
> `/users/thomas/test/modules/StreamDevice/StreamDevice-2-4/src/O.linux-x86_64'
>
> /usr/bin/gcc -c -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS
> -D_XOPEN_SOURCE=500 -D_X86_64_ -DUNIX -D_BSD_SOURCE -Dlinux -D_REENTRANT
> -O3 -Wall -m64 -g -fPIC -I. -I../O.Common -I. -I..
> -I../../../include/os/Linux -I../../../include
> -I/users/thomas/test/modules/sncseq-2.0.12/include
> -I/users/thomas/test/modules/asyn-4.12/include
> -I/users/thomas/test/base/base-3-14-11/include/os/Linux
> -I/users/thomas/test/base/base-3-14-11/include ../devwaveformStream.c
> ../devwaveformStream.c: In function 'readData':
> ../devwaveformStream.c:52: warning: implicit declaration of function
> 'errlogSevPrintf'
> ../devwaveformStream.c:52: error: 'errlogFatal' undeclared (first use in
> this function)
> ../devwaveformStream.c:52: error: (Each undeclared identifier is
> reported only once
> ../devwaveformStream.c:52: error: for each function it appears in.)
> ../devwaveformStream.c:132: error: 'errlogMajor' undeclared (first use
> in this function)
> ../devwaveformStream.c: In function 'writeData':
> ../devwaveformStream.c:184: error: 'errlogFatal' undeclared (first use
> in this function)
> make[2]: *** [devwaveformStream.o] Error 1
> make[2]: Leaving directory
> `/users/thomas/test/modules/StreamDevice/StreamDevice-2-4/src/O.linux-x86_64'
>
> make[1]: *** [install.linux-x86_64] Error 2
> make[1]: Leaving directory
> `/users/thomas/test/modules/StreamDevice/StreamDevice-2-4/src'
> make: *** [src.install] Error 2
>
> Thank you,
> Patrick
>
> Mark Rivers wrote:
>
>> I have built streamDevice 2-4 with 3.14.11 with no problems. This is the version of streamDevice in the synApps module, but I think the code for devwaveformStream.c should be the same. What version of streamDevice are you using, on what platform, and what is the error?
>>
>> Mark
>>
>>
>> ________________________________
>>
>> From: [email protected] on behalf of Patrick Thomas
>> Sent: Tue 9/22/2009 10:44 PM
>> To: [email protected]
>> Subject: building streamdevice with epics 3.14.11
>>
>>
>>
>> Hi,
>>
>> Has anyone else had any trouble building the stream device module with
>> epics base 3-14-11? I seem to get compile errors on running make with
>> reference to ../devwaveformStream.c
>>
>> Thank you,
>> Patrick
>>
>>
>>
>>
>
>
>
>
- References:
- building streamdevice with epics 3.14.11 Patrick Thomas
- RE: building streamdevice with epics 3.14.11 Mark Rivers
- Re: building streamdevice with epics 3.14.11 Patrick Thomas
- RE: building streamdevice with epics 3.14.11 Mark Rivers
- Re: building streamdevice with epics 3.14.11 Patrick Thomas
- Navigate by Date:
- Prev:
Re: building streamdevice with epics 3.14.11 Patrick Thomas
- Next:
New: 14-bit EPICS oscilloscopes Boyd Shaw
- Index:
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
<2009>
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Re: building streamdevice with epics 3.14.11 Patrick Thomas
- Next:
New: 14-bit EPICS oscilloscopes Boyd Shaw
- Index:
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
<2009>
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
|
·
Home
·
News
·
About
·
Base
·
Modules
·
Extensions
·
Distributions
·
Download
·