X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=d4e44b2512b93da5c72e5b240abc2dfc5b8cc224;hb=208c1d35435626a11afa1ab301b2071b2a4e187b;hp=efb9e009c71b4d25f0b3a2fa66a12ca38f443e8e;hpb=07ffa5b315caab0d6d703e04f09035bc0f2b3ee4;p=libsigrok.git diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c index efb9e009..d4e44b25 100644 --- a/src/hardware/gmc-mh-1x-2x/api.c +++ b/src/hardware/gmc-mh-1x-2x/api.c @@ -22,6 +22,7 @@ * @internal */ +#include #include #include "protocol.h" @@ -161,10 +162,9 @@ 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; serialcomm_given = FALSE; sr_spew("scan_1x_2x_rs232() called!"); @@ -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) @@ -466,17 +466,14 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi, struct dev_context *devc; struct sr_serial_dev_inst *serial; - if (!sdi || !cb_data || !(devc = sdi->priv)) - return SR_ERR_BUG; - if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; + devc = sdi->priv; devc->cb_data = cb_data; devc->settings_ok = FALSE; devc->buflen = 0; - /* Send header packet to the session bus. */ std_session_send_df_header(cb_data, LOG_PREFIX); /* Start timer, if required. */ @@ -497,17 +494,14 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi, struct dev_context *devc; struct sr_serial_dev_inst *serial; - if (!sdi || !cb_data || !(devc = sdi->priv)) - return SR_ERR_BUG; - if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; + devc = sdi->priv; devc->cb_data = cb_data; devc->settings_ok = FALSE; devc->buflen = 0; - /* Send header packet to the session bus. */ std_session_send_df_header(cb_data, LOG_PREFIX); /* Start timer, if required. */ @@ -551,7 +545,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 +564,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, };