Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: timvideos/HDMI2USB-litex-firmware
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a6c7618b1236
Choose a base ref
...
head repository: timvideos/HDMI2USB-litex-firmware
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ccb30b98cf86
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 30, 2017

  1. Replace debug (pll|mmcm) with debug clocks 

    Only one of these will be active, and output anything, so let's just run
both, under the hood.
    @stefanor
    stefanor committed Oct 30, 2017
    Copy the full SHA
    4641ee3 View commit details

  2. Merge pull request #365 from stefanor/debug-clock 

    Replace debug (pll|mmcm) with debug clocks
    @mithro
    mithro authored Oct 30, 2017
    Copy the full SHA
    ccb30b9 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 firmware/ci.c
12 changes: 7 additions & 5 deletions firmware/ci.c
View file
Original file line number Diff line number Diff line change
@@ -38,6 +38,7 @@
#include "hdmi_out1.h"
#include "heartbeat.h"
#include "mdio.h"
#include "mmcm.h"
#include "opsis_eeprom.h"
#include "pattern.h"
#include "pll.h"
@@ -161,8 +162,7 @@ static void help_debug(void)
#ifdef CSR_GENERATOR_BASE
wputs(" debug sdram_test - run a memory test");
#endif
wputs(" debug pll - dump pll configuration");
wputs(" debug mmcm - dump mmcm configuration");
wputs(" debug clocks - dump pll/mmcm configuration");
#ifdef CSR_HDMI_IN0_BASE
wputs(" debug input0 <on/off> - debug dvisampler0");
#endif
@@ -935,9 +935,11 @@ void encoder_off(void)
}
#endif

static void debug_pll(void)
static void debug_clocks(void)
{
// Only the active clock system will output anything
pll_dump();
mmcm_dump();
}

static unsigned int log2(unsigned int v)
@@ -1182,8 +1184,8 @@ void ci_service(void)
}
else if((strcmp(token, "debug") == 0) || (strcmp(token, "d") == 0)) {
token = get_token(&str);
if(strcmp(token, "pll") == 0)
debug_pll();
if(strcmp(token, "clocks") == 0)
debug_clocks();
#ifdef CSR_GENERATOR_BASE
else if(strcmp(token, "sdram_test") == 0) bist_test();
#endif