WebSVN – f9daq – Path Comparison – / – /cvi Rev 169 and /cvi/ Rev 170

Ignore whitespace Rev 169 → Rev 170

/cvi/instr/vme/msvc/sis3153w.lib
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/cvi/instr/vme/msvc64/sis3153w.lib
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /cvi/instr/vme/vme.c
 ,6 → 24,7
 #include "CAENV1718.h"
 #include "wusbvme_dll.h"
 #include "wienvme_dll.h"
+#include "sis3153.h"
 static int VME_interface= -1;
 int VME_GetInterface() {
 ,7 → 31,6
   return VME_interface;
 }
 int VME_CONNECTED() {
   return  VME_interface;
 }
 ,6 → 76,7
       VME_MWRST_Ptr =  WIENVME_VME_MWRST;
       VME_MRRST_Ptr =  WIENVME_VME_MRRST;
       break;
     case WIENER_VMUSB:
       WIENER_VMUSB_VME_START("VM0120");
       VME_R_Ptr  =  WIENER_VMUSB_VME_R;
 ,30 → 95,42
       VME_MRRST_Ptr =  WIENER_VMUSB_VME_MRRST;
       break;
+    case SIS3153_USB:
+      SIS3153_USB_VME_START(NULL);
+      VME_R_Ptr  =  SIS3153_USB_VME_R;
+      VME_W_Ptr  =  SIS3153_USB_VME_W;
+      VME_MWRST_Ptr =  SIS3153_USB_VME_MWRST;
+      VME_MW_Ptr =  SIS3153_USB_VME_MW;
+      VME_MWEXEC_Ptr =  SIS3153_USB_VME_MWEXEC;
+      VME_MRRST_Ptr =  SIS3153_USB_VME_MRRST;
+      VME_MR_Ptr =  SIS3153_USB_VME_MR;
+      VME_MREXEC_Ptr =  SIS3153_USB_VME_MREXEC;
+      break;
+    default:
+      break;
   }
   return 0;
 }
 short    VME_STOP () {
 //short   __stdcall VME_STOP () {
   switch (VME_interface) {
     case CAEN_V1718:
-      CAEN_VME_STOP( );
+      CAEN_VME_STOP();
       break;
     case WIENER_VMEMM:
       break;
     case WIENER_VMUSB:
-      WIENER_VMUSB_VME_STOP( );
+      WIENER_VMUSB_VME_STOP();
       break;
+    case SIS3153_USB:
+      SIS3153_USB_VME_STOP();
+      break;
     default:
       break;
   }
   VME_interface = -1;
   return 0;
 }

 /cvi/instr/vme/vme.h
 ,6 → 12,7
 #define CAEN_V1718   0
 #define WIENER_VMEMM 1
 #define WIENER_VMUSB 2
+#define SIS3153_USB  3
 short VME_START( int interface );
 ,26 → 55,26
 #define  VME_R         (*VME_R_Ptr)
 #define  VME_W         (*VME_W_Ptr)
+#define  VME_MWRST     (*VME_MWRST_Ptr)
 #define  VME_MW        (*VME_MW_Ptr)
-#define  VME_MWRST     (*VME_MWRST_Ptr)
 #define  VME_MWEXEC    (*VME_MWEXEC_Ptr)
+#define  VME_MRRST     (*VME_MRRST_Ptr)
 #define  VME_MR        (*VME_MR_Ptr)
-#define  VME_MRRST     (*VME_MRRST_Ptr)
 #define  VME_MREXEC    (*VME_MREXEC_Ptr)
-extern short __stdcall VME_R( uint16_t AM, uint16_t DW,  uint32_t VME_Address, uint32_t *Data);
+extern short __stdcall VME_R( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t *Data);
 extern short __stdcall VME_W( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t Data);
+extern short __stdcall VME_MWRST( void );
 extern short __stdcall VME_MW( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t Data);
-extern short __stdcall VME_MWRST( void );
 extern short __stdcall VME_MWEXEC( void );
+extern short __stdcall VME_MRRST( void );
 extern short __stdcall VME_MR( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t *Data);
-extern short __stdcall VME_MRRST( void );
-extern short __stdcall VME_MREXEC(  uint32_t *Data  );
+extern short __stdcall VME_MREXEC( uint32_t *Data  );
 #endif

 /cvi/instr/vme/vme.prj
 ,7 → 9,7
 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 = 13
+Number of Files = 15
 Target Type = "Static Library"
 Flags = 2064
 Copied From Locked InstrDrv Directory = False
 ,8 → 57,8
 Res Id = 3
 Path Is Rel = True
 Path Rel To = "Project"
-Path Rel Path = "vme.c"
-Path = "/c/home/CVI/instr/vme/vme.c"
+Path Rel Path = "../SIS3153/sis3153.c"
+Path = "/c/home/CVI/instr/SIS3153/sis3153.c"
 Exclude = False
 Compile Into Object File = False
 Project Flags = 0
 ,8 → 70,8
 Res Id = 4
 Path Is Rel = True
 Path Rel To = "Project"
-Path Rel Path = "../WIENVME_DLL/wienvme_dll.c"
-Path = "/c/home/CVI/instr/WIENVME_DLL/wienvme_dll.c"
+Path Rel Path = "vme.c"
+Path = "/c/home/CVI/instr/vme/vme.c"
 Exclude = False
 Compile Into Object File = False
 Project Flags = 0
 ,6 → 83,19
 Res Id = 5
 Path Is Rel = True
 Path Rel To = "Project"
+Path Rel Path = "../WIENVME_DLL/wienvme_dll.c"
+Path = "/c/home/CVI/instr/WIENVME_DLL/wienvme_dll.c"
+Exclude = False
+Compile Into Object File = False
+Project Flags = 0
+Folder = "Source Files"
+Folder Id = 0
+[File 0006]
+File Type = "CSource"
+Res Id = 6
+Path Is Rel = True
+Path Rel To = "Project"
 Path Rel Path = "../WUSBVME_DLL/wusbvme_dll.c"
 Path = "/c/home/CVI/instr/WUSBVME_DLL/wusbvme_dll.c"
 Exclude = False
 ,9 → 104,9
 Folder = "Source Files"
 Folder Id = 0
-[File 0006]
+[File 0007]
 File Type = "Include"
-Res Id = 6
+Res Id = 7
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "../CAENV1718/CAENV1718.h"
 ,9 → 116,9
 Folder = "Include Files"
 Folder Id = 1
-[File 0007]
+[File 0008]
 File Type = "Include"
-Res Id = 7
+Res Id = 8
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "../CAENV1718/CAENVMElib.h"
 ,9 → 128,9
 Folder = "Include Files"
 Folder Id = 1
-[File 0008]
+[File 0009]
 File Type = "Include"
-Res Id = 8
+Res Id = 9
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "../CAENV1718/CAENVMEoslib.h"
 ,9 → 140,9
 Folder = "Include Files"
 Folder Id = 1
-[File 0009]
+[File 0010]
 File Type = "Include"
-Res Id = 9
+Res Id = 10
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "../CAENV1718/CAENVMEtypes.h"
 ,11 → 152,23
 Folder = "Include Files"
 Folder Id = 1
-[File 0010]
+[File 0011]
 File Type = "Include"
-Res Id = 10
+Res Id = 11
 Path Is Rel = True
 Path Rel To = "Project"
+Path Rel Path = "../SIS3153/sis3153.h"
+Path = "/c/home/CVI/instr/SIS3153/sis3153.h"
+Exclude = False
+Project Flags = 0
+Folder = "Include Files"
+Folder Id = 1
+[File 0012]
+File Type = "Include"
+Res Id = 12
+Path Is Rel = True
+Path Rel To = "Project"
 Path Rel Path = "../WUSBVME_DLL/usb.h"
 Path = "/c/home/CVI/instr/WUSBVME_DLL/usb.h"
 Exclude = False
 ,9 → 176,9
 Folder = "Include Files"
 Folder Id = 1
-[File 0011]
+[File 0013]
 File Type = "Include"
-Res Id = 11
+Res Id = 13
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "vme.h"
 ,9 → 188,9
 Folder = "Include Files"
 Folder Id = 1
-[File 0012]
+[File 0014]
 File Type = "Include"
-Res Id = 12
+Res Id = 14
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "../WIENVME_DLL/wienvme_dll.h"
 ,9 → 200,9
 Folder = "Include Files"
 Folder Id = 1
-[File 0013]
+[File 0015]
 File Type = "Include"
-Res Id = 13
+Res Id = 15
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "../WUSBVME_DLL/wusbvme_dll.h"

Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 169 → Rev 170