X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=c3cd244ccd22fe4d15f06ab843d38c495e3f2905;hb=f3f19d1131025b68d29a11273b627c83d748e7ea;hp=5148c8d7fc039cb37bc7b850b2674ed37e64c114;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 5148c8d7..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 uint32_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 uint32_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;
@@ -374,7 +376,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;
@@ -437,7 +439,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;
@@ -512,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;
@@ -586,7 +588,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;
 
@@ -667,10 +669,8 @@ SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index)
 
 	/* 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));
 
@@ -697,10 +697,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++) {
-		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);
@@ -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;
 	}