lecroy-xstream: Drop some unneeded "lecroy_" prefixes.

For the time being this driver only handles LeCroy devices, so those
prefixes are not needed.

diff --git a/src/hardware/lecroy-xstream/api.c b/src/hardware/lecroy-xstream/api.c
index ed3603a28d907e216515abdfd472f736f4ae96be..d859681545f6a1bac236ab6496105b1ceb7b8186 100644 (file)
--- a/src/hardware/lecroy-xstream/api.c
+++ b/src/hardware/lecroy-xstream/api.c
@@ -472,7 +472,7 @@ SR_PRIV int lecroy_xstream_request_data(const struct sr_dev_inst *sdi)
        return sr_scpi_send(sdi->conn, command);
 }
 
-static int lecroy_setup_channels(const struct sr_dev_inst *sdi)
+static int setup_channels(const struct sr_dev_inst *sdi)
 {
        GSList *l;
        gboolean setup_changed;
@@ -550,7 +550,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
         * Configure the analog channels and the
         * corresponding digital pods.
         */
-       if (lecroy_setup_channels(sdi) != SR_OK) {
+       if (setup_channels(sdi) != SR_OK) {
                sr_err("Failed to setup channel configuration!");
                ret = SR_ERR;
                goto free_enabled;

diff --git a/src/hardware/lecroy-xstream/protocol.c b/src/hardware/lecroy-xstream/protocol.c
index b4fae5bfc93aca32364be74e16e94384b65a16ce..066bed2f04593d9d60b328d54fa8fbb90a0a8b08 100644 (file)
--- a/src/hardware/lecroy-xstream/protocol.c
+++ b/src/hardware/lecroy-xstream/protocol.c
@@ -74,7 +74,7 @@ struct lecroy_wavedesc {
        };
 } __attribute__((packed));
 
-static const uint32_t lecroy_devopts[] = {
+static const uint32_t devopts[] = {
        SR_CONF_OSCILLOSCOPE,
        SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
@@ -85,13 +85,13 @@ static const uint32_t lecroy_devopts[] = {
        SR_CONF_SAMPLERATE | SR_CONF_GET,
 };
 
-static const uint32_t lecroy_analog_devopts[] = {
+static const uint32_t analog_devopts[] = {
        SR_CONF_NUM_VDIV | SR_CONF_GET,
        SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-static const char *lecroy_coupling_options[] = {
+static const char *coupling_options[] = {
        "A1M", // AC with 1 MOhm termination
        "D50", // DC with 50 Ohm termination
        "D1M", // DC with 1 MOhm termination
@@ -106,7 +106,7 @@ static const char *scope_trigger_slopes[] = {
        NULL,
 };
 
-static const char *lecroy_xstream_trigger_sources[] = {
+static const char *trigger_sources[] = {
        "C1",
        "C2",
        "C3",
@@ -116,7 +116,7 @@ static const char *lecroy_xstream_trigger_sources[] = {
        NULL,
 };
 
-static const struct sr_rational lecroy_timebases[] = {
+static const struct sr_rational timebases[] = {
        /* picoseconds */
        { 20, 1000000000000 },
        { 50, 1000000000000 },
@@ -166,7 +166,7 @@ static const struct sr_rational lecroy_timebases[] = {
        { 1000, 1 },
 };
 
-static const struct sr_rational lecroy_vdivs[] = {
+static const struct sr_rational vdivs[] = {
        /* millivolts */
        { 1, 1000 },
        { 2, 1000 },
@@ -200,21 +200,21 @@ static const struct scope_config scope_models[] = {
                .analog_channels = 4,
                .analog_names = &scope_analog_channel_names,
 
-               .devopts = &lecroy_devopts,
-               .num_devopts = ARRAY_SIZE(lecroy_devopts),
+               .devopts = &devopts,
+               .num_devopts = ARRAY_SIZE(devopts),
 
-               .analog_devopts = &lecroy_analog_devopts,
-               .num_analog_devopts = ARRAY_SIZE(lecroy_analog_devopts),
+               .analog_devopts = &analog_devopts,
+               .num_analog_devopts = ARRAY_SIZE(analog_devopts),
 
-               .coupling_options = &lecroy_coupling_options,
-               .trigger_sources = &lecroy_xstream_trigger_sources,
+               .coupling_options = &coupling_options,
+               .trigger_sources = &trigger_sources,
                .trigger_slopes = &scope_trigger_slopes,
 
-               .timebases = lecroy_timebases,
-               .num_timebases = ARRAY_SIZE(lecroy_timebases),
+               .timebases = timebases,
+               .num_timebases = ARRAY_SIZE(timebases),
 
-               .vdivs = lecroy_vdivs,
-               .num_vdivs = ARRAY_SIZE(lecroy_vdivs),
+               .vdivs = vdivs,
+               .num_vdivs = ARRAY_SIZE(vdivs),
 
                .num_xdivs = 10,
                .num_ydivs = 8,
@@ -315,8 +315,7 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
                if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK)
                        return SR_ERR;
 
-                if (array_float_get(tmp_str, lecroy_vdivs, ARRAY_SIZE(lecroy_vdivs),
-                                   &j) != SR_OK) {
+                if (array_float_get(tmp_str, vdivs, ARRAY_SIZE(vdivs), &j) != SR_OK) {
                        g_free(tmp_str);
                        sr_err("Could not determine array index for vertical div scale.");
                        return SR_ERR;
@@ -390,8 +389,7 @@ SR_PRIV int lecroy_xstream_state_get(struct sr_dev_inst *sdi)
        if (sr_scpi_get_string(sdi->conn, "TIME_DIV?", &tmp_str) != SR_OK)
                return SR_ERR;
 
-       if (array_float_get(tmp_str, lecroy_timebases, ARRAY_SIZE(lecroy_timebases),
-                           &i) != SR_OK) {
+       if (array_float_get(tmp_str, timebases, ARRAY_SIZE(timebases), &i) != SR_OK) {
                g_free(tmp_str);
                sr_err("Could not determine array index for timbase scale.");
                return SR_ERR;