Skip to content

OLS cleanups #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

OLS cleanups #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3a11254
Clean up OLS: Make use of zero-initialization, move comments to decla…
v1ne Mar 31, 2020
4921d76
Clean up OLS: Remove stray command
v1ne Mar 31, 2020
9d1b394
Clean up OLS: Be more specific about magic values and units in variab…
v1ne Mar 31, 2020
088f0c7
Clean up OLS: Rename "flags" to "capture flags". It's only about capt…
v1ne Mar 31, 2020
a14522b
Clean up OLS: Make constant names more precise, clarify comment
v1ne Mar 31, 2020
7dd3719
Clean up OLS: Use symbolic (non-)error names
v1ne Apr 1, 2020
aa4736b
Refactor OLS: Deduplicate code
v1ne Mar 31, 2020
eb05786
OLS: Document Demon Core commands, use canonic their names, detect it
v1ne Mar 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 34 additions & 31 deletions src/hardware/openbench-logic-sniffer/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,15 +213,15 @@ static int config_get(uint32_t key, GVariant **data,
*data = g_variant_new_uint64(devc->limit_samples);
break;
case SR_CONF_PATTERN_MODE:
if (devc->flag_reg & FLAG_EXTERNAL_TEST_MODE)
if (devc->capture_flags & CAPTURE_FLAG_EXTERNAL_TEST_MODE)
*data = g_variant_new_string(STR_PATTERN_EXTERNAL);
else if (devc->flag_reg & FLAG_INTERNAL_TEST_MODE)
else if (devc->capture_flags & CAPTURE_FLAG_INTERNAL_TEST_MODE)
*data = g_variant_new_string(STR_PATTERN_INTERNAL);
else
*data = g_variant_new_string(STR_PATTERN_NONE);
break;
case SR_CONF_RLE:
*data = g_variant_new_boolean(devc->flag_reg & FLAG_RLE ? TRUE : FALSE);
*data = g_variant_new_boolean(devc->capture_flags & CAPTURE_FLAG_RLE ? TRUE : FALSE);
break;
default:
return SR_ERR_NA;
Expand Down Expand Up @@ -260,10 +260,10 @@ static int config_set(uint32_t key, GVariant *data,
case SR_CONF_EXTERNAL_CLOCK:
if (g_variant_get_boolean(data)) {
sr_info("Enabling external clock.");
devc->flag_reg |= FLAG_CLOCK_EXTERNAL;
devc->capture_flags |= CAPTURE_FLAG_CLOCK_EXTERNAL;
} else {
sr_info("Disabled external clock.");
devc->flag_reg &= ~FLAG_CLOCK_EXTERNAL;
devc->capture_flags &= ~CAPTURE_FLAG_CLOCK_EXTERNAL;
}
break;
case SR_CONF_PATTERN_MODE:
Expand All @@ -273,33 +273,33 @@ static int config_set(uint32_t key, GVariant *data,
flag = 0x0000;
} else if (!strcmp(stropt, STR_PATTERN_INTERNAL)) {
sr_info("Enabling internal test mode.");
flag = FLAG_INTERNAL_TEST_MODE;
flag = CAPTURE_FLAG_INTERNAL_TEST_MODE;
} else if (!strcmp(stropt, STR_PATTERN_EXTERNAL)) {
sr_info("Enabling external test mode.");
flag = FLAG_EXTERNAL_TEST_MODE;
flag = CAPTURE_FLAG_EXTERNAL_TEST_MODE;
} else {
return SR_ERR;
}
devc->flag_reg &= ~FLAG_INTERNAL_TEST_MODE;
devc->flag_reg &= ~FLAG_EXTERNAL_TEST_MODE;
devc->flag_reg |= flag;
devc->capture_flags &= ~CAPTURE_FLAG_INTERNAL_TEST_MODE;
devc->capture_flags &= ~CAPTURE_FLAG_EXTERNAL_TEST_MODE;
devc->capture_flags |= flag;
break;
case SR_CONF_SWAP:
if (g_variant_get_boolean(data)) {
sr_info("Enabling channel swapping.");
devc->flag_reg |= FLAG_SWAP_CHANNELS;
devc->capture_flags |= CAPTURE_FLAG_SWAP_CHANNELS;
} else {
sr_info("Disabling channel swapping.");
devc->flag_reg &= ~FLAG_SWAP_CHANNELS;
devc->capture_flags &= ~CAPTURE_FLAG_SWAP_CHANNELS;
}
break;
case SR_CONF_RLE:
if (g_variant_get_boolean(data)) {
sr_info("Enabling RLE.");
devc->flag_reg |= FLAG_RLE;
devc->capture_flags |= CAPTURE_FLAG_RLE;
} else {
sr_info("Disabling RLE.");
devc->flag_reg &= ~FLAG_RLE;
devc->capture_flags &= ~CAPTURE_FLAG_RLE;
}
break;
default:
Expand Down Expand Up @@ -332,7 +332,7 @@ static int config_list(uint32_t key, GVariant **data,
if (!sdi)
return SR_ERR_ARG;
devc = sdi->priv;
if (devc->flag_reg & FLAG_RLE)
if (devc->capture_flags & CAPTURE_FLAG_RLE)
return SR_ERR_NA;
if (devc->max_samples == 0)
/* Device didn't specify sample memory size in metadata. */
Expand All @@ -358,7 +358,7 @@ static int config_list(uint32_t key, GVariant **data,
return SR_OK;
}

static int set_trigger(const struct sr_dev_inst *sdi, int stage)
static int set_basic_trigger(const struct sr_dev_inst *sdi, int stage)
{
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
Expand All @@ -367,23 +367,23 @@ static int set_trigger(const struct sr_dev_inst *sdi, int stage)
devc = sdi->priv;
serial = sdi->conn;

cmd = CMD_SET_TRIGGER_MASK + stage * 4;
cmd = CMD_SET_BASIC_TRIGGER_MASK0 + stage * 4;
arg[0] = devc->trigger_mask[stage] & 0xff;
arg[1] = (devc->trigger_mask[stage] >> 8) & 0xff;
arg[2] = (devc->trigger_mask[stage] >> 16) & 0xff;
arg[3] = (devc->trigger_mask[stage] >> 24) & 0xff;
if (send_longcommand(serial, cmd, arg) != SR_OK)
return SR_ERR;

cmd = CMD_SET_TRIGGER_VALUE + stage * 4;
cmd = CMD_SET_BASIC_TRIGGER_VALUE0 + stage * 4;
arg[0] = devc->trigger_value[stage] & 0xff;
arg[1] = (devc->trigger_value[stage] >> 8) & 0xff;
arg[2] = (devc->trigger_value[stage] >> 16) & 0xff;
arg[3] = (devc->trigger_value[stage] >> 24) & 0xff;
if (send_longcommand(serial, cmd, arg) != SR_OK)
return SR_ERR;

cmd = CMD_SET_TRIGGER_CONFIG + stage * 4;
cmd = CMD_SET_BASIC_TRIGGER_CONFIG0 + stage * 4;
arg[0] = arg[1] = arg[3] = 0x00;
arg[2] = stage;
if (stage == devc->num_stages)
Expand Down Expand Up @@ -440,16 +440,16 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
return SR_ERR;

delaycount = readcount * (1 - devc->capture_ratio / 100.0);
devc->trigger_at = (readcount - delaycount) * 4 - devc->num_stages;
devc->trigger_at_smpl = (readcount - delaycount) * 4 - devc->num_stages;
for (i = 0; i <= devc->num_stages; i++) {
sr_dbg("Setting OLS stage %d trigger.", i);
if ((ret = set_trigger(sdi, i)) != SR_OK)
if ((ret = set_basic_trigger(sdi, i)) != SR_OK)
return ret;
}
} else {
/* No triggers configured, force trigger on first stage. */
sr_dbg("Forcing trigger at stage 0.");
if ((ret = set_trigger(sdi, 0)) != SR_OK)
if ((ret = set_basic_trigger(sdi, 0)) != SR_OK)
return ret;
delaycount = readcount;
}
Expand Down Expand Up @@ -492,24 +492,27 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)

/* Flag register. */
sr_dbg("Setting intpat %s, extpat %s, RLE %s, noise_filter %s, demux %s",
devc->flag_reg & FLAG_INTERNAL_TEST_MODE ? "on": "off",
devc->flag_reg & FLAG_EXTERNAL_TEST_MODE ? "on": "off",
devc->flag_reg & FLAG_RLE ? "on" : "off",
devc->flag_reg & FLAG_FILTER ? "on": "off",
devc->flag_reg & FLAG_DEMUX ? "on" : "off");
devc->capture_flags & CAPTURE_FLAG_INTERNAL_TEST_MODE ? "on": "off",
devc->capture_flags & CAPTURE_FLAG_EXTERNAL_TEST_MODE ? "on": "off",
devc->capture_flags & CAPTURE_FLAG_RLE ? "on" : "off",
devc->capture_flags & CAPTURE_FLAG_NOISE_FILTER ? "on": "off",
devc->capture_flags & CAPTURE_FLAG_DEMUX ? "on" : "off");
/*
* Enable/disable OLS channel groups in the flag register according
* to the channel mask. 1 means "disable channel".
*/
devc->flag_reg |= ~(ols_changrp_mask << 2) & 0x3c;
arg[0] = devc->flag_reg & 0xff;
arg[1] = devc->flag_reg >> 8;
devc->capture_flags |= ~(ols_changrp_mask << 2) & 0x3c;

/* RLE mode is always zero, for now. */

arg[0] = devc->capture_flags & 0xff;
arg[1] = devc->capture_flags >> 8;
arg[2] = arg[3] = 0x00;
if (send_longcommand(serial, CMD_SET_FLAGS, arg) != SR_OK)
return SR_ERR;

/* Start acquisition on the device. */
if (send_shortcommand(serial, CMD_RUN) != SR_OK)
if (send_shortcommand(serial, CMD_ARM_BASIC_TRIGGER) != SR_OK)
return SR_ERR;

/* Reset all operational states. */
Expand Down
Loading