X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fprotocol.h;h=36ee281a8e2e63bfa32d1af73f20117ca9e3dcd6;hb=HEAD;hp=2ad9e857b3f3d377df2b81e926fabda060026e5d;hpb=945cfd4fdd3d2aa2758e1957c7c4c1440badcf8b;p=libsigrok.git

diff --git a/src/hardware/atten-pps3xxx/protocol.h b/src/hardware/atten-pps3xxx/protocol.h
index 2ad9e857..f9409c2d 100644
--- 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];
@@ -71,18 +71,15 @@ struct per_channel_config {
 	gboolean output_enabled_set;
 };
 
-/** 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;
 
-	/* 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;
@@ -90,7 +87,6 @@ struct dev_context {
 	int channel_mode_set;
 	gboolean over_current_protection_set;
 
-	/* Temporary state across callbacks */
 	uint8_t packet[PACKET_SIZE];
 	int packet_size;