X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fapi.c;h=fcb0db46e78d95e99872d743c4e62e4a6c639b83;hp=df9cc22e027b55eaab291845107b09e9938ff848;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hpb=1a8639164e4e44a43fe1558e30823606f7b607b3 diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c index df9cc22e..fcb0db46 100644 --- a/src/hardware/mic-985xx/api.c +++ b/src/hardware/mic-985xx/api.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "protocol.h" static const uint32_t scanopts[] = { @@ -79,7 +80,7 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx) if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; - drvc = mic_devs[idx].di->priv; + drvc = mic_devs[idx].di->context; devices = NULL; serial_flush(serial); @@ -146,7 +147,7 @@ static GSList *scan(GSList *options, int idx) static GSList *dev_list(int idx) { - return ((struct drv_context *)(mic_devs[idx].di->priv))->instances; + return ((struct drv_context *)(mic_devs[idx].di->context))->instances; } static int cleanup(int idx) @@ -169,13 +170,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd switch (key) { case SR_CONF_LIMIT_SAMPLES: devc->limit_samples = g_variant_get_uint64(data); - sr_dbg("Setting sample limit to %" PRIu64 ".", - devc->limit_samples); break; case SR_CONF_LIMIT_MSEC: devc->limit_msec = g_variant_get_uint64(data); - sr_dbg("Setting time limit to %" PRIu64 "ms.", - devc->limit_msec); break; default: return SR_ERR_NA; @@ -229,7 +226,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, devc->num_samples = 0; devc->starttime = g_get_monotonic_time(); - /* Send header packet to the session bus. */ std_session_send_df_header(cb_data, LOG_PREFIX); /* Poll every 100ms, or whenever some data comes in. */ @@ -295,7 +291,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .dev_close = std_serial_dev_close, \ .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \ .dev_acquisition_stop = dev_acquisition_stop, \ - .priv = NULL, \ + .context = NULL, \ }; DRV(mic_98581, MIC_98581, "mic-98581", "MIC 98581")