X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=1bbd8d7cf0e7c40255ce13ae21d7211cafc550d6;hb=bc4b9ccfc78d9d0987525360fa6d93bed681951a;hp=58cf00e5dddbfcc6e1514cb0534084546fbe3dec;hpb=53aa9bb42c921cfc3a658855598f984cdaac17d0;p=pulseview.git
diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index 58cf00e..1bbd8d7 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -17,12 +17,15 @@
* along with this program; if not, see .
*/
+#include "config.h" // For HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
+
#include
#include
#include
#include
#include
+#include
#include "logic.hpp"
#include "logicsegment.hpp"
@@ -62,7 +65,7 @@ LogicSegment::~LogicSegment()
free(l.data);
}
-uint64_t LogicSegment::unpack_sample(const uint8_t *ptr) const
+inline uint64_t LogicSegment::unpack_sample(const uint8_t *ptr) const
{
#ifdef HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
return *(uint64_t*)ptr;
@@ -100,7 +103,7 @@ uint64_t LogicSegment::unpack_sample(const uint8_t *ptr) const
#endif
}
-void LogicSegment::pack_sample(uint8_t *ptr, uint64_t value)
+inline void LogicSegment::pack_sample(uint8_t *ptr, uint64_t value)
{
#ifdef HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
*(uint64_t*)ptr = value;
@@ -150,8 +153,8 @@ void LogicSegment::append_payload(void *data, uint64_t data_size)
lock_guard lock(mutex_);
- uint64_t prev_sample_count = sample_count_;
- uint64_t sample_count = data_size / unit_size_;
+ const uint64_t prev_sample_count = sample_count_;
+ const uint64_t sample_count = data_size / unit_size_;
append_samples(data, sample_count);
@@ -234,8 +237,8 @@ void LogicSegment::append_payload_to_mipmap()
dest_ptr = (uint8_t*)m0.data + prev_length * unit_size_;
// Iterate through the samples to populate the first level mipmap
- uint64_t start_sample = prev_length * MipMapScaleFactor;
- uint64_t end_sample = m0.length * MipMapScaleFactor;
+ const uint64_t start_sample = prev_length * MipMapScaleFactor;
+ const uint64_t end_sample = m0.length * MipMapScaleFactor;
it = begin_raw_sample_iteration(start_sample);
for (uint64_t i = start_sample; i < end_sample;) {
@@ -300,9 +303,8 @@ uint64_t LogicSegment::get_unpacked_sample(uint64_t index) const
uint8_t data[8];
get_raw_samples(index, 1, data);
- uint64_t sample = unpack_sample(data);
- return sample;
+ return unpack_sample(data);
}
void LogicSegment::get_subsampled_edges(
@@ -478,7 +480,7 @@ uint64_t LogicSegment::get_subsample(int level, uint64_t offset) const
uint64_t LogicSegment::pow2_ceil(uint64_t x, unsigned int power)
{
- const uint64_t p = 1 << power;
+ const uint64_t p = UINT64_C(1) << power;
return (x + p - 1) / p * p;
}