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

Commits on May 13, 2020

  1. Fixed Ethernet autonegotiation protocol decoder. Fixes #6.

    @azonenberg
    azonenberg committed May 13, 2020
    Copy the full SHA
    08a3367 View commit details
Showing with 22 additions and 10 deletions.
  1. +21 −9 scopeprotocols/EthernetAutonegotiationDecoder.cpp
  2. +1 −1 scopeprotocols/scopeprotocols.cpp
30 changes: 21 additions & 9 deletions scopeprotocols/EthernetAutonegotiationDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ string EthernetAutonegotiationDecoder::GetProtocolName()
void EthernetAutonegotiationDecoder::SetDefaultName()
{
char hwname[256];
snprintf(hwname, sizeof(hwname), "%s/Autonegotiation", m_channels[0]->m_displayname.c_str());
snprintf(hwname, sizeof(hwname), "EthANeg(%s)", m_channels[0]->m_displayname.c_str());
m_hwname = hwname;
m_displayname = m_hwname;
}
@@ -210,14 +210,26 @@ string EthernetAutonegotiationDecoder::GetText(int i)
ret += "pause ";
if(ability & 0x10)
ret += "T4 ";
if(ability & 0x8)
ret += "100/full ";
if(ability & 0x4)
ret += "100/half ";
if(ability & 0x2)
ret += "10/full ";
if(ability & 0x1)
ret += "10/half ";
if(ability & 0xc)
{
ret += "100/";
if( (ability & 0xc) == 0xc)
ret += "full+half ";
else if(ability & 0x8)
ret += "full ";
else if(ability & 0x4)
ret += "half ";
}
if(ability & 0x3)
{
ret += "10/";
if( (ability & 0x3) == 0x3)
ret += "full+half ";
else if(ability & 0x2)
ret += "full ";
else if(ability & 0x1)
ret += "half ";
}

if(xnp)
ret += "XNP ";
2 changes: 1 addition & 1 deletion scopeprotocols/scopeprotocols.cpp
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ void ScopeProtocolStaticInit()
AddDecoderClass(Ethernet10BaseTDecoder);
AddDecoderClass(Ethernet100BaseTDecoder);
AddDecoderClass(EthernetGMIIDecoder);
//AddDecoderClass(EthernetAutonegotiationDecoder);
AddDecoderClass(EthernetAutonegotiationDecoder);
AddDecoderClass(EyeDecoder2);
AddDecoderClass(FallMeasurementDecoder);
AddDecoderClass(FFTDecoder);