usbtmc now uses struct scope

[rigol] / usbtmc.h

diff --git a/usbtmc.h b/usbtmc.h
index bae36da5468508feec29615ded18dd04b7c9a29a..519012e04da9aeda12cd8a38cbd9286526be6dca 100644 (file)
--- a/usbtmc.h
+++ b/usbtmc.h
@@ -8,6 +8,7 @@ struct usbtmc_header {
        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
@@ -17,8 +18,8 @@ struct usbtmc_header {
 #define USBTMC_TRANSFERATTRIB_EOM      (1<<0)
 #define USBTMC_TRANSFERATTRIB_TERMCHAR (1<<1)
 
-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);
+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);