X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=06dae50f7cd9a3979692371138df4ad8b91b3f0b;hp=1937a71c996929d262a1cb4161e15ce1c37cc64a;hb=HEAD;hpb=53012da658ae94b245240c8a3e115723eede4c7d diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c index 1937a71c..06dae50f 100644 --- a/src/hardware/yokogawa-dlm/protocol.c +++ b/src/hardware/yokogawa-dlm/protocol.c @@ -23,45 +23,23 @@ #include "protocol.h" static const char *coupling_options[] = { - "AC", - "DC", - "DC50", - "GND", - NULL, + "AC", "DC", "DC50", "GND", }; static const char *trigger_sources_2ch[] = { - "1", - "2", - "LINE", - "EXT", - NULL, + "1", "2", "LINE", "EXT", }; /* TODO: Is BITx handled correctly or is Dx required? */ static const char *trigger_sources_4ch[] = { - "1", - "2", - "3", - "4", - "LINE", - "EXT", - "BIT1", - "BIT2", - "BIT3", - "BIT4", - "BIT5", - "BIT6", - "BIT7", - "BIT8", - NULL, + "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] = { @@ -130,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[] = { @@ -194,7 +134,10 @@ static const struct scope_config scope_models[] = { .digital_names = &scope_digital_channel_names_8, .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, @@ -210,7 +153,10 @@ static const struct scope_config scope_models[] = { .digital_names = &scope_digital_channel_names_8, .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, @@ -228,7 +174,10 @@ static const struct scope_config scope_models[] = { .digital_names = NULL, .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, @@ -244,7 +193,10 @@ static const struct scope_config scope_models[] = { .digital_names = &scope_digital_channel_names_32, .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, @@ -260,7 +212,10 @@ static const struct scope_config scope_models[] = { .digital_names = &scope_digital_channel_names_32, .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, @@ -327,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; @@ -481,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; @@ -716,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; } @@ -813,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; @@ -822,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. */ @@ -1062,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; @@ -1109,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."); @@ -1155,8 +1101,7 @@ 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; /*