receive-handling rewritten

diff --git a/Makefile b/Makefile
index 1383dd729a7e37f57eecbed765650e4fc20f26c1..12b4cc7e6e97fc8b2921c80470ef5e8a0820fde0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
 OFILES=png.o usbtmc.o commands.o scope.o
 
 OFILES=png.o usbtmc.o commands.o scope.o

-CFLAGS=-O2 -Wall -I/opt/local/include
+CFLAGS=-O2 -Wall -I/opt/local/include -g

 LDFLAGS=-L/opt/local/lib -lusb -lreadline -lz
 CC=gcc
 
 LDFLAGS=-L/opt/local/lib -lusb -lreadline -lz
 CC=gcc
 

diff --git a/usbtmc.c b/usbtmc.c
index 732b8f6d19691fccabdeffc60f9086c4e25eb94e..84df109b6778a82dcd15396878bbf40c16466abc 100644 (file)
--- a/usbtmc.c
+++ b/usbtmc.c
@@ -7,7 +7,8 @@
 #include "scope.h"
 #include "usbtmc.h"
 
 #include "scope.h"
 #include "usbtmc.h"
 

-#define USB_TIMEOUT 10000
+#define USB_TIMEOUT            10000
+#define USBTMC_IN_TRANSFERSIZE 0x800

 
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define LE32(x) x
 
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define LE32(x) x


@@ -94,7 +95,7 @@ static struct usbtmc_capabilities* usbtmc_get_capabilities(struct scope *sc)
                return NULL;
        }
 
                return NULL;
        }
 

-       printf("USBTMC Version %x.%x Capabilities:\n", res.bcdUSBTMC[0], res.bcdUSBTMC[1]);
+       printf("USBTMC Version %02x.%02x Capabilities:\n", res.bcdUSBTMC[0], res.bcdUSBTMC[1]);

        if (res.USBTMCIFcapabilities & USBTMC_CAP_IF_INDICATOR_PULSE)
                printf("\tInterface supports indicator pulse\n");
 
        if (res.USBTMCIFcapabilities & USBTMC_CAP_IF_INDICATOR_PULSE)
                printf("\tInterface supports indicator pulse\n");
 


@@ -107,7 +108,7 @@ static struct usbtmc_capabilities* usbtmc_get_capabilities(struct scope *sc)
        if (res.USBTMCDEVcapabilities & USBTMC_CAP_DEV_TERMCHAR_SUPP)
                printf("\tDevice supports Termchar\n");
 
        if (res.USBTMCDEVcapabilities & USBTMC_CAP_DEV_TERMCHAR_SUPP)
                printf("\tDevice supports Termchar\n");
 

-       printf("USB488 Version %x.%x Capabilities:\n", res.bcdUSB488[0], res.bcdUSB488[1]);
+       printf("USB488 Version %02x.%02x Capabilities:\n", res.bcdUSB488[0], res.bcdUSB488[1]);

 
        if (res.USB488IFcapabilities & USB488_CAP_IF_4882)
                printf("\tInterface is 488.2 compliant\n");
 
        if (res.USB488IFcapabilities & USB488_CAP_IF_4882)
                printf("\tInterface is 488.2 compliant\n");


@@ -146,6 +147,8 @@ static void usbtmc_clear(struct scope *sc)
        
        if ((r != 1) || status[0] != USBTMC_STATUS_SUCCESS) {
                printf("INITIATE_CLEAR failed (0x%x): %s\n", status[0], usb_strerror());
        
        if ((r != 1) || status[0] != USBTMC_STATUS_SUCCESS) {
                printf("INITIATE_CLEAR failed (0x%x): %s\n", status[0], usb_strerror());

+               usb_reset(sc->usb.dev);
+               usbtmc_claim(sc);

                return;
        }
 
                return;
        }
 


@@ -224,11 +227,12 @@ int usbtmc_sendscpi(struct scope *sc, char* cmd,
        free(req);
 
        if (resp != NULL && resplen != 0) {
        free(req);
 
        if (resp != NULL && resplen != 0) {

-               unsigned char *buff;
+               unsigned char *buff = NULL;
+               unsigned char rxbuff[USBTMC_IN_TRANSFERSIZE];

                struct usbtmc_header *res;
                int bytes_read;
                struct usbtmc_header *res;
                int bytes_read;

-
-               sc->usb.bTag++;
+               unsigned int transfer_size = USBTMC_IN_TRANSFERSIZE;
+               unsigned int headerlen;

 
                req = calloc(1, sizeof(struct usbtmc_header));
                if (req == NULL) {
 
                req = calloc(1, sizeof(struct usbtmc_header));
                if (req == NULL) {


@@ -236,56 +240,76 @@ int usbtmc_sendscpi(struct scope *sc, char* cmd,
                        exit(EXIT_FAILURE);
                }
 
                        exit(EXIT_FAILURE);
                }
 

-               req->MsgID = USBTMC_REQUEST_DEV_DEP_MSG_IN;
-               req->bTag = sc->usb.bTag;
-               req->bTagInverse = ~sc->usb.bTag;
-               req->TransferSize = LE32(sc->usb.wMaxPacketSize_in);
-               req->bmTransferAttributes = 0;
-               req->TermChar = 0;
+               if (sc->usb.brokenRigol == 1) {
+                       transfer_size = sc->usb.wMaxPacketSize_in;
+               }

 
 

-               /* send read command */
-               r=usb_bulk_write(sc->usb.dev, sc->usb.ep_bulk_out,
-                       (char*)req, sizeof(struct usbtmc_header), USB_TIMEOUT);
-               USB_ERROR("USBTMC_REQUEST_DEV_DEP_MSG_IN", r);
+               bytes_read = 0;
+               do {
+                       headerlen = 0;

 
 

-               free(req);
+                       if ((sc->usb.brokenRigol == 0) || (bytes_read == 0)) {
+                               sc->usb.bTag++;

 
 

-               buff=malloc(sc->usb.wMaxPacketSize_in);
-               if (buff == NULL) {
-                       perror("malloc");
-                       exit(EXIT_FAILURE);
-               }
+                               req->MsgID = USBTMC_REQUEST_DEV_DEP_MSG_IN;
+                               req->bTag = sc->usb.bTag;
+                               req->bTagInverse = ~sc->usb.bTag;
+                               req->TransferSize = LE32(transfer_size);
+                               req->bmTransferAttributes = 0;
+                               req->TermChar = 0;

 
 

-               r=usb_bulk_read(sc->usb.dev, sc->usb.ep_bulk_in,
-                       (char*)buff, sc->usb.wMaxPacketSize_in, USB_TIMEOUT);
-               USB_ERROR("USBTMC_DEV_DEP_MSG_IN1", r);
+                               /* send read command */
+                               r=usb_bulk_write(sc->usb.dev, sc->usb.ep_bulk_out,
+                                               (char*)req, sizeof(struct usbtmc_header), USB_TIMEOUT);
+                               USB_ERROR("USBTMC_REQUEST_DEV_DEP_MSG_IN", r);

 
 

-               if (r < sizeof(struct usbtmc_header)) {
-                       fprintf(stderr, "Short read!\n");
-                       return 0;
-               }
+                               headerlen = sizeof(struct usbtmc_header);
+                       }

 
 

-               bytes_read = r - sizeof(struct usbtmc_header);
-               
-               res = (struct usbtmc_header*)buff;
-               len = LE32(res->TransferSize);
+                       r=usb_bulk_read(sc->usb.dev, sc->usb.ep_bulk_in,
+                                       (char*)rxbuff, transfer_size, USB_TIMEOUT);
+                       USB_ERROR("USBTMC_DEV_DEP_MSG_IN", r);

 
 

-               memmove(buff, buff + sizeof(struct usbtmc_header), bytes_read);
+                       if (r < headerlen) {
+                               fprintf(stderr, "Short read!\n");
+                               return 0;
+                       }

 
 

-               buff = realloc(buff, len);
-               if (buff == NULL) {
-                       perror("realloc");
-                       exit(EXIT_FAILURE);
-               }

 
 

-               while ((len - bytes_read) > 0) {
-                       r=usb_bulk_read(sc->usb.dev, sc->usb.ep_bulk_in,
-                               (char*)buff + bytes_read, len - bytes_read,
-                               USB_TIMEOUT);
-                       USB_ERROR("USBTMC_DEV_DEP_MSG_INx", r);
+                       if (headerlen > 0) {
+                               res = (struct usbtmc_header*)rxbuff;

 
 

-                       bytes_read += r;
-               }
+                               if ((res->bTag != sc->usb.bTag) ||
+                                               (res->bTagInverse != (unsigned char)(~sc->usb.bTag))) {
+                                       fprintf(stderr, "Wrong TAG received! We: 0x%02x, Scope: 0x%02x\n", sc->usb.bTag, res->bTag);
+                                       if (sc->usb.brokenRigol == 1) {
+                                               fprintf(stderr, "Tying to restart transfer...\n");
+                                               bytes_read = 0;
+                                               continue;
+                                       }
+                                       return 0;
+                               }
+
+                               if (buff == NULL) {
+                                       len = LE32(res->TransferSize);
+                                       buff=malloc(len);
+                                       if (buff == NULL) {
+                                               perror("malloc");
+                                               exit(EXIT_FAILURE);
+                                       }
+                               }
+                       }
+
+                       if ((sc->usb.brokenRigol == 0) || (transfer_size == USBTMC_IN_TRANSFERSIZE) ||
+                           ((r - sizeof(struct usbtmc_header) >= len))) {
+                               memcpy(buff + bytes_read, rxbuff + headerlen, r - headerlen);
+                               bytes_read += r - headerlen;
+                       }
+
+                       transfer_size = USBTMC_IN_TRANSFERSIZE;
+               } while(bytes_read < len);
+
+               free(req);

 
                /* TODO: FIXME */
                if (bytes_read > resplen) {
 
                /* TODO: FIXME */
                if (bytes_read > resplen) {