Skip to content

S
Software for White Rabbit PTP Core
Commit f46d263b authored by Alessandro Rubini's avatar Alessandro Rubini Committed by Adam Wujek
Browse files
Options

softpll: removed unused fields 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent ce9e6348
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 39 deletions
dump-info.c
View file @ f46d263b
...@@ -196,7 +196,6 @@ struct dump_info dump_info[] = { ...@@ -196,7 +196,6 @@ struct dump_info dump_info[] = {
DUMP_FIELD(int, mode), DUMP_FIELD(int, mode),
DUMP_FIELD(int, seq_state), DUMP_FIELD(int, seq_state),
DUMP_FIELD(int, dac_timeout), DUMP_FIELD(int, dac_timeout),
DUMP_FIELD(int, default_dac_main),
DUMP_FIELD(int, delock_count), DUMP_FIELD(int, delock_count),
DUMP_FIELD(uint32_t, irq_count), DUMP_FIELD(uint32_t, irq_count),
DUMP_FIELD(int, mpll_shift_ps), DUMP_FIELD(int, mpll_shift_ps),
...@@ -205,7 +204,6 @@ struct dump_info dump_info[] = { ...@@ -205,7 +204,6 @@ struct dump_info dump_info[] = {
DUMP_FIELD(int, helper.tag_d0), DUMP_FIELD(int, helper.tag_d0),
DUMP_FIELD(int, helper.ref_src), DUMP_FIELD(int, helper.ref_src),
DUMP_FIELD(int, helper.sample_n), DUMP_FIELD(int, helper.sample_n),
DUMP_FIELD(int, helper.delock_count),
/* FIXME: missing helper.pi etc.. */ /* FIXME: missing helper.pi etc.. */
DUMP_FIELD(int, ext.enabled), DUMP_FIELD(int, ext.enabled),
DUMP_FIELD(int, ext.align_state), DUMP_FIELD(int, ext.align_state),
...@@ -221,16 +219,11 @@ struct dump_info dump_info[] = { ...@@ -221,16 +219,11 @@ struct dump_info dump_info[] = {
DUMP_FIELD(int, mpll.tag_out), DUMP_FIELD(int, mpll.tag_out),
DUMP_FIELD(int, mpll.tag_ref_d), DUMP_FIELD(int, mpll.tag_ref_d),
DUMP_FIELD(int, mpll.tag_out_d), DUMP_FIELD(int, mpll.tag_out_d),
DUMP_FIELD(uint32_t, mpll.seq_ref),
DUMP_FIELD(int, mpll.seq_out),
DUMP_FIELD(int, mpll.match_state),
DUMP_FIELD(int, mpll.match_seq),
DUMP_FIELD(int, mpll.phase_shift_target), DUMP_FIELD(int, mpll.phase_shift_target),
DUMP_FIELD(int, mpll.phase_shift_current), DUMP_FIELD(int, mpll.phase_shift_current),
DUMP_FIELD(int, mpll.id_ref), DUMP_FIELD(int, mpll.id_ref),
DUMP_FIELD(int, mpll.id_out), DUMP_FIELD(int, mpll.id_out),
DUMP_FIELD(int, mpll.sample_n), DUMP_FIELD(int, mpll.sample_n),
DUMP_FIELD(int, mpll.delock_count),
DUMP_FIELD(int, mpll.dac_index), DUMP_FIELD(int, mpll.dac_index),
DUMP_FIELD(int, mpll.enabled), DUMP_FIELD(int, mpll.enabled),
......
include/revision.h
View file @ f46d263b
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
/* Please increment WRPC_SHMEM_VERSION if you change any exported data /* Please increment WRPC_SHMEM_VERSION if you change any exported data
* structure */ * structure */
#define WRPC_SHMEM_VERSION 1 /* first version */ #define WRPC_SHMEM_VERSION 2 /* removed some unused fields */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern const char *build_revision; extern const char *build_revision;
......
softpll/softpll_ng.h
View file @ f46d263b
...@@ -31,10 +31,6 @@ ...@@ -31,10 +31,6 @@
#define SPLL_AUX_ENABLED (1<<0) /* Locking the particular aux channel to the WR reference is enabled */ #define SPLL_AUX_ENABLED (1<<0) /* Locking the particular aux channel to the WR reference is enabled */
#define SPLL_AUX_LOCKED (1<<1) /* The particular aux clock is already locked to WR reference */ #define SPLL_AUX_LOCKED (1<<1) /* The particular aux clock is already locked to WR reference */
/* Phase detector types */
#define SPLL_PD_DDMTD 0
#define SPLL_PD_BANGBANG 1
/* Channels for spll_measure_frequency() */ /* Channels for spll_measure_frequency() */
#define SPLL_OSC_REF 0 #define SPLL_OSC_REF 0
#define SPLL_OSC_DMTD 1 #define SPLL_OSC_DMTD 1
...@@ -131,7 +127,6 @@ struct softpll_state { ...@@ -131,7 +127,6 @@ struct softpll_state {
int mode; int mode;
int seq_state; int seq_state;
int dac_timeout; int dac_timeout;
int default_dac_main;
int delock_count; int delock_count;
unsigned irq_count; unsigned irq_count;
int32_t mpll_shift_ps; int32_t mpll_shift_ps;
......
softpll/spll_helper.c
View file @ f46d263b
...@@ -11,13 +11,6 @@ ...@@ -11,13 +11,6 @@
#include "softpll_ng.h" #include "softpll_ng.h"
const int helper_precomp_coefs [] =
{ /*b0*/ 60648,
/*b1*/ 60648,
/*b2*/ 0,
/*a1*/ 55760,
/*a2*/ 0};
void helper_init(struct spll_helper_state *s, int ref_channel) void helper_init(struct spll_helper_state *s, int ref_channel)
{ {
...@@ -33,7 +26,6 @@ void helper_init(struct spll_helper_state *s, int ref_channel) ...@@ -33,7 +26,6 @@ void helper_init(struct spll_helper_state *s, int ref_channel)
s->ld.lock_samples = 10000; s->ld.lock_samples = 10000;
s->ld.delock_samples = 100; s->ld.delock_samples = 100;
s->ref_src = ref_channel; s->ref_src = ref_channel;
s->delock_count = 0;
} }
int helper_update(struct spll_helper_state *s, int tag, int helper_update(struct spll_helper_state *s, int tag,
...@@ -101,8 +93,6 @@ void helper_start(struct spll_helper_state *s) ...@@ -101,8 +93,6 @@ void helper_start(struct spll_helper_state *s)
pi_init((spll_pi_t *)&s->pi); pi_init((spll_pi_t *)&s->pi);
ld_init((spll_lock_det_t *)&s->ld); ld_init((spll_lock_det_t *)&s->ld);
biquad_init(&s->precomp, helper_precomp_coefs, 16);
spll_enable_tagger(s->ref_src, 1); spll_enable_tagger(s->ref_src, 1);
spll_debug(DBG_EVENT | DBG_HELPER, DBG_EVT_START, 1); spll_debug(DBG_EVENT | DBG_HELPER, DBG_EVT_START, 1);
} }
......
softpll/spll_helper.h
View file @ f46d263b
...@@ -31,10 +31,8 @@ struct spll_helper_state { ...@@ -31,10 +31,8 @@ struct spll_helper_state {
int p_setpoint, tag_d0; int p_setpoint, tag_d0;
int ref_src; int ref_src;
int sample_n; int sample_n;
int delock_count;
spll_pi_t pi; spll_pi_t pi;
spll_lock_det_t ld; spll_lock_det_t ld;
spll_biquad_t precomp;
}; };
void helper_init(struct spll_helper_state *s, int ref_channel); void helper_init(struct spll_helper_state *s, int ref_channel);
......
softpll/spll_main.c
View file @ f46d263b
...@@ -14,10 +14,6 @@ ...@@ -14,10 +14,6 @@
#define MPLL_TAG_WRAPAROUND 100000000 #define MPLL_TAG_WRAPAROUND 100000000
#define MATCH_NEXT_TAG 0
#define MATCH_WAIT_REF 1
#define MATCH_WAIT_OUT 2
#undef WITH_SEQUENCING #undef WITH_SEQUENCING
void mpll_init(struct spll_main_state *s, int id_ref, void mpll_init(struct spll_main_state *s, int id_ref,
...@@ -37,7 +33,6 @@ void mpll_init(struct spll_main_state *s, int id_ref, ...@@ -37,7 +33,6 @@ void mpll_init(struct spll_main_state *s, int id_ref,
#else #else
#error "Please set CONFIG for wr switch or wr node" #error "Please set CONFIG for wr switch or wr node"
#endif #endif
s->delock_count = 0;
s->enabled = 0; s->enabled = 0;
/* Freqency branch lock detection */ /* Freqency branch lock detection */
...@@ -63,9 +58,6 @@ void mpll_start(struct spll_main_state *s) ...@@ -63,9 +58,6 @@ void mpll_start(struct spll_main_state *s)
s->tag_out = -1; s->tag_out = -1;
s->tag_ref_d = -1; s->tag_ref_d = -1;
s->tag_out_d = -1; s->tag_out_d = -1;
s->seq_ref = 0;
s->seq_out = 0;
s->match_state = MATCH_NEXT_TAG;
s->phase_shift_target = 0; s->phase_shift_target = 0;
s->phase_shift_current = 0; s->phase_shift_current = 0;
......
softpll/spll_main.h
View file @ f46d263b
...@@ -23,16 +23,10 @@ struct spll_main_state { ...@@ -23,16 +23,10 @@ struct spll_main_state {
int adder_ref, adder_out, tag_ref, tag_out, tag_ref_d, tag_out_d; int adder_ref, adder_out, tag_ref, tag_out, tag_ref_d, tag_out_d;
// tag sequencing stuff
uint32_t seq_ref, seq_out;
int match_state;
int match_seq;
int phase_shift_target; int phase_shift_target;
int phase_shift_current; int phase_shift_current;
int id_ref, id_out; /* IDs of the reference and the output channel */ int id_ref, id_out; /* IDs of the reference and the output channel */
int sample_n; int sample_n;
int delock_count;
int dac_index; int dac_index;
int enabled; int enabled;
}; };
......
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