sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

MDIO: Network support

Browse Source
This commit is contained in:
Bryant Jones
2023-05-09 18:14:36 +00:00
parent 0de23f2817
commit f5096b879c
21 changed files with 843 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/api/event.h
+2 -1
View File
@@ -111,6 +111,7 @@ public:
ErrorSettingSocketOption = 0x3107,
GetIfAddrsError = 0x3108,
SendToError = 0x3109,
MDIOMessageExceedsMaxLength = 0x3110,
// FTD3XX
FTOK = 0x4000, // placeholder
@@ -214,4 +215,4 @@ public:
#endif // __cplusplus
#endif
#endif
include/icsneo/communication/message/mdiomessage.h
+41
View File
@@ -0,0 +1,41 @@
#ifndef __MDIOMESSAGE_H_
#define __MDIOMESSAGE_H_
#ifdef __cplusplus
#include "icsneo/communication/message/message.h"
namespace icsneo {
class MDIOMessage : public Frame {
public:
enum class Clause : uint8_t {
Clause45 = 0,
Clause22 = 1
};
enum class Direction : uint8_t {
Write = 0,
Read = 1
};
bool isTXMsg = false;
bool txTimeout = false;
bool txAborted = false;
bool txInvalidBus = false;
bool txInvalidPhyAddr = false;
bool txInvalidRegAddr = false;
bool txInvalidClause = false;
bool txInvalidOpcode = false;
uint8_t phyAddress;
uint8_t devAddress;
uint16_t regAddress;
Direction direction;
Clause clause;
};
}
#endif // __cplusplus
#endif
include/icsneo/communication/network.h
+100 -5
View File
@@ -91,6 +91,7 @@ public:
Ethernet_DAQ = 69,
Data_To_Host = 70,
TextAPI_To_Host = 71,
SPI1 = 72,
OP_Ethernet6 = 73,
Red_VBat = 74,
OP_Ethernet7 = 75,
@@ -146,7 +147,15 @@ public:
DWCAN16 = 541,
LIN7 = 542,
LIN8 = 543,
RED_SET_RTC = 544,
SPI2 = 544,
MDIO1 = 545,
MDIO2 = 546,
MDIO3 = 547,
MDIO4 = 548,
MDIO5 = 549,
MDIO6 = 550,
MDIO7 = 551,
MDIO8 = 552,
Any = 0xfffe, // Never actually set as type, but used as flag for filtering
Invalid = 0xffff
};
@@ -163,6 +172,8 @@ public:
ISO9141 = 9,
I2C = 10,
A2B = 11,
SPI = 12,
MDIO = 13,
Any = 0xFE, // Never actually set as type, but used as flag for filtering
Other = 0xFF
};
@@ -239,6 +250,16 @@ public:
DWCAN16 = 69,
LIN7 = 70,
LIN8 = 71,
SPI1 = 72,
SPI2 = 73,
MDIO1 = 75,
MDIO2 = 76,
MDIO3 = 77,
MDIO4 = 78,
MDIO5 = 79,
MDIO6 = 80,
MDIO7 = 81,
MDIO8 = 82,
};
static const char* GetTypeString(Type type) {
switch(type) {
@@ -266,6 +287,10 @@ public:
return "I²C";
case Type::A2B:
return "A2B";
case Type::SPI:
return "SPI";
case Type::MDIO:
return "MDIO";
case Type::Invalid:
default:
return "Invalid Type";
@@ -327,7 +352,6 @@ public:
case NetID::NeoMemorySDRead:
case NetID::NeoMemoryWriteDone:
case NetID::RED_GET_RTC:
case NetID::RED_SET_RTC:
return Type::Internal;
case NetID::Invalid:
case NetID::Any:
@@ -368,6 +392,18 @@ public:
case NetID::A2B1:
case NetID::A2B2:
return Type::A2B;
case NetID::SPI1:
case NetID::SPI2:
return Type::SPI;
case NetID::MDIO1:
case NetID::MDIO2:
case NetID::MDIO3:
case NetID::MDIO4:
case NetID::MDIO5:
case NetID::MDIO6:
case NetID::MDIO7:
case NetID::MDIO8:
return Type::MDIO;
default:
return Type::Other;
}
@@ -456,8 +492,6 @@ public:
return "RED_HARDWARE_EXCEP";
case NetID::RED_GET_RTC:
return "RED_GET_RTC";
case NetID::RED_SET_RTC:
return "RED_SET_RTC";
case NetID::ISO9141_3:
return "ISO 9141 3";
case NetID::HSCAN2:
@@ -626,6 +660,26 @@ public:
return "LIN 08";
case NetID::WBMS:
return "WBMS";
case NetID::SPI1:
return "SPI 1";
case NetID::SPI2:
return "SPI 2";
case NetID::MDIO1:
return "MDIO 1";
case NetID::MDIO2:
return "MDIO 2";
case NetID::MDIO3:
return "MDIO 3";
case NetID::MDIO4:
return "MDIO 4";
case NetID::MDIO5:
return "MDIO 5";
case NetID::MDIO6:
return "MDIO 6";
case NetID::MDIO7:
return "MDIO 7";
case NetID::MDIO8:
return "MDIO 8";
case NetID::Any:
case NetID::Invalid:
break;
@@ -778,6 +832,26 @@ public:
return CoreMini::LIN7;
case NetID::LIN8:
return CoreMini::LIN8;
case NetID::SPI1:
return CoreMini::SPI1;
case NetID::SPI2:
return CoreMini::SPI2;
case NetID::MDIO1:
return CoreMini::MDIO1;
case NetID::MDIO2:
return CoreMini::MDIO2;
case NetID::MDIO3:
return CoreMini::MDIO3;
case NetID::MDIO4:
return CoreMini::MDIO4;
case NetID::MDIO5:
return CoreMini::MDIO5;
case NetID::MDIO6:
return CoreMini::MDIO6;
case NetID::MDIO7:
return CoreMini::MDIO7;
case NetID::MDIO8:
return CoreMini::MDIO8;
default:
return std::nullopt;
}
@@ -928,6 +1002,27 @@ public:
return NetID::LIN7;
case CoreMini::LIN8:
return NetID::LIN8;
case CoreMini::SPI1:
return NetID::SPI1;
case CoreMini::SPI2:
return NetID::SPI2;
case CoreMini::MDIO1:
return NetID::MDIO1;
case CoreMini::MDIO2:
return NetID::MDIO2;
case CoreMini::MDIO3:
return NetID::MDIO3;
case CoreMini::MDIO4:
return NetID::MDIO4;
case CoreMini::MDIO5:
return NetID::MDIO5;
case CoreMini::MDIO6:
return NetID::MDIO6;
case CoreMini::MDIO7:
return NetID::MDIO7;
case CoreMini::MDIO8:
return NetID::MDIO8;
}
return NetID::Invalid; // Should be unreachable, the compiler should warn about new CoreMini IDs
}
@@ -1095,4 +1190,4 @@ private:
#define ICSNEO_NETWORK_TYPE_OTHER 0xFF
#endif
#endif
#endif
include/icsneo/communication/packet/mdiopacket.h
+61
View File
@@ -0,0 +1,61 @@
#ifndef __MDIOPACKET_H__
#define __MDIOPACKET_H__
#ifdef __cplusplus
#include "icsneo/communication/message/mdiomessage.h"
#include "icsneo/api/eventmanager.h"
#include "icsneo/communication/packetizer.h"
#include "icsneo/communication/network.h"
#include <cstdint>
#include <memory>
namespace icsneo {
#pragma pack(push, 2)
struct HardwareMDIOPacket {
static std::shared_ptr<Message> DecodeToMessage(const std::vector<uint8_t>& bytestream);
static bool EncodeFromMessage(const MDIOMessage& message, std::vector<uint8_t>& bytestream, const device_eventhandler_t& report);
struct {
// C1xMDIO
uint16_t PHY_ADDR : 5; // mdio phy address, 5-bit
uint16_t ST : 2; // Start of Frame (Clause 22/45)
uint16_t OP : 2; // OP Code (Read/Write)
uint16_t ADVANCED_MODE : 1; // future?
uint16_t TRANSMIT : 1; // This is a TX message
uint16_t C45_DEVTYPE : 5;
// C2xMDIO
uint16_t ERR_JOB_CANCELLED : 1; // error flag
uint16_t ERR_TIMEOUT : 1; // error flag
uint16_t ERR_INVALID_BUS : 1; // error flag
uint16_t ERR_INVALID_PHYADDR : 1; // error flag
uint16_t ERR_INVALID_REGADDR : 1; // error flag
uint16_t ERR_UNSUPPORTED_CLAUSE : 1; // error flag
uint16_t ERR_UNSUPPORTED_OPCODE : 1; // error flag
uint16_t ERR_OVERFLOW : 1; // error flag
uint16_t : 8;
// C3xMDIO
uint16_t REG_ADDR;
} header;
uint8_t data[8];
uint16_t stats;
uint64_t timestamp;
uint16_t networkID;
uint16_t length;
static const size_t mdioDataSize;
};
#pragma pack(pop)
}
#endif // __cplusplus
#endif
include/icsneo/device/tree/rada2b/rada2b.h
+3 -1
View File
@@ -32,7 +32,9 @@ public:
Network::NetID::A2B2,
Network::NetID::I2C,
Network::NetID::I2C2
Network::NetID::I2C2,
Network::NetID::MDIO1,
};
return supportedNetworks;
}
include/icsneo/device/tree/radgalaxy/radgalaxy.h
+7 -1
View File
@@ -47,7 +47,13 @@ public:
Network::NetID::OP_Ethernet9,
Network::NetID::OP_Ethernet10,
Network::NetID::OP_Ethernet11,
Network::NetID::OP_Ethernet12
Network::NetID::OP_Ethernet12,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
Network::NetID::MDIO3,
Network::NetID::MDIO4,
Network::NetID::MDIO5,
};
return supportedNetworks;
}
include/icsneo/device/tree/radgigastar/radgigastar.h
+6
View File
@@ -65,6 +65,9 @@ protected:
Network::NetID::I2C,
Network::NetID::I2C2,
Network::NetID::I2C3,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
};
rxNetworks.insert(rxNetworks.end(), supportedRxNetworks.begin(), supportedRxNetworks.end());
}
@@ -91,6 +94,9 @@ protected:
Network::NetID::I2C,
Network::NetID::I2C2,
Network::NetID::I2C3,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
};
txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
}
include/icsneo/device/tree/radmars/radmars.h
+6
View File
@@ -60,6 +60,9 @@ protected:
Network::NetID::FlexRay1b,
Network::NetID::I2C,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
};
rxNetworks.insert(rxNetworks.end(), supportedRxNetworks.begin(), supportedRxNetworks.end());
}
@@ -84,6 +87,9 @@ protected:
// FlexRay is Receive Only
Network::NetID::I2C,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
};
txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end());
}
include/icsneo/device/tree/radmoon2/radmoon2base.h
+16
View File
@@ -16,6 +16,14 @@ public:
APM1000E_CLK, // Clock Option and Keysight Branding
};
static const std::vector<Network>& GetSupportedNetworks() {
static std::vector<Network> supportedNetworks = {
Network::NetID::MDIO1,
Network::NetID::MDIO2,
};
return supportedNetworks;
}
SKU getSKU() const {
switch(getSerial().back()) {
case 'A':
@@ -66,6 +74,14 @@ protected:
bool requiresVehiclePower() const override { return false; }
void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid);
}
// The supported TX networks are the same as the supported RX networks for this device
void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
std::optional<MemoryAddress> getCoreminiStartAddressFlash() const override {
return std::nullopt;
}
include/icsneo/device/tree/radstar2/radstar2.h
+4 -1
View File
@@ -24,7 +24,10 @@ public:
Network::NetID::Ethernet,
Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2
Network::NetID::OP_Ethernet2,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
};
return supportedNetworks;
}
include/icsneo/device/tree/radsupermoon/radsupermoon.h
+2
View File
@@ -24,6 +24,8 @@ public:
static std::vector<Network> supportedNetworks = {
Network::NetID::Ethernet,
Network::NetID::OP_Ethernet1,
Network::NetID::MDIO1,
Network::NetID::MDIO2,
};
return supportedNetworks;
}
include/icsneo/icsneocpp.h
+1
View File
@@ -19,6 +19,7 @@
#include "icsneo/communication/message/i2cmessage.h"
#include "icsneo/communication/message/a2bmessage.h"
#include "icsneo/communication/message/linmessage.h"
#include "icsneo/communication/message/mdiomessage.h"
#include "icsneo/communication/message/callback/streamoutput/a2bwavoutput.h"