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: a62b0be22b18
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 07f92da8f058
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 18, 2021

  1. eSPI: fixed bug causing extra data to be appended to a split transact… 

    …ion in the protocol analyzer view
    @azonenberg
    azonenberg committed May 18, 2021
    Copy the full SHA
    07f92da View commit details
Showing with 12 additions and 3 deletions.
  1. +12 −3 scopeprotocols/ESPIDecoder.cpp
15 changes: 12 additions & 3 deletions scopeprotocols/ESPIDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -2201,8 +2201,13 @@ Packet* ESPIDecoder::CreateMergedHeader(Packet* pack, size_t i)
for(size_t j=i+1; j<m_packets.size(); j++)
{
Packet* p = m_packets[j];

if(p->m_headers["Command"] == "Get Posted Completion")
ret->m_headers["Response"] = p->m_headers["Response"];
else if(p->m_headers["Command"] == "Get Status")
{}
else
break;

ret->m_len = p->m_offset + p->m_len - ret->m_offset;
}
@@ -2219,11 +2224,15 @@ Packet* ESPIDecoder::CreateMergedHeader(Packet* pack, size_t i)
{
Packet* p = m_packets[j];

for(auto b : p->m_data)
ret->m_data.push_back(b);

if(p->m_headers["Command"] == "Get Posted Completion")
ret->m_headers["Response"] = p->m_headers["Response"];
else if(p->m_headers["Command"] == "Get Status")
{}
else
break;

for(auto b : p->m_data)
ret->m_data.push_back(b);

ret->m_len = p->m_offset + p->m_len - ret->m_offset;
}