rigol-ds: Add DS1074Z Plus and DS1104Z Plus.

[libsigrok.git] / src / hardware / atten-pps3xxx / protocol.h

diff --git a/src/hardware/atten-pps3xxx/protocol.h b/src/hardware/atten-pps3xxx/protocol.h
index 2ad9e857b3f3d377df2b81e926fabda060026e5d..b9a256d17ab820daf73e631890a70bc6ad05278b 100644 (file)
--- a/src/hardware/atten-pps3xxx/protocol.h
+++ b/src/hardware/atten-pps3xxx/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "atten-pps3xxx"
@@ -54,7 +54,7 @@ struct channel_spec {
 
 struct pps_model {
        int modelid;
-       char *name;
+       const char *name;
        int channel_modes;
        int num_channels;
        struct channel_spec channels[MAX_CHANNELS];
@@ -74,7 +74,7 @@ struct per_channel_config {
 /** Private, per-device-instance driver context. */
 struct dev_context {
        /* Model-specific information */
-       struct pps_model *model;
+       const struct pps_model *model;
 
        /* Acquisition state */
        gboolean acquisition_running;
@@ -82,7 +82,8 @@ struct dev_context {
        /* Operational state */
        gboolean config_dirty;
        struct per_channel_config *config;
-       float byte_delay_ms;
+       /* Blocking write timeout for packet. */
+       int delay_ms;
        /* Received from device. */
        int channel_mode;
        gboolean over_current_protection;