Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 96 → Rev 97

/cvi/instr/CAENV1718/CAENV1718.c
72,6 → 72,7
CVErrorCodes result;
int ncount=0;
while (1){
result = CAENVME_WriteCycle(Handle, Address, Data, AM, DW );
if (result !=cvSuccess ) {
VMEerrors++;
87,8 → 88,8
 
uint32_t *WStackAddrs = NULL;
uint32_t *WStackBuffer;
short WStackNCycles;
short WStackMaxCycles=0xFFFF;
unsigned short WStackNCycles;
unsigned short WStackMaxCycles=100;
CVAddressModifier *WStackAMs;
CVDataWidth *WStackDWs;
CVErrorCodes *WStackECs;
95,8 → 96,8
 
 
uint32_t *RStackAddrs =NULL;
short RStackNCycles;
short RStackMaxCycles=0xFFFF;
unsigned short RStackNCycles;
unsigned short RStackMaxCycles=1000;
CVAddressModifier *RStackAMs;
CVDataWidth *RStackDWs;
CVErrorCodes *RStackECs;
190,7 → 191,7
}
 
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, (void *)Data, AddressModifier, DataWidth);
return CAEN_VME_write( CAEN_udev, VME_Address, &Data, AddressModifier, DataWidth);
}
 
short __stdcall CAEN_VME_MW( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t Data){
220,8 → 221,8
 
}
short __stdcall CAEN_VME_MREXEC( uint32_t *Data ){
return CAEN_VME_MultiReadExecute(CAEN_udev, Data);
 
return 0;
 
}