summaryrefslogtreecommitdiff
path: root/cleopatre/application
diff options
context:
space:
mode:
authorCyril Jourdan2012-09-20 19:09:23 +0200
committerCyril Jourdan2012-09-20 19:09:23 +0200
commit8f3219ba5bcf33a875ed8d852ee5604ab3c58e1a (patch)
tree282ad88490676408bf0459d7d1d47e9ec897a270 /cleopatre/application
parentf814ad72bc122d60933f5c8e4f95544ec9f33e40 (diff)
parentc0ec44be34d1d3aa611ec82bae4e281e70727225 (diff)
Merge branch 'mse500-asic' into eoc-mse500-asic
In order to make this commit compile, we had to extract some functions from LEON ILRAM. We made this by playing on the ARCH_ILRAM_PRIO config item, but we will do some fine tuning later. Conflicts: cleopatre/devkit/tests/libspid/utests/src/system_utests.c cleopatre/tools/openocd-r668/src/flash/spc300.h common/tests/tests
Diffstat (limited to 'cleopatre/application')
-rw-r--r--cleopatre/application/managerd/src/vs_eoc_mme.c4
-rw-r--r--cleopatre/application/onlined/src/onlined_configure.c2
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/cleopatre/application/managerd/src/vs_eoc_mme.c b/cleopatre/application/managerd/src/vs_eoc_mme.c
index 307e2fba91..42dbd3168c 100644
--- a/cleopatre/application/managerd/src/vs_eoc_mme.c
+++ b/cleopatre/application/managerd/src/vs_eoc_mme.c
@@ -88,7 +88,7 @@ vs_mme_eoc_get_device_info (struct managerd_ctx *ctx, MME_t *request,
/* Init variables */
memset (nvram.product_name, 0, 64);
- nvram.eth_port_nb = 0;
+ nvram.eth1_port_nb = 0;
memset (mtd_name, 0, sizeof (mtd_name));
memset (image_desc.description, 0, 64);
default_downstream_attenuation = 0;
@@ -116,7 +116,7 @@ vs_mme_eoc_get_device_info (struct managerd_ctx *ctx, MME_t *request,
memcpy (get_device_info_cnf->model_no, nvram.product_name, 64);
/* Get port amount */
- get_device_info_cnf->eth_port_nb = nvram.eth_port_nb;
+ get_device_info_cnf->eth_port_nb = nvram.eth1_port_nb;
memset (image_version, 0, LIBSPID_IMAGE_VERSION_STR_MAX_LEN-1);
diff --git a/cleopatre/application/onlined/src/onlined_configure.c b/cleopatre/application/onlined/src/onlined_configure.c
index 35d0824377..e2c3aa01e5 100644
--- a/cleopatre/application/onlined/src/onlined_configure.c
+++ b/cleopatre/application/onlined/src/onlined_configure.c
@@ -291,7 +291,7 @@ onlined_get_port_number (char *mac)
if (MME_SUCCESS != ret)
return -1;
- return nvram.eth_port_nb;
+ return nvram.eth1_port_nb;
}
/**
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c
index d08c5af094..7b12ca4824 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c
@@ -489,7 +489,7 @@ modEoCOnlineCLTTable_container_load(netsnmp_container * container)
if (LIBSPID_SUCCESS != ret){
memset(modEoCOnlineCLTUpLinkDeviceMACAddress, 0, 6);
} else {
- memcpy(modEoCOnlineCLTUpLinkDeviceMACAddress, nvram.eth_address, 6);
+ memcpy(modEoCOnlineCLTUpLinkDeviceMACAddress, nvram.eth1_address, 6);
}
rowreq_ctx->data.modEoCOnlineCLTUpLinkDeviceMACAddress_len = 6;