BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /cvi/ @ 137

  → /cvi/ @ 138

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 137 → Rev 138

/cvi/instr/WUSBVME_DLL/wusbvme_dll.c
32,6 → 32,8
short __stdcall WIENER_VMUSB_VME_MREXEC( uint32_t *Data );
#ifdef XXDLL
short __stdcall xxusb_register_read(usb_dev_handle *hDev, short RegAddr, long *RegData);
short __stdcall xxusb_stack_read(usb_dev_handle *hDev, short StackAddr, long *StackData);
short __stdcall xxusb_stack_write(usb_dev_handle *hDev, short StackAddr, long *StackData);
67,12 → 69,13
void _VI_FUNC WIENER_VMUSB_load (const char* module_path) {
if (module_path == NULL) {
DLLHandle = LoadLibrary("libxxusb.dll");
DLLHandle = LoadLibrary("c:\\Windows\\system32\\libxxusb.dll");
} else {
DLLHandle = LoadLibrary(module_path);
}
if (!DLLHandle) {
printf ("\n\nFailed to Open libxxusb.dll \n");
printf("LastError 0x%x\n",GetLastError() );
return;
}
if (!(xxusb_register_read_Ptr = (void *) GetProcAddress(DLLHandle,"xxusb_register_read"))) exit(1);
104,6 → 107,13
if (!(VME_write_32_Ptr = (void*) GetProcAddress(DLLHandle,"VME_write_32"))) exit(1);
}
#else
void _VI_FUNC WIENER_VMUSB_load (const char* module_path) {
}
#endif
void _VI_FUNC WIENER_VMUSB_open (const char *serial) {
xxusb_device_type devices[100];

/cvi/instr/WUSBVME_DLL/wusbvme_dll.h
11,9 → 11,13
#include "/usr/include/usb.h"
#endif
#ifdef XXDLL
#include "xxusb_dll.h"
#else
#include "libxxusb.h"
#endif
#define CMD_WRITE 0x000
#define CMD_READ 0x100
#define CMD_A24 0x039
46,14 → 50,14
#define WIENER_VMUSB_StackMarker(MRK) WIENER_VMUSB_StackAppend(CMD_MRK, (MRK))
int WIENER_VMUSB_StackAppend(int cmd, uint32_t addr);
int WIENER_VMUSB_StackAppendData(int cmd, uint32_t addr, uint32_t data);
int WIENER_VMUSB_StackAppend(int cmd, uint32_t addr);
int WIENER_VMUSB_StackAppendData(int cmd, uint32_t addr, uint32_t data);
void WIENER_VMUSB_StackConditionalRead(int am ,int d16d32,uint32_t addr, uint32_t data);
void WIENER_VMUSB_StackMultiRead(int addr_modifier,int d16d32, uint32_t baseaddr, int n,uint32_t increment);
void WIENER_VMUSB_StackConditionalRead(int am ,int d16d32,uint32_t addr, uint32_t data);
void WIENER_VMUSB_StackMultiRead(int addr_modifier,int d16d32, uint32_t baseaddr, int n,uint32_t increment);
void WIENER_VMUSB_StackMultiWrite(int addr_modifier,int d16d32,uint32_t baseaddr, int n, uint32_t increment, uint32_t data);
int WIENER_VMUSB_StackGetUint32(int maxn, uint32_t *stack);
int WIENER_VMUSB_StackGetUint32(int maxn, uint32_t *stack);
int WIENER_VMUSB_StackGetUint16(int maxn, uint16_t *stack);
void WIENER_VMUSB_StackPrint();