X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkern-scale%2Fprotocol.h;h=fe8ae8db9d93328229dea9f754c7550495c399bb;hb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;hp=a7f11d2379ce5029ac2106442e7e26209e4bdf45;hpb=607dcdeae13d04fd5c6d41da46d9c29a04206a86;p=libsigrok.git

diff --git a/src/hardware/kern-scale/protocol.h b/src/hardware/kern-scale/protocol.h
index a7f11d23..fe8ae8db 100644
--- a/src/hardware/kern-scale/protocol.h
+++ b/src/hardware/kern-scale/protocol.h
@@ -27,11 +27,11 @@ struct scale_info {
 	/** libsigrok driver info struct. */
 	struct sr_dev_driver di;
 	/** Manufacturer/brand. */
-	char *vendor;
+	const char *vendor;
 	/** Model. */
-	char *device;
+	const char *device;
 	/** serialconn string. */
-	char *conn;
+	const char *conn;
 	/** Baud rate. */
 	uint32_t baudrate;
 	/** Packet size in bytes. */
@@ -40,7 +40,7 @@ struct scale_info {
 	gboolean (*packet_valid)(const uint8_t *);
 	/** Packet parsing function. */
 	int (*packet_parse)(const uint8_t *, float *,
-			    struct sr_datafeed_analog *, void *);
+			    struct sr_datafeed_analog_old *, void *);
 	/** Size of chipset info struct. */
 	gsize info_size;
 };
@@ -55,9 +55,6 @@ struct dev_context {
 	/** The time limit (in milliseconds). */
 	uint64_t limit_msec;
 
-	/** Opaque pointer passed in by the frontend. */
-	void *cb_data;
-
 	/** The current number of already received samples. */
 	uint64_t num_samples;