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

Commits on Dec 13, 2019

  1. MDIODecoder: Added PacketDecoder integration for a few common registers

    @azonenberg
    azonenberg committed Dec 13, 2019
    Copy the full SHA
    90f32c8 View commit details
Showing with 120 additions and 3 deletions.
  1. +116 −1 scopeprotocols/MDIODecoder.cpp
  2. +4 −2 scopeprotocols/MDIODecoder.h
117 changes: 116 additions & 1 deletion scopeprotocols/MDIODecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ using namespace std;
// Construction / destruction

MDIODecoder::MDIODecoder(string color)
: ProtocolDecoder(OscilloscopeChannel::CHANNEL_TYPE_COMPLEX, color, CAT_SERIAL)
: PacketDecoder(OscilloscopeChannel::CHANNEL_TYPE_COMPLEX, color, CAT_SERIAL)
{
//Set up channels
m_signalNames.push_back("mdio");
@@ -160,11 +160,18 @@ void MDIODecoder::Refresh()
len,
MDIOSymbol(MDIOSymbol::TYPE_PREAMBLE, 0)));

//Create the packet
Packet* pack = new Packet;
pack->m_offset = start;

//TODO: safely ignore extra preamble bits

//Next 2 bits are start delimiter
if(i+2 >= dmdio.size())
{
delete pack;
break;
}
uint16_t sof = 0;
if(dmdio[i].m_sample)
sof |= 2;
@@ -174,6 +181,8 @@ void MDIODecoder::Refresh()
//MDIO Clause 22 frame
if(sof == 0x01)
{
pack->m_headers["Clause"] = "22";

//Add the start symbol
cap->m_samples.push_back(MDIOSample(
dmdio[i].m_offset,
@@ -183,13 +192,23 @@ void MDIODecoder::Refresh()

//Next 2 bits are opcode
if(i+2 >= dmdio.size())
{
delete pack;
break;
}
uint16_t op = 0;
if(dmdio[i].m_sample)
op |= 2;
if(dmdio[i+1].m_sample)
op |= 1;

if(op == 1)
pack->m_headers["Op"] = "Write";
else if(op == 2)
pack->m_headers["Op"] = "Read";
else
pack->m_headers["Op"] = "ERROR";

cap->m_samples.push_back(MDIOSample(
dmdio[i].m_offset,
(dmdio[i+1].m_offset - dmdio[i].m_offset) + dmdio[i+1].m_duration,
@@ -214,9 +233,16 @@ void MDIODecoder::Refresh()
MDIOSymbol(MDIOSymbol::TYPE_PHYADDR, addr)));
i += 5;

char tmp[32];
snprintf(tmp, sizeof(tmp), "%02x", addr);
pack->m_headers["PHY"] = tmp;

//Next 5 bits are reg address
if(i+5 >= dmdio.size())
{
delete pack;
break;
}
addr = 0;
start = dmdio[i].m_offset;
for(size_t j=0; j<5; j++)
@@ -232,6 +258,9 @@ void MDIODecoder::Refresh()
MDIOSymbol(MDIOSymbol::TYPE_REGADDR, addr)));
i += 5;

snprintf(tmp, sizeof(tmp), "%02x", addr);
pack->m_headers["Reg"] = tmp;

//Next 2 bits are bus turnaround
if(i+2 >= dmdio.size())
break;
@@ -243,7 +272,10 @@ void MDIODecoder::Refresh()

//Next 16 bits are frame data
if(i+16 >= dmdio.size())
{
delete pack;
break;
}
uint16_t value = 0;
start = dmdio[i].m_offset;
for(size_t j=0; j<16; j++)
@@ -258,6 +290,77 @@ void MDIODecoder::Refresh()
len,
MDIOSymbol(MDIOSymbol::TYPE_DATA, value)));
i += 16;

snprintf(tmp, sizeof(tmp), "%04x", value);
pack->m_headers["Value"] = tmp;

//Add extra information to the decode if it's a known register
string info;
switch(addr)
{
//802.3 Basic Control
case 0x00:
{
info = "Basic Status: ";

uint8_t speed = 0;
if(value & 0x0040)
speed |= 2;
if(value & 0x2000)
speed |= 1;

switch(speed)
{
case 0:
info += "Speed 10M";
break;

case 1:
info += "Speed 100M";
break;

case 2:
info += "Speed 1G";
break;

default:
info += "Speed invalid";
break;
}

if( (value & 0x0100) == 0)
info += "/full";
else
info += "/half";

if( (value & 0x1000) == 0)
info += ", Aneg disable";

if( (value & 0x0800) == 0)
info += ", Power down";
}
break;

//802.3 Basic Status
case 0x1:
info = "Basic Status: ";

if(value & 0x20)
info += "Aneg complete";
else
info += "Aneg not complete";

if(value & 0x4)
info += ", Link up";
else
info += ", Link down";

break;
}
pack->m_headers["Info"] = info;

//Done, add the packet
m_packets.push_back(pack);
}

//MDIO Clause 45 frame
@@ -278,3 +381,15 @@ void MDIODecoder::Refresh()

SetData(cap);
}

vector<string> MDIODecoder::GetHeaders()
{
vector<string> ret;
ret.push_back("Clause");
ret.push_back("Op");
ret.push_back("PHY");
ret.push_back("Reg");
ret.push_back("Value");
ret.push_back("Info");
return ret;
}
6 changes: 4 additions & 2 deletions scopeprotocols/MDIODecoder.h
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@
#ifndef MDIODecoder_h
#define MDIODecoder_h

#include "../scopehal/ProtocolDecoder.h"
#include "../scopehal/PacketDecoder.h"

class MDIOSymbol
{
@@ -70,7 +70,7 @@ class MDIOSymbol
typedef OscilloscopeSample<MDIOSymbol> MDIOSample;
typedef CaptureChannel<MDIOSymbol> MDIOCapture;

class MDIODecoder : public ProtocolDecoder
class MDIODecoder : public PacketDecoder
{
public:
MDIODecoder(std::string color);
@@ -82,6 +82,8 @@ class MDIODecoder : public ProtocolDecoder
static std::string GetProtocolName();
virtual void SetDefaultName();

virtual std::vector<std::string> GetHeaders();

virtual bool ValidateChannel(size_t i, OscilloscopeChannel* channel);

PROTOCOL_DECODER_INITPROC(MDIODecoder)