summaryrefslogtreecommitdiffstats
path: root/libs/Network
diff options
context:
space:
mode:
authorEvan Lojewski <github@meklort.com>2020-01-21 20:28:04 -0700
committerGitHub <noreply@github.com>2020-01-21 20:28:04 -0700
commitafefcfeb9555c8dd496e25e6fb7bff447530fe6c (patch)
treed8cb110a6ace39bcaa31452d1ad6dc9fa17595d5 /libs/Network
parent550345e5f6bb536770b5d712182eb6db73f83ea1 (diff)
downloadbcm5719-ortega-afefcfeb9555c8dd496e25e6fb7bff447530fe6c.tar.gz
bcm5719-ortega-afefcfeb9555c8dd496e25e6fb7bff447530fe6c.zip
APE: Fix shm initialization and add additional error checking to the MII library. (#15)
Diffstat (limited to 'libs/Network')
-rw-r--r--libs/Network/include/Network.h2
-rw-r--r--libs/Network/ports.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/libs/Network/include/Network.h b/libs/Network/include/Network.h
index b806c30..ac26f05 100644
--- a/libs/Network/include/Network.h
+++ b/libs/Network/include/Network.h
@@ -77,7 +77,7 @@ typedef struct
/* Port Registers */
VOLATILE DEVICE_t *device;
VOLATILE FILTERS_t *filters;
- VOLATILE SHM_CHANNEL_t* shm;
+ VOLATILE SHM_CHANNEL_t* shm_channel;
} NetworkPort_t;
typedef union
diff --git a/libs/Network/ports.c b/libs/Network/ports.c
index a90f779..1711c55 100644
--- a/libs/Network/ports.c
+++ b/libs/Network/ports.c
@@ -51,6 +51,10 @@
#include <APE_RX_PORT1.h>
#include <APE_RX_PORT2.h>
#include <APE_RX_PORT3.h>
+#include <APE_SHM_CHANNEL0.h>
+#include <APE_SHM_CHANNEL1.h>
+#include <APE_SHM_CHANNEL2.h>
+#include <APE_SHM_CHANNEL3.h>
#include <APE_TX_PORT1.h>
#include <APE_TX_PORT2.h>
#include <APE_TX_PORT3.h>
@@ -59,6 +63,7 @@
NetworkPort_t gPort0 = {
.device = &DEVICE,
.filters = &FILTERS0,
+ .shm_channel = &SHM_CHANNEL0,
.tx_port = &TX_PORT0,
.tx_allocator = &APE.TxToNetBufferAllocator0,
@@ -74,6 +79,7 @@ NetworkPort_t gPort0 = {
NetworkPort_t gPort1 = {
.device = &DEVICE1,
.filters = &FILTERS1,
+ .shm_channel = &SHM_CHANNEL1,
.tx_port = &TX_PORT1,
.tx_allocator = &APE.TxToNetBufferAllocator1,
@@ -89,6 +95,7 @@ NetworkPort_t gPort1 = {
NetworkPort_t gPort2 = {
.device = &DEVICE2,
.filters = &FILTERS2,
+ .shm_channel = &SHM_CHANNEL2,
.tx_port = &TX_PORT2,
.tx_allocator = &APE.TxToNetBufferAllocator2,
@@ -104,6 +111,7 @@ NetworkPort_t gPort2 = {
NetworkPort_t gPort3 = {
.device = &DEVICE3,
.filters = &FILTERS3,
+ .shm_channel = &SHM_CHANNEL3,
.tx_port = &TX_PORT3,
.tx_allocator = &APE.TxToNetBufferAllocator3,
OpenPOWER on IntegriCloud