X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcenter-3xx%2Fapi.c;h=7fe70fa9a8030bc01223d053849973c7eb8dcecc;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=1d2a5669831a28c2fac8a1ddf356744c46ef155d;hpb=0f34cb472368be61aa2e7bc9d9d1b25bb28aa560;p=libsigrok.git diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c index 1d2a5669..7fe70fa9 100644 --- a/src/hardware/center-3xx/api.c +++ b/src/hardware/center-3xx/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 *center_scan(const char *conn, const char *serialcomm, int idx) if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; - drvc = center_devs[idx].di->priv; + drvc = center_devs[idx].di->context; devices = NULL; serial_flush(serial); @@ -140,7 +141,7 @@ static GSList *scan(GSList *options, int idx) static GSList *dev_list(int idx) { - return ((struct drv_context *)(center_devs[idx].di->priv))->instances; + return ((struct drv_context *)(center_devs[idx].di->context))->instances; } static int cleanup(int idx) @@ -217,7 +218,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 500ms, or whenever some data comes in. */ @@ -278,7 +278,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(center_309, CENTER_309, "center-309", "Center 309")