X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=4fcc87a076f13c090f2bdb2aa82d2df682b484ac;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=7d0fbf8b21030e080f699c6090b0fa8251b7e8f6;hpb=07962655ecd48304d0663e0a91e54f52076c3f8b;p=libsigrok.git
diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index 7d0fbf8b..4fcc87a0 100644
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -19,6 +19,7 @@
* along with this program. If not, see .
*/
+#include
#include "protocol.h"
static const uint32_t devopts[] = {
@@ -60,7 +61,7 @@ static int dev_clear(const struct sr_dev_driver *di)
struct dev_context *devc;
int ret = SR_OK;
- if (!(drvc = di->priv))
+ if (!(drvc = di->context))
return SR_OK;
/* Properly close and free all devices. */
@@ -219,7 +220,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
}
//Add the driver
- struct drv_context *drvc = di->priv;
+ struct drv_context *drvc = di->context;
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
}
@@ -229,7 +230,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 dev_open(struct sr_dev_inst *sdi)
@@ -445,7 +446,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
/* Reset trigger state. */
devc->trigger_state = 0x00;
- /* Send header packet to the session bus. */
std_session_send_df_header(cb_data, LOG_PREFIX);
/* Our first channel is analog, the other 8 are of type 'logic'. */
@@ -483,5 +483,5 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
.dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};