X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rigol/blobdiff_plain/7b57506902b8a0b9ba2186eea5e99901e5afa952..c399a4575976d9f60f2fa8b70939413c9afdf3ae:/usbtmc.c

diff --git a/usbtmc.c b/usbtmc.c
index 5b07ade..85842ec 100644
--- a/usbtmc.c
+++ b/usbtmc.c
@@ -17,7 +17,7 @@
 #error BYTE_ORDER not defined/known!
 #endif
 
-#define USB_ERROR(x) do { if (x < 0) { fprintf(stderr, "usb: %s\n", usb_strerror()); exit(EXIT_FAILURE); } } while(0)
+#define USB_ERROR(s, x) do { if (x < 0) { fprintf(stderr, "usb %s: %s\n", s, usb_strerror()); usb_reset(sc->usb.dev); return 0; } } while(0)
 
 /* This routine locates a scope by VID/PID and returns a struct scope* for it */
 static struct scope* usbtmc_find_scope() {
@@ -47,8 +47,8 @@ static struct scope* usbtmc_find_scope() {
 
 				/* TODO: FIXME */
 				sc->usb.brokenRigol = 1;
-				sc->usb.ep_bulk_out = 1;
-				sc->usb.ep_bulk_in = 2;
+				sc->usb.ep_bulk_out = 0x01;
+				sc->usb.ep_bulk_in = 0x82;
 				sc->usb.wMaxPacketSize_in = 0x40;
 				
 				return sc;
@@ -59,6 +59,22 @@ static struct scope* usbtmc_find_scope() {
 	return NULL;
 }
 
+unsigned char usbtmc_status(struct scope *sc)
+{
+	int r;
+	unsigned char status[3];
+
+	sc->usb.bTag++;
+
+	r = usb_control_msg(sc->usb.dev, 0xA1, 128, (sc->usb.bTag & 0x7f), 0, (char*)status, 3, USB_TIMEOUT);
+	if ((r != 3) || (status[0] != 0x01) || (status[1] != (sc->usb.bTag & 0x7f))) {
+		printf("READ_STATUS_BYTE failed: %d 0x%x 0x%x 0x%x\n", r, status[0], status[1], status[2]);
+		return 0xff;
+	}
+
+	return status[2];
+}
+
 /*
  * Send a scpi-command to the scope. The response goes into the buffer
  * called resp, with a size of resplen. If resp==NULL, no response
@@ -93,16 +109,16 @@ int usbtmc_sendscpi(struct scope *sc, char* cmd,
 		r=usb_bulk_write(sc->usb.dev, sc->usb.ep_bulk_out,
 			(char*)req, sizeof(struct usbtmc_header),
 			USB_TIMEOUT);
-		USB_ERROR(r);
+		USB_ERROR("USBTMC_DEV_DEP_MSG_OUT1", r);
 
 		r=usb_bulk_write(sc->usb.dev, sc->usb.ep_bulk_out,
 			(char*)&(req->msg), len - sizeof(struct usbtmc_header),
 			USB_TIMEOUT);
-		USB_ERROR(r);
+		USB_ERROR("USBTMC_DEV_DEP_MSG_OUT2", r);
 	} else {
 		r=usb_bulk_write(sc->usb.dev, sc->usb.ep_bulk_out,
 			(char*)req, len, USB_TIMEOUT);
-		USB_ERROR(r);
+		USB_ERROR("USBTMC_DEV_DEP_MSG_OUT", r);
 	}
 
 	free(req);
@@ -124,13 +140,13 @@ int usbtmc_sendscpi(struct scope *sc, char* cmd,
 		req->bTag = sc->usb.bTag;
 		req->bTagInverse = ~sc->usb.bTag;
 		req->TransferSize = LE32(sc->usb.wMaxPacketSize_in);
-		req->bmTransferAttributes = 0;
+		req->bmTransferAttributes = USBTMC_TRANSFERATTRIB_EOM;
 		req->TermChar = 0;
 
 		/* 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(r);
+		USB_ERROR("USBTMC_REQUEST_DEV_DEP_MSG_IN", r);
 
 		free(req);
 
@@ -142,7 +158,7 @@ int usbtmc_sendscpi(struct scope *sc, char* cmd,
 
 		r=usb_bulk_read(sc->usb.dev, sc->usb.ep_bulk_in,
 			(char*)buff, sc->usb.wMaxPacketSize_in, USB_TIMEOUT);
-		USB_ERROR(r);
+		USB_ERROR("USBTMC_DEV_DEP_MSG_IN1", r);
 
 		if (r < sizeof(struct usbtmc_header)) {
 			fprintf(stderr, "Short read!\n");
@@ -166,7 +182,7 @@ int usbtmc_sendscpi(struct scope *sc, char* cmd,
 			r=usb_bulk_read(sc->usb.dev, sc->usb.ep_bulk_in,
 				(char*)buff + bytes_read, len - bytes_read,
 				USB_TIMEOUT);
-			USB_ERROR(r);
+			USB_ERROR("USBTMC_DEV_DEP_MSG_INx", r);
 
 			bytes_read += r;
 		}
@@ -199,7 +215,7 @@ void usbtmc_release(struct scope *sc)
 //Initialize the scope.
 struct scope* usbtmc_initscope(void) {
 	int r;
-	unsigned char buff[10];
+	uint32_t vidpid;
 	struct scope *sc;
 
 	/* Init libusb */
@@ -213,7 +229,7 @@ struct scope* usbtmc_initscope(void) {
 	usbtmc_claim(sc);
 	/* The following code isn't really necessary, the program works
 	   OK without it too. */
-	r=usb_control_msg(sc->usb.dev, 0xC8, 9, 0, 0, (char*)buff, 4, USB_TIMEOUT);
+	r=usb_control_msg(sc->usb.dev, 0xC8, 9, 0, 0, (char*)&vidpid, 4, USB_TIMEOUT);
 	usbtmc_release(sc);
 	if (r < 0) {
 		fprintf (stderr, "Error %d sending init message: %s\n", 
@@ -221,8 +237,8 @@ struct scope* usbtmc_initscope(void) {
 		fprintf (stderr, "Do you have permission on the USB device?\n");
 		exit (1);
 	}
-	if (LE32((*(uint32_t*)buff))!=0x40005dc) {
-		fprintf(stderr,"Init: buff[%i]=%x\n",r,LE32((*(uint32_t*)buff)));
+	if (LE32(vidpid)!=0x40005dc) {
+		fprintf(stderr,"Init: buff[%i]=%x\n",r,LE32(vidpid));
 	}
 	return sc;
 }