Introduce standard implementation of the dev_list() callback

[libsigrok.git] / src / hardware / kern-scale / protocol.h

diff --git a/src/hardware/kern-scale/protocol.h b/src/hardware/kern-scale/protocol.h
index a7f11d2379ce5029ac2106442e7e26209e4bdf45..fe8ae8db9d93328229dea9f754c7550495c399bb 100644 (file)
--- 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;