Fix a bunch of typos.

[libsigrok.git] / src / hardware / yokogawa-dlm / protocol.c

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 7acd1b59b5d80d09b5f56a2b25b7d757d8404341..c3cd244ccd22fe4d15f06ab843d38c495e3f2905 100644 (file)
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -28,17 +28,19 @@
 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_devopts[] = {
-       SR_CONF_VDIV,
-       SR_CONF_COUPLING,
-       SR_CONF_NUM_VDIV,
+       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},
@@ -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;
        }