X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=a0f033a8291344ccdf1c34b673c184c962057399;hb=ce19d4c6157b2998aa88a2f32670dd7bdcca02e8;hp=d75debb84420510dafdd0dda68e52941eff2e81f;hpb=2ea67fc9bf2b8e777aa45f88477f8880e5bc6286;p=libsigrok.git
diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index d75debb8..a0f033a8 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. */
@@ -213,13 +214,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sdi->driver = di;
sdi->priv = devc;
- for (i = 0; i < NUM_CHANNELS; i++) {
+ for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
chtype = (i == 0) ? SR_CHANNEL_ANALOG : SR_CHANNEL_LOGIC;
sr_channel_new(sdi, i, chtype, TRUE, channel_names[i]);
}
//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)
@@ -483,5 +484,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,
};