1.1 --- a/pkg/devices/lib/cpm/include/cpm-common.h Mon Sep 18 00:13:36 2023 +0200
1.2 +++ b/pkg/devices/lib/cpm/include/cpm-common.h Mon Sep 18 00:41:04 2023 +0200
1.3 @@ -309,14 +309,6 @@
1.4 {
1.5 Field _multiplier, _input_divider, _output_divider0, _output_divider1;
1.6
1.7 -public:
1.8 - explicit Divider_pll(Field multiplier, Field input_divider,
1.9 - Field output_divider0, Field output_divider1)
1.10 - : _multiplier(multiplier), _input_divider(input_divider),
1.11 - _output_divider0(output_divider0), _output_divider1(output_divider1)
1.12 - {
1.13 - }
1.14 -
1.15 // General frequency modifiers.
1.16
1.17 uint32_t get_multiplier(Cpm_regs ®s);
1.18 @@ -326,6 +318,14 @@
1.19 uint32_t get_output_divider(Cpm_regs ®s);
1.20 void set_output_divider(Cpm_regs ®s, uint32_t divider);
1.21
1.22 +public:
1.23 + explicit Divider_pll(Field multiplier, Field input_divider,
1.24 + Field output_divider0, Field output_divider1)
1.25 + : _multiplier(multiplier), _input_divider(input_divider),
1.26 + _output_divider0(output_divider0), _output_divider1(output_divider1)
1.27 + {
1.28 + }
1.29 +
1.30 // Output frequency.
1.31
1.32 uint32_t get_frequency(Cpm_regs ®s, uint32_t source_frequency);
1.33 @@ -344,6 +344,12 @@
1.34 {
1.35 Field _multiplier, _divider_N, _divider_D;
1.36
1.37 + // General frequency modifiers.
1.38 +
1.39 + uint32_t get_multiplier(Cpm_regs ®s);
1.40 + uint32_t get_divider_N(Cpm_regs ®s);
1.41 + uint32_t get_divider_D(Cpm_regs ®s);
1.42 +
1.43 public:
1.44 explicit Divider_i2s(Field multiplier, Field divider_N,
1.45 Field divider_D)
1.46 @@ -352,12 +358,6 @@
1.47 {
1.48 }
1.49
1.50 - // General frequency modifiers.
1.51 -
1.52 - uint32_t get_multiplier(Cpm_regs ®s);
1.53 - uint32_t get_divider_N(Cpm_regs ®s);
1.54 - uint32_t get_divider_D(Cpm_regs ®s);
1.55 -
1.56 // Output frequency.
1.57
1.58 uint32_t get_frequency(Cpm_regs ®s, uint32_t source_frequency);
1.59 @@ -509,8 +509,6 @@
1.60
1.61 class Pll : public Clock_divided
1.62 {
1.63 - // Value storage.
1.64 -
1.65 Control_pll _control;
1.66 Divider_pll _divider;
1.67
1.68 @@ -538,8 +536,6 @@
1.69
1.70 class Clock : public Clock_divided
1.71 {
1.72 - // Value storage.
1.73 -
1.74 Control _control;
1.75 Divider _divider;
1.76
1.77 @@ -562,8 +558,6 @@
1.78
1.79 class Clock_divided_i2s : public Clock_divided
1.80 {
1.81 - // Value storage.
1.82 -
1.83 Control _control;
1.84 Divider_i2s _divider;
1.85