X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.hpp;h=43fd41126617bd0b9d76dbc0f8bbf7875c5569bd;hb=26a883ede0bcf68d087eda5dd2082890d36c7aef;hp=3e092c531dfd46c6d98c98427af2684c7bdcec2c;hpb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b;p=pulseview.git

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 3e092c5..43fd411 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -14,12 +14,11 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_DATA_LOGICSNAPSHOT_H
-#define PULSEVIEW_PV_DATA_LOGICSNAPSHOT_H
+#ifndef PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP
+#define PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP
 
 #include "segment.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<int64_t, bool> EdgePair;
 
 public:
-	LogicSegment(std::shared_ptr<sigrok::Logic> logic,
-		uint64_t samplerate, uint64_t expected_num_samples = 0);
+	LogicSegment(std::shared_ptr<sigrok::Logic> logic, uint64_t samplerate);
 
 	virtual ~LogicSegment();
 
 	void append_payload(std::shared_ptr<sigrok::Logic> 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<EdgePair> &edges,
 		uint64_t start, uint64_t end,
 		float min_length, int sig_index);
@@ -116,4 +123,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_LOGICSNAPSHOT_H
+#endif // PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP