X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsnapshot.h;h=bcb644da58da7073831883920f4294535eae8a2d;hb=943edd769f24a5a17df4f0b5e94d92b1b19c8300;hp=ecff5edc089c61846c400c400cb7c1192303a8fa;hpb=ed990f118d154cd487261d23986b7ad0ba4e24fe;p=pulseview.git diff --git a/pv/data/logicsnapshot.h b/pv/data/logicsnapshot.h index ecff5edc..bcb644da 100644 --- a/pv/data/logicsnapshot.h +++ b/pv/data/logicsnapshot.h @@ -27,11 +27,11 @@ #include namespace LogicSnapshotTest { -class Pow2; -class Basic; -class LargeData; -class Pulses; -class LongPulses; +struct Pow2; +struct Basic; +struct LargeData; +struct Pulses; +struct LongPulses; } namespace pv { @@ -58,7 +58,8 @@ public: typedef std::pair EdgePair; public: - LogicSnapshot(const sr_datafeed_logic &logic); + LogicSnapshot(const sr_datafeed_logic &logic, + uint64_t expected_num_samples = 0); virtual ~LogicSnapshot(); @@ -68,6 +69,9 @@ public: int64_t start_sample, int64_t end_sample) const; private: + uint64_t unpack_sample(const uint8_t *ptr) const; + void pack_sample(uint8_t *ptr, uint64_t value); + void reallocate_mipmap_level(MipMapLevel &m); void append_payload_to_mipmap(); @@ -98,11 +102,11 @@ private: struct MipMapLevel _mip_map[ScaleStepCount]; uint64_t _last_append_sample; - friend class LogicSnapshotTest::Pow2; - friend class LogicSnapshotTest::Basic; - friend class LogicSnapshotTest::LargeData; - friend class LogicSnapshotTest::Pulses; - friend class LogicSnapshotTest::LongPulses; + friend struct LogicSnapshotTest::Pow2; + friend struct LogicSnapshotTest::Basic; + friend struct LogicSnapshotTest::LargeData; + friend struct LogicSnapshotTest::Pulses; + friend struct LogicSnapshotTest::LongPulses; }; } // namespace data