X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fdata%2Flogicsegment.hpp;h=43fd41126617bd0b9d76dbc0f8bbf7875c5569bd;hb=26a883ede0bcf68d087eda5dd2082890d36c7aef;hp=6f19c1cb28e3bb58f65ef712e6112541ae78762b;hpb=a38268f064687eff3e5395da6bb7f39e55dcd60f;p=pulseview.git
diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 6f19c1c..43fd411 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP
@@ -41,6 +40,12 @@ struct LongPulses;
namespace pv {
namespace data {
+typedef struct {
+ uint64_t sample_index, chunk_num, chunk_offs;
+ uint8_t* chunk;
+ uint8_t* value;
+} SegmentLogicDataIterator;
+
class LogicSegment : public Segment
{
private:
@@ -62,15 +67,17 @@ public:
typedef std::pair EdgePair;
public:
- LogicSegment(std::shared_ptr logic,
- uint64_t samplerate, uint64_t expected_num_samples = 0);
+ LogicSegment(std::shared_ptr logic, uint64_t samplerate);
virtual ~LogicSegment();
void append_payload(std::shared_ptr logic);
- void get_samples(uint8_t *const data,
- int64_t start_sample, int64_t end_sample) const;
+ const uint8_t* get_samples(int64_t start_sample, int64_t end_sample) const;
+
+ SegmentLogicDataIterator* begin_sample_iteration(uint64_t start) const;
+ void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase) const;
+ void end_sample_iteration(SegmentLogicDataIterator* it) const;
private:
uint64_t unpack_sample(const uint8_t *ptr) const;
@@ -80,7 +87,7 @@ private:
void append_payload_to_mipmap();
- uint64_t get_sample(uint64_t index) const;
+ uint64_t get_unpacked_sample(uint64_t index) const;
public:
/**
@@ -92,7 +99,7 @@ public:
* @param[in] min_length The minimum number of samples that
* can be resolved at this level of detail.
* @param[in] sig_index The index of the signal.
- **/
+ */
void get_subsampled_edges(std::vector &edges,
uint64_t start, uint64_t end,
float min_length, int sig_index);