Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-09-20 08:05:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

C++14: const all the methods!

Browse Source
This commit is contained in:
Jared Boone 2017-01-05 17:06:44 -08:00
parent 01cd8c7776
commit 0ea2f9650e
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
firmware/application/si5351.hpp
View File

@ -168,7 +168,7 @@ struct Inputs {
const uint32_t f_clkin; const uint32_t f_clkin;
const uint32_t clkin_div; const uint32_t clkin_div;
constexpr uint32_t f_clkin_out() { constexpr uint32_t f_clkin_out() const {
return f_clkin / clkin_div; return f_clkin / clkin_div;
} }
}; };
@ -181,23 +181,23 @@ struct PLL {
const uint32_t b; const uint32_t b;
const uint32_t c; const uint32_t c;
constexpr uint32_t f_vco() { constexpr uint32_t f_vco() const {
return f_in * (a + (float)b / (float)c); return f_in * (a + (float)b / (float)c);
} }
constexpr uint32_t p1() { constexpr uint32_t p1() const {
return 128 * a + (uint32_t)(128 * (float)b / (float)c) - 512; return 128 * a + (uint32_t)(128 * (float)b / (float)c) - 512;
} }
constexpr uint32_t p2() { constexpr uint32_t p2() const {
return 128 * b - c * (uint32_t)(128 * (float)b / (float)c); return 128 * b - c * (uint32_t)(128 * (float)b / (float)c);
} }
constexpr uint32_t p3() { constexpr uint32_t p3() const {
return c; return c;
} }
constexpr PLLReg reg(const uint8_t pll_n) { constexpr PLLReg reg(const uint8_t pll_n) const {
return { return {
uint8_t(26 + (pll_n * 8)), uint8_t(26 + (pll_n * 8)),
uint8_t((p3() >> 8) & 0xff), uint8_t((p3() >> 8) & 0xff),
@ -224,23 +224,23 @@ struct MultisynthFractional {
const uint32_t c; const uint32_t c;
const uint32_t r_div; const uint32_t r_div;
constexpr uint32_t p1() { constexpr uint32_t p1() const {
return 128 * a + (uint32_t)(128 * (float)b / (float)c) - 512; return 128 * a + (uint32_t)(128 * (float)b / (float)c) - 512;
} }
constexpr uint32_t p2() { constexpr uint32_t p2() const {
return 128 * b - c * (uint32_t)(128 * (float)b / (float)c); return 128 * b - c * (uint32_t)(128 * (float)b / (float)c);
} }
constexpr uint32_t p3() { constexpr uint32_t p3() const {
return c; return c;
} }
constexpr uint32_t f_out() { constexpr uint32_t f_out() const {
return f_src / (a + (float)b / (float)c) / (1 << r_div); return f_src / (a + (float)b / (float)c) / (1 << r_div);
} }
constexpr MultisynthFractionalReg reg(const uint8_t multisynth_n) { constexpr MultisynthFractionalReg reg(const uint8_t multisynth_n) const {
return { return {
uint8_t(42 + (multisynth_n * 8)), uint8_t(42 + (multisynth_n * 8)),
uint8_t((p3() >> 8) & 0xFF), uint8_t((p3() >> 8) & 0xFF),
@ -260,11 +260,11 @@ struct MultisynthInteger {
const uint32_t a; const uint32_t a;
const uint32_t r_div; const uint32_t r_div;
constexpr uint8_t p1() { constexpr uint8_t p1() const {
return a; return a;
} }
constexpr uint32_t f_out() { constexpr uint32_t f_out() const {
return f_src / a / (1 << r_div); return f_src / a / (1 << r_div);
} }
}; };

6
firmware/common/i2c_pp.hpp
View File

@ -46,15 +46,15 @@ struct I2CClockConfig {
return 1e9 / f; return 1e9 / f;
} }
constexpr uint32_t i2c_period_count() { constexpr uint32_t i2c_period_count() const {
return period_ns(bus_f) / period_ns(clock_source_f) + 0.5f; return period_ns(bus_f) / period_ns(clock_source_f) + 0.5f;
} }
constexpr uint32_t i2c_high_count() { constexpr uint32_t i2c_high_count() const {
return high_period_ns / period_ns(clock_source_f) + 0.5f; return high_period_ns / period_ns(clock_source_f) + 0.5f;
} }
constexpr uint32_t i2c_low_count() { constexpr uint32_t i2c_low_count() const {
return i2c_period_count() - i2c_high_count(); return i2c_period_count() - i2c_high_count();
} }
}; };

6
firmware/common/memory_map.hpp
View File

@ -43,15 +43,15 @@ public:
} }
constexpr uint32_t base() { constexpr uint32_t base() const {
return base_; return base_;
} }
constexpr uint32_t end() { constexpr uint32_t end() const {
return base_ + size_; return base_ + size_;
} }
constexpr size_t size() { constexpr size_t size() const {
return size_; return size_;
} }

2
firmware/common/spi_image.hpp
View File

@ -86,7 +86,7 @@ struct region_t {
const size_t offset; const size_t offset;
const size_t size; const size_t size;
constexpr const void* base() { constexpr const void* base() const {
return reinterpret_cast<void*>(portapack::memory::map::spifi_cached.base() + offset); return reinterpret_cast<void*>(portapack::memory::map::spifi_cached.base() + offset);
} }
}; };