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

Minor cosmetics and consistency fixes.

This commit is contained in:
Uwe Hermann 2015-03-27 08:43:45 +01:00
parent b1f8310376
commit 2ea67fc9bf
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hardware/link-mso19/api.c
View File

@ -268,14 +268,14 @@ static int cleanup(const struct sr_dev_driver *di)
return dev_clear(); return dev_clear();
} }
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg) const struct sr_channel_group *cg)
{ {
struct dev_context *devc; struct dev_context *devc;
(void)cg; (void)cg;
switch (id) { switch (key) {
case SR_CONF_SAMPLERATE: case SR_CONF_SAMPLERATE:
if (sdi) { if (sdi) {
devc = sdi->priv; devc = sdi->priv;
@ -290,7 +290,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
return SR_OK; return SR_OK;
} }
static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg) const struct sr_channel_group *cg)
{ {
int ret; int ret;
@ -306,7 +306,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
switch (id) { switch (key) {
case SR_CONF_SAMPLERATE: case SR_CONF_SAMPLERATE:
// FIXME // FIXME
return mso_configure_rate(sdi, g_variant_get_uint64(data)); return mso_configure_rate(sdi, g_variant_get_uint64(data));

3
src/hardware/rigol-ds/protocol.c
View File

@ -415,8 +415,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
sr_dbg("Starting reading data from channel %d", ch->index + 1); sr_dbg("Starting reading data from channel %d", ch->index + 1);
switch (devc->model->series->protocol) switch (devc->model->series->protocol) {
{
case PROTOCOL_V1: case PROTOCOL_V1:
case PROTOCOL_V2: case PROTOCOL_V2:
if (ch->type == SR_CHANNEL_LOGIC) { if (ch->type == SR_CHANNEL_LOGIC) {