usbtmc now uses struct scope

[rigol] / usbtmc.h

diff --git a/usbtmc.h b/usbtmc.h
index 1ac3005e233ccaf4d4db277167d64997daf3304f..519012e04da9aeda12cd8a38cbd9286526be6dca 100644 (file)
--- a/usbtmc.h
+++ b/usbtmc.h
@@ -1,5 +1,25 @@
-int usbtmc_sendscpi(struct usb_dev_handle *dev, char* cmd, unsigned char *resp, int resplen);
-struct usb_dev_handle* usbtmc_initscope(void);
-void usbtmc_close(struct usb_dev_handle *sc);
-void usbtmc_claim(struct usb_dev_handle *sc);
-void usbtmc_release(struct usb_dev_handle *sc);
+struct usbtmc_header {
+       unsigned char MsgID;
+       unsigned char bTag;
+       unsigned char bTagInverse;
+       unsigned char Reserved3;
+       uint32_t TransferSize;
+       unsigned char bmTransferAttributes;
+       unsigned char TermChar; /* Only in REQUEST_DEV_DEP_MSG_IN */
+       unsigned char Reverved10;
+       unsigned char Reverved11;
+       unsigned char msg[];
+} __attribute__ ((__packed__));
+
+#define USBTMC_DEV_DEP_MSG_OUT         0x1
+#define USBTMC_REQUEST_DEV_DEP_MSG_IN  0x2
+#define USBTMC_DEV_DEP_MSG_IN          0x2
+
+#define USBTMC_TRANSFERATTRIB_EOM      (1<<0)
+#define USBTMC_TRANSFERATTRIB_TERMCHAR (1<<1)
+
+int usbtmc_sendscpi(struct scope *sc, char* cmd, unsigned char *resp, int resplen);
+struct scope * usbtmc_initscope(void);
+void usbtmc_close(struct scope *sc);
+void usbtmc_claim(struct scope *sc);
+void usbtmc_release(struct scope *sc);