X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=c3cd244ccd22fe4d15f06ab843d38c495e3f2905;hb=f3f19d1131025b68d29a11273b627c83d748e7ea;hp=582da49236dad6ed8fe4fc9f8b0bfbcf59a8bf4b;hpb=0028d5a1eeca4620a21a6f7374edd43ca1370aab;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c index 582da492..c3cd244c 100644 --- a/src/hardware/yokogawa-dlm/protocol.c +++ b/src/hardware/yokogawa-dlm/protocol.c @@ -25,20 +25,22 @@ #include "protocol.h" -static const int32_t dlm_hwcaps[] = { +static const uint32_t dlm_devopts[] = { SR_CONF_LOGIC_ANALYZER, SR_CONF_OSCILLOSCOPE, - SR_CONF_TRIGGER_SLOPE, - SR_CONF_TRIGGER_SOURCE, - SR_CONF_TIMEBASE, - SR_CONF_NUM_TIMEBASE, - SR_CONF_HORIZ_TRIGGERPOS, + 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 int32_t dlm_analog_caps[] = { - SR_CONF_VDIV, - SR_CONF_COUPLING, - SR_CONF_NUM_VDIV, +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[] = { @@ -166,7 +168,7 @@ static const char *scope_digital_channel_names[] = { "D7" }; -static struct scope_config scope_models[] = { +static const struct scope_config scope_models[] = { { .model_id = {"710105", "710115", "710125", NULL}, .model_name = {"DLM2022", "DLM2032", "DLM2052", NULL}, @@ -177,11 +179,11 @@ static struct scope_config scope_models[] = { .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, - .hw_caps = &dlm_hwcaps, - .num_hwcaps = ARRAY_SIZE(dlm_hwcaps), + .devopts = &dlm_devopts, + .num_devopts = ARRAY_SIZE(dlm_devopts), - .analog_hwcaps = &dlm_analog_caps, - .num_analog_hwcaps = ARRAY_SIZE(dlm_analog_caps), + .analog_devopts = &dlm_analog_devopts, + .num_analog_devopts = ARRAY_SIZE(dlm_analog_devopts), .coupling_options = &dlm_coupling_options, .trigger_sources = &dlm_2ch_trigger_sources, @@ -206,11 +208,11 @@ static struct scope_config scope_models[] = { .analog_names = &scope_analog_channel_names, .digital_names = &scope_digital_channel_names, - .hw_caps = &dlm_hwcaps, - .num_hwcaps = ARRAY_SIZE(dlm_hwcaps), + .devopts = &dlm_devopts, + .num_devopts = ARRAY_SIZE(dlm_devopts), - .analog_hwcaps = &dlm_analog_caps, - .num_analog_hwcaps = ARRAY_SIZE(dlm_analog_caps), + .analog_devopts = &dlm_analog_devopts, + .num_analog_devopts = ARRAY_SIZE(dlm_analog_devopts), .coupling_options = &dlm_coupling_options, .trigger_sources = &dlm_4ch_trigger_sources, @@ -233,7 +235,7 @@ 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; @@ -241,25 +243,25 @@ static void scope_state_dump(struct scope_config *config, 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]); + (*config->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], - tmp, state->analog_states[i].vertical_offset); + i + 1, state->analog_states[i].state ? "On" : "Off", + (*config->coupling_options)[state->analog_states[i].coupling], + tmp, state->analog_states[i].vertical_offset); } for (i = 0; i < config->digital_channels; ++i) { sr_info("State of digital channel %d -> %s", i, - state->digital_states[i] ? "On" : "Off"); + state->digital_states[i] ? "On" : "Off"); } for (i = 0; i < config->pods; ++i) { sr_info("State of digital POD %d -> %s", i, - state->pod_states[i] ? "On" : "Off"); + state->pod_states[i] ? "On" : "Off"); } tmp = sr_period_string((*config->timebases)[state->timebase][0] * - (*config->timebases)[state->timebase][1]); + (*config->timebases)[state->timebase][1]); sr_info("Current timebase: %s", tmp); g_free(tmp); @@ -268,12 +270,12 @@ static void scope_state_dump(struct scope_config *config, g_free(tmp); sr_info("Current samples per acquisition (i.e. frame): %d", - state->samples_per_frame); + state->samples_per_frame); sr_info("Current trigger: %s (source), %s (slope) %.2f (offset)", - (*config->trigger_sources)[state->trigger_source], - (*config->trigger_slopes)[state->trigger_slope], - state->horiz_triggerpos); + (*config->trigger_sources)[state->trigger_source], + (*config->trigger_slopes)[state->trigger_slope], + state->horiz_triggerpos); } /** @@ -328,6 +330,7 @@ static int array_float_get(gchar *value, const uint64_t array[][2], int i; uint64_t f; float s; + unsigned int s_int; gchar ss[10], es[10]; memset(ss, 0, sizeof(ss)); @@ -350,10 +353,10 @@ static int array_float_get(gchar *value, const uint64_t array[][2], while ((int)fmod(log10(f), 3) > 0) { s *= 10; f *= 10; } /* Truncate s to circumvent rounding errors. */ - s = (int)s; + s_int = (unsigned int)s; for (i = 0; i < array_len; i++) { - if ( (s == array[i][0]) && (f == array[i][1]) ) { + if ( (s_int == array[i][0]) && (f == array[i][1]) ) { *result = i; return SR_OK; } @@ -373,8 +376,8 @@ 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, - struct scope_state *state) + const struct scope_config *config, + struct scope_state *state) { int i, j; gchar *response; @@ -382,14 +385,14 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi, for (i = 0; i < config->analog_channels; ++i) { if (dlm_analog_chan_state_get(scpi, i + 1, - &state->analog_states[i].state) != SR_OK) + &state->analog_states[i].state) != SR_OK) return SR_ERR; 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, - &j) != SR_OK) { + &j) != SR_OK) { g_free(response); return SR_ERR; } @@ -398,15 +401,15 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi, state->analog_states[i].vdiv = j; if (dlm_analog_chan_voffs_get(scpi, i + 1, - &state->analog_states[i].vertical_offset) != SR_OK) + &state->analog_states[i].vertical_offset) != SR_OK) return SR_ERR; if (dlm_analog_chan_wrange_get(scpi, i + 1, - &state->analog_states[i].waveform_range) != SR_OK) + &state->analog_states[i].waveform_range) != SR_OK) return SR_ERR; if (dlm_analog_chan_woffs_get(scpi, i + 1, - &state->analog_states[i].waveform_offset) != SR_OK) + &state->analog_states[i].waveform_offset) != SR_OK) return SR_ERR; if (dlm_analog_chan_coupl_get(scpi, i + 1, &response) != SR_OK) { @@ -415,7 +418,7 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi, } if (array_option_get(response, config->coupling_options, - &state->analog_states[i].coupling) != SR_OK) { + &state->analog_states[i].coupling) != SR_OK) { g_free(response); return SR_ERR; } @@ -436,15 +439,15 @@ 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, - struct scope_state *state) + const struct scope_config *config, + struct scope_state *state) { unsigned int i; if (!config->digital_channels) { sr_warn("Tried obtaining digital channel states on a " \ - "model without digital inputs."); + "model without digital inputs."); return SR_OK; } @@ -511,7 +514,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; @@ -530,7 +533,7 @@ SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi) return SR_ERR; if (array_float_get(response, *config->timebases, - config->num_timebases, &i) != SR_OK) { + config->num_timebases, &i) != SR_OK) { g_free(response); return SR_ERR; } @@ -543,8 +546,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)(*config->timebases)[state->timebase][0] / + (*config->timebases)[state->timebase][1]) * config->num_xdivs); state->horiz_triggerpos -= 0.5; state->horiz_triggerpos *= -1; @@ -554,7 +557,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) { + &state->trigger_source) != SR_OK) { g_free(response); return SR_ERR; } @@ -583,20 +586,19 @@ SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi) * * @param config The device configuration to use. * - * @return The newly allocated scope_state struct or NULL on error. + * @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; - if (!(state = g_try_malloc0(sizeof(struct scope_state)))) - return NULL; + state = g_malloc0(sizeof(struct scope_state)); state->analog_states = g_malloc0(config->analog_channels * - sizeof(struct analog_channel_state)); + sizeof(struct analog_channel_state)); state->digital_states = g_malloc0(config->digital_channels * - sizeof(gboolean)); + sizeof(gboolean)); state->pod_states = g_malloc0(config->pods * sizeof(gboolean)); @@ -637,7 +639,7 @@ SR_PRIV int dlm_model_get(char *model_id, char **model_name, int *model_index) if (*model_index == -1) { sr_err("Found unsupported DLM device with model identifier %s.", - model_id); + model_id); return SR_ERR_NA; } @@ -660,26 +662,24 @@ SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index) devc = sdi->priv; devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) * - scope_models[model_index].analog_channels); + 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].digital_channels); /* Add analog channels. */ for (i = 0; i < scope_models[model_index].analog_channels; i++) { - if (!(ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE, - (*scope_models[model_index].analog_names)[i]))) - return SR_ERR_MALLOC; - sdi->channels = g_slist_append(sdi->channels, ch); + 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]); + (char *)(*scope_models[model_index].analog_names)[i]); devc->analog_groups[i]->channels = g_slist_append(NULL, ch); sdi->channel_groups = g_slist_append(sdi->channel_groups, - devc->analog_groups[i]); + devc->analog_groups[i]); } /* Add digital channel groups. */ @@ -697,13 +697,11 @@ 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++) { - if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, - (*scope_models[model_index].digital_names)[i]))) - return SR_ERR_MALLOC; - sdi->channels = g_slist_append(sdi->channels, ch); + ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, + (*scope_models[model_index].digital_names)[i]); devc->digital_groups[i / 8]->channels = g_slist_append( - devc->digital_groups[i / 8]->channels, ch); + devc->digital_groups[i / 8]->channels, ch); } devc->model_config = &scope_models[model_index]; devc->frame_limit = 0; @@ -789,8 +787,8 @@ static int dlm_block_data_header_process(GArray *data, int *len) * @return SR_ERR when data is trucated, SR_OK otherwise. */ static int dlm_analog_samples_send(GArray *data, - struct analog_channel_state *ch_state, - struct sr_dev_inst *sdi) + struct analog_channel_state *ch_state, + struct sr_dev_inst *sdi) { uint32_t i, samples; float voltage, range, offset; @@ -821,7 +819,7 @@ static int dlm_analog_samples_send(GArray *data, for (i = 0; i < samples; i++) { voltage = (float)g_array_index(data, int8_t, i); voltage = (range * voltage / - DLM_DIVISION_FOR_BYTE_FORMAT) + offset; + DLM_DIVISION_FOR_BYTE_FORMAT) + offset; g_array_append_val(float_data, voltage); } @@ -852,7 +850,7 @@ static int dlm_analog_samples_send(GArray *data, * @return SR_ERR when data is trucated, SR_OK otherwise. */ static int dlm_digital_samples_send(GArray *data, - struct sr_dev_inst *sdi) + struct sr_dev_inst *sdi) { struct dev_context *devc; struct scope_state *model_state; @@ -923,14 +921,14 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data) if (sr_scpi_read_begin(sdi->conn) == SR_OK) /* The 16 here accounts for the header and EOL. */ data = g_array_sized_new(FALSE, FALSE, sizeof(uint8_t), - 16 + model_state->samples_per_frame); + 16 + model_state->samples_per_frame); else return TRUE; } /* Store incoming data. */ chunk_len = sr_scpi_read_data(sdi->conn, devc->receive_buffer, - RECEIVE_BUFFER_SIZE); + RECEIVE_BUFFER_SIZE); if (chunk_len < 0) { sr_err("Error while reading data: %d", chunk_len); goto fail; @@ -957,8 +955,8 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data) if (num_bytes == 0) { sr_warn("Zero-length waveform data packet received. " \ - "Live mode not supported yet, stopping " \ - "acquisition and retrying."); + "Live mode not supported yet, stopping " \ + "acquisition and retrying."); /* Don't care about return value here. */ dlm_acquisition_stop(sdi->conn); g_array_free(data, TRUE); @@ -1003,7 +1001,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; }