X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=e40066b0c0eeb9ed16bfc9e03f012c181ba629c3;hb=f8195cb2da3268c89e24071ed32ab9acdded5bc0;hp=22ba0e3d1270004879b2d150661ae8215d86aeec;hpb=5faebab2903dc91949edc31f0a4b118d86090a30;p=libsigrok.git
diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 22ba0e3d..e40066b0 100644
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -18,56 +18,31 @@
* along with this program. If not, see .
*/
-/**
- * @file
- *
- * Yokogawa DL/DLM series oscilloscope driver
- * @internal
- */
-
#include
#include "scpi.h"
#include "protocol.h"
-static const char *dlm_coupling_options[] = {
- "AC",
- "DC",
- "DC50",
- "GND",
+static const char *coupling_options[] = {
+ "AC", "DC", "DC50", "GND",
NULL,
};
-static const char *dlm_2ch_trigger_sources[] = {
- "1",
- "2",
- "LINE",
- "EXT",
+static const char *trigger_sources_2ch[] = {
+ "1", "2", "LINE", "EXT",
NULL,
};
/* TODO: Is BITx handled correctly or is Dx required? */
-static const char *dlm_4ch_trigger_sources[] = {
- "1",
- "2",
- "3",
- "4",
- "LINE",
- "EXT",
- "BIT1",
- "BIT2",
- "BIT3",
- "BIT4",
- "BIT5",
- "BIT6",
- "BIT7",
- "BIT8",
+static const char *trigger_sources_4ch[] = {
+ "1", "2", "3", "4",
+ "LINE", "EXT", "BIT1",
+ "BIT2", "BIT3", "BIT4", "BIT5", "BIT6", "BIT7", "BIT8",
NULL,
};
/* Note: Values must correlate to the trigger_slopes values. */
const char *dlm_trigger_slopes[3] = {
- "r",
- "f",
+ "r", "f",
NULL,
};
@@ -137,56 +112,18 @@ const uint64_t dlm_vdivs[17][2] = {
};
static const char *scope_analog_channel_names[] = {
- "1",
- "2",
- "3",
- "4",
+ "1", "2", "3", "4",
};
static const char *scope_digital_channel_names_8[] = {
- "D0",
- "D1",
- "D2",
- "D3",
- "D4",
- "D5",
- "D6",
- "D7",
+ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
};
static const char *scope_digital_channel_names_32[] = {
- "A0",
- "A1",
- "A2",
- "A3",
- "A4",
- "A5",
- "A6",
- "A7",
- "B0",
- "B1",
- "B2",
- "B3",
- "B4",
- "B5",
- "B6",
- "B7",
- "C0",
- "C1",
- "C2",
- "C3",
- "C4",
- "C5",
- "C6",
- "C7",
- "D0",
- "D1",
- "D2",
- "D3",
- "D4",
- "D5",
- "D6",
- "D7",
+ "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
+ "B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7",
+ "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7",
+ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
};
static const struct scope_config scope_models[] = {
@@ -200,15 +137,15 @@ static const struct scope_config scope_models[] = {
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names_8,
- .coupling_options = &dlm_coupling_options,
- .trigger_sources = &dlm_2ch_trigger_sources,
+ .coupling_options = &coupling_options,
+ .trigger_sources = &trigger_sources_2ch,
.num_xdivs = 10,
.num_ydivs = 8,
},
{
- .model_id = {"710110", "710120", "710130", NULL},
- .model_name = {"DLM2024", "DLM2034", "DLM2054", NULL},
+ .model_id = {"710110", "710120", "710130", NULL},
+ .model_name = {"DLM2024", "DLM2034", "DLM2054", NULL},
.analog_channels = 4,
.digital_channels = 8,
.pods = 1,
@@ -216,17 +153,17 @@ static const struct scope_config scope_models[] = {
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names_8,
- .coupling_options = &dlm_coupling_options,
- .trigger_sources = &dlm_4ch_trigger_sources,
+ .coupling_options = &coupling_options,
+ .trigger_sources = &trigger_sources_4ch,
.num_xdivs = 10,
.num_ydivs = 8,
},
{
.model_id = {"701307", "701308", "701310", "701311",
- "701312", "701313", NULL},
+ "701312", "701313", NULL},
.model_name = {"DL9040", "DL9040L", "DL9140", "DL9140L",
- "DL9240", "DL9240L", NULL},
+ "DL9240", "DL9240L", NULL},
.analog_channels = 4,
.digital_channels = 0,
.pods = 0,
@@ -234,8 +171,8 @@ static const struct scope_config scope_models[] = {
.analog_names = &scope_analog_channel_names,
.digital_names = NULL,
- .coupling_options = &dlm_coupling_options,
- .trigger_sources = &dlm_4ch_trigger_sources,
+ .coupling_options = &coupling_options,
+ .trigger_sources = &trigger_sources_4ch,
.num_xdivs = 10,
.num_ydivs = 8,
@@ -250,8 +187,8 @@ static const struct scope_config scope_models[] = {
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names_32,
- .coupling_options = &dlm_coupling_options,
- .trigger_sources = &dlm_4ch_trigger_sources,
+ .coupling_options = &coupling_options,
+ .trigger_sources = &trigger_sources_4ch,
.num_xdivs = 10,
.num_ydivs = 8,
@@ -266,8 +203,8 @@ static const struct scope_config scope_models[] = {
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names_32,
- .coupling_options = &dlm_coupling_options,
- .trigger_sources = &dlm_4ch_trigger_sources,
+ .coupling_options = &coupling_options,
+ .trigger_sources = &trigger_sources_4ch,
.num_xdivs = 10,
.num_ydivs = 8,
@@ -305,7 +242,7 @@ static void scope_state_dump(const struct scope_config *config,
state->pod_states[i] ? "On" : "Off");
}
- tmp = sr_period_string(dlm_timebases[state->timebase][0] *
+ tmp = sr_period_string(dlm_timebases[state->timebase][0],
dlm_timebases[state->timebase][1]);
sr_info("Current timebase: %s", tmp);
g_free(tmp);
@@ -372,7 +309,8 @@ static int array_option_get(char *value, const char *(*array)[],
static int array_float_get(gchar *value, const uint64_t array[][2],
int array_len, int *result)
{
- int i;
+ int i, e;
+ size_t pos;
uint64_t f;
float s;
unsigned int s_int;
@@ -381,28 +319,38 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
memset(ss, 0, sizeof(ss));
memset(es, 0, sizeof(es));
- strncpy(ss, value, 5);
- strncpy(es, &(value[6]), 3);
+ /* Get index of the separating 'E' character and break up the string. */
+ pos = strcspn(value, "E");
+
+ strncpy(ss, value, pos);
+ strncpy(es, &(value[pos+1]), 3);
if (sr_atof_ascii(ss, &s) != SR_OK)
return SR_ERR;
- if (sr_atoi(es, &i) != SR_OK)
+ if (sr_atoi(es, &e) != SR_OK)
return SR_ERR;
/* Transform e.g. 10^-03 to 1000 as the array stores the inverse. */
- f = pow(10, abs(i));
+ f = pow(10, abs(e));
/*
* Adjust the significand/factor pair to make sure
* that f is a multiple of 1000.
*/
- while ((int)fmod(log10(f), 3) > 0) { s *= 10; f *= 10; }
+ while ((int)fmod(log10(f), 3) > 0) {
+ s *= 10;
+
+ if (e < 0)
+ f *= 10;
+ else
+ f /= 10;
+ }
/* Truncate s to circumvent rounding errors. */
s_int = (unsigned int)s;
for (i = 0; i < array_len; i++) {
- if ( (s_int == array[i][0]) && (f == array[i][1]) ) {
+ if ((s_int == array[i][0]) && (f == array[i][1])) {
*result = i;
return SR_OK;
}
@@ -450,7 +398,7 @@ static int analog_channel_state_get(const struct sr_dev_inst *sdi,
if (dlm_analog_chan_vdiv_get(scpi, i + 1, &response) != SR_OK)
return SR_ERR;
- if (array_float_get(response, dlm_vdivs, ARRAY_SIZE(dlm_vdivs),
+ if (array_float_get(response, ARRAY_AND_SIZE(dlm_vdivs),
&j) != SR_OK) {
g_free(response);
return SR_ERR;
@@ -688,8 +636,7 @@ SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi)
if (dlm_timebase_get(sdi->conn, &response) != SR_OK)
return SR_ERR;
- if (array_float_get(response, dlm_timebases,
- ARRAY_SIZE(dlm_timebases), &i) != SR_OK) {
+ if (array_float_get(response, ARRAY_AND_SIZE(dlm_timebases), &i) != SR_OK) {
g_free(response);
return SR_ERR;
}
@@ -953,7 +900,10 @@ static int dlm_analog_samples_send(GArray *data,
struct dev_context *devc;
struct scope_state *model_state;
struct sr_channel *ch;
- struct sr_datafeed_analog_old analog;
+ struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct sr_datafeed_packet packet;
devc = sdi->priv;
@@ -981,16 +931,18 @@ static int dlm_analog_samples_send(GArray *data,
g_array_append_val(float_data, voltage);
}
- analog.channels = g_slist_append(NULL, ch);
+ /* TODO: Use proper 'digits' value for this device (and its modes). */
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
+ analog.meaning->channels = g_slist_append(NULL, ch);
analog.num_samples = float_data->len;
analog.data = (float*)float_data->data;
- analog.mq = SR_MQ_VOLTAGE;
- analog.unit = SR_UNIT_VOLT;
- analog.mqflags = 0;
- packet.type = SR_DF_ANALOG_OLD;
+ analog.meaning->mq = SR_MQ_VOLTAGE;
+ analog.meaning->unit = SR_UNIT_VOLT;
+ analog.meaning->mqflags = 0;
+ packet.type = SR_DF_ANALOG;
packet.payload = &analog;
sr_session_send(sdi, &packet);
- g_slist_free(analog.channels);
+ g_slist_free(analog.meaning->channels);
g_array_free(float_data, TRUE);
g_array_remove_range(data, 0, samples * sizeof(uint8_t));
@@ -1155,7 +1107,7 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
* As of now we only support importing the current acquisition
* data so we're going to stop at this point.
*/
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ sr_dev_acquisition_stop(sdi);
return TRUE;
} else
devc->current_channel = devc->current_channel->next;