update to libusb-1.0

[rigol] / scope.h

diff --git a/scope.h b/scope.h
index 453aaf6c99f35549e34aeba582f936dd80c6ef9d..6c4f9549621cdf07219df1a24291629fd5c9bc89 100644 (file)
--- a/scope.h
+++ b/scope.h
@@ -40,7 +40,7 @@ struct channel_s {
 
 struct scope {
        struct {
-               struct usb_dev_handle *dev;
+               struct libusb_device_handle *dev;
                int ep_bulk_out;
                int ep_bulk_in;
                unsigned int wMaxPacketSize_in;
@@ -101,6 +101,8 @@ struct scope {
                } timebase;
 
                struct {
+                       char mode[32];
+                       
                        /* TODO */
                } trigger;
 
@@ -109,9 +111,14 @@ struct scope {
                } la;
 
                struct {
-                       /* TODO */
+                       int displayed;
                } math;
+
+               struct {
+                       int displayed;
+               } fft;
        } status;
+
        char idn[128];
 };
 
@@ -128,3 +135,4 @@ int scope_get_int(struct scope *sc, char *cmd);
 double scope_get_double(struct scope *sc, char*cmd);
 void update_scope_measurements(struct scope *sc);
 int update_scope_status(struct scope *sc);
+char *scope_get_data(struct scope *sc, char *source, int *len);