Skip to content

S
Software for White Rabbit PTP Core
Commit f81fc5cf authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files
Options

post-rebase fixes

parent 61ebc593
Pipeline #4504 passed with stage
    in 3 minutes and 13 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 2 additions and 10 deletions
    boards/ertm14/board.c
    View file @ f81fc5cf
    ...@@ -1790,7 +1790,7 @@ static void ertm14_init_leds(void) ...@@ -1790,7 +1790,7 @@ static void ertm14_init_leds(void)
    static void ertm15_init_leds(void) static void ertm15_init_leds(void)
    { {
    blink_led(&pin_ertm15_led_ref_green); blink_led(&pin_ertm15_led_ref_green);
    blink_led(&pin_ertm15_led_lo_green); blink_led(&pin_ertm15_led_lo_green);
    blink_led(&pin_ertm15_led_clkb_green); blink_led(&pin_ertm15_led_clkb_green);
    ...@@ -1805,8 +1805,6 @@ static void ertm15_init_leds(void) ...@@ -1805,8 +1805,6 @@ static void ertm15_init_leds(void)
    led_create( &board.leds.clkb, &pin_ertm15_led_clkb_green, &pin_ertm15_led_clkb_red, LED_TYPE_DUAL_COLOR, LED_OFF ); led_create( &board.leds.clkb, &pin_ertm15_led_clkb_green, &pin_ertm15_led_clkb_red, LED_TYPE_DUAL_COLOR, LED_OFF );
    led_create( &board.leds.lo, &pin_ertm15_led_lo_green, &pin_ertm15_led_lo_red, LED_TYPE_DUAL_COLOR, LED_OFF ); led_create( &board.leds.lo, &pin_ertm15_led_lo_green, &pin_ertm15_led_lo_red, LED_TYPE_DUAL_COLOR, LED_OFF );
    led_create( &board.leds.ref, &pin_ertm15_led_ref_green, &pin_ertm15_led_ref_red, LED_TYPE_DUAL_COLOR, LED_OFF ); led_create( &board.leds.ref, &pin_ertm15_led_ref_green, &pin_ertm15_led_ref_red, LED_TYPE_DUAL_COLOR, LED_OFF );
    }
    } }
    // initializes the eRTM15 LTC6950 PLL & OCXO // initializes the eRTM15 LTC6950 PLL & OCXO
    ......
    boards/ertm14/board.h
    View file @ f81fc5cf
    ...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
    #undef BOARD_ERTM14_REV_1 #undef BOARD_ERTM14_REV_1
    #define BOARD_ERTM14_REV_2 #define BOARD_ERTM14_REV_2
    #define BOARD_MAX_CONSOLE_DEVICES (3 + HAS_NETCONSOLE + HAS_PUTS_SYSLOG) #define BOARD_CONSOLE_DEVICES 2
    #define BOARD_USE_EVENTS 1 #define BOARD_USE_EVENTS 1
    ...@@ -66,9 +66,6 @@ ...@@ -66,9 +66,6 @@
    /* Number of auxillary clock channels - usually equal to the number of FMCs */ /* Number of auxillary clock channels - usually equal to the number of FMCs */
    #define NUM_AUX_CLOCKS 1 #define NUM_AUX_CLOCKS 1
    int board_init(void);
    int board_update(void);
    /* spll parameter that are board-specific */ /* spll parameter that are board-specific */
    # define BOARD_DIVIDE_DMTD_CLOCKS 0 # define BOARD_DIVIDE_DMTD_CLOCKS 0
    # define NS_PER_CLOCK 16 # define NS_PER_CLOCK 16
    ......
    softpll/spll_main.c
    View file @ f81fc5cf
    ...@@ -193,9 +193,6 @@ int mpll_update(struct spll_main_state *s, int tag, int source) ...@@ -193,9 +193,6 @@ int mpll_update(struct spll_main_state *s, int tag, int source)
    int err, y; int err, y;
    int mtag = DBG_MAIN( s->id_out - spll_n_chan_ref );
    if (source == s->id_ref) if (source == s->id_ref)
    { {
    s->tag_ref = tag; s->tag_ref = tag;
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment