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

Commits on Dec 13, 2019

  1. USB2Packet: restructured to avoid warnings, added handling of invalid… 

    … PIDs
    @azonenberg
    azonenberg committed Dec 13, 2019
    Copy the full SHA
    3bafdda View commit details
Showing with 6 additions and 18 deletions.
  1. +6 −18 scopeprotocols/USB2PacketRenderer.cpp
24 changes: 6 additions & 18 deletions scopeprotocols/USB2PacketRenderer.cpp
View file
Original file line number Diff line number Diff line change
@@ -102,6 +102,8 @@ string USB2PacketRenderer::GetText(int i)
if(i >= (int)data->m_samples.size())
return "";

char tmp[32];

auto sample = data->m_samples[i];
switch(sample.m_sample.m_type)
{
@@ -141,44 +143,30 @@ string USB2PacketRenderer::GetText(int i)
return "STALL";
case USB2PacketSymbol::PID_MDATA:
return "MDATA";

default:
return "INVALID PID";
}
break;
}
case USB2PacketSymbol::TYPE_ADDR:
{
char tmp[32];
snprintf(tmp, sizeof(tmp), "Dev %d", sample.m_sample.m_data);
return string(tmp);
}
case USB2PacketSymbol::TYPE_NFRAME:
{
char tmp[32];
snprintf(tmp, sizeof(tmp), "Frame %d", sample.m_sample.m_data);
return string(tmp);
}
case USB2PacketSymbol::TYPE_ENDP:
{
char tmp[32];
snprintf(tmp, sizeof(tmp), "EP %d", sample.m_sample.m_data);
return string(tmp);
}
case USB2PacketSymbol::TYPE_CRC5:
{
char tmp[32];
snprintf(tmp, sizeof(tmp), "CRC %02x", sample.m_sample.m_data);
return string(tmp);
}
case USB2PacketSymbol::TYPE_CRC16:
{
char tmp[32];
snprintf(tmp, sizeof(tmp), "CRC %04x", sample.m_sample.m_data);
return string(tmp);
}
case USB2PacketSymbol::TYPE_DATA:
{
char tmp[16];
snprintf(tmp, sizeof(tmp), "%02x", sample.m_sample.m_data);
return string(tmp);
}
case USB2PacketSymbol::TYPE_ERROR:
default:
return "ERROR";