X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkern-scale%2Fprotocol.h;h=dcfe06cbdadf4ce968084002045f34fb5771ee1c;hb=8a63a4064eb5a759dd438e5d1fe9e9d21d7a3e69;hp=9be375f7b8867d69b9912c02f8bdf80ed78ad6b6;hpb=5faebab2903dc91949edc31f0a4b118d86090a30;p=libsigrok.git diff --git a/src/hardware/kern-scale/protocol.h b/src/hardware/kern-scale/protocol.h index 9be375f7..dcfe06cb 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;