Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 80 → Rev 81

/pts/wienvme_dll.h
1,46 → 1,61
#ifndef _WIENVME_DLL_H
#define _WIENVME_DLL_H
 
extern int VMEerrors;
extern int hHandle24, hHandle32, hHandle16;
#include <ansi_c.h>
#include <stdint.h>
#include <windows.h>
#include <cvidef.h>
 
void VME_load (char*);
int VME_open (int*, unsigned char, char*, unsigned short);
int VME_open24 (void);
int VME_open32 (void);
int VME_open16 (void);
int VME_start (char*);
void VME_unload (void);
int VME_close (int);
int VME_close24 (void);
int VME_close32 (void);
int VME_close16 (void);
int VME_stop (void);
int VME_reset (void);
extern int hHandle24, hHandle32;
 
int VME_read8 (int, unsigned long, unsigned long, void*);
int VME_read16 (int, unsigned long, unsigned long, void*);
int VME_read32 (int, unsigned long, unsigned long, void*);
int VME_write8 (int, unsigned long, unsigned long, void*);
int VME_write16 (int, unsigned long, unsigned long, void*);
int VME_write32 (int, unsigned long, unsigned long, void*);
void WIENVME_load (char*);
int WIENVME_open (int*, unsigned char, char*, unsigned short);
int WIENVME_open24 (void);
int WIENVME_open32 (void);
int WIENVME_start (char*);
void WIENVME_unload (void);
int WIENVME_close (int);
int WIENVME_close24 (void);
int WIENVME_close32 (void);
int WIENVME_stop (void);
int WIENVME_reset (void);
 
#define VME_START(NODE) VME_start((NODE))
#define VME_STOP() VME_stop()
#define VME_RESET() VME_reset()
#define VME_A24D8_R(VME,DATA) VME_read8(hHandle24, 1, (VME), (DATA))
#define VME_A24D16_R(VME,DATA) VME_read16(hHandle24, 1, (VME), (DATA))
#define VME_A24D32_R(VME,DATA) VME_read32(hHandle24, 1, (VME), (DATA))
#define VME_A24D8_W(VME,DATA) VME_write8(hHandle24, 1, (VME), (DATA))
#define VME_A24D16_W(VME,DATA) VME_write16(hHandle24, 1, (VME), (DATA))
#define VME_A24D32_W(VME,DATA) VME_write32(hHandle24, 1, (VME), (DATA))
#define VME_A32D8_R(VME,DATA) VME_read8(hHandle32, 1, (VME), (DATA))
#define VME_A32D16_R(VME,DATA) VME_read16(hHandle32, 1, (VME), (DATA))
#define VME_A32D32_R(VME,DATA) VME_read32(hHandle32, 1, (VME), (DATA))
#define VME_A32D8_W(VME,DATA) VME_write8(hHandle32, 1, (VME), (DATA))
#define VME_A32D16_W(VME,DATA) VME_write16(hHandle32, 1, (VME), (DATA))
#define VME_A32D32_W(VME,DATA) VME_write32(hHandle32, 1, (VME), (DATA))
int WIENVME_read8 (int, unsigned long, unsigned long, void*);
int WIENVME_read16 (int, unsigned long, unsigned long, void*);
int WIENVME_read32 (int, unsigned long, unsigned long, void*);
int WIENVME_write8 (int, unsigned long, unsigned long, void*);
int WIENVME_write16 (int, unsigned long, unsigned long, void*);
int WIENVME_write32 (int, unsigned long, unsigned long, void*);
 
#define WIENVME_VME_START(NODE) WIENVME_start((NODE))
#define WIENVME_VME_STOP() WIENVME_stop()
#define WIENVME_VME_RESET() WIENVME_reset()
#define WIENVME_VME_A24D8_R(VME,DATA) WIENVME_read8(hHandle24, 1, (VME), (DATA))
#define WIENVME_VME_A24D16_R(VME,DATA) WIENVME_read16(hHandle24, 1, (VME), (DATA))
#define WIENVME_VME_A24D32_R(VME,DATA) WIENVME_read32(hHandle24, 1, (VME), (DATA))
#define WIENVME_VME_A24D8_W(VME,DATA) WIENVME_write8(hHandle24, 1, (VME), (DATA))
#define WIENVME_VME_A24D16_W(VME,DATA) WIENVME_write16(hHandle24, 1, (VME), (DATA))
#define WIENVME_VME_A24D32_W(VME,DATA) WIENVME_write32(hHandle24, 1, (VME), (DATA))
#define WIENVME_VME_A32D8_R(VME,DATA) WIENVME_read8(hHandle32, 1, (VME), (DATA))
#define WIENVME_VME_A32D16_R(VME,DATA) WIENVME_read16(hHandle32, 1, (VME), (DATA))
#define WIENVME_VME_A32D32_R(VME,DATA) WIENVME_read32(hHandle32, 1, (VME), (DATA))
#define WIENVME_VME_A32D8_W(VME,DATA) WIENVME_write8(hHandle32, 1, (VME), (DATA))
#define WIENVME_VME_A32D16_W(VME,DATA) WIENVME_write16(hHandle32, 1, (VME), (DATA))
#define WIENVME_VME_A32D32_W(VME,DATA) WIENVME_write32(hHandle32, 1, (VME), (DATA))
 
 
short __stdcall WIENVME_VME_R( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t *Data);
 
short __stdcall WIENVME_VME_W( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t Data);
 
short __stdcall WIENVME_VME_MW( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t Data);
short __stdcall WIENVME_VME_MWRST( void );
short __stdcall WIENVME_VME_MWEXEC( void );
 
short __stdcall WIENVME_VME_MR( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t *Data);
short __stdcall WIENVME_VME_MRRST( void );
short __stdcall WIENVME_VME_MREXEC( uint32_t *Data );
 
typedef unsigned short ADDRESS_MODIFIER;
 
#define Std_Sup_Data (ADDRESS_MODIFIER)0x3d
/pts/PtsModule.c
17,27 → 17,36
uint32_t ptaddr=0;
 
int Pts_write(uint32_t addr, uint32_t data ){
VME_A32D32_W(ptaddr+addr,&data);
return 0;
fprintf(stderr, "Pts_write ADDR 0x%04x 0x%04x ",addr,ptaddr+addr );
int nb=VME_A32D32_W(ptaddr+addr,&data);
fprintf(stderr, " nb=%d\n",nb);
return nb;
}
 
int Pts_Mwrite(uint32_t addr, uint32_t data ){
VME_A32D32_MW(ptaddr+addr,&data);
return 1;
}
 
int Pts_read(uint32_t addr, uint32_t *data ){
VME_A32D32_R(ptaddr+addr,data);
return 0;
fprintf(stderr, "Pts_read ADDR 0x%04x 0x%04x ",addr,ptaddr+addr );
int nb=VME_A32D32_R(ptaddr+addr,data);
fprintf(stderr, " nb=%d\n",nb);
return nb;
}
 
 
int Pts_erase( int verbose ) {
uint32_t dum;
uint32_t dum = 0;
Pts_write( ADR_CSR1, 0 );
Delay(0.1);
Pts_read( ADR_CSR1, &dum);
if( verbose ) printf( "CSR1(0x%02x) = 0x%04x\n", ADR_CSR1,
if( verbose ) fprintf( stderr, "CSR1(0x%02x) = 0x%04x <<<<\n", ADR_CSR1,
dum & 0xffff );
Pts_write( ADR_CSR1, CSR1_PROGRAM_ );
Delay(0.1);
Pts_read( ADR_CSR1, &dum);
if( verbose ) printf( "CSR1(0x%02x) = 0x%04x\n", ADR_CSR1,
if( verbose ) fprintf(stderr, "CSR1(0x%02x) = 0x%04x >>>>>\n", ADR_CSR1,
dum & 0xffff );
return 1;
}
112,8 → 121,8
if( ( fp = fopen( filename, "rb" ) ) == NULL ) {
if( verbose ) fprintf( stderr, "cannot open \"%s\"\n", filename );
return -1;
}
if(verbose) printf( "file \"%s\" opened.\n", filename );
}
if(verbose) printf( "Verbose= %d File \"%s\" opened.\n", verbose ,filename );
/* ------------------------------------------------------------ *\
The data for the configuration start from 0xffff_ffff_aa99_aa66
127,37 → 136,67
}
(c == 0xff) ? dummyword++ : (dummyword=0);
} while( dummyword < 4 );
 
// const long byte_per_dot = BYTE_PER_DOT;
// unsigned long nchar = 0;
 
if( mode == SLAVESERIAL_MODE ) {
if(verbose) puts("slave serial mode");
if(verbose) fprintf(stderr, "slave serial mode");
Pts_write( ADR_MODE, mode );
Pts_erase( verbose );
for( j=0; j<32; j++ ) Pts_write( ADR_CFG, 0x1 );
while( (c=getc(fp))!=EOF ){
while(!feof(fp))
{
int nb = fread(&c,1,1,fp);
if (nb<=0) continue;
//while( (c=getc(fp))!=EOF ){
for( j=0; j<8; j++ ) Pts_write( ADR_CFG, (c>>(7-j))&0x1 );
nchar++;
if( verbose && nchar%byte_per_dot==0 ) putchar('.');
}
} else if( mode == SELECTMAP_MODE ) {
if( verbose ) puts("select map mode");
if( verbose ) fprintf(stderr, "select map mode ....");
Pts_write( ADR_MODE, SELECTMAP_MODE );
Pts_erase( verbose );
for( j=0; j<4; j++ ) Pts_write( ADR_CFG, 0xff );
while( (c=getc(fp))!=EOF ){
fprintf(stderr, "-------------\n");
//if( verbose ) fprintf(stderr, "program ....\n");
for( j=0; j<4; j++ ) {
fprintf(stderr, "%d ------------\n", j);
Pts_write( ADR_CFG, 0xff );
}
fprintf(stderr, "at line %d -------------\n", __LINE__);
VME_MWRST();
while(!feof(fp))
{
int nb = fread(&c,1,1,fp);
if (nb<=0) continue;
// while ( (c=getc(fp))!=EOF ){
if (feof(fp)) {
if(verbose) fprintf(stderr, "feof detected. Exit.\n");
return -1;
}
int cc = 0;
for(j=0; j<8; j++) cc |= ((c&(1<<j))>>j)<<(7-j);
Pts_write( ADR_CFG, cc );
//fprintf(stderr, "s");
Pts_Mwrite( ADR_CFG, cc );
nchar++;
if( verbose && nchar%byte_per_dot==0 ) putchar('.');
if( verbose && nchar%byte_per_dot==0 ) {
fprintf(stderr, "#");
VME_MWEXEC();
VME_MWRST();
fprintf(stderr, ".");
}
}
} else {
if(verbose) fprintf(stderr, "\nIllegal mode\n");
return -1;
}
if(verbose) printf("\ntotal %ld bits\n", nchar);
fclose(fp);
if(verbose) fprintf(stderr, "\ntotal %ld bits\n", nchar);
if (fp) fclose(fp);
return Pts_check_configure( verbose );
}
 
166,10 → 205,10
Pts_read(ADR_CSR1,&csr1_value);
if(verbose) printf("CSR1(0x%02x)=0x%04x\n",ADR_CSR1,csr1_value&0xffff);
if(csr1_value&CSR1_DONE) {
if(verbose) puts("configure complete.");
if(verbose) fprintf(stderr, "configure complete.\n");
return 1;
} else {
if(verbose) puts("configure not complete.");
if(verbose) fprintf(stderr, "configure not complete.\n");
return -1;
}
}
/pts/PtsModule_CVI.c
10,8 → 10,9
#include <formatio.h>
static int p1;
 
// ./pts -a 0x1000000 -v 1 -w 2 turn LED ON
// ./pts -a 0x1000000 -v 1 -w 1 turn LED OFF
// sudo ./pts -a 0x1000000 -v 1 -w 2 turn LED ON
// sudo ./pts -a 0x1000000 -v 1 -w 1 turn LED OFF
// sudo ./ptsvmusb -a 0x02501000 -v 2 -i a.bit -b 2
#include <stdlib.h>
#include <stdio.h>
 
19,18 → 20,13
 
#include <string.h>
 
#include "vme.h"
 
#ifndef CAEN_V1718
//typedef unsigned long uint32_t;
#endif
/*
void Delay(double t){
usleep(t*1e6);
}
*/
 
 
 
 
 
int verbose;
uint32_t ptaddr=0;
char str[255];
37,13 → 33,13
 
int Pts_write(uint32_t addr, uint32_t data ){
int i;
VME_A32D32_W(ptaddr+addr,&data);
VME_A32D32_W(ptaddr+addr,data);
return 0;
}
 
int Pts_Mwrite(uint32_t addr, uint32_t data ){
int i;
VME_A32D32_MW(ptaddr+addr,&data);
VME_MW(VME_A32, VME_D32, ptaddr+addr,data);
return 0;
}
 
106,8 → 102,6
(c == 0xff) ? dummyword++ : (dummyword=0);
} while( dummyword < 4 );
 
// const long byte_per_dot = BYTE_PER_DOT;
// unsigned long nchar = 0;
if( mode == SLAVESERIAL_MODE ) {
if(verbose) SetCtrlVal(p1,P1_RESPONSE,"slave serial mode");
Pts_write( ADR_MODE, mode );
125,7 → 119,10
if( verbose ) SetCtrlVal(p1,P1_RESPONSE,"select map mode\n");
Pts_write( ADR_MODE, SELECTMAP_MODE );
Pts_erase( verbose );
for( j=0; j<4; j++ ) Pts_write( ADR_CFG, 0xff );
VME_MWRST();
for( j=0; j<4; j++ ) Pts_Mwrite( ADR_CFG, 0xff );
VME_MWEXEC();
VME_MWRST();
while( (c=getc(fp))!=EOF ){
int cc = 0;
227,7 → 224,7
if ((p1 = LoadPanel (0, "PtsModule_CVI.uir", P1)) < 0)
return -1;
DisplayPanel (p1);
VME_START(NULL);
GetCtrlVal(p1,P1_VERBOSE,&verbose);
GetCtrlVal(p1,P1_ADDRESS,saddr);
ptaddr = strtoul (saddr,NULL,0);
271,8 → 268,11
case EVENT_COMMIT:
GetCtrlVal(p1,P1_FIRMWARE,filename);
GetCtrlVal(p1,P1_MODE,&mode);
Pts_configure_bit( filename, mode, verbose );
if(VME_CONNECTED() >=0 ) {
Pts_configure_bit( filename, mode, verbose );
} else {
MessagePopup ("Warning", "Connect VME!!");
}
break;
}
return 0;
471,3 → 471,30
}
return 0;
}
 
int CVICALLBACK Connect (int panel, int control, int event,
void *callbackData, int eventData1, int eventData2)
{
int interface = 0;
switch (event)
{
case EVENT_COMMIT:
GetCtrlVal (p1, P1_VMEINTERFACE, &interface);
VME_START(interface);
break;
}
return 0;
}
 
int CVICALLBACK Disconnect (int panel, int control, int event,
void *callbackData, int eventData1, int eventData2)
{
switch (event)
{
case EVENT_COMMIT:
VME_STOP();
break;
}
return 0;
}
/pts/PtsModule.h
1,6 → 1,6
#ifndef PtsModule__H_
#define PtsModule__H_
#include "vme.h"
 
#define BYTE_PER_DOT 8192
#define ADR_CSR0 0x00 // D[1] LEDTEST; D[0] RESET
#define ADR_CLK 0x04 // D[15:12] CLKOUT1; D[11:8] CLKOUT0;
/pts/PtsModule_CVI.h
1,6 → 1,5
/**************************************************************************/
/* LabWindows/CVI User Interface Resource (UIR) Include File */
/* Copyright (c) National Instruments 2014. All Rights Reserved. */
/* */
/* WARNING: Do not add to, delete from, or otherwise modify the contents */
/* of this include file. */
35,7 → 34,10
#define P1_EXIT 19 /* control type: command, callback function: Exit */
#define P1_LED 20 /* control type: LED, callback function: LedCB */
#define P1_FSELECT 21 /* control type: command, callback function: FSelect */
#define P1_TEXTMSG 22 /* control type: textMsg, callback function: (none) */
#define P1_VMEINTERFACE 22 /* control type: ring, callback function: (none) */
#define P1_DISCONNECT 23 /* control type: command, callback function: Disconnect */
#define P1_CONNECT 24 /* control type: command, callback function: Connect */
#define P1_TEXTMSG 25 /* control type: textMsg, callback function: (none) */
 
 
/* Control Arrays: */
52,6 → 54,8
 
int CVICALLBACK Address(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
int CVICALLBACK Check(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
int CVICALLBACK Connect(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
int CVICALLBACK Disconnect(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
int CVICALLBACK Download(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
int CVICALLBACK Erase(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
int CVICALLBACK Execute(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
/pts/PtsModule_CVI.prj
1,15 → 1,22
[Project Header]
<<<<<<< .mine
Version = 1302
Pathname = "/c/home/rok/hapd/pts/PtsModule_CVI.prj"
CVI Dir = "/c/program files/national instruments/cvi2013"
CVI Shared Dir = "/C/Program Files/National Instruments/Shared/CVI"
=======
Version = 1201
Pathname = "/c/home/rok/pts/PtsModule_CVI.prj"
CVI Dir = "/c/program files (x86)/national instruments/cvi2012"
CVI Shared Dir = "/C/Program Files (x86)/National Instruments/Shared/CVI"
CVI Pub Local Dir = "/C/ProgramData/National Instruments/CVI2012"
>>>>>>> .r80
CVI Pub Local Dir = "/C/ProgramData/National Instruments/CVI2013"
CVI Pub Global Dir = "/C/ProgramData/National Instruments/CVI"
IVI Standard Root Dir = "/C/Program Files (x86)/IVI Foundation/IVI"
VXIplug&play Framework Dir = "/C/Program Files (x86)/IVI Foundation/VISA/winnt"
IVI Standard Root 64-bit Dir = "/C/Program Files/IVI Foundation/IVI"
VXIplug&play Framework 64-bit Dir = "/C/Program Files/IVI Foundation/VISA/win64"
Number of Files = 7
Number of Files = 8
Target Type = "Executable"
Flags = 2064
Copied From Locked InstrDrv Directory = False
17,86 → 24,128
Locked InstrDrv Name = ""
Don't Display Deploy InstrDrv Dialog = False
 
[Folders]
Folder 0 = "Source Files"
FolderEx 0 = "Source Files"
Folder 1 = "Include Files"
FolderEx 1 = "Include Files"
Folder 2 = "User Interface Files"
FolderEx 2 = "User Interface Files"
Folder 3 = "Instrument Files"
FolderEx 3 = "Instrument Files"
Folder 4 = "Library Files"
FolderEx 4 = "Library Files"
 
[File 0001]
File Type = "CSource"
Res Id = 1
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "CAEN_V1718.c"
Path = "/c/home/rok/pts/CAEN_V1718.c"
Path Rel Path = "PtsModule_CVI.c"
Path = "/c/home/rok/hapd/pts/PtsModule_CVI.c"
Exclude = False
Compile Into Object File = False
Project Flags = 0
Folder = "Source Files"
Folder Id = 0
 
[File 0002]
File Type = "Library"
File Type = "Include"
Res Id = 2
Path Is Rel = True
Path Rel To = "Project"
<<<<<<< .mine
Path Rel Path = "PtsModule.h"
Path = "/c/home/rok/hapd/pts/PtsModule.h"
=======
Path Rel Path = "../../../Program Files/CAEN/VME/lib/x86_64/CAENVMELib.lib"
Path = "/c/Program Files/CAEN/VME/lib/x86_64/CAENVMELib.lib"
>>>>>>> .r80
Exclude = False
Project Flags = 0
Folder = "Library Files"
Folder = "Include Files"
Folder Id = 1
 
[File 0003]
File Type = "Include"
File Type = "User Interface Resource"
Res Id = 3
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "PtsModule.h"
Path = "/c/home/rok/pts/PtsModule.h"
Path Rel Path = "PtsModule_CVI.uir"
Path = "/c/home/rok/hapd/pts/PtsModule_CVI.uir"
Exclude = False
Project Flags = 0
Folder = "Include Files"
Folder = "User Interface Files"
Folder Id = 2
 
[File 0004]
File Type = "CSource"
File Type = "Function Panel"
Res Id = 4
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "PtsModule_CVI.c"
Path = "/c/home/rok/pts/PtsModule_CVI.c"
Path Rel Path = "../../../CVI/instr/CAENV1718/CAENV1718.fp"
Path = "/c/home/CVI/instr/CAENV1718/CAENV1718.fp"
Exclude = False
Compile Into Object File = False
Project Flags = 0
Folder = "Source Files"
Folder = "Instrument Files"
Folder Id = 3
 
[File 0005]
File Type = "User Interface Resource"
File Type = "Function Panel"
Res Id = 5
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "PtsModule_CVI.uir"
Path = "/c/home/rok/pts/PtsModule_CVI.uir"
Path Rel Path = "../../../CVI/instr/vme/vme.fp"
Path = "/c/home/CVI/instr/vme/vme.fp"
Exclude = False
Project Flags = 0
Folder = "User Interface Files"
Folder = "Instrument Files"
Folder Id = 3
 
[File 0006]
File Type = "Include"
File Type = "Function Panel"
Res Id = 6
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "vme.h"
Path = "/c/home/rok/pts/vme.h"
Path Rel Path = "../../../CVI/instr/WIENVME_DLL/wienvme_dll.fp"
Path = "/c/home/CVI/instr/WIENVME_DLL/wienvme_dll.fp"
Exclude = False
Project Flags = 0
Folder = "Include Files"
Folder = "Instrument Files"
Folder Id = 3
 
[File 0007]
File Type = "Function Panel"
Res Id = 7
Path Is Rel = True
<<<<<<< .mine
Path Rel To = "Project"
Path Rel Path = "../../../CVI/instr/WUSBVME_DLL/wusbvme_dll.fp"
Path = "/c/home/CVI/instr/WUSBVME_DLL/wusbvme_dll.fp"
=======
Path Rel To = "Project"
Path Rel Path Line0001 = "../../../Program Files/National Instruments/CVI2012/instr/WIENVME_DLL/wienvme_dl"
Path Rel Path Line0002 = "l.fp"
Path = "/c/Program Files/National Instruments/CVI2012/instr/WIENVME_DLL/wienvme_dll.fp"
>>>>>>> .r80
Exclude = False
Project Flags = 0
Folder = "Instrument Files"
Folder Id = 3
 
<<<<<<< .mine
[File 0008]
File Type = "Library"
Res Id = 8
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "../../../../Program Files/CAEN/VME/lib/x86/CAENVMELib.lib"
Path = "/c/Program Files/CAEN/VME/lib/x86/CAENVMELib.lib"
Exclude = False
Project Flags = 0
Folder = "Library Files"
Folder Id = 4
=======
[Folders]
Folder 0 = "Source Files"
Folder 1 = "Include Files"
103,6 → 152,7
Folder 2 = "User Interface Files"
Folder 3 = "Instrument Files"
Folder 4 = "Library Files"
>>>>>>> .r80
 
[Custom Build Configs]
Num Custom Build Configs = 0
112,18 → 162,33
Is 64-Bit = False
Is Release = False
Default Calling Convention = "cdecl"
Uninitialized Locals Compile Warning = "Conservative"
Optimization Level = "No optimizations"
Require Prototypes = True
Require Return Values = True
Show Warning IDs in Build Output = False
Selected Warning Level = "None"
Warning List None = "4,9,84,105,106,107,108,109,110,111"
Warning List Common = ""
Warning List Extended = ""
Warning List All = ""
Warning Mode = 0
Enable Unreferenced Identifiers Warning = False
Enable Pointer Mismatch Warning = False
Enable Unreachable Code Warning = False
Enable Unreferenced Identifiers Warning = False
Enable Assignment In Conditional Warning = False
Uninitialized Locals Compile Warning = "Aggressive"
Require Return Values = True
Enable C99 Extensions = False
Enable OpenMP Extensions = False
Stack Size = 250000
Stack Reserve = 1048576
Stack Commit = 4096
Image Base Address = 4194304
Image Base Address x64 = 4194304
<<<<<<< .mine
Compiler Defines = "/DWIN32_LEAN_AND_MEAN"
=======
Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DCAEN_V1718 /DWXXIENVME"
>>>>>>> .r80
Sign = False
Sign Store = ""
Sign Certificate = ""
133,7 → 198,6
Icon File Is Rel = False
Icon File = ""
Application Title = ""
DLL Import Library Choice = "Gen Lib For Current Mode"
Use IVI Subdirectories for Import Libraries = False
Use VXIPNP Subdirectories for Import Libraries = False
Use Dflt Import Lib Base Name = True
145,8 → 209,9
Runtime Binding = "Shared"
Embed Project .UIRs = False
Generate Map File = False
Embed Timestamp = True
Create Console Application = False
Using LoadExternalModule = False
Using LoadExternalModule = True
DLL Exports = "Include File Symbols"
Register ActiveX Server = False
Numeric File Version = "1,0,0,0"
155,7 → 220,7
Comments Ex = ""
Company Name = ""
Company Name Ex = "%company"
File Description = "PtsModule_CVI (Debug x86)"
File Description = "PtsModule_CVI_dbg (Debug x86)"
File Description Ex = "%application (%rel_dbg %arch)"
File Version = "1.0"
File Version Ex = "%f1.%f2"
169,7 → 234,7
Original Filename Ex = "%filename"
Private Build = ""
Private Build Ex = ""
Product Name = " PtsModule_CVI"
Product Name = " PtsModule_CVI_dbg"
Product Name Ex = "%company %application"
Product Version = "1.0"
Product Version Ex = "%p1.%p2"
186,15 → 251,26
Is 64-Bit = False
Is Release = True
Default Calling Convention = "cdecl"
Uninitialized Locals Compile Warning = "Conservative"
Optimization Level = "No optimizations"
Require Prototypes = True
Require Return Values = True
Show Warning IDs in Build Output = False
Selected Warning Level = "None"
Warning List None = "4,9,84,105,106,107,108,109,110,111"
Warning List Common = ""
Warning List Extended = ""
Warning List All = ""
Warning Mode = 0
Enable Unreferenced Identifiers Warning = False
Enable Pointer Mismatch Warning = False
Enable Unreachable Code Warning = False
Enable Unreferenced Identifiers Warning = False
Enable Assignment In Conditional Warning = False
Uninitialized Locals Compile Warning = "Aggressive"
Require Return Values = True
Enable C99 Extensions = False
Enable OpenMP Extensions = False
Stack Size = 250000
Stack Reserve = 1048576
Stack Commit = 4096
Image Base Address = 4194304
Image Base Address x64 = 4194304
Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DCAEN_V1718"
207,7 → 283,6
Icon File Is Rel = False
Icon File = ""
Application Title = ""
DLL Import Library Choice = "Gen Lib For Current Mode"
Use IVI Subdirectories for Import Libraries = False
Use VXIPNP Subdirectories for Import Libraries = False
Use Dflt Import Lib Base Name = True
219,6 → 294,7
Runtime Binding = "Shared"
Embed Project .UIRs = False
Generate Map File = False
Embed Timestamp = True
Create Console Application = False
Using LoadExternalModule = False
DLL Exports = "Include File Symbols"
234,15 → 310,26
Is 64-Bit = True
Is Release = False
Default Calling Convention = "cdecl"
Uninitialized Locals Compile Warning = "Conservative"
Optimization Level = "No optimizations"
Require Prototypes = True
Require Return Values = True
Show Warning IDs in Build Output = False
Selected Warning Level = "None"
Warning List None = "4,9,84,105,106,107,108,109,110,111"
Warning List Common = ""
Warning List Extended = ""
Warning List All = ""
Warning Mode = 0
Enable Unreferenced Identifiers Warning = False
Enable Pointer Mismatch Warning = False
Enable Unreachable Code Warning = False
Enable Unreferenced Identifiers Warning = False
Enable Assignment In Conditional Warning = False
Uninitialized Locals Compile Warning = "Aggressive"
Require Return Values = True
Enable C99 Extensions = False
Enable OpenMP Extensions = False
Stack Size = 250000
Stack Reserve = 1048576
Stack Commit = 4096
Image Base Address = 4194304
Image Base Address x64 = 4194304
Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DCAEN_V1718"
255,7 → 342,6
Icon File Is Rel = False
Icon File = ""
Application Title = ""
DLL Import Library Choice = "Gen Lib For Current Mode"
Use IVI Subdirectories for Import Libraries = False
Use VXIPNP Subdirectories for Import Libraries = False
Use Dflt Import Lib Base Name = True
267,6 → 353,7
Runtime Binding = "Shared"
Embed Project .UIRs = False
Generate Map File = False
Embed Timestamp = True
Create Console Application = False
Using LoadExternalModule = False
DLL Exports = "Include File Symbols"
308,15 → 395,26
Is 64-Bit = True
Is Release = True
Default Calling Convention = "cdecl"
Uninitialized Locals Compile Warning = "Conservative"
Optimization Level = "No optimizations"
Require Prototypes = True
Require Return Values = True
Show Warning IDs in Build Output = False
Selected Warning Level = "None"
Warning List None = "4,9,84,105,106,107,108,109,110,111"
Warning List Common = ""
Warning List Extended = ""
Warning List All = ""
Warning Mode = 0
Enable Unreferenced Identifiers Warning = False
Enable Pointer Mismatch Warning = False
Enable Unreachable Code Warning = False
Enable Unreferenced Identifiers Warning = False
Enable Assignment In Conditional Warning = False
Uninitialized Locals Compile Warning = "Aggressive"
Require Return Values = True
Enable C99 Extensions = False
Enable OpenMP Extensions = False
Stack Size = 250000
Stack Reserve = 1048576
Stack Commit = 4096
Image Base Address = 4194304
Image Base Address x64 = 4194304
Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DCAEN_V1718"
329,7 → 427,6
Icon File Is Rel = False
Icon File = ""
Application Title = ""
DLL Import Library Choice = "Gen Lib For Current Mode"
Use IVI Subdirectories for Import Libraries = False
Use VXIPNP Subdirectories for Import Libraries = False
Use Dflt Import Lib Base Name = True
341,6 → 438,7
Runtime Binding = "Shared"
Embed Project .UIRs = False
Generate Map File = False
Embed Timestamp = True
Create Console Application = False
Using LoadExternalModule = False
DLL Exports = "Include File Symbols"
361,12 → 459,13
Enable Assignment In Conditional Warning = False
O Option Compatible With 5.0 = False
Enable C99 Extensions = False
Uninitialized Locals Compile Warning = "Conservative"
Uninitialized Locals Compile Warning = "Aggressive"
Precompile Prefix Header = False
Prefix Header File = ""
 
[Run Options]
Stack Size = 250000
Stack Commit = 4096
Image Base Address = 4194304
Image Base Address x64 = 4194304
 
377,30 → 476,29
Include Path 1 Is Rel = True
Include Path 1 Rel To = "Project"
Include Path 1 Rel Path = ""
Include Path 1 = "/c/home/rok/pts"
Include Path 1 = "/c/home/rok/hapd/pts"
 
[Create Executable]
Executable File_Debug Is Rel = True
Executable File_Debug Rel To = "Project"
Executable File_Debug Rel Path = "PtsModule_CVI_dbg.exe"
Executable File_Debug = "/c/home/rok/pts/PtsModule_CVI_dbg.exe"
Executable File_Debug = "/c/home/rok/hapd/pts/PtsModule_CVI_dbg.exe"
Executable File_Release Is Rel = True
Executable File_Release Rel To = "Project"
Executable File_Release Rel Path = "PtsModule_CVI.exe"
Executable File_Release = "/c/home/rok/pts/PtsModule_CVI.exe"
Executable File_Release = "/c/home/rok/hapd/pts/PtsModule_CVI.exe"
Executable File_Debug64 Is Rel = True
Executable File_Debug64 Rel To = "Project"
Executable File_Debug64 Rel Path = "PtsModule_CVI.exe"
Executable File_Debug64 = "/c/home/rok/pts/PtsModule_CVI.exe"
Executable File_Debug64 = "/c/home/rok/hapd/pts/PtsModule_CVI.exe"
Executable File_Release64 Is Rel = True
Executable File_Release64 Rel To = "Project"
Executable File_Release64 Rel Path = "PtsModule_CVI.exe"
Executable File_Release64 = "/c/home/rok/pts/PtsModule_CVI.exe"
Executable File_Release64 = "/c/home/rok/hapd/pts/PtsModule_CVI.exe"
Icon File Is Rel = False
Icon File = ""
Application Title = ""
DLL Exports = "Include File Symbols"
DLL Import Library Choice = "Gen Lib For Current Mode"
Use IVI Subdirectories for Import Libraries = False
Use VXIPNP Subdirectories for Import Libraries = False
Use Dflt Import Lib Base Name = True
/pts/Makefile
11,7 → 11,7
SRC = .
INC1 = -I. -I../lib -I/usr/include
DBG =
CFLAGS = $(DBG) $(INC) -fPIC -DLINUX -Wall
CFLAGS = $(DBG) $(INC) -fPIC -DLINUX -Wall -g
 
SHLIB = -lpcivme -lz
 
18,8 → 18,11
OBJ_FILES = PtsModule.o
 
 
all: pts
all: ptsvmusb
 
ptsvmusb: PtsModule.c VmUsbStack_cvi.c wusbxx_dll.c libxxusb.c
$(CXX) $(CFLAGS) -DWVMUSB PtsModule.c VmUsbStack_cvi.c wusbxx_dll.c libxxusb.c -lusb -lz -o ptsvmusb
 
pts: PtsModule.c wienvme_dll.c
$(CXX) $(CFLAGS) PtsModule.c wienvme_dll.c $(SHLIB) -o pts
# cp sa02_ctrl ../bin