# HG changeset patch # User Paul Boddie # Date 1694990464 -7200 # Node ID 5a914ca513df7806b4192a341873a78c14335b05 # Parent 04e69fba99d861379ff3c24ef3db47df396dbe18 Adjusted visibility of various methods. Removed superfluous comments. diff -r 04e69fba99d8 -r 5a914ca513df pkg/devices/lib/cpm/include/cpm-common.h --- a/pkg/devices/lib/cpm/include/cpm-common.h Mon Sep 18 00:13:36 2023 +0200 +++ b/pkg/devices/lib/cpm/include/cpm-common.h Mon Sep 18 00:41:04 2023 +0200 @@ -309,14 +309,6 @@ { Field _multiplier, _input_divider, _output_divider0, _output_divider1; -public: - explicit Divider_pll(Field multiplier, Field input_divider, - Field output_divider0, Field output_divider1) - : _multiplier(multiplier), _input_divider(input_divider), - _output_divider0(output_divider0), _output_divider1(output_divider1) - { - } - // General frequency modifiers. uint32_t get_multiplier(Cpm_regs ®s); @@ -326,6 +318,14 @@ uint32_t get_output_divider(Cpm_regs ®s); void set_output_divider(Cpm_regs ®s, uint32_t divider); +public: + explicit Divider_pll(Field multiplier, Field input_divider, + Field output_divider0, Field output_divider1) + : _multiplier(multiplier), _input_divider(input_divider), + _output_divider0(output_divider0), _output_divider1(output_divider1) + { + } + // Output frequency. uint32_t get_frequency(Cpm_regs ®s, uint32_t source_frequency); @@ -344,6 +344,12 @@ { Field _multiplier, _divider_N, _divider_D; + // General frequency modifiers. + + uint32_t get_multiplier(Cpm_regs ®s); + uint32_t get_divider_N(Cpm_regs ®s); + uint32_t get_divider_D(Cpm_regs ®s); + public: explicit Divider_i2s(Field multiplier, Field divider_N, Field divider_D) @@ -352,12 +358,6 @@ { } - // General frequency modifiers. - - uint32_t get_multiplier(Cpm_regs ®s); - uint32_t get_divider_N(Cpm_regs ®s); - uint32_t get_divider_D(Cpm_regs ®s); - // Output frequency. uint32_t get_frequency(Cpm_regs ®s, uint32_t source_frequency); @@ -509,8 +509,6 @@ class Pll : public Clock_divided { - // Value storage. - Control_pll _control; Divider_pll _divider; @@ -538,8 +536,6 @@ class Clock : public Clock_divided { - // Value storage. - Control _control; Divider _divider; @@ -562,8 +558,6 @@ class Clock_divided_i2s : public Clock_divided { - // Value storage. - Control _control; Divider_i2s _divider;