X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=890fec47d1bd5ef6da1f1930f5baf46493097d0e;hp=efb9e009c71b4d25f0b3a2fa66a12ca38f443e8e;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hpb=c11a1e6122998b247df66c59d2076eb814818497 diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c index efb9e009..890fec47 100644 --- a/src/hardware/gmc-mh-1x-2x/api.c +++ b/src/hardware/gmc-mh-1x-2x/api.c @@ -161,7 +161,7 @@ static GSList *scan_1x_2x_rs232(struct sr_dev_driver *di, GSList *options) gboolean serialcomm_given; devices = NULL; - drvc = di->priv; + drvc = di->context; drvc->instances = NULL; conn = serialcomm = NULL; model = METRAHIT_NONE; @@ -256,7 +256,7 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options) conn = serialcomm = NULL; devices = NULL; - drvc = di->priv; + drvc = di->context; drvc->instances = NULL; sr_spew("scan_2x_bd232() called!"); @@ -354,7 +354,7 @@ exit_err: 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_close(struct sr_dev_inst *sdi) @@ -551,7 +551,7 @@ SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start_1x_2x_rs232, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, }; SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info = { @@ -570,5 +570,5 @@ SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start_2x_bd232, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };