From dd58a2795e6c6cc83ea10f9f572915d34a5b2adf Mon Sep 17 00:00:00 2001
From: Patrick Robbe <robbe@lal.in2p3.fr>
Date: Fri, 27 Mar 2020 16:48:57 +0100
Subject: [PATCH] Fix compilation C++
---
Pcie40Libraries/pcie40_b2slc.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Pcie40Libraries/pcie40_b2slc.cpp b/Pcie40Libraries/pcie40_b2slc.cpp
index dfe6a06..f4549ac 100644
--- a/Pcie40Libraries/pcie40_b2slc.cpp
+++ b/Pcie40Libraries/pcie40_b2slc.cpp
@@ -102,16 +102,16 @@ int pcie40_readfee8( int dev , int ch , int adr) {
if ( ret != 0 ) return ret ;
// start emit
- ret = pcie40_startEmit( dev , ch )
+ ret = pcie40_startEmit( dev , ch ) ;
if ( ret != 0 ) return -1 ;
// Wait for the result to come back (40 words in the fifo)
- ret = pcie40_waitRead( dev , fd , 40 ) ;
+ ret = pcie40_waitRead( dev , ch , 40 ) ;
if ( ret != 0 ) return -1 ;
// Read the value
std::vector< int > result ;
- ret = pcie40_readData( dev , fd , result , 5 ) ;
+ ret = pcie40_readData( dev , ch , result , 5 ) ;
int ret2 = result.at( 1 ) ;
int ret3 = result.at( 2 ) ;
@@ -143,7 +143,7 @@ int pcie40_writefee8( int dev , int ch , int adr , int val ) {
if ( ret != 0 ) return ret ;
// start emit
- ret = pcie40_startEmit( dev , ch )
+ ret = pcie40_startEmit( dev , ch ) ;
if ( ret != 0 ) return -1 ;
return 0 ;
@@ -171,7 +171,7 @@ unsigned long pcie40_readfee32( int dev , int ch , int adr ) {
if ( ret != 0 ) return ret ;
// start emit
- ret = pcie40_startEmit( dev , ch )
+ ret = pcie40_startEmit( dev , ch ) ;
if ( ret != 0 ) return -1 ;
// Wait for the result to come back
@@ -179,7 +179,7 @@ unsigned long pcie40_readfee32( int dev , int ch , int adr ) {
if ( ret != 0 ) return -1 ;
// Read the value
- std::result< int > result ;
+ std::vector< int > result ;
ret = pcie40_readData( dev , ch , result , 56 ) ;
int t_ret1 = result.at(0);
@@ -263,14 +263,14 @@ int pcie40_writefee32( int dev , int ch , int adr , int val ) {
data.push_back( 0x7000 | val4 ) ;
data.push_back( 0x7000 | val3 ) ;
data.push_back( 0x7000 | val2 ) ;
- data.push_back( 0x7000 | val1 ) :
+ data.push_back( 0x7000 | val1 ) ;
data.push_back( 0xEEEE ) ;
ret = pcie40_writeToFifo( dev , ch , data ) ;
if ( ret != 0 ) return ret ;
// start emit
- ret = pcie40_startEmit( dev , ch )
+ ret = pcie40_startEmit( dev , ch ) ;
if ( ret != 0 ) return -1 ;
return ret;
--
GitLab