Skip to content

S
Software for White Rabbit PTP Core
Commit 146c1411 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files
Options

softpll: fix compilation warnings

parent 29b5155a
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 4 deletions
include/trace.h
View file @ 146c1411
...@@ -2,12 +2,14 @@ ...@@ -2,12 +2,14 @@
#define __FREESTANDING_TRACE_H__ #define __FREESTANDING_TRACE_H__
#ifdef CONFIG_WR_NODE #ifdef CONFIG_WR_NODE
#include <wrc.h>
#define TRACE_WRAP(...) #define TRACE_WRAP(...)
#define TRACE_DEV(...) wrc_debug_printf(0, __VA_ARGS__) #define TRACE_DEV(...) wrc_debug_printf(0, __VA_ARGS__)
#else /* WR_SWITCH */ #else /* WR_SWITCH */
#include <pp-printf.h>
#define TRACE(...) pp_printf(__VA_ARGS__) #define TRACE(...) pp_printf(__VA_ARGS__)
#define TRACE_DEV(...) pp_printf(__VA_ARGS__) #define TRACE_DEV(...) pp_printf(__VA_ARGS__)
......
softpll/softpll_ng.c
View file @ 146c1411
...@@ -658,6 +658,8 @@ static int spll_measure_frequency(int osc) ...@@ -658,6 +658,8 @@ static int spll_measure_frequency(int osc)
case SPLL_OSC_EXT: case SPLL_OSC_EXT:
reg = &SPLL->F_EXT; reg = &SPLL->F_EXT;
break; break;
default:
return 0;
} }
timer_delay_ms(2000); timer_delay_ms(2000);
......
softpll/spll_common.c
View file @ 146c1411
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
/* spll_common.c - common data structures and functions used by the SoftPLL */ /* spll_common.c - common data structures and functions used by the SoftPLL */
#include <string.h> #include <string.h>
#include <pp-printf.h>
#include "trace.h"
#include "spll_defs.h" #include "spll_defs.h"
#include "spll_common.h" #include "spll_common.h"
......
softpll/spll_external.c
View file @ 146c1411
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "spll_external.h" #include "spll_external.h"
#include "spll_debug.h" #include "spll_debug.h"
#include <pp-printf.h>
#include "trace.h" #include "trace.h"
#include "irq.h" #include "irq.h"
...@@ -58,7 +59,7 @@ void external_start(struct spll_external_state *s) ...@@ -58,7 +59,7 @@ void external_start(struct spll_external_state *s)
spll_debug (DBG_EVENT | DBG_EXT, DBG_EVT_START, 1); spll_debug (DBG_EVENT | DBG_EXT, DBG_EVT_START, 1);
} }
int external_locked(struct spll_external_state *s) int external_locked(volatile struct spll_external_state *s)
{ {
if (!s->helper->ld.locked || !s->main->ld.locked) if (!s->helper->ld.locked || !s->main->ld.locked)
return 0; return 0;
...@@ -90,7 +91,7 @@ static int align_sample(int channel, int *v) ...@@ -90,7 +91,7 @@ static int align_sample(int channel, int *v)
return 0; // sample not valid return 0; // sample not valid
} }
void external_align_fsm( struct spll_external_state *s ) void external_align_fsm(volatile struct spll_external_state *s)
{ {
int v; int v;
switch(s->align_state) { switch(s->align_state) {
......
softpll/spll_external.h
View file @ 146c1411
...@@ -35,8 +35,8 @@ void external_init(volatile struct spll_external_state *s, int ext_ref, ...@@ -35,8 +35,8 @@ void external_init(volatile struct spll_external_state *s, int ext_ref,
void external_start(struct spll_external_state *s); void external_start(struct spll_external_state *s);
int external_locked(struct spll_external_state *s); int external_locked(volatile struct spll_external_state *s);
void external_align_fsm( struct spll_external_state *s ); void external_align_fsm(volatile struct spll_external_state *s);
#endif // __SPLL_EXTERNAL_H #endif // __SPLL_EXTERNAL_H
softpll/spll_main.c
View file @ 146c1411
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#include "spll_main.h" #include "spll_main.h"
#include "spll_debug.h" #include "spll_debug.h"
#include <pp-printf.h>
#include "trace.h"
#define MPLL_TAG_WRAPAROUND 100000000 #define MPLL_TAG_WRAPAROUND 100000000
......
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