X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=06dae50f7cd9a3979692371138df4ad8b91b3f0b;hp=e63e6357f0cc3a130ec49feaa38706fffb23911c;hb=HEAD;hpb=10c4ca9c5bd9b2e917759e9fddc6f8655895b92c
diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index e63e6357..06dae50f 100644
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -18,57 +18,28 @@
* 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",
- NULL,
+static const char *coupling_options[] = {
+ "AC", "DC", "DC50", "GND",
};
-static const char *dlm_2ch_trigger_sources[] = {
- "1",
- "2",
- "LINE",
- "EXT",
- NULL,
+static const char *trigger_sources_2ch[] = {
+ "1", "2", "LINE", "EXT",
};
/* 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",
- NULL,
+static const char *trigger_sources_4ch[] = {
+ "1", "2", "3", "4",
+ "LINE", "EXT", "BIT1",
+ "BIT2", "BIT3", "BIT4", "BIT5", "BIT6", "BIT7", "BIT8",
};
/* Note: Values must correlate to the trigger_slopes values. */
-const char *dlm_trigger_slopes[3] = {
- "r",
- "f",
- NULL,
+const char *dlm_trigger_slopes[2] = {
+ "r", "f",
};
const uint64_t dlm_timebases[36][2] = {
@@ -137,56 +108,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 +133,18 @@ 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,
+ .num_coupling_options = ARRAY_SIZE(coupling_options),
+
+ .trigger_sources = &trigger_sources_2ch,
+ .num_trigger_sources = ARRAY_SIZE(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 +152,20 @@ 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,
+ .num_coupling_options = ARRAY_SIZE(coupling_options),
+
+ .trigger_sources = &trigger_sources_4ch,
+ .num_trigger_sources = ARRAY_SIZE(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 +173,11 @@ 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,
+ .num_coupling_options = ARRAY_SIZE(coupling_options),
+
+ .trigger_sources = &trigger_sources_4ch,
+ .num_trigger_sources = ARRAY_SIZE(trigger_sources_4ch),
.num_xdivs = 10,
.num_ydivs = 8,
@@ -250,8 +192,11 @@ 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,
+ .num_coupling_options = ARRAY_SIZE(coupling_options),
+
+ .trigger_sources = &trigger_sources_4ch,
+ .num_trigger_sources = ARRAY_SIZE(trigger_sources_4ch),
.num_xdivs = 10,
.num_ydivs = 8,
@@ -266,8 +211,11 @@ 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,
+ .num_coupling_options = ARRAY_SIZE(coupling_options),
+
+ .trigger_sources = &trigger_sources_4ch,
+ .num_trigger_sources = ARRAY_SIZE(trigger_sources_4ch),
.num_xdivs = 10,
.num_ydivs = 8,
@@ -305,7 +253,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);
@@ -334,13 +282,13 @@ static void scope_state_dump(const struct scope_config *config,
* @return SR_ERR when value couldn't be found, SR_OK otherwise.
*/
static int array_option_get(char *value, const char *(*array)[],
- int *result)
+ unsigned int n, int *result)
{
unsigned int i;
*result = -1;
- for (i = 0; (*array)[i]; i++)
+ for (i = 0; i < n; i++)
if (!g_strcmp0(value, (*array)[i])) {
*result = i;
break;
@@ -461,7 +409,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;
@@ -488,6 +436,7 @@ static int analog_channel_state_get(const struct sr_dev_inst *sdi,
}
if (array_option_get(response, config->coupling_options,
+ config->num_coupling_options,
&state->analog_states[i].coupling) != SR_OK) {
g_free(response);
return SR_ERR;
@@ -699,8 +648,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;
}
@@ -724,7 +672,7 @@ SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi)
}
if (array_option_get(response, config->trigger_sources,
- &state->trigger_source) != SR_OK) {
+ config->num_trigger_sources, &state->trigger_source) != SR_OK) {
g_free(response);
return SR_ERR;
}
@@ -821,7 +769,6 @@ SR_PRIV int dlm_model_get(char *model_id, char **model_name, int *model_index)
*/
SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index)
{
- char tmp[25];
int i;
struct sr_channel *ch;
struct dev_context *devc;
@@ -830,36 +777,30 @@ SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index)
devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) *
scope_models[model_index].analog_channels);
-
devc->digital_groups = g_malloc0(sizeof(struct sr_channel_group*) *
scope_models[model_index].pods);
+ if (!devc->analog_groups || !devc->digital_groups) {
+ g_free(devc->analog_groups);
+ g_free(devc->digital_groups);
+ return SR_ERR_MALLOC;
+ }
/* Add analog channels, each in its own group. */
for (i = 0; i < scope_models[model_index].analog_channels; i++) {
ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE,
(*scope_models[model_index].analog_names)[i]);
- devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
-
- devc->analog_groups[i]->name = g_strdup(
- (char *)(*scope_models[model_index].analog_names)[i]);
+ devc->analog_groups[i] = sr_channel_group_new(sdi,
+ (*scope_models[model_index].analog_names)[i], NULL);
devc->analog_groups[i]->channels = g_slist_append(NULL, ch);
-
- sdi->channel_groups = g_slist_append(sdi->channel_groups,
- devc->analog_groups[i]);
}
/* Add digital channel groups. */
for (i = 0; i < scope_models[model_index].pods; i++) {
- g_snprintf(tmp, sizeof(tmp), "POD%d", i);
-
- devc->digital_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
+ devc->digital_groups[i] = sr_channel_group_new(sdi, NULL, NULL);
if (!devc->digital_groups[i])
return SR_ERR_MALLOC;
-
- devc->digital_groups[i]->name = g_strdup(tmp);
- sdi->channel_groups = g_slist_append(sdi->channel_groups,
- devc->digital_groups[i]);
+ devc->digital_groups[i]->name = g_strdup_printf("POD%d", i);
}
/* Add digital channels. */
@@ -964,7 +905,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;
@@ -992,16 +936,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));
@@ -1065,7 +1011,6 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
struct scope_state *model_state;
struct dev_context *devc;
struct sr_channel *ch;
- struct sr_datafeed_packet packet;
int chunk_len, num_bytes;
static GArray *data = NULL;
@@ -1112,10 +1057,8 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
devc->data_pending = FALSE;
/* Signal the beginning of a new frame if this is the first channel. */
- if (devc->current_channel == devc->enabled_channels) {
- packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(sdi, &packet);
- }
+ if (devc->current_channel == devc->enabled_channels)
+ std_session_send_df_frame_begin(sdi);
if (dlm_block_data_header_process(data, &num_bytes) != SR_OK) {
sr_err("Encountered malformed block data header.");
@@ -1158,15 +1101,14 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
* and set the next enabled channel. Then, request its data.
*/
if (!devc->current_channel->next) {
- packet.type = SR_DF_FRAME_END;
- sr_session_send(sdi, &packet);
+ std_session_send_df_frame_end(sdi);
devc->current_channel = devc->enabled_channels;
/*
* 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;