X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcolead-slm%2Fapi.c;h=5d350ec5fcf98d9067da2a03903372c5001cc456;hb=035a1078fda93cf1da37d19b3a1d95311b99b00f;hp=098ba92ffa397a7d5a36534ff84c1e9dd4225e5b;hpb=1987b8d63e748f0813dc6a4630e99686e4fe1728;p=libsigrok.git diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c index 098ba92f..5d350ec5 100644 --- a/hardware/colead-slm/api.c +++ b/hardware/colead-slm/api.c @@ -31,16 +31,16 @@ #define SERIALCOMM "2400/8n1" static const int hwopts[] = { - SR_HWOPT_CONN, - SR_HWOPT_SERIALCOMM, + SR_CONF_CONN, + SR_CONF_SERIALCOMM, 0, }; static const int hwcaps[] = { - SR_HWCAP_SOUNDLEVELMETER, - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_LIMIT_MSEC, - SR_HWCAP_CONTINUOUS, + SR_CONF_SOUNDLEVELMETER, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_LIMIT_MSEC, + SR_CONF_CONTINUOUS, 0, }; @@ -105,10 +105,10 @@ static GSList *hw_scan(GSList *options) for (l = options; l; l = l->next) { src = l->data; switch (src->key) { - case SR_HWOPT_CONN: + case SR_CONF_CONN: conn = src->value; break; - case SR_HWOPT_SERIALCOMM: + case SR_CONF_SERIALCOMM: serialcomm = src->value; break; } @@ -191,12 +191,11 @@ static int hw_cleanup(void) return SR_OK; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) { (void)sdi; - switch (info_id) { + switch (id) { case SR_DI_HWOPTS: *data = hwopts; break; @@ -210,8 +209,7 @@ static int hw_info_get(int info_id, const void **data, return SR_OK; } -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -223,8 +221,8 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, return SR_ERR_BUG; } - switch (hwcap) { - case SR_HWCAP_LIMIT_MSEC: + switch (id) { + case SR_CONF_LIMIT_MSEC: /* TODO: not yet implemented */ if (*(const uint64_t *)value == 0) { sr_err("LIMIT_MSEC can't be 0."); @@ -234,13 +232,13 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, sr_dbg("Setting time limit to %" PRIu64 "ms.", devc->limit_msec); break; - case SR_HWCAP_LIMIT_SAMPLES: + case SR_CONF_LIMIT_SAMPLES: devc->limit_samples = *(const uint64_t *)value; sr_dbg("Setting sample limit to %" PRIu64 ".", devc->limit_samples); break; default: - sr_err("Unknown capability: %d.", hwcap); + sr_err("Unknown capability: %d.", id); return SR_ERR; break; } @@ -314,10 +312,10 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info = { .scan = hw_scan, .dev_list = hw_dev_list, .dev_clear = clear_instances, + .config_get = config_get, + .config_set = config_set, .dev_open = hw_dev_open, .dev_close = hw_dev_close, - .info_get = hw_info_get, - .dev_config_set = hw_dev_config_set, .dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_stop = hw_dev_acquisition_stop, .priv = NULL,