Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 99 → Rev 100

/cvi/instr/CAENV1718/CAENV1718.c
7,9 → 7,16
#include <CAENVMEoslib.h>
#include <CAENVMEtypes.h>
 
#ifndef _CVI_
#define __stdcall
#define UCHAR unsigned char
#define _VI_FUNC
#endif
 
#include "CAENV1718.h"
 
 
 
int32_t CAEN_udev;
 
int VMEerrors;
23,7 → 30,7
printf(" Check usb cable, usb udev permissions and restart! Exiting .....\n");
return (-1);
}
if (serial == NULL) serial = malloc(100*sizeof(char));
if (serial == NULL) serial = (char *) malloc(100*sizeof(char));
CAENVME_BoardFWRelease(CAEN_udev, serial);
return result;
187,16 → 194,16
 
 
short __stdcall CAEN_VME_R( uint16_t AddressModifier, uint16_t DataWidth, uint32_t VME_Address, uint32_t *Data){
return CAEN_VME_read( CAEN_udev, VME_Address, (void *)Data, AddressModifier, DataWidth);
return CAEN_VME_read( CAEN_udev, VME_Address, (void *)Data, (CVAddressModifier) AddressModifier, (CVDataWidth) DataWidth);
}
 
short __stdcall CAEN_VME_W( uint16_t AddressModifier, uint16_t DataWidth, uint32_t VME_Address, uint32_t Data){
return CAEN_VME_write( CAEN_udev, VME_Address, &Data, AddressModifier, DataWidth);
return CAEN_VME_write( CAEN_udev, VME_Address, &Data, (CVAddressModifier) AddressModifier, (CVDataWidth) DataWidth);
}
 
short __stdcall CAEN_VME_MW( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t Data){
 
return CAEN_VME_appendwrite( VME_Address, &Data ,AM , DW) ;
return CAEN_VME_appendwrite( VME_Address, &Data ,(CVAddressModifier) AM , (CVDataWidth) DW) ;
 
}
short __stdcall CAEN_VME_MWRST( void ){
212,7 → 219,7
 
short __stdcall CAEN_VME_MR( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t *Data){
 
return CAEN_VME_appendread( VME_Address, Data ,AM , DW) ;
return CAEN_VME_appendread( VME_Address, Data ,(CVAddressModifier) AM , (CVDataWidth) DW) ;
 
}
short __stdcall CAEN_VME_MRRST( void ){