Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

constexpr a bunch of stuff.

Browse Source
This commit is contained in:
Jared Boone 2015-12-08 13:47:52 -08:00
parent 0c1c0da8a5
commit 31fdf026f2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
firmware/application/app_ais.cpp
View File

@ -34,7 +34,7 @@ namespace baseband {
namespace ais { namespace ais {
struct CRCBitRemap { struct CRCBitRemap {
size_t operator()(const size_t bit_index) const { constexpr size_t operator()(const size_t& bit_index) const {
return bit_index; return bit_index;
} }
}; };
@ -58,23 +58,23 @@ struct PacketLengthRange {
// static_assert((max_bits & 7) == 0, "minimum bits not a multiple of 8"); // static_assert((max_bits & 7) == 0, "minimum bits not a multiple of 8");
} }
bool contains(const size_t bit_count) const { constexpr bool contains(const size_t bit_count) const {
return !is_above(bit_count) && !is_below(bit_count); return !is_above(bit_count) && !is_below(bit_count);
} }
bool is_above(const size_t bit_count) const { constexpr bool is_above(const size_t bit_count) const {
return (min() > bit_count); return (min() > bit_count);
} }
bool is_below(const size_t bit_count) const { constexpr bool is_below(const size_t bit_count) const {
return (max() < bit_count); return (max() < bit_count);
} }
size_t min() const { constexpr size_t min() const {
return min_bytes * 8; return min_bytes * 8;
} }
size_t max() const { constexpr size_t max() const {
return max_bytes * 8; return max_bytes * 8;
} }
@ -119,13 +119,13 @@ static constexpr std::array<PacketLengthRange, 64> packet_length_range { {
} }; } };
struct PacketLengthValidator { struct PacketLengthValidator {
bool operator()(const uint_fast8_t message_id, const size_t length) { constexpr bool operator()(const uint_fast8_t message_id, const size_t length) const {
return packet_length_range[message_id].contains(length); return packet_length_range[message_id].contains(length);
} }
}; };
struct PacketTooLong { struct PacketTooLong {
bool operator()(const uint_fast8_t message_id, const size_t length) { constexpr bool operator()(const uint_fast8_t message_id, const size_t length) const {
return packet_length_range[message_id].is_below(length); return packet_length_range[message_id].is_below(length);
} }
}; };
@ -174,7 +174,7 @@ static std::string format_navigational_status(const unsigned int value) {
} }
} }
static char char_to_ascii(const uint8_t c) { static constexpr char char_to_ascii(const uint8_t c) {
return (c ^ 32) + 32; return (c ^ 32) + 32;
} }

2
firmware/application/app_ais.hpp
View File

@ -44,7 +44,7 @@ namespace baseband {
namespace ais { namespace ais {
struct BitRemap { struct BitRemap {
size_t operator()(const size_t bit_index) const { constexpr size_t operator()(const size_t bit_index) const {
return bit_index ^ 7; return bit_index ^ 7;
} }
}; };

2
firmware/application/app_ert.hpp
View File

@ -39,7 +39,7 @@ using namespace lpc43xx;
namespace ert { namespace ert {
struct BitRemap { struct BitRemap {
size_t operator()(const size_t bit_index) const { constexpr size_t operator()(const size_t bit_index) const {
return bit_index; return bit_index;
} }
}; };