BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers: Drop some unneeded _names suffixes.

This commit is contained in:
Uwe Hermann 2017-07-31 08:20:25 +02:00
parent efad7cccec
commit e124cf9b7a
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hardware/dreamsourcelab-dslogic/api.c
View File

@ -67,7 +67,7 @@ static const uint32_t devopts[] = {
SR_CONF_CLOCK_EDGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_CLOCK_EDGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
}; };
static const char *signal_edge_names[] = { static const char *signal_edges[] = {
[DS_EDGE_RISING] = "rising", [DS_EDGE_RISING] = "rising",
[DS_EDGE_FALLING] = "falling", [DS_EDGE_FALLING] = "falling",
}; };
@ -428,9 +428,9 @@ static int config_get(uint32_t key, GVariant **data,
break; break;
case SR_CONF_CLOCK_EDGE: case SR_CONF_CLOCK_EDGE:
idx = devc->clock_edge; idx = devc->clock_edge;
if (idx >= (int)ARRAY_SIZE(signal_edge_names)) if (idx >= (int)ARRAY_SIZE(signal_edges))
return SR_ERR_BUG; return SR_ERR_BUG;
*data = g_variant_new_string(signal_edge_names[0]); *data = g_variant_new_string(signal_edges[0]);
break; break;
default: default:
return SR_ERR_NA; return SR_ERR_NA;
@ -483,7 +483,7 @@ static int config_set(uint32_t key, GVariant *data,
devc->continuous_mode = g_variant_get_boolean(data); devc->continuous_mode = g_variant_get_boolean(data);
break; break;
case SR_CONF_CLOCK_EDGE: case SR_CONF_CLOCK_EDGE:
if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edge_names))) < 0) if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edges))) < 0)
return SR_ERR_ARG; return SR_ERR_ARG;
devc->clock_edge = idx; devc->clock_edge = idx;
break; break;
@ -515,7 +515,7 @@ static int config_list(uint32_t key, GVariant **data,
*data = std_gvar_samplerates(devc->samplerates, devc->num_samplerates); *data = std_gvar_samplerates(devc->samplerates, devc->num_samplerates);
break; break;
case SR_CONF_CLOCK_EDGE: case SR_CONF_CLOCK_EDGE:
*data = g_variant_new_strv(ARRAY_AND_SIZE(signal_edge_names)); *data = g_variant_new_strv(ARRAY_AND_SIZE(signal_edges));
break; break;
default: default:
return SR_ERR_NA; return SR_ERR_NA;

26
src/hardware/sysclk-lwla/api.c
View File

@ -41,12 +41,12 @@ static const int32_t trigger_matches[] = {
SR_TRIGGER_FALLING, SR_TRIGGER_FALLING,
}; };
static const char *trigger_source_names[] = { static const char *trigger_sources[] = {
[TRIGGER_CHANNELS] = "CH", [TRIGGER_CHANNELS] = "CH",
[TRIGGER_EXT_TRG] = "TRG", [TRIGGER_EXT_TRG] = "TRG",
}; };
static const char *signal_edge_names[] = { static const char *signal_edges[] = {
[EDGE_POSITIVE] = "r", [EDGE_POSITIVE] = "r",
[EDGE_NEGATIVE] = "f", [EDGE_NEGATIVE] = "f",
}; };
@ -358,21 +358,21 @@ static int config_get(uint32_t key, GVariant **data,
break; break;
case SR_CONF_CLOCK_EDGE: case SR_CONF_CLOCK_EDGE:
idx = devc->cfg_clock_edge; idx = devc->cfg_clock_edge;
if (idx >= ARRAY_SIZE(signal_edge_names)) if (idx >= ARRAY_SIZE(signal_edges))
return SR_ERR_BUG; return SR_ERR_BUG;
*data = g_variant_new_string(signal_edge_names[idx]); *data = g_variant_new_string(signal_edges[idx]);
break; break;
case SR_CONF_TRIGGER_SOURCE: case SR_CONF_TRIGGER_SOURCE:
idx = devc->cfg_trigger_source; idx = devc->cfg_trigger_source;
if (idx >= ARRAY_SIZE(trigger_source_names)) if (idx >= ARRAY_SIZE(trigger_sources))
return SR_ERR_BUG; return SR_ERR_BUG;
*data = g_variant_new_string(trigger_source_names[idx]); *data = g_variant_new_string(trigger_sources[idx]);
break; break;
case SR_CONF_TRIGGER_SLOPE: case SR_CONF_TRIGGER_SLOPE:
idx = devc->cfg_trigger_slope; idx = devc->cfg_trigger_slope;
if (idx >= ARRAY_SIZE(signal_edge_names)) if (idx >= ARRAY_SIZE(signal_edges))
return SR_ERR_BUG; return SR_ERR_BUG;
*data = g_variant_new_string(signal_edge_names[idx]); *data = g_variant_new_string(signal_edges[idx]);
break; break;
default: default:
/* Must not happen for a key listed in devopts. */ /* Must not happen for a key listed in devopts. */
@ -427,17 +427,17 @@ static int config_set(uint32_t key, GVariant *data,
? CLOCK_EXT_CLK : CLOCK_INTERNAL; ? CLOCK_EXT_CLK : CLOCK_INTERNAL;
break; break;
case SR_CONF_CLOCK_EDGE: case SR_CONF_CLOCK_EDGE:
if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edge_names))) < 0) if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edges))) < 0)
return SR_ERR_ARG; return SR_ERR_ARG;
devc->cfg_clock_edge = idx; devc->cfg_clock_edge = idx;
break; break;
case SR_CONF_TRIGGER_SOURCE: case SR_CONF_TRIGGER_SOURCE:
if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_source_names))) < 0) if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0)
return SR_ERR_ARG; return SR_ERR_ARG;
devc->cfg_trigger_source = idx; devc->cfg_trigger_source = idx;
break; break;
case SR_CONF_TRIGGER_SLOPE: case SR_CONF_TRIGGER_SLOPE:
if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edge_names))) < 0) if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edges))) < 0)
return SR_ERR_ARG; return SR_ERR_ARG;
devc->cfg_trigger_slope = idx; devc->cfg_trigger_slope = idx;
break; break;
@ -595,11 +595,11 @@ static int config_list(uint32_t key, GVariant **data,
*data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches)); *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
break; break;
case SR_CONF_TRIGGER_SOURCE: case SR_CONF_TRIGGER_SOURCE:
*data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_source_names)); *data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_sources));
break; break;
case SR_CONF_TRIGGER_SLOPE: case SR_CONF_TRIGGER_SLOPE:
case SR_CONF_CLOCK_EDGE: case SR_CONF_CLOCK_EDGE:
*data = g_variant_new_strv(ARRAY_AND_SIZE(signal_edge_names)); *data = g_variant_new_strv(ARRAY_AND_SIZE(signal_edges));
break; break;
default: default:
/* Must not happen for a key listed in devopts. */ /* Must not happen for a key listed in devopts. */