Skip to content

Make the debug command be more deterministic about debug state. #214

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

Merged
merged 2 commits into from
Apr 11, 2016
Merged

Make the debug command be more deterministic about debug state. #214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
809503f
Make the debug command be more deterministic about debug state.
deeprave Feb 18, 2016
4861236
Be more deterministic in handling of the debug command - revised.
deeprave Feb 20, 2016
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: 59 additions & 6 deletions firmware/lm32/ci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,26 @@ static void debug_ddr(void)
printf("read:%5dMbps write:%5dMbps all:%5dMbps\r\n", rdb, wrb, rdb + wrb);
}

#if defined(CSR_HDMI_IN0_BASE) || defined(CSR_HDMI_IN1_BASE)
static void debug_input(unsigned int channels, unsigned int change, unsigned int state)
{
#ifdef CSR_HDMI_IN0_BASE
if (channels & 1) {
if (change & 1)
hdmi_in0_debug = (state & 1) != 0;
printf("HDMI Input 0 debug %s\r\n", hdmi_in0_debug ? "on" : "off");
}
#endif
#ifdef CSR_HDMI_IN1_BASE
if (channels & 2) {
if (change & 2)
hdmi_in1_debug = (state & 2) != 0;
printf("HDMI Input 1 debug %s\r\n", hdmi_in0_debug ? "on" : "off");
}
#endif
}
#endif

static char *readstr(void)
{
char c[2];
Expand Down Expand Up @@ -630,16 +650,49 @@ void ci_service(void)
token = get_token(&str);
if(strcmp(token, "pll") == 0)
debug_pll();
#if defined(CSR_HDMI_IN0_BASE) || defined(CSR_HDMI_IN1_BASE)
else if(strcmp(token, "input") == 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there anyway to reduce the duplication in the code below?

token = get_token(&str);
if(strcmp(token, "on") == 0)
debug_input(3, 3, 3);
else if(strcmp(token, "off") == 0)
debug_input(3, 3, 0);
else if(strcmp(token, "?") != 0)
debug_input(3, 3, (hdmi_in0_debug ? 0 : 1) | (hdmi_in1_debug ? 0 : 2));
else
debug_input(3, 0, 0);
}
else if(strcmp(token, "on") == 0)
debug_input(3, 3, 3);
else if(strcmp(token, "off") == 0)
debug_input(3, 3, 0);
else if(strcmp(token, "?") == 0)
debug_input(3, 0, 0);
#endif
#ifdef CSR_HDMI_IN0_BASE
else if(strcmp(token, "input0") == 0) {
hdmi_in0_debug = !hdmi_in0_debug;
printf("HDMI Input 0 debug %s\r\n", hdmi_in0_debug ? "on" : "off");
else if(strcmp(token, "input0") == 0 || strcmp(token, "0") == 0) {
token = get_token(&str);
if(strcmp(token, "on") == 0)
debug_input(1, 1, 1);
else if(strcmp(token, "off") == 0)
debug_input(1, 1, 0);
else if(strcmp(token, "?") != 0)
debug_input(1, 1, hdmi_in0_debug ? 0 : 1);
else
debug_input(1, 0, 0);
}
#endif
#ifdef CSR_HDMI_IN1_BASE
else if(strcmp(token, "input1") == 0) {
hdmi_in1_debug = !hdmi_in1_debug;
printf("HDMI Input 1 debug %s\r\n", hdmi_in1_debug ? "on" : "off");
else if(strcmp(token, "input1") == 0 || strcmp(token, "1") == 0) {
token = get_token(&str);
if(strcmp(token, "on") == 0)
debug_input(2, 2, 2);
else if(strcmp(token, "off") == 0)
debug_input(2, 2, 0);
else if(strcmp(token, "?") != 0)
debug_input(2, 2, hdmi_in1_debug ? 0 : 2);
else
debug_input(2, 0, 0);
}
#endif
else if(strcmp(token, "ddr") == 0)
Expand Down