diff options
| -rw-r--r-- | ape/main.c | 1 | ||||
| -rw-r--r-- | include/APE_SHM_CHANNEL0.h | 583 | ||||
| -rw-r--r-- | include/APE_SHM_CHANNEL1.h | 15 | ||||
| -rw-r--r-- | include/APE_SHM_CHANNEL2.h | 15 | ||||
| -rw-r--r-- | include/APE_SHM_CHANNEL3.h | 15 | ||||
| -rw-r--r-- | include/bcm5719_SHM_CHANNEL0.h | 583 | ||||
| -rw-r--r-- | include/bcm5719_SHM_CHANNEL1.h | 15 | ||||
| -rw-r--r-- | include/bcm5719_SHM_CHANNEL2.h | 15 | ||||
| -rw-r--r-- | include/bcm5719_SHM_CHANNEL3.h | 15 | ||||
| -rw-r--r-- | ipxact/SHM.xml | 42 | ||||
| -rw-r--r-- | libs/NCSI/ncsi.c | 31 | ||||
| -rw-r--r-- | libs/Network/rx.c | 7 | ||||
| -rw-r--r-- | libs/Network/tx.c | 5 | ||||
| -rw-r--r-- | simulator/bcm5719_SHM_CHANNEL0.cpp | 18 | ||||
| -rw-r--r-- | simulator/bcm5719_SHM_CHANNEL0_sim.cpp | 53 | ||||
| -rw-r--r-- | simulator/bcm5719_SHM_CHANNEL1.cpp | 18 | ||||
| -rw-r--r-- | simulator/bcm5719_SHM_CHANNEL1_sim.cpp | 53 | ||||
| -rw-r--r-- | simulator/bcm5719_SHM_CHANNEL2.cpp | 18 | ||||
| -rw-r--r-- | simulator/bcm5719_SHM_CHANNEL2_sim.cpp | 53 | ||||
| -rw-r--r-- | simulator/bcm5719_SHM_CHANNEL3.cpp | 18 | ||||
| -rw-r--r-- | simulator/bcm5719_SHM_CHANNEL3_sim.cpp | 53 | ||||
| -rw-r--r-- | utils/bcmregtool/main.cpp | 6 |
22 files changed, 602 insertions, 1030 deletions
@@ -196,6 +196,7 @@ void handleBMCPacket(void) { // Pass through to network NetworkPort_t *port = gPort; + ++port->shm_channel->NcsiChannelNcsiRx.r32; if (port->shm_channel->NcsiChannelInfo.bits.Enabled) { if (!Network_TX_transmitPassthroughPacket(bytes, port)) diff --git a/include/APE_SHM_CHANNEL0.h b/include/APE_SHM_CHANNEL0.h index 50a3364..29ac3de 100644 --- a/include/APE_SHM_CHANNEL0.h +++ b/include/APE_SHM_CHANNEL0.h @@ -286,74 +286,6 @@ typedef register_container RegSHM_CHANNELNcsiChannelMcid_t { #endif /* CXX_SIMULATOR */ } RegSHM_CHANNELNcsiChannelMcid_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_AEN ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x60220908) /* Set via NCSI ENABLE AEN. */ -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN_SHIFT 0u -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN_MASK 0x1u -#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN(__reg__) (((__reg__) & 0x1) >> 0u) -#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN(__val__) (((__val__) << 0u) & 0x1u) -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN_SHIFT 1u -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN_MASK 0x2u -#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN(__reg__) (((__reg__) & 0x2) >> 1u) -#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN(__val__) (((__val__) << 1u) & 0x2u) -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN_SHIFT 2u -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN_MASK 0x4u -#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN(__reg__) (((__reg__) & 0x4) >> 2u) -#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN(__val__) (((__val__) << 2u) & 0x4u) - -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelAen. */ -typedef register_container RegSHM_CHANNELNcsiChannelAen_t { - /** @brief 32bit direct register access. */ - APE_SHM_CHANNEL0_H_uint32_t r32; - - BITFIELD_BEGIN(APE_SHM_CHANNEL0_H_uint32_t, bits) -#if defined(__LITTLE_ENDIAN__) - /** @brief */ - BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableLinkStatusChangeAEN, 0, 1) - /** @brief */ - BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableConfigurationRequiredAEN, 1, 1) - /** @brief */ - BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableHostNCDriverStatusChangeAEN, 2, 1) - /** @brief Padding */ - BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, reserved_31_3, 3, 29) -#elif defined(__BIG_ENDIAN__) - /** @brief Padding */ - BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, reserved_31_3, 3, 29) - /** @brief */ - BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableHostNCDriverStatusChangeAEN, 2, 1) - /** @brief */ - BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableConfigurationRequiredAEN, 1, 1) - /** @brief */ - BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableLinkStatusChangeAEN, 0, 1) -#else -#error Unknown Endian -#endif - BITFIELD_END(APE_SHM_CHANNEL0_H_uint32_t, bits) -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelAen"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelAen_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelAen. */ - r32.setName("NcsiChannelAen"); - bits.EnableLinkStatusChangeAEN.setBaseRegister(&r32); - bits.EnableLinkStatusChangeAEN.setName("EnableLinkStatusChangeAEN"); - bits.EnableConfigurationRequiredAEN.setBaseRegister(&r32); - bits.EnableConfigurationRequiredAEN.setName("EnableConfigurationRequiredAEN"); - bits.EnableHostNCDriverStatusChangeAEN.setBaseRegister(&r32); - bits.EnableHostNCDriverStatusChangeAEN.setName("EnableHostNCDriverStatusChangeAEN"); - } - RegSHM_CHANNELNcsiChannelAen_t& operator=(const RegSHM_CHANNELNcsiChannelAen_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelAen_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_BFILT ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x6022090c) /* */ #define SHM_CHANNEL0_NCSI_CHANNEL_BFILT_ARP_PACKET_SHIFT 0u #define SHM_CHANNEL0_NCSI_CHANNEL_BFILT_ARP_PACKET_MASK 0x1u @@ -769,7 +701,7 @@ typedef register_container RegSHM_CHANNELNcsiChannelAltHostMacLow_t { #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC0_HIGH ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x60220934) /* Lower 16 bits of this word contains upper 16 bits of the MAC. */ /** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac0High. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac0High_t { +typedef register_container RegSHM_CHANNELMacHigh_t { /** @brief 32bit direct register access. */ APE_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR @@ -779,22 +711,22 @@ typedef register_container RegSHM_CHANNELNcsiChannelMac0High_t { /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelMac0High_t() + RegSHM_CHANNELMacHigh_t() { /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac0High. */ r32.setName("NcsiChannelMac0High"); } - RegSHM_CHANNELNcsiChannelMac0High_t& operator=(const RegSHM_CHANNELNcsiChannelMac0High_t& other) + RegSHM_CHANNELMacHigh_t& operator=(const RegSHM_CHANNELMacHigh_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac0High_t; +} RegSHM_CHANNELMacHigh_t; #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC0_MID ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x60220938) /* Lower 16 bits of this word contains mid 16 bits of the MAC. */ /** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac0Mid. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac0Mid_t { +typedef register_container RegSHM_CHANNELMacMid_t { /** @brief 32bit direct register access. */ APE_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR @@ -804,22 +736,22 @@ typedef register_container RegSHM_CHANNELNcsiChannelMac0Mid_t { /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelMac0Mid_t() + RegSHM_CHANNELMacMid_t() { /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac0Mid. */ r32.setName("NcsiChannelMac0Mid"); } - RegSHM_CHANNELNcsiChannelMac0Mid_t& operator=(const RegSHM_CHANNELNcsiChannelMac0Mid_t& other) + RegSHM_CHANNELMacMid_t& operator=(const RegSHM_CHANNELMacMid_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac0Mid_t; +} RegSHM_CHANNELMacMid_t; #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC0_LOW ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x6022093c) /* Lower 16 bits of this word contains low 16 bits of the MAC. */ /** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac0Low. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac0Low_t { +typedef register_container RegSHM_CHANNELMacLow_t { /** @brief 32bit direct register access. */ APE_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR @@ -829,244 +761,28 @@ typedef register_container RegSHM_CHANNELNcsiChannelMac0Low_t { /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelMac0Low_t() + RegSHM_CHANNELMacLow_t() { /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac0Low. */ r32.setName("NcsiChannelMac0Low"); } - RegSHM_CHANNELNcsiChannelMac0Low_t& operator=(const RegSHM_CHANNELNcsiChannelMac0Low_t& other) + RegSHM_CHANNELMacLow_t& operator=(const RegSHM_CHANNELMacLow_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac0Low_t; +} RegSHM_CHANNELMacLow_t; #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC1_HIGH ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x60220944) /* Lower 16 bits of this word contains upper 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac1High. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac1High_t { - /** @brief 32bit direct register access. */ - APE_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac1High"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac1High_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac1High. */ - r32.setName("NcsiChannelMac1High"); - } - RegSHM_CHANNELNcsiChannelMac1High_t& operator=(const RegSHM_CHANNELNcsiChannelMac1High_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac1High_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC1_MID ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x60220948) /* Lower 16 bits of this word contains mid 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac1Mid. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac1Mid_t { - /** @brief 32bit direct register access. */ - APE_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac1Mid"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac1Mid_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac1Mid. */ - r32.setName("NcsiChannelMac1Mid"); - } - RegSHM_CHANNELNcsiChannelMac1Mid_t& operator=(const RegSHM_CHANNELNcsiChannelMac1Mid_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac1Mid_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC1_LOW ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x6022094c) /* Lower 16 bits of this word contains low 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac1Low. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac1Low_t { - /** @brief 32bit direct register access. */ - APE_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac1Low"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac1Low_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac1Low. */ - r32.setName("NcsiChannelMac1Low"); - } - RegSHM_CHANNELNcsiChannelMac1Low_t& operator=(const RegSHM_CHANNELNcsiChannelMac1Low_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac1Low_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC2_HIGH ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x60220954) /* Lower 16 bits of this word contains upper 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac2High. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac2High_t { - /** @brief 32bit direct register access. */ - APE_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac2High"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac2High_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac2High. */ - r32.setName("NcsiChannelMac2High"); - } - RegSHM_CHANNELNcsiChannelMac2High_t& operator=(const RegSHM_CHANNELNcsiChannelMac2High_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac2High_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC2_MID ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x60220958) /* Lower 16 bits of this word contains mid 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac2Mid. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac2Mid_t { - /** @brief 32bit direct register access. */ - APE_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac2Mid"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac2Mid_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac2Mid. */ - r32.setName("NcsiChannelMac2Mid"); - } - RegSHM_CHANNELNcsiChannelMac2Mid_t& operator=(const RegSHM_CHANNELNcsiChannelMac2Mid_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac2Mid_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC2_LOW ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x6022095c) /* Lower 16 bits of this word contains low 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac2Low. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac2Low_t { - /** @brief 32bit direct register access. */ - APE_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac2Low"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac2Low_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac2Low. */ - r32.setName("NcsiChannelMac2Low"); - } - RegSHM_CHANNELNcsiChannelMac2Low_t& operator=(const RegSHM_CHANNELNcsiChannelMac2Low_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac2Low_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC3_HIGH ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x60220964) /* Lower 16 bits of this word contains upper 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac3High. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac3High_t { - /** @brief 32bit direct register access. */ - APE_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac3High"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac3High_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac3High. */ - r32.setName("NcsiChannelMac3High"); - } - RegSHM_CHANNELNcsiChannelMac3High_t& operator=(const RegSHM_CHANNELNcsiChannelMac3High_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac3High_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC3_MID ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x60220968) /* Lower 16 bits of this word contains mid 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac3Mid. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac3Mid_t { - /** @brief 32bit direct register access. */ - APE_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac3Mid"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac3Mid_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac3Mid. */ - r32.setName("NcsiChannelMac3Mid"); - } - RegSHM_CHANNELNcsiChannelMac3Mid_t& operator=(const RegSHM_CHANNELNcsiChannelMac3Mid_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac3Mid_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC3_LOW ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x6022096c) /* Lower 16 bits of this word contains low 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac3Low. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac3Low_t { - /** @brief 32bit direct register access. */ - APE_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac3Low"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac3Low_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac3Low. */ - r32.setName("NcsiChannelMac3Low"); - } - RegSHM_CHANNELNcsiChannelMac3Low_t& operator=(const RegSHM_CHANNELNcsiChannelMac3Low_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac3Low_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC0_VLAN_VALID ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x60220970) /* Nonzero indicates VLAN field is valid */ /** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac0VlanValid. */ typedef register_container RegSHM_CHANNELNcsiChannelMac0VlanValid_t { @@ -1534,180 +1250,223 @@ typedef register_container RegSHM_CHANNELNcsiChannelDbg_t { #endif /* CXX_SIMULATOR */ } RegSHM_CHANNELNcsiChannelDbg_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_RX ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209b0) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatRx_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NETWORK_RX ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209b0) /* Number of packets received from the external network interface */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ +typedef register_container RegSHM_CHANNELNcsiChannelNetworkRx_t { /** @brief 32bit direct register access. */ APE_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatRx"; } + const char* getName(void) { return "NcsiChannelNetworkRx"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatRx_t() + RegSHM_CHANNELNcsiChannelNetworkRx_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ - r32.setName("NcsiChannelCtrlstatRx"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ + r32.setName("NcsiChannelNetworkRx"); } - RegSHM_CHANNELNcsiChannelCtrlstatRx_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatRx_t& other) + RegSHM_CHANNELNcsiChannelNetworkRx_t& operator=(const RegSHM_CHANNELNcsiChannelNetworkRx_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatRx_t; +} RegSHM_CHANNELNcsiChannelNetworkRx_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_DROPPED ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209b4) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatDropped_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NETWORK_TX ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209b4) /* Number of packets transmited from the BCM5719 to external network interface */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ +typedef register_container RegSHM_CHANNELNcsiChannelNetworkTx_t { /** @brief 32bit direct register access. */ APE_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatDropped"; } + const char* getName(void) { return "NcsiChannelNetworkTx"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatDropped_t() + RegSHM_CHANNELNcsiChannelNetworkTx_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ - r32.setName("NcsiChannelCtrlstatDropped"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ + r32.setName("NcsiChannelNetworkTx"); } - RegSHM_CHANNELNcsiChannelCtrlstatDropped_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatDropped_t& other) + RegSHM_CHANNELNcsiChannelNetworkTx_t& operator=(const RegSHM_CHANNELNcsiChannelNetworkTx_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatDropped_t; +} RegSHM_CHANNELNcsiChannelNetworkTx_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_TYPE_ERR ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209b8) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NCSI_RX ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209b8) /* Number of packets received from the BMC via NCSI */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ +typedef register_container RegSHM_CHANNELNcsiChannelNcsiRx_t { /** @brief 32bit direct register access. */ APE_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatTypeErr"; } + const char* getName(void) { return "NcsiChannelNcsiRx"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t() + RegSHM_CHANNELNcsiChannelNcsiRx_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ - r32.setName("NcsiChannelCtrlstatTypeErr"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ + r32.setName("NcsiChannelNcsiRx"); } - RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t& other) + RegSHM_CHANNELNcsiChannelNcsiRx_t& operator=(const RegSHM_CHANNELNcsiChannelNcsiRx_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t; +} RegSHM_CHANNELNcsiChannelNcsiRx_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_BAD_CSUM ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209bc) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NCSI_TX ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209bc) /* Number of packets transmitted from the BCM5719 to the BMC via NCSI */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ +typedef register_container RegSHM_CHANNELNcsiChannelNcsiTx_t { /** @brief 32bit direct register access. */ APE_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatBadCsum"; } + const char* getName(void) { return "NcsiChannelNcsiTx"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t() + RegSHM_CHANNELNcsiChannelNcsiTx_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ - r32.setName("NcsiChannelCtrlstatBadCsum"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ + r32.setName("NcsiChannelNcsiTx"); } - RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t& other) + RegSHM_CHANNELNcsiChannelNcsiTx_t& operator=(const RegSHM_CHANNELNcsiChannelNcsiTx_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t; +} RegSHM_CHANNELNcsiChannelNcsiTx_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_ALL_RX ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209c0) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NCSI_DROPPED ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209c0) /* Number of packets dropped on the NCSI interface. */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ +typedef register_container RegSHM_CHANNELNcsiChannelNcsiDropped_t { /** @brief 32bit direct register access. */ APE_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatAllRx"; } + const char* getName(void) { return "NcsiChannelNcsiDropped"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t() + RegSHM_CHANNELNcsiChannelNcsiDropped_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ - r32.setName("NcsiChannelCtrlstatAllRx"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ + r32.setName("NcsiChannelNcsiDropped"); } - RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t& other) + RegSHM_CHANNELNcsiChannelNcsiDropped_t& operator=(const RegSHM_CHANNELNcsiChannelNcsiDropped_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t; +} RegSHM_CHANNELNcsiChannelNcsiDropped_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_ALL_TX ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209c4) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NETWORK_DROPPED ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209c4) /* Number of packets dropped on the external network interface. */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ +typedef register_container RegSHM_CHANNELNcsiChannelNetworkDropped_t { /** @brief 32bit direct register access. */ APE_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatAllTx"; } + const char* getName(void) { return "NcsiChannelNetworkDropped"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t() + RegSHM_CHANNELNcsiChannelNetworkDropped_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ - r32.setName("NcsiChannelCtrlstatAllTx"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ + r32.setName("NcsiChannelNetworkDropped"); } - RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t& other) + RegSHM_CHANNELNcsiChannelNetworkDropped_t& operator=(const RegSHM_CHANNELNcsiChannelNetworkDropped_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t; +} RegSHM_CHANNELNcsiChannelNetworkDropped_t; + +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_AEN ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209c8) /* Number of AEN packets sent via NCSI */ +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN_SHIFT 0u +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN_MASK 0x1u +#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN(__reg__) (((__reg__) & 0x1) >> 0u) +#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN(__val__) (((__val__) << 0u) & 0x1u) +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN_SHIFT 1u +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN_MASK 0x2u +#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN(__reg__) (((__reg__) & 0x2) >> 1u) +#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN(__val__) (((__val__) << 1u) & 0x2u) +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN_SHIFT 2u +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN_MASK 0x4u +#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN(__reg__) (((__reg__) & 0x4) >> 2u) +#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN(__val__) (((__val__) << 2u) & 0x4u) -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_ALL_AEN ((volatile APE_SHM_CHANNEL0_H_uint32_t*)0x602209c8) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t { +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelAen. */ +typedef register_container RegSHM_CHANNELNcsiChannelAen_t { /** @brief 32bit direct register access. */ APE_SHM_CHANNEL0_H_uint32_t r32; + + BITFIELD_BEGIN(APE_SHM_CHANNEL0_H_uint32_t, bits) +#if defined(__LITTLE_ENDIAN__) + /** @brief */ + BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableLinkStatusChangeAEN, 0, 1) + /** @brief */ + BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableConfigurationRequiredAEN, 1, 1) + /** @brief */ + BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableHostNCDriverStatusChangeAEN, 2, 1) + /** @brief Padding */ + BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, reserved_31_3, 3, 29) +#elif defined(__BIG_ENDIAN__) + /** @brief Padding */ + BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, reserved_31_3, 3, 29) + /** @brief */ + BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableHostNCDriverStatusChangeAEN, 2, 1) + /** @brief */ + BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableConfigurationRequiredAEN, 1, 1) + /** @brief */ + BITFIELD_MEMBER(APE_SHM_CHANNEL0_H_uint32_t, EnableLinkStatusChangeAEN, 0, 1) +#else +#error Unknown Endian +#endif + BITFIELD_END(APE_SHM_CHANNEL0_H_uint32_t, bits) #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatAllAen"; } + const char* getName(void) { return "NcsiChannelAen"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t() + RegSHM_CHANNELNcsiChannelAen_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ - r32.setName("NcsiChannelCtrlstatAllAen"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelAen. */ + r32.setName("NcsiChannelAen"); + bits.EnableLinkStatusChangeAEN.setBaseRegister(&r32); + bits.EnableLinkStatusChangeAEN.setName("EnableLinkStatusChangeAEN"); + bits.EnableConfigurationRequiredAEN.setBaseRegister(&r32); + bits.EnableConfigurationRequiredAEN.setName("EnableConfigurationRequiredAEN"); + bits.EnableHostNCDriverStatusChangeAEN.setBaseRegister(&r32); + bits.EnableHostNCDriverStatusChangeAEN.setName("EnableHostNCDriverStatusChangeAEN"); } - RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t& other) + RegSHM_CHANNELNcsiChannelAen_t& operator=(const RegSHM_CHANNELNcsiChannelAen_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t; +} RegSHM_CHANNELNcsiChannelAen_t; /** @brief Component definition for @ref SHM_CHANNEL0. */ typedef struct SHM_CHANNEL_t { @@ -1717,8 +1476,8 @@ typedef struct SHM_CHANNEL_t { /** @brief AEN Management Controller ID, set by BMC when sending AEN ENABLE command and used when sending AENs. */ RegSHM_CHANNELNcsiChannelMcid_t NcsiChannelMcid; - /** @brief Set via NCSI ENABLE AEN. */ - RegSHM_CHANNELNcsiChannelAen_t NcsiChannelAen; + /** @brief Reserved bytes to pad out data structure. */ + APE_SHM_CHANNEL0_H_uint32_t reserved_8[1]; /** @brief */ RegSHM_CHANNELNcsiChannelBfilt_t NcsiChannelBfilt; @@ -1751,49 +1510,49 @@ typedef struct SHM_CHANNEL_t { APE_SHM_CHANNEL0_H_uint32_t reserved_48[1]; /** @brief Lower 16 bits of this word contains upper 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac0High_t NcsiChannelMac0High; + RegSHM_CHANNELMacHigh_t NcsiChannelMac0High; /** @brief Lower 16 bits of this word contains mid 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac0Mid_t NcsiChannelMac0Mid; + RegSHM_CHANNELMacMid_t NcsiChannelMac0Mid; /** @brief Lower 16 bits of this word contains low 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac0Low_t NcsiChannelMac0Low; + RegSHM_CHANNELMacLow_t NcsiChannelMac0Low; /** @brief Reserved bytes to pad out data structure. */ APE_SHM_CHANNEL0_H_uint32_t reserved_64[1]; /** @brief Lower 16 bits of this word contains upper 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac1High_t NcsiChannelMac1High; + RegSHM_CHANNELMacHigh_t NcsiChannelMac1High; /** @brief Lower 16 bits of this word contains mid 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac1Mid_t NcsiChannelMac1Mid; + RegSHM_CHANNELMacMid_t NcsiChannelMac1Mid; /** @brief Lower 16 bits of this word contains low 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac1Low_t NcsiChannelMac1Low; + RegSHM_CHANNELMacLow_t NcsiChannelMac1Low; /** @brief Reserved bytes to pad out data structure. */ APE_SHM_CHANNEL0_H_uint32_t reserved_80[1]; /** @brief Lower 16 bits of this word contains upper 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac2High_t NcsiChannelMac2High; + RegSHM_CHANNELMacHigh_t NcsiChannelMac2High; /** @brief Lower 16 bits of this word contains mid 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac2Mid_t NcsiChannelMac2Mid; + RegSHM_CHANNELMacMid_t NcsiChannelMac2Mid; /** @brief Lower 16 bits of this word contains low 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac2Low_t NcsiChannelMac2Low; + RegSHM_CHANNELMacLow_t NcsiChannelMac2Low; /** @brief Reserved bytes to pad out data structure. */ APE_SHM_CHANNEL0_H_uint32_t reserved_96[1]; /** @brief Lower 16 bits of this word contains upper 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac3High_t NcsiChannelMac3High; + RegSHM_CHANNELMacHigh_t NcsiChannelMac3High; /** @brief Lower 16 bits of this word contains mid 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac3Mid_t NcsiChannelMac3Mid; + RegSHM_CHANNELMacMid_t NcsiChannelMac3Mid; /** @brief Lower 16 bits of this word contains low 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac3Low_t NcsiChannelMac3Low; + RegSHM_CHANNELMacLow_t NcsiChannelMac3Low; /** @brief Nonzero indicates VLAN field is valid */ RegSHM_CHANNELNcsiChannelMac0VlanValid_t NcsiChannelMac0VlanValid; @@ -1831,26 +1590,26 @@ typedef struct SHM_CHANNEL_t { /** @brief Reserved bytes to pad out data structure. */ APE_SHM_CHANNEL0_H_uint32_t reserved_164[3]; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatRx_t NcsiChannelCtrlstatRx; + /** @brief Number of packets received from the external network interface */ + RegSHM_CHANNELNcsiChannelNetworkRx_t NcsiChannelNetworkRx; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatDropped_t NcsiChannelCtrlstatDropped; + /** @brief Number of packets transmited from the BCM5719 to external network interface */ + RegSHM_CHANNELNcsiChannelNetworkTx_t NcsiChannelNetworkTx; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t NcsiChannelCtrlstatTypeErr; + /** @brief Number of packets received from the BMC via NCSI */ + RegSHM_CHANNELNcsiChannelNcsiRx_t NcsiChannelNcsiRx; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t NcsiChannelCtrlstatBadCsum; + /** @brief Number of packets transmitted from the BCM5719 to the BMC via NCSI */ + RegSHM_CHANNELNcsiChannelNcsiTx_t NcsiChannelNcsiTx; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t NcsiChannelCtrlstatAllRx; + /** @brief Number of packets dropped on the NCSI interface. */ + RegSHM_CHANNELNcsiChannelNcsiDropped_t NcsiChannelNcsiDropped; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t NcsiChannelCtrlstatAllTx; + /** @brief Number of packets dropped on the external network interface. */ + RegSHM_CHANNELNcsiChannelNetworkDropped_t NcsiChannelNetworkDropped; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t NcsiChannelCtrlstatAllAen; + /** @brief Number of AEN packets sent via NCSI */ + RegSHM_CHANNELNcsiChannelAen_t NcsiChannelAen; #ifdef CXX_SIMULATOR typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*); @@ -1864,7 +1623,10 @@ typedef struct SHM_CHANNEL_t { { NcsiChannelInfo.r32.setComponentOffset(0x0); NcsiChannelMcid.r32.setComponentOffset(0x4); - NcsiChannelAen.r32.setComponentOffset(0x8); + for(int i = 0; i < 1; i++) + { + reserved_8[i].setComponentOffset(0x8 + (i * 4)); + } NcsiChannelBfilt.r32.setComponentOffset(0xc); NcsiChannelMfilt.r32.setComponentOffset(0x10); NcsiChannelSetting1.r32.setComponentOffset(0x14); @@ -1881,29 +1643,41 @@ typedef struct SHM_CHANNEL_t { { reserved_48[i].setComponentOffset(0x30 + (i * 4)); } + NcsiChannelMac0High.r32.setName("NcsiChannelMac0High"); NcsiChannelMac0High.r32.setComponentOffset(0x34); + NcsiChannelMac0Mid.r32.setName("NcsiChannelMac0Mid"); NcsiChannelMac0Mid.r32.setComponentOffset(0x38); + NcsiChannelMac0Low.r32.setName("NcsiChannelMac0Low"); NcsiChannelMac0Low.r32.setComponentOffset(0x3c); for(int i = 0; i < 1; i++) { reserved_64[i].setComponentOffset(0x40 + (i * 4)); } + NcsiChannelMac1High.r32.setName("NcsiChannelMac1High"); NcsiChannelMac1High.r32.setComponentOffset(0x44); + NcsiChannelMac1Mid.r32.setName("NcsiChannelMac1Mid"); NcsiChannelMac1Mid.r32.setComponentOffset(0x48); + NcsiChannelMac1Low.r32.setName("NcsiChannelMac1Low"); NcsiChannelMac1Low.r32.setComponentOffset(0x4c); for(int i = 0; i < 1; i++) { reserved_80[i].setComponentOffset(0x50 + (i * 4)); } + NcsiChannelMac2High.r32.setName("NcsiChannelMac2High"); NcsiChannelMac2High.r32.setComponentOffset(0x54); + NcsiChannelMac2Mid.r32.setName("NcsiChannelMac2Mid"); NcsiChannelMac2Mid.r32.setComponentOffset(0x58); + NcsiChannelMac2Low.r32.setName("NcsiChannelMac2Low"); NcsiChannelMac2Low.r32.setComponentOffset(0x5c); for(int i = 0; i < 1; i++) { reserved_96[i].setComponentOffset(0x60 + (i * 4)); } + NcsiChannelMac3High.r32.setName("NcsiChannelMac3High"); NcsiChannelMac3High.r32.setComponentOffset(0x64); + NcsiChannelMac3Mid.r32.setName("NcsiChannelMac3Mid"); NcsiChannelMac3Mid.r32.setComponentOffset(0x68); + NcsiChannelMac3Low.r32.setName("NcsiChannelMac3Low"); NcsiChannelMac3Low.r32.setComponentOffset(0x6c); NcsiChannelMac0VlanValid.r32.setComponentOffset(0x70); NcsiChannelMac0Vlan.r32.setComponentOffset(0x74); @@ -1923,19 +1697,22 @@ typedef struct SHM_CHANNEL_t { { reserved_164[i].setComponentOffset(0xa4 + (i * 4)); } - NcsiChannelCtrlstatRx.r32.setComponentOffset(0xb0); - NcsiChannelCtrlstatDropped.r32.setComponentOffset(0xb4); - NcsiChannelCtrlstatTypeErr.r32.setComponentOffset(0xb8); - NcsiChannelCtrlstatBadCsum.r32.setComponentOffset(0xbc); - NcsiChannelCtrlstatAllRx.r32.setComponentOffset(0xc0); - NcsiChannelCtrlstatAllTx.r32.setComponentOffset(0xc4); - NcsiChannelCtrlstatAllAen.r32.setComponentOffset(0xc8); + NcsiChannelNetworkRx.r32.setComponentOffset(0xb0); + NcsiChannelNetworkTx.r32.setComponentOffset(0xb4); + NcsiChannelNcsiRx.r32.setComponentOffset(0xb8); + NcsiChannelNcsiTx.r32.setComponentOffset(0xbc); + NcsiChannelNcsiDropped.r32.setComponentOffset(0xc0); + NcsiChannelNetworkDropped.r32.setComponentOffset(0xc4); + NcsiChannelAen.r32.setComponentOffset(0xc8); } void print() { NcsiChannelInfo.print(); NcsiChannelMcid.print(); - NcsiChannelAen.print(); + for(int i = 0; i < 1; i++) + { + reserved_8[i].print(); + } NcsiChannelBfilt.print(); NcsiChannelMfilt.print(); NcsiChannelSetting1.print(); @@ -1994,13 +1771,13 @@ typedef struct SHM_CHANNEL_t { { reserved_164[i].print(); } - NcsiChannelCtrlstatRx.print(); - NcsiChannelCtrlstatDropped.print(); - NcsiChannelCtrlstatTypeErr.print(); - NcsiChannelCtrlstatBadCsum.print(); - NcsiChannelCtrlstatAllRx.print(); - NcsiChannelCtrlstatAllTx.print(); - NcsiChannelCtrlstatAllAen.print(); + NcsiChannelNetworkRx.print(); + NcsiChannelNetworkTx.print(); + NcsiChannelNcsiRx.print(); + NcsiChannelNcsiTx.print(); + NcsiChannelNcsiDropped.print(); + NcsiChannelNetworkDropped.print(); + NcsiChannelAen.print(); } uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); } void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); } diff --git a/include/APE_SHM_CHANNEL1.h b/include/APE_SHM_CHANNEL1.h index 90d34e8..aa09799 100644 --- a/include/APE_SHM_CHANNEL1.h +++ b/include/APE_SHM_CHANNEL1.h @@ -84,7 +84,6 @@ typedef uint32_t APE_SHM_CHANNEL1_H_uint32_t; #define REG_SHM_CHANNEL1_NCSI_CHANNEL_INFO ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220a00) /* */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_MCID ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220a04) /* AEN Management Controller ID, set by BMC when sending AEN ENABLE command and used when sending AENs. */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_AEN ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220a08) /* Set via NCSI ENABLE AEN. */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_BFILT ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220a0c) /* */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_MFILT ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220a10) /* */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_SETTING_1 ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220a14) /* This is the "Link Settings" value from NCSI Set Link. */ @@ -115,13 +114,13 @@ typedef uint32_t APE_SHM_CHANNEL1_H_uint32_t; #define REG_SHM_CHANNEL1_NCSI_CHANNEL_DROPFIL ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220a8c) /* */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_SLINK ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220a90) /* */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_DBG ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220aa0) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_RX ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ab0) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_DROPPED ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ab4) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_TYPE_ERR ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ab8) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_BAD_CSUM ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220abc) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_ALL_RX ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ac0) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_ALL_TX ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ac4) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_ALL_AEN ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ac8) /* */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NETWORK_RX ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ab0) /* Number of packets received from the external network interface */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NETWORK_TX ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ab4) /* Number of packets transmited from the BCM5719 to external network interface */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NCSI_RX ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ab8) /* Number of packets received from the BMC via NCSI */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NCSI_TX ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220abc) /* Number of packets transmitted from the BCM5719 to the BMC via NCSI */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NCSI_DROPPED ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ac0) /* Number of packets dropped on the NCSI interface. */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NETWORK_DROPPED ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ac4) /* Number of packets dropped on the external network interface. */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_AEN ((volatile APE_SHM_CHANNEL1_H_uint32_t*)0x60220ac8) /* Number of AEN packets sent via NCSI */ /** @brief Device SHM Registers, function 0 */ extern volatile SHM_CHANNEL_t SHM_CHANNEL1; diff --git a/include/APE_SHM_CHANNEL2.h b/include/APE_SHM_CHANNEL2.h index 714b6bc..10ffc4b 100644 --- a/include/APE_SHM_CHANNEL2.h +++ b/include/APE_SHM_CHANNEL2.h @@ -84,7 +84,6 @@ typedef uint32_t APE_SHM_CHANNEL2_H_uint32_t; #define REG_SHM_CHANNEL2_NCSI_CHANNEL_INFO ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220b00) /* */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_MCID ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220b04) /* AEN Management Controller ID, set by BMC when sending AEN ENABLE command and used when sending AENs. */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_AEN ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220b08) /* Set via NCSI ENABLE AEN. */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_BFILT ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220b0c) /* */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_MFILT ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220b10) /* */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_SETTING_1 ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220b14) /* This is the "Link Settings" value from NCSI Set Link. */ @@ -115,13 +114,13 @@ typedef uint32_t APE_SHM_CHANNEL2_H_uint32_t; #define REG_SHM_CHANNEL2_NCSI_CHANNEL_DROPFIL ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220b8c) /* */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_SLINK ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220b90) /* */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_DBG ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220ba0) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_RX ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bb0) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_DROPPED ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bb4) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_TYPE_ERR ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bb8) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_BAD_CSUM ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bbc) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_ALL_RX ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bc0) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_ALL_TX ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bc4) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_ALL_AEN ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bc8) /* */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NETWORK_RX ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bb0) /* Number of packets received from the external network interface */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NETWORK_TX ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bb4) /* Number of packets transmited from the BCM5719 to external network interface */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NCSI_RX ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bb8) /* Number of packets received from the BMC via NCSI */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NCSI_TX ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bbc) /* Number of packets transmitted from the BCM5719 to the BMC via NCSI */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NCSI_DROPPED ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bc0) /* Number of packets dropped on the NCSI interface. */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NETWORK_DROPPED ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bc4) /* Number of packets dropped on the external network interface. */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_AEN ((volatile APE_SHM_CHANNEL2_H_uint32_t*)0x60220bc8) /* Number of AEN packets sent via NCSI */ /** @brief Device SHM Registers, function 0 */ extern volatile SHM_CHANNEL_t SHM_CHANNEL2; diff --git a/include/APE_SHM_CHANNEL3.h b/include/APE_SHM_CHANNEL3.h index 35eb126..7edd3a4 100644 --- a/include/APE_SHM_CHANNEL3.h +++ b/include/APE_SHM_CHANNEL3.h @@ -84,7 +84,6 @@ typedef uint32_t APE_SHM_CHANNEL3_H_uint32_t; #define REG_SHM_CHANNEL3_NCSI_CHANNEL_INFO ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220c00) /* */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_MCID ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220c04) /* AEN Management Controller ID, set by BMC when sending AEN ENABLE command and used when sending AENs. */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_AEN ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220c08) /* Set via NCSI ENABLE AEN. */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_BFILT ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220c0c) /* */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_MFILT ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220c10) /* */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_SETTING_1 ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220c14) /* This is the "Link Settings" value from NCSI Set Link. */ @@ -115,13 +114,13 @@ typedef uint32_t APE_SHM_CHANNEL3_H_uint32_t; #define REG_SHM_CHANNEL3_NCSI_CHANNEL_DROPFIL ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220c8c) /* */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_SLINK ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220c90) /* */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_DBG ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220ca0) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_RX ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cb0) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_DROPPED ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cb4) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_TYPE_ERR ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cb8) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_BAD_CSUM ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cbc) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_ALL_RX ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cc0) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_ALL_TX ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cc4) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_ALL_AEN ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cc8) /* */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NETWORK_RX ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cb0) /* Number of packets received from the external network interface */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NETWORK_TX ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cb4) /* Number of packets transmited from the BCM5719 to external network interface */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NCSI_RX ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cb8) /* Number of packets received from the BMC via NCSI */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NCSI_TX ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cbc) /* Number of packets transmitted from the BCM5719 to the BMC via NCSI */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NCSI_DROPPED ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cc0) /* Number of packets dropped on the NCSI interface. */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NETWORK_DROPPED ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cc4) /* Number of packets dropped on the external network interface. */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_AEN ((volatile APE_SHM_CHANNEL3_H_uint32_t*)0x60220cc8) /* Number of AEN packets sent via NCSI */ /** @brief Device SHM Registers, function 0 */ extern volatile SHM_CHANNEL_t SHM_CHANNEL3; diff --git a/include/bcm5719_SHM_CHANNEL0.h b/include/bcm5719_SHM_CHANNEL0.h index bd2f181..4f708f4 100644 --- a/include/bcm5719_SHM_CHANNEL0.h +++ b/include/bcm5719_SHM_CHANNEL0.h @@ -286,74 +286,6 @@ typedef register_container RegSHM_CHANNELNcsiChannelMcid_t { #endif /* CXX_SIMULATOR */ } RegSHM_CHANNELNcsiChannelMcid_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_AEN ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc0014908) /* Set via NCSI ENABLE AEN. */ -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN_SHIFT 0u -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN_MASK 0x1u -#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN(__reg__) (((__reg__) & 0x1) >> 0u) -#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN(__val__) (((__val__) << 0u) & 0x1u) -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN_SHIFT 1u -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN_MASK 0x2u -#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN(__reg__) (((__reg__) & 0x2) >> 1u) -#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN(__val__) (((__val__) << 1u) & 0x2u) -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN_SHIFT 2u -#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN_MASK 0x4u -#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN(__reg__) (((__reg__) & 0x4) >> 2u) -#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN(__val__) (((__val__) << 2u) & 0x4u) - -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelAen. */ -typedef register_container RegSHM_CHANNELNcsiChannelAen_t { - /** @brief 32bit direct register access. */ - BCM5719_SHM_CHANNEL0_H_uint32_t r32; - - BITFIELD_BEGIN(BCM5719_SHM_CHANNEL0_H_uint32_t, bits) -#if defined(__LITTLE_ENDIAN__) - /** @brief */ - BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableLinkStatusChangeAEN, 0, 1) - /** @brief */ - BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableConfigurationRequiredAEN, 1, 1) - /** @brief */ - BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableHostNCDriverStatusChangeAEN, 2, 1) - /** @brief Padding */ - BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, reserved_31_3, 3, 29) -#elif defined(__BIG_ENDIAN__) - /** @brief Padding */ - BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, reserved_31_3, 3, 29) - /** @brief */ - BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableHostNCDriverStatusChangeAEN, 2, 1) - /** @brief */ - BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableConfigurationRequiredAEN, 1, 1) - /** @brief */ - BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableLinkStatusChangeAEN, 0, 1) -#else -#error Unknown Endian -#endif - BITFIELD_END(BCM5719_SHM_CHANNEL0_H_uint32_t, bits) -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelAen"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelAen_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelAen. */ - r32.setName("NcsiChannelAen"); - bits.EnableLinkStatusChangeAEN.setBaseRegister(&r32); - bits.EnableLinkStatusChangeAEN.setName("EnableLinkStatusChangeAEN"); - bits.EnableConfigurationRequiredAEN.setBaseRegister(&r32); - bits.EnableConfigurationRequiredAEN.setName("EnableConfigurationRequiredAEN"); - bits.EnableHostNCDriverStatusChangeAEN.setBaseRegister(&r32); - bits.EnableHostNCDriverStatusChangeAEN.setName("EnableHostNCDriverStatusChangeAEN"); - } - RegSHM_CHANNELNcsiChannelAen_t& operator=(const RegSHM_CHANNELNcsiChannelAen_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelAen_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_BFILT ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc001490c) /* */ #define SHM_CHANNEL0_NCSI_CHANNEL_BFILT_ARP_PACKET_SHIFT 0u #define SHM_CHANNEL0_NCSI_CHANNEL_BFILT_ARP_PACKET_MASK 0x1u @@ -769,7 +701,7 @@ typedef register_container RegSHM_CHANNELNcsiChannelAltHostMacLow_t { #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC0_HIGH ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc0014934) /* Lower 16 bits of this word contains upper 16 bits of the MAC. */ /** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac0High. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac0High_t { +typedef register_container RegSHM_CHANNELMacHigh_t { /** @brief 32bit direct register access. */ BCM5719_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR @@ -779,22 +711,22 @@ typedef register_container RegSHM_CHANNELNcsiChannelMac0High_t { /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelMac0High_t() + RegSHM_CHANNELMacHigh_t() { /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac0High. */ r32.setName("NcsiChannelMac0High"); } - RegSHM_CHANNELNcsiChannelMac0High_t& operator=(const RegSHM_CHANNELNcsiChannelMac0High_t& other) + RegSHM_CHANNELMacHigh_t& operator=(const RegSHM_CHANNELMacHigh_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac0High_t; +} RegSHM_CHANNELMacHigh_t; #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC0_MID ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc0014938) /* Lower 16 bits of this word contains mid 16 bits of the MAC. */ /** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac0Mid. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac0Mid_t { +typedef register_container RegSHM_CHANNELMacMid_t { /** @brief 32bit direct register access. */ BCM5719_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR @@ -804,22 +736,22 @@ typedef register_container RegSHM_CHANNELNcsiChannelMac0Mid_t { /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelMac0Mid_t() + RegSHM_CHANNELMacMid_t() { /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac0Mid. */ r32.setName("NcsiChannelMac0Mid"); } - RegSHM_CHANNELNcsiChannelMac0Mid_t& operator=(const RegSHM_CHANNELNcsiChannelMac0Mid_t& other) + RegSHM_CHANNELMacMid_t& operator=(const RegSHM_CHANNELMacMid_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac0Mid_t; +} RegSHM_CHANNELMacMid_t; #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC0_LOW ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc001493c) /* Lower 16 bits of this word contains low 16 bits of the MAC. */ /** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac0Low. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac0Low_t { +typedef register_container RegSHM_CHANNELMacLow_t { /** @brief 32bit direct register access. */ BCM5719_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR @@ -829,244 +761,28 @@ typedef register_container RegSHM_CHANNELNcsiChannelMac0Low_t { /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelMac0Low_t() + RegSHM_CHANNELMacLow_t() { /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac0Low. */ r32.setName("NcsiChannelMac0Low"); } - RegSHM_CHANNELNcsiChannelMac0Low_t& operator=(const RegSHM_CHANNELNcsiChannelMac0Low_t& other) + RegSHM_CHANNELMacLow_t& operator=(const RegSHM_CHANNELMacLow_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac0Low_t; +} RegSHM_CHANNELMacLow_t; #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC1_HIGH ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc0014944) /* Lower 16 bits of this word contains upper 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac1High. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac1High_t { - /** @brief 32bit direct register access. */ - BCM5719_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac1High"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac1High_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac1High. */ - r32.setName("NcsiChannelMac1High"); - } - RegSHM_CHANNELNcsiChannelMac1High_t& operator=(const RegSHM_CHANNELNcsiChannelMac1High_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac1High_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC1_MID ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc0014948) /* Lower 16 bits of this word contains mid 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac1Mid. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac1Mid_t { - /** @brief 32bit direct register access. */ - BCM5719_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac1Mid"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac1Mid_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac1Mid. */ - r32.setName("NcsiChannelMac1Mid"); - } - RegSHM_CHANNELNcsiChannelMac1Mid_t& operator=(const RegSHM_CHANNELNcsiChannelMac1Mid_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac1Mid_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC1_LOW ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc001494c) /* Lower 16 bits of this word contains low 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac1Low. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac1Low_t { - /** @brief 32bit direct register access. */ - BCM5719_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac1Low"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac1Low_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac1Low. */ - r32.setName("NcsiChannelMac1Low"); - } - RegSHM_CHANNELNcsiChannelMac1Low_t& operator=(const RegSHM_CHANNELNcsiChannelMac1Low_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac1Low_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC2_HIGH ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc0014954) /* Lower 16 bits of this word contains upper 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac2High. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac2High_t { - /** @brief 32bit direct register access. */ - BCM5719_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac2High"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac2High_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac2High. */ - r32.setName("NcsiChannelMac2High"); - } - RegSHM_CHANNELNcsiChannelMac2High_t& operator=(const RegSHM_CHANNELNcsiChannelMac2High_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac2High_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC2_MID ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc0014958) /* Lower 16 bits of this word contains mid 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac2Mid. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac2Mid_t { - /** @brief 32bit direct register access. */ - BCM5719_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac2Mid"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac2Mid_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac2Mid. */ - r32.setName("NcsiChannelMac2Mid"); - } - RegSHM_CHANNELNcsiChannelMac2Mid_t& operator=(const RegSHM_CHANNELNcsiChannelMac2Mid_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac2Mid_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC2_LOW ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc001495c) /* Lower 16 bits of this word contains low 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac2Low. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac2Low_t { - /** @brief 32bit direct register access. */ - BCM5719_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac2Low"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac2Low_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac2Low. */ - r32.setName("NcsiChannelMac2Low"); - } - RegSHM_CHANNELNcsiChannelMac2Low_t& operator=(const RegSHM_CHANNELNcsiChannelMac2Low_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac2Low_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC3_HIGH ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc0014964) /* Lower 16 bits of this word contains upper 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac3High. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac3High_t { - /** @brief 32bit direct register access. */ - BCM5719_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac3High"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac3High_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac3High. */ - r32.setName("NcsiChannelMac3High"); - } - RegSHM_CHANNELNcsiChannelMac3High_t& operator=(const RegSHM_CHANNELNcsiChannelMac3High_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac3High_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC3_MID ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc0014968) /* Lower 16 bits of this word contains mid 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac3Mid. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac3Mid_t { - /** @brief 32bit direct register access. */ - BCM5719_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac3Mid"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac3Mid_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac3Mid. */ - r32.setName("NcsiChannelMac3Mid"); - } - RegSHM_CHANNELNcsiChannelMac3Mid_t& operator=(const RegSHM_CHANNELNcsiChannelMac3Mid_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac3Mid_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC3_LOW ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc001496c) /* Lower 16 bits of this word contains low 16 bits of the MAC. */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac3Low. */ -typedef register_container RegSHM_CHANNELNcsiChannelMac3Low_t { - /** @brief 32bit direct register access. */ - BCM5719_SHM_CHANNEL0_H_uint32_t r32; -#ifdef CXX_SIMULATOR - /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelMac3Low"; } - - /** @brief Print register value. */ - void print(void) { r32.print(); } - - RegSHM_CHANNELNcsiChannelMac3Low_t() - { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelMac3Low. */ - r32.setName("NcsiChannelMac3Low"); - } - RegSHM_CHANNELNcsiChannelMac3Low_t& operator=(const RegSHM_CHANNELNcsiChannelMac3Low_t& other) - { - r32 = other.r32; - return *this; - } -#endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelMac3Low_t; - #define REG_SHM_CHANNEL0_NCSI_CHANNEL_MAC0_VLAN_VALID ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc0014970) /* Nonzero indicates VLAN field is valid */ /** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelMac0VlanValid. */ typedef register_container RegSHM_CHANNELNcsiChannelMac0VlanValid_t { @@ -1534,180 +1250,223 @@ typedef register_container RegSHM_CHANNELNcsiChannelDbg_t { #endif /* CXX_SIMULATOR */ } RegSHM_CHANNELNcsiChannelDbg_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_RX ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149b0) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatRx_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NETWORK_RX ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149b0) /* Number of packets received from the external network interface */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ +typedef register_container RegSHM_CHANNELNcsiChannelNetworkRx_t { /** @brief 32bit direct register access. */ BCM5719_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatRx"; } + const char* getName(void) { return "NcsiChannelNetworkRx"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatRx_t() + RegSHM_CHANNELNcsiChannelNetworkRx_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ - r32.setName("NcsiChannelCtrlstatRx"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ + r32.setName("NcsiChannelNetworkRx"); } - RegSHM_CHANNELNcsiChannelCtrlstatRx_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatRx_t& other) + RegSHM_CHANNELNcsiChannelNetworkRx_t& operator=(const RegSHM_CHANNELNcsiChannelNetworkRx_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatRx_t; +} RegSHM_CHANNELNcsiChannelNetworkRx_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_DROPPED ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149b4) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatDropped_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NETWORK_TX ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149b4) /* Number of packets transmited from the BCM5719 to external network interface */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ +typedef register_container RegSHM_CHANNELNcsiChannelNetworkTx_t { /** @brief 32bit direct register access. */ BCM5719_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatDropped"; } + const char* getName(void) { return "NcsiChannelNetworkTx"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatDropped_t() + RegSHM_CHANNELNcsiChannelNetworkTx_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ - r32.setName("NcsiChannelCtrlstatDropped"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ + r32.setName("NcsiChannelNetworkTx"); } - RegSHM_CHANNELNcsiChannelCtrlstatDropped_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatDropped_t& other) + RegSHM_CHANNELNcsiChannelNetworkTx_t& operator=(const RegSHM_CHANNELNcsiChannelNetworkTx_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatDropped_t; +} RegSHM_CHANNELNcsiChannelNetworkTx_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_TYPE_ERR ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149b8) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NCSI_RX ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149b8) /* Number of packets received from the BMC via NCSI */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ +typedef register_container RegSHM_CHANNELNcsiChannelNcsiRx_t { /** @brief 32bit direct register access. */ BCM5719_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatTypeErr"; } + const char* getName(void) { return "NcsiChannelNcsiRx"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t() + RegSHM_CHANNELNcsiChannelNcsiRx_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ - r32.setName("NcsiChannelCtrlstatTypeErr"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ + r32.setName("NcsiChannelNcsiRx"); } - RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t& other) + RegSHM_CHANNELNcsiChannelNcsiRx_t& operator=(const RegSHM_CHANNELNcsiChannelNcsiRx_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t; +} RegSHM_CHANNELNcsiChannelNcsiRx_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_BAD_CSUM ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149bc) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NCSI_TX ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149bc) /* Number of packets transmitted from the BCM5719 to the BMC via NCSI */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ +typedef register_container RegSHM_CHANNELNcsiChannelNcsiTx_t { /** @brief 32bit direct register access. */ BCM5719_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatBadCsum"; } + const char* getName(void) { return "NcsiChannelNcsiTx"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t() + RegSHM_CHANNELNcsiChannelNcsiTx_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ - r32.setName("NcsiChannelCtrlstatBadCsum"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ + r32.setName("NcsiChannelNcsiTx"); } - RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t& other) + RegSHM_CHANNELNcsiChannelNcsiTx_t& operator=(const RegSHM_CHANNELNcsiChannelNcsiTx_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t; +} RegSHM_CHANNELNcsiChannelNcsiTx_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_ALL_RX ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149c0) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NCSI_DROPPED ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149c0) /* Number of packets dropped on the NCSI interface. */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ +typedef register_container RegSHM_CHANNELNcsiChannelNcsiDropped_t { /** @brief 32bit direct register access. */ BCM5719_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatAllRx"; } + const char* getName(void) { return "NcsiChannelNcsiDropped"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t() + RegSHM_CHANNELNcsiChannelNcsiDropped_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ - r32.setName("NcsiChannelCtrlstatAllRx"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ + r32.setName("NcsiChannelNcsiDropped"); } - RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t& other) + RegSHM_CHANNELNcsiChannelNcsiDropped_t& operator=(const RegSHM_CHANNELNcsiChannelNcsiDropped_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t; +} RegSHM_CHANNELNcsiChannelNcsiDropped_t; -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_ALL_TX ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149c4) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t { +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_NETWORK_DROPPED ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149c4) /* Number of packets dropped on the external network interface. */ +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ +typedef register_container RegSHM_CHANNELNcsiChannelNetworkDropped_t { /** @brief 32bit direct register access. */ BCM5719_SHM_CHANNEL0_H_uint32_t r32; #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatAllTx"; } + const char* getName(void) { return "NcsiChannelNetworkDropped"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t() + RegSHM_CHANNELNcsiChannelNetworkDropped_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ - r32.setName("NcsiChannelCtrlstatAllTx"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ + r32.setName("NcsiChannelNetworkDropped"); } - RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t& other) + RegSHM_CHANNELNcsiChannelNetworkDropped_t& operator=(const RegSHM_CHANNELNcsiChannelNetworkDropped_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t; +} RegSHM_CHANNELNcsiChannelNetworkDropped_t; + +#define REG_SHM_CHANNEL0_NCSI_CHANNEL_AEN ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149c8) /* Number of AEN packets sent via NCSI */ +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN_SHIFT 0u +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN_MASK 0x1u +#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN(__reg__) (((__reg__) & 0x1) >> 0u) +#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_LINK_STATUS_CHANGE_AEN(__val__) (((__val__) << 0u) & 0x1u) +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN_SHIFT 1u +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN_MASK 0x2u +#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN(__reg__) (((__reg__) & 0x2) >> 1u) +#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_CONFIGURATION_REQUIRED_AEN(__val__) (((__val__) << 1u) & 0x2u) +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN_SHIFT 2u +#define SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN_MASK 0x4u +#define GET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN(__reg__) (((__reg__) & 0x4) >> 2u) +#define SET_SHM_CHANNEL0_NCSI_CHANNEL_AEN_ENABLE_HOST_NC_DRIVER_STATUS_CHANGE_AEN(__val__) (((__val__) << 2u) & 0x4u) -#define REG_SHM_CHANNEL0_NCSI_CHANNEL_CTRLSTAT_ALL_AEN ((volatile BCM5719_SHM_CHANNEL0_H_uint32_t*)0xc00149c8) /* */ -/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ -typedef register_container RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t { +/** @brief Register definition for @ref SHM_CHANNEL_t.NcsiChannelAen. */ +typedef register_container RegSHM_CHANNELNcsiChannelAen_t { /** @brief 32bit direct register access. */ BCM5719_SHM_CHANNEL0_H_uint32_t r32; + + BITFIELD_BEGIN(BCM5719_SHM_CHANNEL0_H_uint32_t, bits) +#if defined(__LITTLE_ENDIAN__) + /** @brief */ + BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableLinkStatusChangeAEN, 0, 1) + /** @brief */ + BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableConfigurationRequiredAEN, 1, 1) + /** @brief */ + BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableHostNCDriverStatusChangeAEN, 2, 1) + /** @brief Padding */ + BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, reserved_31_3, 3, 29) +#elif defined(__BIG_ENDIAN__) + /** @brief Padding */ + BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, reserved_31_3, 3, 29) + /** @brief */ + BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableHostNCDriverStatusChangeAEN, 2, 1) + /** @brief */ + BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableConfigurationRequiredAEN, 1, 1) + /** @brief */ + BITFIELD_MEMBER(BCM5719_SHM_CHANNEL0_H_uint32_t, EnableLinkStatusChangeAEN, 0, 1) +#else +#error Unknown Endian +#endif + BITFIELD_END(BCM5719_SHM_CHANNEL0_H_uint32_t, bits) #ifdef CXX_SIMULATOR /** @brief Register name for use with the simulator. */ - const char* getName(void) { return "NcsiChannelCtrlstatAllAen"; } + const char* getName(void) { return "NcsiChannelAen"; } /** @brief Print register value. */ void print(void) { r32.print(); } - RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t() + RegSHM_CHANNELNcsiChannelAen_t() { - /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ - r32.setName("NcsiChannelCtrlstatAllAen"); + /** @brief constructor for @ref SHM_CHANNEL_t.NcsiChannelAen. */ + r32.setName("NcsiChannelAen"); + bits.EnableLinkStatusChangeAEN.setBaseRegister(&r32); + bits.EnableLinkStatusChangeAEN.setName("EnableLinkStatusChangeAEN"); + bits.EnableConfigurationRequiredAEN.setBaseRegister(&r32); + bits.EnableConfigurationRequiredAEN.setName("EnableConfigurationRequiredAEN"); + bits.EnableHostNCDriverStatusChangeAEN.setBaseRegister(&r32); + bits.EnableHostNCDriverStatusChangeAEN.setName("EnableHostNCDriverStatusChangeAEN"); } - RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t& operator=(const RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t& other) + RegSHM_CHANNELNcsiChannelAen_t& operator=(const RegSHM_CHANNELNcsiChannelAen_t& other) { r32 = other.r32; return *this; } #endif /* CXX_SIMULATOR */ -} RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t; +} RegSHM_CHANNELNcsiChannelAen_t; /** @brief Component definition for @ref SHM_CHANNEL0. */ typedef struct SHM_CHANNEL_t { @@ -1717,8 +1476,8 @@ typedef struct SHM_CHANNEL_t { /** @brief AEN Management Controller ID, set by BMC when sending AEN ENABLE command and used when sending AENs. */ RegSHM_CHANNELNcsiChannelMcid_t NcsiChannelMcid; - /** @brief Set via NCSI ENABLE AEN. */ - RegSHM_CHANNELNcsiChannelAen_t NcsiChannelAen; + /** @brief Reserved bytes to pad out data structure. */ + BCM5719_SHM_CHANNEL0_H_uint32_t reserved_8[1]; /** @brief */ RegSHM_CHANNELNcsiChannelBfilt_t NcsiChannelBfilt; @@ -1751,49 +1510,49 @@ typedef struct SHM_CHANNEL_t { BCM5719_SHM_CHANNEL0_H_uint32_t reserved_48[1]; /** @brief Lower 16 bits of this word contains upper 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac0High_t NcsiChannelMac0High; + RegSHM_CHANNELMacHigh_t NcsiChannelMac0High; /** @brief Lower 16 bits of this word contains mid 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac0Mid_t NcsiChannelMac0Mid; + RegSHM_CHANNELMacMid_t NcsiChannelMac0Mid; /** @brief Lower 16 bits of this word contains low 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac0Low_t NcsiChannelMac0Low; + RegSHM_CHANNELMacLow_t NcsiChannelMac0Low; /** @brief Reserved bytes to pad out data structure. */ BCM5719_SHM_CHANNEL0_H_uint32_t reserved_64[1]; /** @brief Lower 16 bits of this word contains upper 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac1High_t NcsiChannelMac1High; + RegSHM_CHANNELMacHigh_t NcsiChannelMac1High; /** @brief Lower 16 bits of this word contains mid 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac1Mid_t NcsiChannelMac1Mid; + RegSHM_CHANNELMacMid_t NcsiChannelMac1Mid; /** @brief Lower 16 bits of this word contains low 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac1Low_t NcsiChannelMac1Low; + RegSHM_CHANNELMacLow_t NcsiChannelMac1Low; /** @brief Reserved bytes to pad out data structure. */ BCM5719_SHM_CHANNEL0_H_uint32_t reserved_80[1]; /** @brief Lower 16 bits of this word contains upper 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac2High_t NcsiChannelMac2High; + RegSHM_CHANNELMacHigh_t NcsiChannelMac2High; /** @brief Lower 16 bits of this word contains mid 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac2Mid_t NcsiChannelMac2Mid; + RegSHM_CHANNELMacMid_t NcsiChannelMac2Mid; /** @brief Lower 16 bits of this word contains low 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac2Low_t NcsiChannelMac2Low; + RegSHM_CHANNELMacLow_t NcsiChannelMac2Low; /** @brief Reserved bytes to pad out data structure. */ BCM5719_SHM_CHANNEL0_H_uint32_t reserved_96[1]; /** @brief Lower 16 bits of this word contains upper 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac3High_t NcsiChannelMac3High; + RegSHM_CHANNELMacHigh_t NcsiChannelMac3High; /** @brief Lower 16 bits of this word contains mid 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac3Mid_t NcsiChannelMac3Mid; + RegSHM_CHANNELMacMid_t NcsiChannelMac3Mid; /** @brief Lower 16 bits of this word contains low 16 bits of the MAC. */ - RegSHM_CHANNELNcsiChannelMac3Low_t NcsiChannelMac3Low; + RegSHM_CHANNELMacLow_t NcsiChannelMac3Low; /** @brief Nonzero indicates VLAN field is valid */ RegSHM_CHANNELNcsiChannelMac0VlanValid_t NcsiChannelMac0VlanValid; @@ -1831,26 +1590,26 @@ typedef struct SHM_CHANNEL_t { /** @brief Reserved bytes to pad out data structure. */ BCM5719_SHM_CHANNEL0_H_uint32_t reserved_164[3]; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatRx_t NcsiChannelCtrlstatRx; + /** @brief Number of packets received from the external network interface */ + RegSHM_CHANNELNcsiChannelNetworkRx_t NcsiChannelNetworkRx; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatDropped_t NcsiChannelCtrlstatDropped; + /** @brief Number of packets transmited from the BCM5719 to external network interface */ + RegSHM_CHANNELNcsiChannelNetworkTx_t NcsiChannelNetworkTx; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatTypeErr_t NcsiChannelCtrlstatTypeErr; + /** @brief Number of packets received from the BMC via NCSI */ + RegSHM_CHANNELNcsiChannelNcsiRx_t NcsiChannelNcsiRx; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatBadCsum_t NcsiChannelCtrlstatBadCsum; + /** @brief Number of packets transmitted from the BCM5719 to the BMC via NCSI */ + RegSHM_CHANNELNcsiChannelNcsiTx_t NcsiChannelNcsiTx; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatAllRx_t NcsiChannelCtrlstatAllRx; + /** @brief Number of packets dropped on the NCSI interface. */ + RegSHM_CHANNELNcsiChannelNcsiDropped_t NcsiChannelNcsiDropped; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatAllTx_t NcsiChannelCtrlstatAllTx; + /** @brief Number of packets dropped on the external network interface. */ + RegSHM_CHANNELNcsiChannelNetworkDropped_t NcsiChannelNetworkDropped; - /** @brief */ - RegSHM_CHANNELNcsiChannelCtrlstatAllAen_t NcsiChannelCtrlstatAllAen; + /** @brief Number of AEN packets sent via NCSI */ + RegSHM_CHANNELNcsiChannelAen_t NcsiChannelAen; #ifdef CXX_SIMULATOR typedef uint32_t (*callback_t)(uint32_t, uint32_t, void*); @@ -1864,7 +1623,10 @@ typedef struct SHM_CHANNEL_t { { NcsiChannelInfo.r32.setComponentOffset(0x0); NcsiChannelMcid.r32.setComponentOffset(0x4); - NcsiChannelAen.r32.setComponentOffset(0x8); + for(int i = 0; i < 1; i++) + { + reserved_8[i].setComponentOffset(0x8 + (i * 4)); + } NcsiChannelBfilt.r32.setComponentOffset(0xc); NcsiChannelMfilt.r32.setComponentOffset(0x10); NcsiChannelSetting1.r32.setComponentOffset(0x14); @@ -1881,29 +1643,41 @@ typedef struct SHM_CHANNEL_t { { reserved_48[i].setComponentOffset(0x30 + (i * 4)); } + NcsiChannelMac0High.r32.setName("NcsiChannelMac0High"); NcsiChannelMac0High.r32.setComponentOffset(0x34); + NcsiChannelMac0Mid.r32.setName("NcsiChannelMac0Mid"); NcsiChannelMac0Mid.r32.setComponentOffset(0x38); + NcsiChannelMac0Low.r32.setName("NcsiChannelMac0Low"); NcsiChannelMac0Low.r32.setComponentOffset(0x3c); for(int i = 0; i < 1; i++) { reserved_64[i].setComponentOffset(0x40 + (i * 4)); } + NcsiChannelMac1High.r32.setName("NcsiChannelMac1High"); NcsiChannelMac1High.r32.setComponentOffset(0x44); + NcsiChannelMac1Mid.r32.setName("NcsiChannelMac1Mid"); NcsiChannelMac1Mid.r32.setComponentOffset(0x48); + NcsiChannelMac1Low.r32.setName("NcsiChannelMac1Low"); NcsiChannelMac1Low.r32.setComponentOffset(0x4c); for(int i = 0; i < 1; i++) { reserved_80[i].setComponentOffset(0x50 + (i * 4)); } + NcsiChannelMac2High.r32.setName("NcsiChannelMac2High"); NcsiChannelMac2High.r32.setComponentOffset(0x54); + NcsiChannelMac2Mid.r32.setName("NcsiChannelMac2Mid"); NcsiChannelMac2Mid.r32.setComponentOffset(0x58); + NcsiChannelMac2Low.r32.setName("NcsiChannelMac2Low"); NcsiChannelMac2Low.r32.setComponentOffset(0x5c); for(int i = 0; i < 1; i++) { reserved_96[i].setComponentOffset(0x60 + (i * 4)); } + NcsiChannelMac3High.r32.setName("NcsiChannelMac3High"); NcsiChannelMac3High.r32.setComponentOffset(0x64); + NcsiChannelMac3Mid.r32.setName("NcsiChannelMac3Mid"); NcsiChannelMac3Mid.r32.setComponentOffset(0x68); + NcsiChannelMac3Low.r32.setName("NcsiChannelMac3Low"); NcsiChannelMac3Low.r32.setComponentOffset(0x6c); NcsiChannelMac0VlanValid.r32.setComponentOffset(0x70); NcsiChannelMac0Vlan.r32.setComponentOffset(0x74); @@ -1923,19 +1697,22 @@ typedef struct SHM_CHANNEL_t { { reserved_164[i].setComponentOffset(0xa4 + (i * 4)); } - NcsiChannelCtrlstatRx.r32.setComponentOffset(0xb0); - NcsiChannelCtrlstatDropped.r32.setComponentOffset(0xb4); - NcsiChannelCtrlstatTypeErr.r32.setComponentOffset(0xb8); - NcsiChannelCtrlstatBadCsum.r32.setComponentOffset(0xbc); - NcsiChannelCtrlstatAllRx.r32.setComponentOffset(0xc0); - NcsiChannelCtrlstatAllTx.r32.setComponentOffset(0xc4); - NcsiChannelCtrlstatAllAen.r32.setComponentOffset(0xc8); + NcsiChannelNetworkRx.r32.setComponentOffset(0xb0); + NcsiChannelNetworkTx.r32.setComponentOffset(0xb4); + NcsiChannelNcsiRx.r32.setComponentOffset(0xb8); + NcsiChannelNcsiTx.r32.setComponentOffset(0xbc); + NcsiChannelNcsiDropped.r32.setComponentOffset(0xc0); + NcsiChannelNetworkDropped.r32.setComponentOffset(0xc4); + NcsiChannelAen.r32.setComponentOffset(0xc8); } void print() { NcsiChannelInfo.print(); NcsiChannelMcid.print(); - NcsiChannelAen.print(); + for(int i = 0; i < 1; i++) + { + reserved_8[i].print(); + } NcsiChannelBfilt.print(); NcsiChannelMfilt.print(); NcsiChannelSetting1.print(); @@ -1994,13 +1771,13 @@ typedef struct SHM_CHANNEL_t { { reserved_164[i].print(); } - NcsiChannelCtrlstatRx.print(); - NcsiChannelCtrlstatDropped.print(); - NcsiChannelCtrlstatTypeErr.print(); - NcsiChannelCtrlstatBadCsum.print(); - NcsiChannelCtrlstatAllRx.print(); - NcsiChannelCtrlstatAllTx.print(); - NcsiChannelCtrlstatAllAen.print(); + NcsiChannelNetworkRx.print(); + NcsiChannelNetworkTx.print(); + NcsiChannelNcsiRx.print(); + NcsiChannelNcsiTx.print(); + NcsiChannelNcsiDropped.print(); + NcsiChannelNetworkDropped.print(); + NcsiChannelAen.print(); } uint32_t read(int offset) { return mIndexReadCallback(0, offset, mIndexReadCallbackArgs); } void write(int offset, uint32_t value) { (void)mIndexWriteCallback(value, offset, mIndexWriteCallbackArgs); } diff --git a/include/bcm5719_SHM_CHANNEL1.h b/include/bcm5719_SHM_CHANNEL1.h index bbd748e..ce3f2c9 100644 --- a/include/bcm5719_SHM_CHANNEL1.h +++ b/include/bcm5719_SHM_CHANNEL1.h @@ -84,7 +84,6 @@ typedef uint32_t BCM5719_SHM_CHANNEL1_H_uint32_t; #define REG_SHM_CHANNEL1_NCSI_CHANNEL_INFO ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014a00) /* */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_MCID ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014a04) /* AEN Management Controller ID, set by BMC when sending AEN ENABLE command and used when sending AENs. */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_AEN ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014a08) /* Set via NCSI ENABLE AEN. */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_BFILT ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014a0c) /* */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_MFILT ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014a10) /* */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_SETTING_1 ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014a14) /* This is the "Link Settings" value from NCSI Set Link. */ @@ -115,13 +114,13 @@ typedef uint32_t BCM5719_SHM_CHANNEL1_H_uint32_t; #define REG_SHM_CHANNEL1_NCSI_CHANNEL_DROPFIL ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014a8c) /* */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_SLINK ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014a90) /* */ #define REG_SHM_CHANNEL1_NCSI_CHANNEL_DBG ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014aa0) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_RX ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ab0) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_DROPPED ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ab4) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_TYPE_ERR ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ab8) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_BAD_CSUM ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014abc) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_ALL_RX ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ac0) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_ALL_TX ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ac4) /* */ -#define REG_SHM_CHANNEL1_NCSI_CHANNEL_CTRLSTAT_ALL_AEN ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ac8) /* */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NETWORK_RX ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ab0) /* Number of packets received from the external network interface */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NETWORK_TX ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ab4) /* Number of packets transmited from the BCM5719 to external network interface */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NCSI_RX ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ab8) /* Number of packets received from the BMC via NCSI */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NCSI_TX ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014abc) /* Number of packets transmitted from the BCM5719 to the BMC via NCSI */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NCSI_DROPPED ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ac0) /* Number of packets dropped on the NCSI interface. */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_NETWORK_DROPPED ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ac4) /* Number of packets dropped on the external network interface. */ +#define REG_SHM_CHANNEL1_NCSI_CHANNEL_AEN ((volatile BCM5719_SHM_CHANNEL1_H_uint32_t*)0xc0014ac8) /* Number of AEN packets sent via NCSI */ /** @brief Device APE SHM Channel Registers */ extern volatile SHM_CHANNEL_t SHM_CHANNEL1; diff --git a/include/bcm5719_SHM_CHANNEL2.h b/include/bcm5719_SHM_CHANNEL2.h index 957b744..ae0176e 100644 --- a/include/bcm5719_SHM_CHANNEL2.h +++ b/include/bcm5719_SHM_CHANNEL2.h @@ -84,7 +84,6 @@ typedef uint32_t BCM5719_SHM_CHANNEL2_H_uint32_t; #define REG_SHM_CHANNEL2_NCSI_CHANNEL_INFO ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014b00) /* */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_MCID ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014b04) /* AEN Management Controller ID, set by BMC when sending AEN ENABLE command and used when sending AENs. */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_AEN ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014b08) /* Set via NCSI ENABLE AEN. */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_BFILT ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014b0c) /* */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_MFILT ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014b10) /* */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_SETTING_1 ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014b14) /* This is the "Link Settings" value from NCSI Set Link. */ @@ -115,13 +114,13 @@ typedef uint32_t BCM5719_SHM_CHANNEL2_H_uint32_t; #define REG_SHM_CHANNEL2_NCSI_CHANNEL_DROPFIL ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014b8c) /* */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_SLINK ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014b90) /* */ #define REG_SHM_CHANNEL2_NCSI_CHANNEL_DBG ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014ba0) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_RX ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bb0) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_DROPPED ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bb4) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_TYPE_ERR ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bb8) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_BAD_CSUM ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bbc) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_ALL_RX ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bc0) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_ALL_TX ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bc4) /* */ -#define REG_SHM_CHANNEL2_NCSI_CHANNEL_CTRLSTAT_ALL_AEN ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bc8) /* */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NETWORK_RX ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bb0) /* Number of packets received from the external network interface */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NETWORK_TX ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bb4) /* Number of packets transmited from the BCM5719 to external network interface */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NCSI_RX ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bb8) /* Number of packets received from the BMC via NCSI */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NCSI_TX ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bbc) /* Number of packets transmitted from the BCM5719 to the BMC via NCSI */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NCSI_DROPPED ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bc0) /* Number of packets dropped on the NCSI interface. */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_NETWORK_DROPPED ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bc4) /* Number of packets dropped on the external network interface. */ +#define REG_SHM_CHANNEL2_NCSI_CHANNEL_AEN ((volatile BCM5719_SHM_CHANNEL2_H_uint32_t*)0xc0014bc8) /* Number of AEN packets sent via NCSI */ /** @brief Device APE SHM Channel Registers */ extern volatile SHM_CHANNEL_t SHM_CHANNEL2; diff --git a/include/bcm5719_SHM_CHANNEL3.h b/include/bcm5719_SHM_CHANNEL3.h index c86f068..9439b83 100644 --- a/include/bcm5719_SHM_CHANNEL3.h +++ b/include/bcm5719_SHM_CHANNEL3.h @@ -84,7 +84,6 @@ typedef uint32_t BCM5719_SHM_CHANNEL3_H_uint32_t; #define REG_SHM_CHANNEL3_NCSI_CHANNEL_INFO ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014c00) /* */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_MCID ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014c04) /* AEN Management Controller ID, set by BMC when sending AEN ENABLE command and used when sending AENs. */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_AEN ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014c08) /* Set via NCSI ENABLE AEN. */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_BFILT ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014c0c) /* */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_MFILT ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014c10) /* */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_SETTING_1 ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014c14) /* This is the "Link Settings" value from NCSI Set Link. */ @@ -115,13 +114,13 @@ typedef uint32_t BCM5719_SHM_CHANNEL3_H_uint32_t; #define REG_SHM_CHANNEL3_NCSI_CHANNEL_DROPFIL ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014c8c) /* */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_SLINK ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014c90) /* */ #define REG_SHM_CHANNEL3_NCSI_CHANNEL_DBG ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014ca0) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_RX ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cb0) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_DROPPED ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cb4) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_TYPE_ERR ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cb8) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_BAD_CSUM ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cbc) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_ALL_RX ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cc0) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_ALL_TX ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cc4) /* */ -#define REG_SHM_CHANNEL3_NCSI_CHANNEL_CTRLSTAT_ALL_AEN ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cc8) /* */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NETWORK_RX ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cb0) /* Number of packets received from the external network interface */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NETWORK_TX ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cb4) /* Number of packets transmited from the BCM5719 to external network interface */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NCSI_RX ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cb8) /* Number of packets received from the BMC via NCSI */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NCSI_TX ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cbc) /* Number of packets transmitted from the BCM5719 to the BMC via NCSI */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NCSI_DROPPED ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cc0) /* Number of packets dropped on the NCSI interface. */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_NETWORK_DROPPED ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cc4) /* Number of packets dropped on the external network interface. */ +#define REG_SHM_CHANNEL3_NCSI_CHANNEL_AEN ((volatile BCM5719_SHM_CHANNEL3_H_uint32_t*)0xc0014cc8) /* Number of AEN packets sent via NCSI */ /** @brief Device APE SHM Channel Registers */ extern volatile SHM_CHANNEL_t SHM_CHANNEL3; diff --git a/ipxact/SHM.xml b/ipxact/SHM.xml index d3dc11c..4857ef2 100644 --- a/ipxact/SHM.xml +++ b/ipxact/SHM.xml @@ -947,6 +947,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC0_HIGH</ipxact:name> + <ipxact:typeIdentifier>MAC_HIGH</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains upper 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x34</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -955,6 +956,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC0_MID</ipxact:name> + <ipxact:typeIdentifier>MAC_MID</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains mid 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x38</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -963,6 +965,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC0_LOW</ipxact:name> + <ipxact:typeIdentifier>MAC_LOW</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains low 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x3c</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -971,6 +974,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC1_HIGH</ipxact:name> + <ipxact:typeIdentifier>MAC_HIGH</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains upper 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x44</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -979,6 +983,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC1_MID</ipxact:name> + <ipxact:typeIdentifier>MAC_MID</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains mid 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x48</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -987,6 +992,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC1_LOW</ipxact:name> + <ipxact:typeIdentifier>MAC_LOW</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains low 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x4c</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -995,6 +1001,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC2_HIGH</ipxact:name> + <ipxact:typeIdentifier>MAC_HIGH</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains upper 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x54</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -1003,6 +1010,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC2_MID</ipxact:name> + <ipxact:typeIdentifier>MAC_MID</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains mid 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x58</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -1011,6 +1019,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC2_LOW</ipxact:name> + <ipxact:typeIdentifier>MAC_LOW</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains low 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x5c</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -1019,6 +1028,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC3_HIGH</ipxact:name> + <ipxact:typeIdentifier>MAC_HIGH</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains upper 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x64</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -1027,6 +1037,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC3_MID</ipxact:name> + <ipxact:typeIdentifier>MAC_MID</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains mid 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x68</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -1035,6 +1046,7 @@ </ipxact:register> <ipxact:register> <ipxact:name>NCSI_CHANNEL_MAC3_LOW</ipxact:name> + <ipxact:typeIdentifier>MAC_LOW</ipxact:typeIdentifier>> <ipxact:description>Lower 16 bits of this word contains low 16 bits of the MAC.</ipxact:description> <ipxact:addressOffset>0x6c</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> @@ -1297,58 +1309,58 @@ <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> <ipxact:size>32</ipxact:size> <ipxact:volatile>true</ipxact:volatile> - </ipxact:register> + </ipxact:register> <ipxact:register> - <ipxact:name>NCSI_CHANNEL_CTRLSTAT_RX</ipxact:name> - <ipxact:description></ipxact:description> + <ipxact:name>NCSI_CHANNEL_NETWORK_RX</ipxact:name> + <ipxact:description>Number of packets received from the external network interface</ipxact:description> <ipxact:addressOffset>0xb0</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> <ipxact:size>32</ipxact:size> <ipxact:volatile>true</ipxact:volatile> </ipxact:register> <ipxact:register> - <ipxact:name>NCSI_CHANNEL_CTRLSTAT_DROPPED</ipxact:name> - <ipxact:description></ipxact:description> + <ipxact:name>NCSI_CHANNEL_NETWORK_TX</ipxact:name> + <ipxact:description>Number of packets transmited from the BCM5719 to external network interface</ipxact:description> <ipxact:addressOffset>0xb4</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> <ipxact:size>32</ipxact:size> <ipxact:volatile>true</ipxact:volatile> </ipxact:register> <ipxact:register> - <ipxact:name>NCSI_CHANNEL_CTRLSTAT_TYPE_ERR</ipxact:name> - <ipxact:description></ipxact:description> + <ipxact:name>NCSI_CHANNEL_NCSI_RX</ipxact:name> + <ipxact:description>Number of packets received from the BMC via NCSI</ipxact:description> <ipxact:addressOffset>0xb8</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> <ipxact:size>32</ipxact:size> <ipxact:volatile>true</ipxact:volatile> </ipxact:register> <ipxact:register> - <ipxact:name>NCSI_CHANNEL_CTRLSTAT_BAD_CSUM</ipxact:name> - <ipxact:description></ipxact:description> + <ipxact:name>NCSI_CHANNEL_NCSI_TX</ipxact:name> + <ipxact:description>Number of packets transmitted from the BCM5719 to the BMC via NCSI</ipxact:description> <ipxact:addressOffset>0xbc</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> <ipxact:size>32</ipxact:size> <ipxact:volatile>true</ipxact:volatile> </ipxact:register> <ipxact:register> - <ipxact:name>NCSI_CHANNEL_CTRLSTAT_ALL_RX</ipxact:name> - <ipxact:description></ipxact:description> + <ipxact:name>NCSI_CHANNEL_NCSI_DROPPED</ipxact:name> + <ipxact:description>Number of packets dropped on the NCSI interface.</ipxact:description> <ipxact:addressOffset>0xc0</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> <ipxact:size>32</ipxact:size> <ipxact:volatile>true</ipxact:volatile> </ipxact:register> <ipxact:register> - <ipxact:name>NCSI_CHANNEL_CTRLSTAT_ALL_TX</ipxact:name> - <ipxact:description></ipxact:description> + <ipxact:name>NCSI_CHANNEL_NETWORK_DROPPED</ipxact:name> + <ipxact:description>Number of packets dropped on the external network interface.</ipxact:description> <ipxact:addressOffset>0xc4</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> <ipxact:size>32</ipxact:size> <ipxact:volatile>true</ipxact:volatile> </ipxact:register> <ipxact:register> - <ipxact:name>NCSI_CHANNEL_CTRLSTAT_ALL_AEN</ipxact:name> - <ipxact:description></ipxact:description> + <ipxact:name>NCSI_CHANNEL_AEN</ipxact:name> + <ipxact:description>Number of AEN packets sent via NCSI</ipxact:description> <ipxact:addressOffset>0xc8</ipxact:addressOffset> <!-- LINK: registerDefinitionGroup: see 6.11.3, Register definition group --> <ipxact:size>32</ipxact:size> diff --git a/libs/NCSI/ncsi.c b/libs/NCSI/ncsi.c index 88f603d..25d97f5 100644 --- a/libs/NCSI/ncsi.c +++ b/libs/NCSI/ncsi.c @@ -407,8 +407,10 @@ static void getLinkStatusHandler(NetworkFrame_t *frame) NetworkPort_t *port = gPackageState.port[ch]; uint8_t phy = MII_getPhy(port->device); - uint32_t rx = port->shm_channel->NcsiChannelCtrlstatAllRx.r32; - uint32_t tx = port->shm_channel->NcsiChannelCtrlstatAllTx.r32; + uint32_t rx_net = port->shm_channel->NcsiChannelNetworkRx.r32; + uint32_t tx_net = port->shm_channel->NcsiChannelNetworkTx.r32; + uint32_t rx_ncsi = port->shm_channel->NcsiChannelNcsiRx.r32; + uint32_t tx_ncsi = port->shm_channel->NcsiChannelNcsiTx.r32; APE_aquireLock(); stat.r16 = MII_readRegister(port->device, phy, (mii_reg_t)REG_MII_AUXILIARY_STATUS_SUMMARY); @@ -416,10 +418,8 @@ static void getLinkStatusHandler(NetworkFrame_t *frame) RegSHM_CHANNELNcsiChannelStatus_t linkStatus = port->shm_channel->NcsiChannelStatus; - uint32_t tx_used = APE_TX_TO_NET_BUFFER_RING_FREE_MAX - port->tx_ring->bits.Free; - uint32_t rx_avail = APE_RX_POOL_FREE_POINTER_FREE_COUNT_MAX - port->rx_ring->bits.FreeCount; - debug("Link Status [%d] %s, TX %d [%d used], RX %d [%d avail]\n", frame->controlPacket.ChannelID, stat.bits.LinkStatus ? "up" : "down", tx, tx_used, rx, - rx_avail); + debug("Link Status [%d] %s, NCSI TX/RX 0x%08X/0x%08X Net TX/RX 0x%08X/0x%08X\n", frame->controlPacket.ChannelID, stat.bits.LinkStatus ? "up" : "down", + tx_ncsi, rx_ncsi, tx_net, rx_net); if (!stat.bits.LinkStatus) { @@ -627,7 +627,7 @@ void handleNCSIFrame(NetworkFrame_t *frame) if (port) { - ++port->shm_channel->NcsiChannelCtrlstatRx.r32; + ++port->shm_channel->NcsiChannelNcsiRx.r32; } gPackageState.selected = true; SHM.SegSig.r32 |= (1 << command); @@ -657,7 +657,7 @@ void handleNCSIFrame(NetworkFrame_t *frame) { if (port) { - ++port->shm_channel->NcsiChannelCtrlstatRx.r32; + ++port->shm_channel->NcsiChannelNcsiRx.r32; } SHM.SegSig.r32 |= (1 << command); handler->fn(frame); @@ -680,9 +680,10 @@ void resetChannel(int ch) NetworkPort_t *port = gPackageState.port[ch]; port->shm_channel->NcsiChannelInfo.r32 = 0; - port->shm_channel->NcsiChannelCtrlstatRx.r32 = 0; - port->shm_channel->NcsiChannelCtrlstatAllTx.r32 = 0; - port->shm_channel->NcsiChannelCtrlstatAllRx.r32 = 0; + port->shm_channel->NcsiChannelNcsiRx.r32 = 0; + port->shm_channel->NcsiChannelNcsiTx.r32 = 0; + port->shm_channel->NcsiChannelNetworkRx.r32 = 0; + port->shm_channel->NcsiChannelNetworkTx.r32 = 0; port->shm_channel->NcsiChannelInfo.bits.Ready = false; uint8_t phy = MII_getPhy(port->device); @@ -694,6 +695,10 @@ void resetChannel(int ch) void reloadChannel(int ch, reload_type_t reset_phy) { NetworkPort_t *port = gPackageState.port[ch]; + port->shm_channel->NcsiChannelNcsiRx.r32 = 0; + port->shm_channel->NcsiChannelNcsiTx.r32 = 0; + port->shm_channel->NcsiChannelNetworkRx.r32 = 0; + port->shm_channel->NcsiChannelNetworkTx.r32 = 0; uint32_t low = port->shm_channel->NcsiChannelMac0Mid.r32 << 16 | port->shm_channel->NcsiChannelMac0Low.r32; uint16_t high = port->shm_channel->NcsiChannelMac0High.r32; @@ -739,6 +744,9 @@ void NCSI_TxPacket(uint32_t *packet, uint32_t packet_len) debug("Transmitting last word %d: 0x%08x\n", packetWords - 1, packet[packetWords - 1]); #endif APE_PERI.BmcToNcTxBufferLast.r32 = packet[packetWords - 1]; + + NetworkPort_t *port = gPackageState.port[0]; + ++port->shm_channel->NcsiChannelNcsiTx.r32; } void sendNCSILinkStatusResponse(uint8_t InstanceID, uint8_t channelID, uint32_t LinkStatus, uint32_t OEMLinkStatus, uint32_t OtherIndications) { @@ -800,7 +808,6 @@ void NCSI_handlePassthrough(void) if (shm_ch->NcsiChannelInfo.bits.Ready) { Network_PassthroughRxPatcket(port); - ++shm_ch->NcsiChannelCtrlstatAllTx.r32; } } } diff --git a/libs/Network/rx.c b/libs/Network/rx.c index 637c3d7..1dfdb69 100644 --- a/libs/Network/rx.c +++ b/libs/Network/rx.c @@ -119,6 +119,8 @@ bool Network_RxLePatcket(uint32_t *buffer, uint32_t *bytes, NetworkPort_t *port) *bytes = rx_bytes; + ++port->shm_channel->NcsiChannelNetworkRx.r32; + return true; } else @@ -258,8 +260,9 @@ bool Network_PassthroughRxPatcket(NetworkPort_t *port) rxbuf.bits.Finished = 1; *((RegAPERxbufoffset_t *)port->rx_offset) = rxbuf; - // Packet recieved. - ++port->shm_channel->NcsiChannelCtrlstatAllRx.r32; + // Packet recieved (RX via Network and transmitted via NCSI). + ++port->shm_channel->NcsiChannelNetworkRx.r32; + ++port->shm_channel->NcsiChannelNcsiTx.r32; return true; } diff --git a/libs/Network/tx.c b/libs/Network/tx.c index 20a33a7..5c89f51 100644 --- a/libs/Network/tx.c +++ b/libs/Network/tx.c @@ -286,6 +286,9 @@ static inline bool Network_TX_transmitPacket_internal(uint8_t *packet, uint32_t *((RegAPETxToNetDoorbell_t *)port->tx_doorbell) = doorbell; + // Packet Transmitted. + ++port->shm_channel->NcsiChannelNetworkTx.r32; + return true; } @@ -477,7 +480,7 @@ bool Network_TX_transmitPassthroughPacket(uint32_t length, NetworkPort_t *port) (void)data; // Packet transmitted. - ++port->shm_channel->NcsiChannelCtrlstatAllTx.r32; + ++port->shm_channel->NcsiChannelNetworkTx.r32; return true; } diff --git a/simulator/bcm5719_SHM_CHANNEL0.cpp b/simulator/bcm5719_SHM_CHANNEL0.cpp index 94519ed..d1fac5e 100644 --- a/simulator/bcm5719_SHM_CHANNEL0.cpp +++ b/simulator/bcm5719_SHM_CHANNEL0.cpp @@ -10,7 +10,7 @@ /// //////////////////////////////////////////////////////////////////////////////// /// -/// @copyright Copyright (c) 2018, Evan Lojewski +/// @copyright Copyright (c) 2020, Evan Lojewski /// @cond /// /// All rights reserved. @@ -53,8 +53,6 @@ void init_bcm5719_SHM_CHANNEL0(void) /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMcid. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */ /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMfilt. */ @@ -115,19 +113,19 @@ void init_bcm5719_SHM_CHANNEL0(void) /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelDbg. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ } diff --git a/simulator/bcm5719_SHM_CHANNEL0_sim.cpp b/simulator/bcm5719_SHM_CHANNEL0_sim.cpp index 3f19cfd..59230ad 100644 --- a/simulator/bcm5719_SHM_CHANNEL0_sim.cpp +++ b/simulator/bcm5719_SHM_CHANNEL0_sim.cpp @@ -10,7 +10,7 @@ /// //////////////////////////////////////////////////////////////////////////////// /// -/// @copyright Copyright (c) 2018, Evan Lojewski +/// @copyright Copyright (c) 2020, Evan Lojewski /// @cond /// /// All rights reserved. @@ -89,10 +89,11 @@ void init_bcm5719_SHM_CHANNEL0_sim(void *base) SHM_CHANNEL0.NcsiChannelMcid.r32.installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL0.NcsiChannelMcid.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ - SHM_CHANNEL0.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL0.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - + for(int i = 0; i < 1; i++) + { + SHM_CHANNEL0.reserved_8[i].installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL0.reserved_8[i].installWriteCallback(write_to_ram, (uint8_t *)base); + } /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */ SHM_CHANNEL0.NcsiChannelBfilt.r32.installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL0.NcsiChannelBfilt.r32.installWriteCallback(write_to_ram, (uint8_t *)base); @@ -248,33 +249,33 @@ void init_bcm5719_SHM_CHANNEL0_sim(void *base) SHM_CHANNEL0.reserved_164[i].installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL0.reserved_164[i].installWriteCallback(write_to_ram, (uint8_t *)base); } - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ - SHM_CHANNEL0.NcsiChannelCtrlstatRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL0.NcsiChannelCtrlstatRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ + SHM_CHANNEL0.NcsiChannelNetworkRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL0.NcsiChannelNetworkRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ - SHM_CHANNEL0.NcsiChannelCtrlstatDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL0.NcsiChannelCtrlstatDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ + SHM_CHANNEL0.NcsiChannelNetworkTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL0.NcsiChannelNetworkTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ - SHM_CHANNEL0.NcsiChannelCtrlstatTypeErr.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL0.NcsiChannelCtrlstatTypeErr.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ + SHM_CHANNEL0.NcsiChannelNcsiRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL0.NcsiChannelNcsiRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ - SHM_CHANNEL0.NcsiChannelCtrlstatBadCsum.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL0.NcsiChannelCtrlstatBadCsum.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ + SHM_CHANNEL0.NcsiChannelNcsiTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL0.NcsiChannelNcsiTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ - SHM_CHANNEL0.NcsiChannelCtrlstatAllRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL0.NcsiChannelCtrlstatAllRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ + SHM_CHANNEL0.NcsiChannelNcsiDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL0.NcsiChannelNcsiDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ - SHM_CHANNEL0.NcsiChannelCtrlstatAllTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL0.NcsiChannelCtrlstatAllTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ + SHM_CHANNEL0.NcsiChannelNetworkDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL0.NcsiChannelNetworkDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ - SHM_CHANNEL0.NcsiChannelCtrlstatAllAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL0.NcsiChannelCtrlstatAllAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ + SHM_CHANNEL0.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL0.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); } diff --git a/simulator/bcm5719_SHM_CHANNEL1.cpp b/simulator/bcm5719_SHM_CHANNEL1.cpp index 98998a2..55a979d 100644 --- a/simulator/bcm5719_SHM_CHANNEL1.cpp +++ b/simulator/bcm5719_SHM_CHANNEL1.cpp @@ -10,7 +10,7 @@ /// //////////////////////////////////////////////////////////////////////////////// /// -/// @copyright Copyright (c) 2018, Evan Lojewski +/// @copyright Copyright (c) 2020, Evan Lojewski /// @cond /// /// All rights reserved. @@ -53,8 +53,6 @@ void init_bcm5719_SHM_CHANNEL1(void) /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMcid. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */ /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMfilt. */ @@ -115,19 +113,19 @@ void init_bcm5719_SHM_CHANNEL1(void) /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelDbg. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ } diff --git a/simulator/bcm5719_SHM_CHANNEL1_sim.cpp b/simulator/bcm5719_SHM_CHANNEL1_sim.cpp index 1c82fda..3b6f011 100644 --- a/simulator/bcm5719_SHM_CHANNEL1_sim.cpp +++ b/simulator/bcm5719_SHM_CHANNEL1_sim.cpp @@ -10,7 +10,7 @@ /// //////////////////////////////////////////////////////////////////////////////// /// -/// @copyright Copyright (c) 2018, Evan Lojewski +/// @copyright Copyright (c) 2020, Evan Lojewski /// @cond /// /// All rights reserved. @@ -89,10 +89,11 @@ void init_bcm5719_SHM_CHANNEL1_sim(void *base) SHM_CHANNEL1.NcsiChannelMcid.r32.installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL1.NcsiChannelMcid.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ - SHM_CHANNEL1.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL1.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - + for(int i = 0; i < 1; i++) + { + SHM_CHANNEL1.reserved_8[i].installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL1.reserved_8[i].installWriteCallback(write_to_ram, (uint8_t *)base); + } /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */ SHM_CHANNEL1.NcsiChannelBfilt.r32.installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL1.NcsiChannelBfilt.r32.installWriteCallback(write_to_ram, (uint8_t *)base); @@ -248,33 +249,33 @@ void init_bcm5719_SHM_CHANNEL1_sim(void *base) SHM_CHANNEL1.reserved_164[i].installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL1.reserved_164[i].installWriteCallback(write_to_ram, (uint8_t *)base); } - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ - SHM_CHANNEL1.NcsiChannelCtrlstatRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL1.NcsiChannelCtrlstatRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ + SHM_CHANNEL1.NcsiChannelNetworkRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL1.NcsiChannelNetworkRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ - SHM_CHANNEL1.NcsiChannelCtrlstatDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL1.NcsiChannelCtrlstatDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ + SHM_CHANNEL1.NcsiChannelNetworkTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL1.NcsiChannelNetworkTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ - SHM_CHANNEL1.NcsiChannelCtrlstatTypeErr.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL1.NcsiChannelCtrlstatTypeErr.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ + SHM_CHANNEL1.NcsiChannelNcsiRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL1.NcsiChannelNcsiRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ - SHM_CHANNEL1.NcsiChannelCtrlstatBadCsum.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL1.NcsiChannelCtrlstatBadCsum.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ + SHM_CHANNEL1.NcsiChannelNcsiTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL1.NcsiChannelNcsiTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ - SHM_CHANNEL1.NcsiChannelCtrlstatAllRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL1.NcsiChannelCtrlstatAllRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ + SHM_CHANNEL1.NcsiChannelNcsiDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL1.NcsiChannelNcsiDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ - SHM_CHANNEL1.NcsiChannelCtrlstatAllTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL1.NcsiChannelCtrlstatAllTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ + SHM_CHANNEL1.NcsiChannelNetworkDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL1.NcsiChannelNetworkDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ - SHM_CHANNEL1.NcsiChannelCtrlstatAllAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL1.NcsiChannelCtrlstatAllAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ + SHM_CHANNEL1.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL1.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); } diff --git a/simulator/bcm5719_SHM_CHANNEL2.cpp b/simulator/bcm5719_SHM_CHANNEL2.cpp index 5afe988..b233379 100644 --- a/simulator/bcm5719_SHM_CHANNEL2.cpp +++ b/simulator/bcm5719_SHM_CHANNEL2.cpp @@ -10,7 +10,7 @@ /// //////////////////////////////////////////////////////////////////////////////// /// -/// @copyright Copyright (c) 2018, Evan Lojewski +/// @copyright Copyright (c) 2020, Evan Lojewski /// @cond /// /// All rights reserved. @@ -53,8 +53,6 @@ void init_bcm5719_SHM_CHANNEL2(void) /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMcid. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */ /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMfilt. */ @@ -115,19 +113,19 @@ void init_bcm5719_SHM_CHANNEL2(void) /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelDbg. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ } diff --git a/simulator/bcm5719_SHM_CHANNEL2_sim.cpp b/simulator/bcm5719_SHM_CHANNEL2_sim.cpp index c01aa6f..34b4d98 100644 --- a/simulator/bcm5719_SHM_CHANNEL2_sim.cpp +++ b/simulator/bcm5719_SHM_CHANNEL2_sim.cpp @@ -10,7 +10,7 @@ /// //////////////////////////////////////////////////////////////////////////////// /// -/// @copyright Copyright (c) 2018, Evan Lojewski +/// @copyright Copyright (c) 2020, Evan Lojewski /// @cond /// /// All rights reserved. @@ -89,10 +89,11 @@ void init_bcm5719_SHM_CHANNEL2_sim(void *base) SHM_CHANNEL2.NcsiChannelMcid.r32.installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL2.NcsiChannelMcid.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ - SHM_CHANNEL2.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL2.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - + for(int i = 0; i < 1; i++) + { + SHM_CHANNEL2.reserved_8[i].installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL2.reserved_8[i].installWriteCallback(write_to_ram, (uint8_t *)base); + } /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */ SHM_CHANNEL2.NcsiChannelBfilt.r32.installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL2.NcsiChannelBfilt.r32.installWriteCallback(write_to_ram, (uint8_t *)base); @@ -248,33 +249,33 @@ void init_bcm5719_SHM_CHANNEL2_sim(void *base) SHM_CHANNEL2.reserved_164[i].installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL2.reserved_164[i].installWriteCallback(write_to_ram, (uint8_t *)base); } - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ - SHM_CHANNEL2.NcsiChannelCtrlstatRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL2.NcsiChannelCtrlstatRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ + SHM_CHANNEL2.NcsiChannelNetworkRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL2.NcsiChannelNetworkRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ - SHM_CHANNEL2.NcsiChannelCtrlstatDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL2.NcsiChannelCtrlstatDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ + SHM_CHANNEL2.NcsiChannelNetworkTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL2.NcsiChannelNetworkTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ - SHM_CHANNEL2.NcsiChannelCtrlstatTypeErr.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL2.NcsiChannelCtrlstatTypeErr.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ + SHM_CHANNEL2.NcsiChannelNcsiRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL2.NcsiChannelNcsiRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ - SHM_CHANNEL2.NcsiChannelCtrlstatBadCsum.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL2.NcsiChannelCtrlstatBadCsum.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ + SHM_CHANNEL2.NcsiChannelNcsiTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL2.NcsiChannelNcsiTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ - SHM_CHANNEL2.NcsiChannelCtrlstatAllRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL2.NcsiChannelCtrlstatAllRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ + SHM_CHANNEL2.NcsiChannelNcsiDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL2.NcsiChannelNcsiDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ - SHM_CHANNEL2.NcsiChannelCtrlstatAllTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL2.NcsiChannelCtrlstatAllTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ + SHM_CHANNEL2.NcsiChannelNetworkDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL2.NcsiChannelNetworkDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ - SHM_CHANNEL2.NcsiChannelCtrlstatAllAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL2.NcsiChannelCtrlstatAllAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ + SHM_CHANNEL2.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL2.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); } diff --git a/simulator/bcm5719_SHM_CHANNEL3.cpp b/simulator/bcm5719_SHM_CHANNEL3.cpp index a1a5663..f844395 100644 --- a/simulator/bcm5719_SHM_CHANNEL3.cpp +++ b/simulator/bcm5719_SHM_CHANNEL3.cpp @@ -10,7 +10,7 @@ /// //////////////////////////////////////////////////////////////////////////////// /// -/// @copyright Copyright (c) 2018, Evan Lojewski +/// @copyright Copyright (c) 2020, Evan Lojewski /// @cond /// /// All rights reserved. @@ -53,8 +53,6 @@ void init_bcm5719_SHM_CHANNEL3(void) /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMcid. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */ /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelMfilt. */ @@ -115,19 +113,19 @@ void init_bcm5719_SHM_CHANNEL3(void) /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelDbg. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ } diff --git a/simulator/bcm5719_SHM_CHANNEL3_sim.cpp b/simulator/bcm5719_SHM_CHANNEL3_sim.cpp index a28e58c..550b2a5 100644 --- a/simulator/bcm5719_SHM_CHANNEL3_sim.cpp +++ b/simulator/bcm5719_SHM_CHANNEL3_sim.cpp @@ -10,7 +10,7 @@ /// //////////////////////////////////////////////////////////////////////////////// /// -/// @copyright Copyright (c) 2018, Evan Lojewski +/// @copyright Copyright (c) 2020, Evan Lojewski /// @cond /// /// All rights reserved. @@ -89,10 +89,11 @@ void init_bcm5719_SHM_CHANNEL3_sim(void *base) SHM_CHANNEL3.NcsiChannelMcid.r32.installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL3.NcsiChannelMcid.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ - SHM_CHANNEL3.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL3.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - + for(int i = 0; i < 1; i++) + { + SHM_CHANNEL3.reserved_8[i].installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL3.reserved_8[i].installWriteCallback(write_to_ram, (uint8_t *)base); + } /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelBfilt. */ SHM_CHANNEL3.NcsiChannelBfilt.r32.installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL3.NcsiChannelBfilt.r32.installWriteCallback(write_to_ram, (uint8_t *)base); @@ -248,33 +249,33 @@ void init_bcm5719_SHM_CHANNEL3_sim(void *base) SHM_CHANNEL3.reserved_164[i].installReadCallback(read_from_ram, (uint8_t *)base); SHM_CHANNEL3.reserved_164[i].installWriteCallback(write_to_ram, (uint8_t *)base); } - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatRx. */ - SHM_CHANNEL3.NcsiChannelCtrlstatRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL3.NcsiChannelCtrlstatRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkRx. */ + SHM_CHANNEL3.NcsiChannelNetworkRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL3.NcsiChannelNetworkRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatDropped. */ - SHM_CHANNEL3.NcsiChannelCtrlstatDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL3.NcsiChannelCtrlstatDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkTx. */ + SHM_CHANNEL3.NcsiChannelNetworkTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL3.NcsiChannelNetworkTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatTypeErr. */ - SHM_CHANNEL3.NcsiChannelCtrlstatTypeErr.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL3.NcsiChannelCtrlstatTypeErr.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiRx. */ + SHM_CHANNEL3.NcsiChannelNcsiRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL3.NcsiChannelNcsiRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatBadCsum. */ - SHM_CHANNEL3.NcsiChannelCtrlstatBadCsum.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL3.NcsiChannelCtrlstatBadCsum.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiTx. */ + SHM_CHANNEL3.NcsiChannelNcsiTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL3.NcsiChannelNcsiTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllRx. */ - SHM_CHANNEL3.NcsiChannelCtrlstatAllRx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL3.NcsiChannelCtrlstatAllRx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNcsiDropped. */ + SHM_CHANNEL3.NcsiChannelNcsiDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL3.NcsiChannelNcsiDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllTx. */ - SHM_CHANNEL3.NcsiChannelCtrlstatAllTx.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL3.NcsiChannelCtrlstatAllTx.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelNetworkDropped. */ + SHM_CHANNEL3.NcsiChannelNetworkDropped.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL3.NcsiChannelNetworkDropped.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelCtrlstatAllAen. */ - SHM_CHANNEL3.NcsiChannelCtrlstatAllAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM_CHANNEL3.NcsiChannelCtrlstatAllAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_CHANNEL_t.NcsiChannelAen. */ + SHM_CHANNEL3.NcsiChannelAen.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM_CHANNEL3.NcsiChannelAen.r32.installWriteCallback(write_to_ram, (uint8_t *)base); } diff --git a/utils/bcmregtool/main.cpp b/utils/bcmregtool/main.cpp index 497b107..f37c428 100644 --- a/utils/bcmregtool/main.cpp +++ b/utils/bcmregtool/main.cpp @@ -716,10 +716,12 @@ int main(int argc, char const *argv[]) APE_PERI.BmcToNcTxControl.print(); APE_PERI.BmcToNcRxStatus.print(); APE_PERI.BmcToNcRxControl.print(); - SHM_CHANNEL0.NcsiChannelCtrlstatAllTx.print(); - SHM_CHANNEL0.NcsiChannelCtrlstatRx.print(); + SHM_CHANNEL0.NcsiChannelNcsiTx.print(); + SHM_CHANNEL0.NcsiChannelNcsiRx.print(); printf("\n======= Port 0 =======\n"); + SHM_CHANNEL0.NcsiChannelNetworkTx.print(); + SHM_CHANNEL0.NcsiChannelNetworkRx.print(); APE_PERI.BmcToNcSourceMacHigh.print(); APE_PERI.BmcToNcSourceMacMatch0High.print(); APE_PERI.BmcToNcSourceMacMatch0Low.print(); |
