projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify get_samples() semantics for AnalogSegment and LogicSegment
[pulseview.git]
/
pv
/
data
/
logicsegment.hpp
diff --git
a/pv/data/logicsegment.hpp
b/pv/data/logicsegment.hpp
index 9d07d203e3b6d64b88e15898b5771b1bfef82e33..0931e2c46c9f6ed86a9c1d8f8706c8477cc56a26 100644
(file)
--- 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
* 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_LOGICS
NAPSHO
T_HPP
-#define PULSEVIEW_PV_DATA_LOGICS
NAPSHO
T_HPP
+#ifndef PULSEVIEW_PV_DATA_LOGICS
EGMEN
T_HPP
+#define PULSEVIEW_PV_DATA_LOGICS
EGMEN
T_HPP
#include "segment.hpp"
#include "segment.hpp"
@@
-69,8
+68,7
@@
public:
void append_payload(std::shared_ptr<sigrok::Logic> logic);
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;
private:
uint64_t unpack_sample(const uint8_t *ptr) const;
private:
uint64_t unpack_sample(const uint8_t *ptr) const;
@@
-92,7
+90,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.
* @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);
void get_subsampled_edges(std::vector<EdgePair> &edges,
uint64_t start, uint64_t end,
float min_length, int sig_index);
@@
-116,4
+114,4
@@
private:
} // namespace data
} // namespace pv
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_LOGICS
NAPSHO
T_HPP
+#endif // PULSEVIEW_PV_DATA_LOGICS
EGMEN
T_HPP