X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkern-scale%2Fprotocol.h;h=ba4942ad6795d9a3efaa8c8d0b21371daca9207a;hb=4154a516de818ace3aabfe5e44cf4c81986074e7;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..ba4942ad 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. */ @@ -49,20 +49,7 @@ struct scale_info { /** Private, per-device-instance driver context. */ struct dev_context { - /** The current sampling limit (in number of samples). */ - uint64_t limit_samples; - - /** 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; - - /** The starting time of current sampling run. */ - int64_t starttime; + struct sr_sw_limits limits; uint8_t buf[SCALE_BUFSIZE]; int bufoffset;