X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-dmm%2Fapi.c;h=808778db136999e3e5d3423255cac205ffae8e58;hb=069d9f25d9f63e35885a7e4c83e8587f0356d8f9;hp=4c6e2c18aeff25bb7c2572c4ea811904ccd6b6f4;hpb=1a46cc62e2b528bcaeb1f8dc0c952a81b3bcba5c;p=libsigrok.git diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c index 4c6e2c18..808778db 100644 --- a/src/hardware/fluke-dmm/api.c +++ b/src/hardware/fluke-dmm/api.c @@ -17,13 +17,13 @@ * along with this program. If not, see . */ +#include #include #include #include #include #include -#include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #include "fluke-dmm.h" @@ -79,7 +79,7 @@ static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn, if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; - drvc = di->priv; + drvc = di->context; b = buf; retry = 0; devices = NULL; @@ -190,7 +190,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) static GSList *dev_list(const struct sr_dev_driver *di) { - return ((struct drv_context *)(di->priv))->instances; + return ((struct drv_context *)(di->context))->instances; } static int cleanup(const struct sr_dev_driver *di) @@ -305,5 +305,5 @@ SR_PRIV struct sr_dev_driver flukedmm_driver_info = { .dev_close = std_serial_dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };