From: Soeren Apel Date: Tue, 3 Oct 2017 11:29:46 +0000 (+0200) Subject: lecroy-xstream: Use best-effort strategy for unknown models X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e7d2cd1e0558594f590f1a4d531c87dd4922c6d9;p=libsigrok.git lecroy-xstream: Use best-effort strategy for unknown models As there is a huge range of supported LeCroy scopes, naming the IDN response for every single one of them is going to be impossible. Hence, it makes more sense to treat all LeCroy devices as if they were scopes and supported. This approach lets users try to see how far they get and if they run into issues, they can then be treated separately - e.g. by creating a custom device profile. Unless we do this, the vast majority of LeCroy scopes will not be recognized by the driver. --- diff --git a/src/hardware/lecroy-xstream/protocol.c b/src/hardware/lecroy-xstream/protocol.c index 63459d0b..ce06c9b4 100644 --- a/src/hardware/lecroy-xstream/protocol.c +++ b/src/hardware/lecroy-xstream/protocol.c @@ -166,7 +166,8 @@ static const char *scope_analog_channel_names[] = { static const struct scope_config scope_models[] = { { - .name = { "WP7000", "WP7100", "WP7200", "WP7300" }, + /* Default config */ + .name = {NULL}, .analog_channels = 4, .analog_names = &scope_analog_channel_names, @@ -455,8 +456,10 @@ SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi) } if (model_index == -1) { - sr_dbg("Unsupported LeCroy device."); - return SR_ERR_NA; + sr_dbg("Unknown LeCroy device, using default config."); + for (i = 0; i < ARRAY_SIZE(scope_models); i++) + if (scope_models[i].name[0] == NULL) + model_index = i; } /* Set the desired response and format modes. */