X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-dmm%2Fapi.c;h=1b4ce404bdf8df3a94e515bce888f038f26b4328;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hp=36142fd5587cd3614259a160dff1642bf94b4472;hpb=dcd438ee3523098201c7937e75e55775da3b506f;p=libsigrok.git diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c index 36142fd5..1b4ce404 100644 --- a/src/hardware/fluke-dmm/api.c +++ b/src/hardware/fluke-dmm/api.c @@ -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; @@ -181,7 +181,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) break; /* The Scopemeter 199B, at least, requires this * after all the 115k/9.6k confusion. */ - g_usleep(5000); + g_usleep(5 * 1000); } } @@ -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, };