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

sr/cli/gtk/qt: s/configuration/config/.

This commit is contained in:
Uwe Hermann 2012-02-18 00:31:35 +01:00
parent ffedd0bf5d
commit a7d05fcb38
11 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/alsa/alsa.c
View File

@ -209,7 +209,7 @@ static int *hw_hwcap_get_all(void)
return hwcaps; return hwcaps;
} }
static int hw_set_configuration(int dev_index, int hwcap, void *value) static int hw_config_set(int dev_index, int hwcap, void *value)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct alsa *alsa; struct alsa *alsa;
@ -403,7 +403,7 @@ SR_PRIV struct sr_dev_plugin alsa_plugin_info = {
.get_dev_info = hw_get_dev_info, .get_dev_info = hw_get_dev_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.hwcap_get_all = hw_hwcap_get_all, .hwcap_get_all = hw_hwcap_get_all,
.set_configuration = hw_set_configuration, .config_set = hw_config_set,
.start_acquisition = hw_start_acquisition, .start_acquisition = hw_start_acquisition,
.stop_acquisition = hw_stop_acquisition, .stop_acquisition = hw_stop_acquisition,
}; };

4
hardware/asix-sigma/asix-sigma.c
View File

@ -797,7 +797,7 @@ static int *hw_hwcap_get_all(void)
return hwcaps; return hwcaps;
} }
static int hw_set_configuration(int dev_index, int hwcap, void *value) static int hw_config_set(int dev_index, int hwcap, void *value)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct sigma *sigma; struct sigma *sigma;
@ -1422,7 +1422,7 @@ SR_PRIV struct sr_dev_plugin asix_sigma_plugin_info = {
.get_dev_info = hw_get_dev_info, .get_dev_info = hw_get_dev_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.hwcap_get_all = hw_hwcap_get_all, .hwcap_get_all = hw_hwcap_get_all,
.set_configuration = hw_set_configuration, .config_set = hw_config_set,
.start_acquisition = hw_start_acquisition, .start_acquisition = hw_start_acquisition,
.stop_acquisition = hw_stop_acquisition, .stop_acquisition = hw_stop_acquisition,
}; };

4
hardware/chronovu-la8/chronovu-la8.c
View File

@ -762,7 +762,7 @@ static int *hw_hwcap_get_all(void)
return hwcaps; return hwcaps;
} }
static int hw_set_configuration(int dev_index, int hwcap, void *value) static int hw_config_set(int dev_index, int hwcap, void *value)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct la8 *la8; struct la8 *la8;
@ -1124,7 +1124,7 @@ SR_PRIV struct sr_dev_plugin chronovu_la8_plugin_info = {
.get_dev_info = hw_get_dev_info, .get_dev_info = hw_get_dev_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.hwcap_get_all = hw_hwcap_get_all, .hwcap_get_all = hw_hwcap_get_all,
.set_configuration = hw_set_configuration, .config_set = hw_config_set,
.start_acquisition = hw_start_acquisition, .start_acquisition = hw_start_acquisition,
.stop_acquisition = hw_stop_acquisition, .stop_acquisition = hw_stop_acquisition,
}; };

4
hardware/demo/demo.c
View File

@ -227,7 +227,7 @@ static int *hw_hwcap_get_all(void)
return hwcaps; return hwcaps;
} }
static int hw_set_configuration(int dev_index, int hwcap, void *value) static int hw_config_set(int dev_index, int hwcap, void *value)
{ {
int ret; int ret;
char *stropt; char *stropt;
@ -500,7 +500,7 @@ SR_PRIV struct sr_dev_plugin demo_plugin_info = {
.get_dev_info = hw_get_dev_info, .get_dev_info = hw_get_dev_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.hwcap_get_all = hw_hwcap_get_all, .hwcap_get_all = hw_hwcap_get_all,
.set_configuration = hw_set_configuration, .config_set = hw_config_set,
.start_acquisition = hw_start_acquisition, .start_acquisition = hw_start_acquisition,
.stop_acquisition = hw_stop_acquisition, .stop_acquisition = hw_stop_acquisition,
}; };

4
hardware/link-mso19/link-mso19.c
View File

@ -650,7 +650,7 @@ static int *hw_hwcap_get_all(void)
return hwcaps; return hwcaps;
} }
static int hw_set_configuration(int dev_index, int hwcap, void *value) static int hw_config_set(int dev_index, int hwcap, void *value)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
@ -840,7 +840,7 @@ SR_PRIV struct sr_dev_plugin link_mso19_plugin_info = {
.get_dev_info = hw_get_dev_info, .get_dev_info = hw_get_dev_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.hwcap_get_all = hw_hwcap_get_all, .hwcap_get_all = hw_hwcap_get_all,
.set_configuration = hw_set_configuration, .config_set = hw_config_set,
.start_acquisition = hw_start_acquisition, .start_acquisition = hw_start_acquisition,
.stop_acquisition = hw_stop_acquisition, .stop_acquisition = hw_stop_acquisition,
}; };

9
hardware/openbench-logic-sniffer/ols.c
View File

@ -605,8 +605,7 @@ static int *hw_hwcap_get_all(void)
return hwcaps; return hwcaps;
} }
static int set_configuration_samplerate(struct sr_dev_inst *sdi, static int config_set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
uint64_t samplerate)
{ {
struct ols_dev *ols; struct ols_dev *ols;
@ -638,7 +637,7 @@ static int set_configuration_samplerate(struct sr_dev_inst *sdi,
return SR_OK; return SR_OK;
} }
static int hw_set_configuration(int dev_index, int hwcap, void *value) static int hw_config_set(int dev_index, int hwcap, void *value)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct ols_dev *ols; struct ols_dev *ols;
@ -655,7 +654,7 @@ static int hw_set_configuration(int dev_index, int hwcap, void *value)
switch (hwcap) { switch (hwcap) {
case SR_HWCAP_SAMPLERATE: case SR_HWCAP_SAMPLERATE:
tmp_u64 = value; tmp_u64 = value;
ret = set_configuration_samplerate(sdi, *tmp_u64); ret = config_set_samplerate(sdi, *tmp_u64);
break; break;
case SR_HWCAP_PROBECONFIG: case SR_HWCAP_PROBECONFIG:
ret = configure_probes(ols, (GSList *) value); ret = configure_probes(ols, (GSList *) value);
@ -1049,7 +1048,7 @@ SR_PRIV struct sr_dev_plugin ols_plugin_info = {
.get_dev_info = hw_get_dev_info, .get_dev_info = hw_get_dev_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.hwcap_get_all = hw_hwcap_get_all, .hwcap_get_all = hw_hwcap_get_all,
.set_configuration = hw_set_configuration, .config_set = hw_config_set,
.start_acquisition = hw_start_acquisition, .start_acquisition = hw_start_acquisition,
.stop_acquisition = hw_stop_acquisition, .stop_acquisition = hw_stop_acquisition,
}; };

13
hardware/saleae-logic/saleae-logic.c
View File

@ -93,7 +93,7 @@ static libusb_context *usb_context = NULL;
static int new_saleae_logic_firmware = 0; static int new_saleae_logic_firmware = 0;
static int hw_set_configuration(int dev_index, int hwcap, void *value); static int hw_config_set(int dev_index, int hwcap, void *value);
static int hw_stop_acquisition(int dev_index, gpointer session_dev_id); static int hw_stop_acquisition(int dev_index, gpointer session_dev_id);
/** /**
@ -440,7 +440,7 @@ static int hw_opendev(int dev_index)
if (fx2->cur_samplerate == 0) { if (fx2->cur_samplerate == 0) {
/* Samplerate hasn't been set; default to the slowest one. */ /* Samplerate hasn't been set; default to the slowest one. */
if (hw_set_configuration(dev_index, SR_HWCAP_SAMPLERATE, if (hw_config_set(dev_index, SR_HWCAP_SAMPLERATE,
&supported_samplerates[0]) == SR_ERR) &supported_samplerates[0]) == SR_ERR)
return SR_ERR; return SR_ERR;
} }
@ -591,8 +591,7 @@ static uint8_t new_firmware_divider_value(uint64_t samplerate)
return 0; return 0;
} }
static int set_configuration_samplerate(struct sr_dev_inst *sdi, static int config_set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
uint64_t samplerate)
{ {
struct fx2_dev *fx2; struct fx2_dev *fx2;
uint8_t divider; uint8_t divider;
@ -628,7 +627,7 @@ static int set_configuration_samplerate(struct sr_dev_inst *sdi,
return SR_OK; return SR_OK;
} }
static int hw_set_configuration(int dev_index, int hwcap, void *value) static int hw_config_set(int dev_index, int hwcap, void *value)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct fx2_dev *fx2; struct fx2_dev *fx2;
@ -641,7 +640,7 @@ static int hw_set_configuration(int dev_index, int hwcap, void *value)
if (hwcap == SR_HWCAP_SAMPLERATE) { if (hwcap == SR_HWCAP_SAMPLERATE) {
tmp_u64 = value; tmp_u64 = value;
ret = set_configuration_samplerate(sdi, *tmp_u64); ret = config_set_samplerate(sdi, *tmp_u64);
} else if (hwcap == SR_HWCAP_PROBECONFIG) { } else if (hwcap == SR_HWCAP_PROBECONFIG) {
ret = configure_probes(fx2, (GSList *) value); ret = configure_probes(fx2, (GSList *) value);
} else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
@ -902,7 +901,7 @@ SR_PRIV struct sr_dev_plugin saleae_logic_plugin_info = {
.get_dev_info = hw_get_dev_info, .get_dev_info = hw_get_dev_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.hwcap_get_all = hw_hwcap_get_all, .hwcap_get_all = hw_hwcap_get_all,
.set_configuration = hw_set_configuration, .config_set = hw_config_set,
.start_acquisition = hw_start_acquisition, .start_acquisition = hw_start_acquisition,
.stop_acquisition = hw_stop_acquisition, .stop_acquisition = hw_stop_acquisition,
}; };

13
hardware/zeroplus-logic-cube/zeroplus.c
View File

@ -166,7 +166,7 @@ struct zp {
struct sr_usb_dev_inst *usb; struct sr_usb_dev_inst *usb;
}; };
static int hw_set_configuration(int dev_index, int hwcap, void *value); static int hw_config_set(int dev_index, int hwcap, void *value);
static unsigned int get_memory_size(int type) static unsigned int get_memory_size(int type)
{ {
@ -462,7 +462,7 @@ static int hw_opendev(int dev_index)
if (zp->cur_samplerate == 0) { if (zp->cur_samplerate == 0) {
/* Samplerate hasn't been set. Default to the slowest one. */ /* Samplerate hasn't been set. Default to the slowest one. */
if (hw_set_configuration(dev_index, SR_HWCAP_SAMPLERATE, if (hw_config_set(dev_index, SR_HWCAP_SAMPLERATE,
&samplerates.list[0]) == SR_ERR) &samplerates.list[0]) == SR_ERR)
return SR_ERR; return SR_ERR;
} }
@ -568,8 +568,7 @@ static int *hw_hwcap_get_all(void)
return hwcaps; return hwcaps;
} }
static int set_configuration_samplerate(struct sr_dev_inst *sdi, static int config_set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
uint64_t samplerate)
{ {
struct zp *zp; struct zp *zp;
@ -597,7 +596,7 @@ static int set_configuration_samplerate(struct sr_dev_inst *sdi,
return SR_OK; return SR_OK;
} }
static int hw_set_configuration(int dev_index, int hwcap, void *value) static int hw_config_set(int dev_index, int hwcap, void *value)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
uint64_t *tmp_u64; uint64_t *tmp_u64;
@ -616,7 +615,7 @@ static int hw_set_configuration(int dev_index, int hwcap, void *value)
switch (hwcap) { switch (hwcap) {
case SR_HWCAP_SAMPLERATE: case SR_HWCAP_SAMPLERATE:
tmp_u64 = value; tmp_u64 = value;
return set_configuration_samplerate(sdi, *tmp_u64); return config_set_samplerate(sdi, *tmp_u64);
case SR_HWCAP_PROBECONFIG: case SR_HWCAP_PROBECONFIG:
return configure_probes(sdi, (GSList *)value); return configure_probes(sdi, (GSList *)value);
case SR_HWCAP_LIMIT_SAMPLES: case SR_HWCAP_LIMIT_SAMPLES:
@ -740,7 +739,7 @@ SR_PRIV struct sr_dev_plugin zeroplus_logic_cube_plugin_info = {
.get_dev_info = hw_get_dev_info, .get_dev_info = hw_get_dev_info,
.get_status = hw_get_status, .get_status = hw_get_status,
.hwcap_get_all = hw_hwcap_get_all, .hwcap_get_all = hw_hwcap_get_all,
.set_configuration = hw_set_configuration, .config_set = hw_config_set,
.start_acquisition = hw_start_acquisition, .start_acquisition = hw_start_acquisition,
.stop_acquisition = hw_stop_acquisition, .stop_acquisition = hw_stop_acquisition,
}; };

4
session_driver.c
View File

@ -232,7 +232,7 @@ static int *hw_hwcap_get_all(void)
return hwcaps; return hwcaps;
} }
static int hw_set_configuration(int dev_index, int hwcap, void *value) static int hw_config_set(int dev_index, int hwcap, void *value)
{ {
struct session_vdev *vdev; struct session_vdev *vdev;
uint64_t *tmp_u64; uint64_t *tmp_u64;
@ -342,7 +342,7 @@ SR_PRIV struct sr_dev_plugin session_driver = {
hw_get_dev_info, hw_get_dev_info,
hw_get_status, hw_get_status,
hw_hwcap_get_all, hw_hwcap_get_all,
hw_set_configuration, hw_config_set,
hw_start_acquisition, hw_start_acquisition,
NULL, NULL,
}; };

8
session_file.c
View File

@ -120,17 +120,17 @@ SR_API int sr_session_load(const char *filename)
/* first device, init the plugin */ /* first device, init the plugin */
dev->plugin->init((char *)filename); dev->plugin->init((char *)filename);
sr_session_dev_add(dev); sr_session_dev_add(dev);
dev->plugin->set_configuration(devcnt, SR_HWCAP_CAPTUREFILE, val); dev->plugin->config_set(devcnt, SR_HWCAP_CAPTUREFILE, val);
g_ptr_array_add(capturefiles, val); g_ptr_array_add(capturefiles, val);
} else if (!strcmp(keys[j], "samplerate")) { } else if (!strcmp(keys[j], "samplerate")) {
sr_parse_sizestring(val, &tmp_u64); sr_parse_sizestring(val, &tmp_u64);
dev->plugin->set_configuration(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64); dev->plugin->config_set(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64);
} else if (!strcmp(keys[j], "unitsize")) { } else if (!strcmp(keys[j], "unitsize")) {
tmp_u64 = strtoull(val, NULL, 10); tmp_u64 = strtoull(val, NULL, 10);
dev->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_UNITSIZE, &tmp_u64); dev->plugin->config_set(devcnt, SR_HWCAP_CAPTURE_UNITSIZE, &tmp_u64);
} else if (!strcmp(keys[j], "total probes")) { } else if (!strcmp(keys[j], "total probes")) {
total_probes = strtoull(val, NULL, 10); total_probes = strtoull(val, NULL, 10);
dev->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes); dev->plugin->config_set(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes);
for (p = 0; p < total_probes; p++) { for (p = 0; p < total_probes; p++) {
snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p); snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
sr_dev_probe_add(dev, probename); sr_dev_probe_add(dev, probename);

4
sigrok.h
View File

@ -94,7 +94,7 @@ extern "C" {
typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data); typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
/* Data types used by hardware plugins for set_configuration() */ /* Data types used by hardware plugins for config_set() */
enum { enum {
SR_T_UINT64, SR_T_UINT64,
SR_T_CHAR, SR_T_CHAR,
@ -352,7 +352,7 @@ struct sr_dev_plugin {
void *(*get_dev_info) (int dev_index, int dev_info_id); void *(*get_dev_info) (int dev_index, int dev_info_id);
int (*get_status) (int dev_index); int (*get_status) (int dev_index);
int *(*hwcap_get_all) (void); int *(*hwcap_get_all) (void);
int (*set_configuration) (int dev_index, int hwcap, void *value); int (*config_set) (int dev_index, int hwcap, void *value);
int (*start_acquisition) (int dev_index, gpointer session_dev_id); int (*start_acquisition) (int dev_index, gpointer session_dev_id);
int (*stop_acquisition) (int dev_index, gpointer session_dev_id); int (*stop_acquisition) (int dev_index, gpointer session_dev_id);
}; };