X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=a60bc0d3208d3f103400e50ba335fe33d54fa6b3;hb=f3c60fb6affce2ebd81250db1d60bee733e5f479;hp=8acaf023553c6c75243b12440dc684f30d9dd8ab;hpb=5e23fcab889c62864b92aa3ad6902ce3e9f5be49;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c index 8acaf023..a60bc0d3 100644 --- a/src/hardware/yokogawa-dlm/protocol.c +++ b/src/hardware/yokogawa-dlm/protocol.c @@ -25,24 +25,6 @@ #include "protocol.h" -static const uint32_t dlm_devopts[] = { - SR_CONF_LOGIC_ANALYZER, - SR_CONF_OSCILLOSCOPE, - SR_CONF_LIMIT_FRAMES | SR_CONF_SET, - SR_CONF_SAMPLERATE | SR_CONF_GET, - SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_NUM_HDIV | SR_CONF_GET, - SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET, -}; - -static const uint32_t dlm_analog_devopts[] = { - SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_NUM_VDIV | SR_CONF_GET, -}; - static const char *dlm_coupling_options[] = { "AC", "DC", @@ -51,13 +33,6 @@ static const char *dlm_coupling_options[] = { NULL, }; -/* Note: Values must correlate to the trigger_slopes values */ -static const char *dlm_trigger_slopes[] = { - "r", - "f", - NULL, -}; - static const char *dlm_2ch_trigger_sources[] = { "1", "2", @@ -85,7 +60,14 @@ static const char *dlm_4ch_trigger_sources[] = { NULL, }; -static const uint64_t dlm_timebases[][2] = { +/* Note: Values must correlate to the trigger_slopes values */ +const char *dlm_trigger_slopes[3] = { + "r", + "f", + NULL, +}; + +const uint64_t dlm_timebases[36][2] = { /* nanoseconds */ { 1, 1000000000 }, { 2, 1000000000 }, @@ -128,7 +110,7 @@ static const uint64_t dlm_timebases[][2] = { { 500, 1 }, }; -static const uint64_t dlm_vdivs[][2] = { +const uint64_t dlm_vdivs[17][2] = { /* millivolts */ { 2, 1000 }, { 5, 1000 }, @@ -157,7 +139,7 @@ static const char *scope_analog_channel_names[] = { "4" }; -static const char *scope_digital_channel_names[] = { +static const char *scope_digital_channel_names_8[] = { "D0", "D1", "D2", @@ -168,7 +150,42 @@ static const char *scope_digital_channel_names[] = { "D7" }; -static struct scope_config scope_models[] = { +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", +}; + +static const struct scope_config scope_models[] = { { .model_id = {"710105", "710115", "710125", NULL}, .model_name = {"DLM2022", "DLM2032", "DLM2052", NULL}, @@ -177,23 +194,10 @@ static struct scope_config scope_models[] = { .pods = 0, .analog_names = &scope_analog_channel_names, - .digital_names = &scope_digital_channel_names, - - .devopts = &dlm_devopts, - .num_devopts = ARRAY_SIZE(dlm_devopts), - - .analog_devopts = &dlm_analog_devopts, - .num_analog_devopts = ARRAY_SIZE(dlm_analog_devopts), + .digital_names = &scope_digital_channel_names_8, .coupling_options = &dlm_coupling_options, .trigger_sources = &dlm_2ch_trigger_sources, - .trigger_slopes = &dlm_trigger_slopes, - - .timebases = &dlm_timebases, - .num_timebases = ARRAY_SIZE(dlm_timebases), - - .vdivs = &dlm_vdivs, - .num_vdivs = ARRAY_SIZE(dlm_vdivs), .num_xdivs = 10, .num_ydivs = 8, @@ -206,23 +210,60 @@ static struct scope_config scope_models[] = { .pods = 1, .analog_names = &scope_analog_channel_names, - .digital_names = &scope_digital_channel_names, + .digital_names = &scope_digital_channel_names_8, + + .coupling_options = &dlm_coupling_options, + .trigger_sources = &dlm_4ch_trigger_sources, + + .num_xdivs = 10, + .num_ydivs = 8, + }, + { + .model_id = {"701307", "701308", "701310", "701311", + "701312", "701313", NULL}, + .model_name = {"DL9040", "DL9040L", "DL9140", "DL9140L", + "DL9240", "DL9240L", NULL}, + .analog_channels = 4, + .digital_channels = 0, + .pods = 0, + + .analog_names = &scope_analog_channel_names, + .digital_names = NULL, + + .coupling_options = &dlm_coupling_options, + .trigger_sources = &dlm_4ch_trigger_sources, - .devopts = &dlm_devopts, - .num_devopts = ARRAY_SIZE(dlm_devopts), + .num_xdivs = 10, + .num_ydivs = 8, + }, + { + .model_id = {"701320", "701321", NULL}, + .model_name = {"DL9505L", "DL9510L", NULL}, + .analog_channels = 4, + .digital_channels = 16, + .pods = 4, - .analog_devopts = &dlm_analog_devopts, - .num_analog_devopts = ARRAY_SIZE(dlm_analog_devopts), + .analog_names = &scope_analog_channel_names, + .digital_names = &scope_digital_channel_names_32, .coupling_options = &dlm_coupling_options, .trigger_sources = &dlm_4ch_trigger_sources, - .trigger_slopes = &dlm_trigger_slopes, - .timebases = &dlm_timebases, - .num_timebases = ARRAY_SIZE(dlm_timebases), + .num_xdivs = 10, + .num_ydivs = 8, + }, + { + .model_id = {"701330", "701331", NULL}, + .model_name = {"DL9705L", "DL9710L", NULL}, + .analog_channels = 4, + .digital_channels = 32, + .pods = 4, - .vdivs = &dlm_vdivs, - .num_vdivs = ARRAY_SIZE(dlm_vdivs), + .analog_names = &scope_analog_channel_names, + .digital_names = &scope_digital_channel_names_32, + + .coupling_options = &dlm_coupling_options, + .trigger_sources = &dlm_4ch_trigger_sources, .num_xdivs = 10, .num_ydivs = 8, @@ -235,15 +276,15 @@ static struct scope_config scope_models[] = { * @param config This is the scope configuration. * @param state The current scope state to print. */ -static void scope_state_dump(struct scope_config *config, +static void scope_state_dump(const struct scope_config *config, struct scope_state *state) { unsigned int i; char *tmp; for (i = 0; i < config->analog_channels; ++i) { - tmp = sr_voltage_string((*config->vdivs)[state->analog_states[i].vdiv][0], - (*config->vdivs)[state->analog_states[i].vdiv][1]); + tmp = sr_voltage_string(dlm_vdivs[state->analog_states[i].vdiv][0], + dlm_vdivs[state->analog_states[i].vdiv][1]); sr_info("State of analog channel %d -> %s : %s (coupling) %s (vdiv) %2.2e (offset)", i + 1, state->analog_states[i].state ? "On" : "Off", (*config->coupling_options)[state->analog_states[i].coupling], @@ -260,8 +301,8 @@ static void scope_state_dump(struct scope_config *config, state->pod_states[i] ? "On" : "Off"); } - tmp = sr_period_string((*config->timebases)[state->timebase][0] * - (*config->timebases)[state->timebase][1]); + tmp = sr_period_string(dlm_timebases[state->timebase][0] * + dlm_timebases[state->timebase][1]); sr_info("Current timebase: %s", tmp); g_free(tmp); @@ -274,7 +315,7 @@ static void scope_state_dump(struct scope_config *config, sr_info("Current trigger: %s (source), %s (slope) %.2f (offset)", (*config->trigger_sources)[state->trigger_source], - (*config->trigger_slopes)[state->trigger_slope], + dlm_trigger_slopes[state->trigger_slope], state->horiz_triggerpos); } @@ -376,7 +417,7 @@ static int array_float_get(gchar *value, const uint64_t array[][2], * @return SR_ERR on error, SR_OK otherwise. */ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi, - struct scope_config *config, + const struct scope_config *config, struct scope_state *state) { int i, j; @@ -391,7 +432,7 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi, if (dlm_analog_chan_vdiv_get(scpi, i + 1, &response) != SR_OK) return SR_ERR; - if (array_float_get(response, *config->vdivs, config->num_vdivs, + if (array_float_get(response, dlm_vdivs, ARRAY_SIZE(dlm_vdivs), &j) != SR_OK) { g_free(response); return SR_ERR; @@ -439,7 +480,7 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi, * @return SR_ERR on error, SR_OK otherwise. */ static int digital_channel_state_get(struct sr_scpi_dev_inst *scpi, - struct scope_config *config, + const struct scope_config *config, struct scope_state *state) { unsigned int i; @@ -514,7 +555,7 @@ SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi) { struct dev_context *devc; struct scope_state *state; - struct scope_config *config; + const struct scope_config *config; float tmp_float; gchar *response; int i; @@ -532,8 +573,8 @@ 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, *config->timebases, - config->num_timebases, &i) != SR_OK) { + if (array_float_get(response, dlm_timebases, + ARRAY_SIZE(dlm_timebases), &i) != SR_OK) { g_free(response); return SR_ERR; } @@ -546,8 +587,8 @@ SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi) /* TODO: Check if the calculation makes sense for the DLM. */ state->horiz_triggerpos = tmp_float / - (((double)(*config->timebases)[state->timebase][0] / - (*config->timebases)[state->timebase][1]) * config->num_xdivs); + (((double)dlm_timebases[state->timebase][0] / + dlm_timebases[state->timebase][1]) * config->num_xdivs); state->horiz_triggerpos -= 0.5; state->horiz_triggerpos *= -1; @@ -588,7 +629,7 @@ SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi) * * @return The newly allocated scope_state struct. */ -static struct scope_state *dlm_scope_state_new(struct scope_config *config) +static struct scope_state *dlm_scope_state_new(const struct scope_config *config) { struct scope_state *state; @@ -665,9 +706,9 @@ SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index) scope_models[model_index].analog_channels); devc->digital_groups = g_malloc0(sizeof(struct sr_channel_group*) * - scope_models[model_index].digital_channels); + scope_models[model_index].pods); - /* Add analog channels. */ + /* 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]); @@ -697,7 +738,8 @@ SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index) /* Add digital channels. */ for (i = 0; i < scope_models[model_index].digital_channels; i++) { - ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, + ch = sr_channel_new(sdi, DLM_DIG_CHAN_INDEX_OFFS + i, + SR_CHANNEL_LOGIC, TRUE, (*scope_models[model_index].digital_names)[i]); devc->digital_groups[i / 8]->channels = g_slist_append( @@ -1001,7 +1043,7 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data) devc->current_channel = devc->current_channel->next; if (dlm_channel_data_request(sdi) != SR_OK) { - sr_err("Failed to request aquisition data."); + sr_err("Failed to request acquisition data."); goto fail; }