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

drivers: Consistently name per-cg options 'devopts_cg_*'.

This commit is contained in:
Uwe Hermann 2017-07-19 22:40:47 +02:00
parent 4b25cbffa1
commit 6b82c3e57a
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/hameg-hmo/api.c
View File

@ -492,7 +492,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
} else if (cg_type == CG_ANALOG) { } else if (cg_type == CG_ANALOG) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
model->analog_devopts, model->num_analog_devopts, model->devopts_cg_analog, model->num_devopts_cg_analog,
sizeof(uint32_t)); sizeof(uint32_t));
} else { } else {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,

14
src/hardware/hameg-hmo/protocol.c
View File

@ -68,7 +68,7 @@ static const uint32_t devopts[] = {
SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
}; };
static const uint32_t analog_devopts[] = { static const uint32_t devopts_cg_analog[] = {
SR_CONF_NUM_VDIV | SR_CONF_GET, SR_CONF_NUM_VDIV | SR_CONF_GET,
SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, 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_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
@ -259,8 +259,8 @@ static const struct scope_config scope_models[] = {
.devopts = &devopts, .devopts = &devopts,
.num_devopts = ARRAY_SIZE(devopts), .num_devopts = ARRAY_SIZE(devopts),
.analog_devopts = &analog_devopts, .devopts_cg_analog = &devopts_cg_analog,
.num_analog_devopts = ARRAY_SIZE(analog_devopts), .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
.coupling_options = &coupling_options, .coupling_options = &coupling_options,
.trigger_sources = &compact2_trigger_sources, .trigger_sources = &compact2_trigger_sources,
@ -289,8 +289,8 @@ static const struct scope_config scope_models[] = {
.devopts = &devopts, .devopts = &devopts,
.num_devopts = ARRAY_SIZE(devopts), .num_devopts = ARRAY_SIZE(devopts),
.analog_devopts = &analog_devopts, .devopts_cg_analog = &devopts_cg_analog,
.num_analog_devopts = ARRAY_SIZE(analog_devopts), .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
.coupling_options = &coupling_options, .coupling_options = &coupling_options,
.trigger_sources = &compact4_trigger_sources, .trigger_sources = &compact4_trigger_sources,
@ -319,8 +319,8 @@ static const struct scope_config scope_models[] = {
.devopts = &devopts, .devopts = &devopts,
.num_devopts = ARRAY_SIZE(devopts), .num_devopts = ARRAY_SIZE(devopts),
.analog_devopts = &analog_devopts, .devopts_cg_analog = &devopts_cg_analog,
.num_analog_devopts = ARRAY_SIZE(analog_devopts), .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
.coupling_options = &coupling_options, .coupling_options = &coupling_options,
.trigger_sources = &compact4_dig16_trigger_sources, .trigger_sources = &compact4_dig16_trigger_sources,

4
src/hardware/hameg-hmo/protocol.h
View File

@ -46,8 +46,8 @@ struct scope_config {
const uint32_t (*devopts)[]; const uint32_t (*devopts)[];
const uint8_t num_devopts; const uint8_t num_devopts;
const uint32_t (*analog_devopts)[]; const uint32_t (*devopts_cg_analog)[];
const uint8_t num_analog_devopts; const uint8_t num_devopts_cg_analog;
const char *(*coupling_options)[]; const char *(*coupling_options)[];
const uint8_t num_coupling_options; const uint8_t num_coupling_options;

4
src/hardware/hung-chang-dso-2100/api.c
View File

@ -39,7 +39,7 @@ static const uint32_t devopts[] = {
SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
}; };
static const uint32_t cgopts[] = { static const uint32_t devopts_cg[] = {
SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, 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_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET, SR_CONF_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET,
@ -596,7 +596,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
if (!cg) if (!cg)
return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts); return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
cgopts, ARRAY_SIZE(cgopts), sizeof(uint32_t)); devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
break; break;
case SR_CONF_SAMPLERATE: case SR_CONF_SAMPLERATE:
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));

4
src/hardware/lecroy-xstream/api.c
View File

@ -46,7 +46,7 @@ static const uint32_t devopts[] = {
SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
}; };
static const uint32_t analog_devopts[] = { static const uint32_t devopts_cg_analog[] = {
SR_CONF_NUM_VDIV | SR_CONF_GET, SR_CONF_NUM_VDIV | SR_CONF_GET,
SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, 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_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
@ -401,7 +401,7 @@ static int config_list(uint32_t key, GVariant **data,
if (!cg) if (!cg)
return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts); return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
analog_devopts, ARRAY_SIZE(analog_devopts), devopts_cg_analog, ARRAY_SIZE(devopts_cg_analog),
sizeof(uint32_t)); sizeof(uint32_t));
break; break;
case SR_CONF_COUPLING: case SR_CONF_COUPLING:

8
src/hardware/motech-lps-30x/api.c
View File

@ -51,7 +51,7 @@ static const uint32_t devopts[] = {
}; };
/** Hardware capabilities channel 1, 2. */ /** Hardware capabilities channel 1, 2. */
static const uint32_t devopts_ch12[] = { static const uint32_t devopts_cg_ch12[] = {
SR_CONF_VOLTAGE | SR_CONF_GET, SR_CONF_VOLTAGE | SR_CONF_GET,
SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_CURRENT | SR_CONF_GET, SR_CONF_CURRENT | SR_CONF_GET,
@ -60,7 +60,7 @@ static const uint32_t devopts_ch12[] = {
}; };
/** Hardware capabilities channel 3 (LPS-304/305 only). */ /** Hardware capabilities channel 3 (LPS-304/305 only). */
static const uint32_t devopts_ch3[] = { static const uint32_t devopts_cg_ch3[] = {
SR_CONF_VOLTAGE | SR_CONF_GET, SR_CONF_VOLTAGE | SR_CONF_GET,
SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET,
}; };
@ -685,10 +685,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
if ((ch_idx == 0) || (ch_idx == 1)) /* CH1, CH2 */ if ((ch_idx == 0) || (ch_idx == 1)) /* CH1, CH2 */
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts_ch12, ARRAY_SIZE(devopts_ch12), sizeof(uint32_t)); devopts_cg_ch12, ARRAY_SIZE(devopts_cg_ch12), sizeof(uint32_t));
else /* Must be CH3 */ else /* Must be CH3 */
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts_ch3, ARRAY_SIZE(devopts_ch3), sizeof(uint32_t)); devopts_cg_ch3, ARRAY_SIZE(devopts_cg_ch3), sizeof(uint32_t));
break; break;
case SR_CONF_VOLTAGE_TARGET: case SR_CONF_VOLTAGE_TARGET:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);

4
src/hardware/rigol-ds/api.c
View File

@ -53,7 +53,7 @@ static const uint32_t devopts[] = {
SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
}; };
static const uint32_t analog_devopts[] = { static const uint32_t devopts_cg_analog[] = {
SR_CONF_NUM_VDIV | SR_CONF_GET, SR_CONF_NUM_VDIV | SR_CONF_GET,
SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, 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_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
@ -860,7 +860,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
for (i = 0; i < devc->model->analog_channels; i++) { for (i = 0; i < devc->model->analog_channels; i++) {
if (cg == devc->analog_groups[i]) { if (cg == devc->analog_groups[i]) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
analog_devopts, ARRAY_SIZE(analog_devopts), sizeof(uint32_t)); devopts_cg_analog, ARRAY_SIZE(devopts_cg_analog), sizeof(uint32_t));
return SR_OK; return SR_OK;
} }
} }

8
src/hardware/yokogawa-dlm/api.c
View File

@ -47,13 +47,13 @@ static const uint32_t devopts[] = {
SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
}; };
static const uint32_t analog_devopts[] = { static const uint32_t devopts_cg_analog[] = {
SR_CONF_NUM_VDIV | SR_CONF_GET, SR_CONF_NUM_VDIV | SR_CONF_GET,
SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, 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_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
}; };
static const uint32_t digital_devopts[] = { static const uint32_t devopts_cg_digital[] = {
}; };
enum { enum {
@ -509,10 +509,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
if (cg_type == CG_ANALOG) { if (cg_type == CG_ANALOG) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
analog_devopts, ARRAY_SIZE(analog_devopts), sizeof(uint32_t)); devopts_cg_analog, ARRAY_SIZE(devopts_cg_analog), sizeof(uint32_t));
} else if (cg_type == CG_DIGITAL) { } else if (cg_type == CG_DIGITAL) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
digital_devopts, ARRAY_SIZE(digital_devopts), sizeof(uint32_t)); devopts_cg_digital, ARRAY_SIZE(devopts_cg_digital), sizeof(uint32_t));
} else { } else {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
NULL, 0, sizeof(uint32_t)); NULL, 0, sizeof(uint32_t));