| 74,12 → 74,12 |
|---|
| } |
| |
| |
| uint16_t fStack[MAXSTACKSIZE]; |
| uint32_t fStack[MAXSTACKSIZE]; |
| uint32_t fStackSize; |
| |
| |
| int WIENER_VMUSB_StackInit(){ |
| fStack[0]=1; |
| fStack[1]=0; |
| fStackSize=1; |
| return fStack[0]; |
| } |
| |
| 89,45 → 89,43 |
|---|
| |
| int WIENER_VMUSB_StackGetUInt16(int maxn, uint16_t *stack){ |
| int i; |
| for (i=0;i< fStack[0]+1;i++){ |
| if (i<maxn) stack[i]=fStack[i]; else return -1; |
| uint16_t * u16Stack = (uint16_t *) fStack; |
| for (i=0;i< fStackSize*2;i++){ |
| if (i<maxn) stack[i]=u16Stack[i]; else return -1; |
| } |
| return fStack[0]+1; |
| return fStackSize*2; |
| } |
| |
| int WIENER_VMUSB_StackGetUInt32(int maxn, uint32_t *stack){ |
| int i; |
| for (i=0;i< fStack[0]+1;i++){ |
| if (i<maxn) stack[i]=fStack[i]; else return -1; |
| uint16_t * u16Stack = (uint16_t *) fStack; |
| for (i=0;i< fStackSize*2;i++){ |
| if (i<maxn) stack[i]=u16Stack[i]; else return -1; |
| } |
| return fStack[0]+1; |
| return fStackSize*2; |
| } |
| |
| |
| int WIENER_VMUSB_StackAppend(int cmd, uint32_t addr ){ |
| int i= fStack[0]+1; |
| if (i+4 >= MAXSTACKSIZE) { |
| fprintf(stderr,"WIENER_VMUSB_StackAppend Maximum stack size reached! Increase....%d\n", i+4); |
| if (fStackSize+2 >= MAXSTACKSIZE) { |
| fprintf(stderr,"WIENER_VMUSB_StackAppend Maximum stack size reached! Increase....%d\n", fStackSize+2); |
| return -1; |
| } |
| fStack[i] = (cmd & 0xFFFF); |
| fStack[i+1] = (cmd >> 16); |
| fStack[i+2] = addr&0xFFFF; |
| fStack[i+3] = (addr >> 16)& 0xFFFF; |
| fStack[fStackSize ++] = cmd; |
| fStack[fStackSize ++] = addr; |
| fStack[0]+=4; |
| return fStack[0]; |
| } |
| |
| int WIENER_VMUSB_StackAppendData(int cmd,uint32_t addr ,uint32_t data){ |
| int i=0; |
| |
| WIENER_VMUSB_StackAppend( cmd, addr ); |
| i = fStack[0]+1; |
| if (i+2 >= MAXSTACKSIZE) { |
| fprintf(stderr,"WIENER_VMUSB_StackAppendData Maximum stack size reached! Increase....%d\n", i+4); |
| |
| if (fStackSize+1 >= MAXSTACKSIZE) { |
| fprintf(stderr,"WIENER_VMUSB_StackAppendData Maximum stack size reached! Increase....%d\n", fStackSize+1); |
| return -1; |
| } |
| fStack[i] = data & 0xFFFF; |
| fStack[i+1] = (data >> 16)&0xFFFF; |
| fStack[fStackSize++] = data; |
| fStack[0]+=2; |
| return fStack[0]; |
| } |
| 147,9 → 145,10 |
|---|
| } |
| |
| void WIENER_VMUSB_StackPrint(){ |
| uint16_t * u16Stack = (uint16_t *) fStack; |
| uint32_t i; |
| for (i=0; i < fStack[0]+1;i++) printf("0x%04x\n",fStack[i]); |
| printf("size of stack %d __________________________________\n",fStack[0]+1); |
| for (i=0; i < fStackSize*2;i++) printf("0x%04x\n",u16Stack[i]); |
| printf("size of stack %d __________________________________\n",fStackSize*2-1); |
| } |
| |
| |
| 158,16 → 157,19 |
|---|
| |
| int _VI_FUNC WUSBXX_stack_execute (usb_dev_handle * dev, char * stack){ |
| int i, nb=0; |
| if (!dev) return -1; |
| if (!dev) { |
| printf("WUSBXX_stack_execute device not open\n"); |
| return -1; |
| } |
| uint16_t * exstack = (uint16_t *) wusbcc_stack; |
| exstack[0]=0; |
| nb = WIENER_VMUSB_StackGetUInt16(MAXSTACKSIZE, &exstack[1] ); |
| //printf("WUSBXX_stack_execute stack size %d ", nb); |
| //printf("WUSBXX_stack_execute stack size %d\n", nb); |
| //WIENER_VMUSB_StackPrint(); |
| nb = xxusb_longstack_execute (dev, exstack, nb, 1000); |
| |
| |
| if (nb<0 ) printf("%s line:%d err=%d %s\n",__FILE__,__LINE__,nb, strerror(-nb) ); |
| //DataBuffer(0 - (ReturnValue/2-1)) - (unsigned short)array of returned data when ReturnValue>0 |
| //printf("WUSBXX_stack_execute return size %d\n", nb); |
| if (nb<0 ) printf("xxusb_longstack_execute %s line:%d err=%d %s\n",__FILE__,__LINE__,nb, strerror(-nb) ); |
| if (stack!=NULL) for ( i=0;i<nb;i++) stack[i]=wusbcc_stack[i]; |
| return nb/sizeof(uint32_t); |
| } |
| 224,14 → 226,13 |
|---|
| return 0; |
| } |
| short __stdcall WIENER_VMUSB_VME_MWEXEC( void ){ |
| WUSBXX_stack_execute (WUSB_udev, NULL); |
| return 0; |
| return WUSBXX_stack_execute (WUSB_udev, NULL); |
| } |
| |
| short __stdcall WIENER_VMUSB_VME_MR( uint16_t AM, uint16_t DW, uint32_t VME_Address, uint32_t *Data){ |
| switch (DW){ |
| case VME_D16: return (short) WIENER_VMUSB_StackAppendData(CMD_READ | AM , VME_Address | CMD_D16 , *Data); |
| case VME_D32: return (short) WIENER_VMUSB_StackAppendData(CMD_READ | AM , VME_Address | CMD_D32 , *Data); |
| case VME_D16: return (short) WIENER_VMUSB_StackAppend(CMD_READ | AM , VME_Address | CMD_D16 ); |
| case VME_D32: return (short) WIENER_VMUSB_StackAppend(CMD_READ | AM , VME_Address | CMD_D32 ); |
| default: return 0; |
| } |
| return 0; |
| 241,6 → 242,5 |
|---|
| return 0; |
| } |
| short __stdcall WIENER_VMUSB_VME_MREXEC( uint32_t *Data ){ |
| WUSBXX_stack_execute (WUSB_udev,(char *) Data); |
| return 0; |
| return WUSBXX_stack_execute (WUSB_udev,(char *) Data); |
| } |