Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 80a0de9b30b5
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e57fc6646c85
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 17, 2020

  1. Copy the full SHA
    e57fc66 View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 scopeprotocols/EthernetProtocolDecoder.cpp
5 changes: 4 additions & 1 deletion scopeprotocols/EthernetProtocolDecoder.cpp
Original file line number Diff line number Diff line change
@@ -83,8 +83,10 @@ void EthernetProtocolDecoder::BytesToFrames(
Packet* pack = NULL;

EthernetFrameSegment segment;
segment.m_type = EthernetFrameSegment::TYPE_INVALID;
size_t start = 0;
for(size_t i=0; i<bytes.size(); i++)
size_t len = bytes.size();
for(size_t i=0; i<len; i++)
{
switch(segment.m_type)
{
@@ -117,6 +119,7 @@ void EthernetProtocolDecoder::BytesToFrames(
//Look for the SFD
if(bytes[i] == 0xd5)
{

//Save the preamble
cap->m_offsets.push_back(start);
cap->m_durations.push_back( (starts[i] / cap->m_timescale) - start);