summaryrefslogtreecommitdiff
path: root/cleopatre/application/spidnetsnmp/agent/mibgroup
diff options
context:
space:
mode:
authorCyril Jourdan2012-09-20 14:57:18 +0200
committerCyril Jourdan2012-09-20 14:57:18 +0200
commitf814ad72bc122d60933f5c8e4f95544ec9f33e40 (patch)
tree629dbbfb7cda5d400f2f9a61d5abaf6af61dd6ac /cleopatre/application/spidnetsnmp/agent/mibgroup
parentcb0f35944d1565e967be2bd95464828b27515af8 (diff)
parentf1dcfc4eed20b3f720a77947c10702cb2a6f20ee (diff)
Merge branch 'mse500-common' into eoc-drv
More than resolving the conflicts, there were some other modifications to handle to make the merge complete: - rename of the CHIP_SPC300DINI into CHIP_MSE500DINI_300 - rename of the spc300_nvram_t type into spidcom_nvram_t - CHIP_FEATURE_GIC_64_LINES and CHIP_FEATURE_NVRAM_EXTRA_FIELDS added - rename of some defines in spid_img_desc.h Conflicts: cleopatre/application/libspid/inc/libspid.h cleopatre/application/libspid/src/image.c cleopatre/application/libspid/src/system.c cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config cleopatre/buildroot/target/device/Spidcom/spr310/linux26.config cleopatre/devkit/tests/libspid/utests/src/system_utests.c cleopatre/include/spid_img_desc.h cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/nvram.h cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/spid_img_desc.h cleopatre/u-boot-1.1.6/include/asm-arm/arch-spc300/image_desc.h cleopatre/u-boot-1.1.6/include/asm-arm/arch-spc300/nvram.h common/tools/genNVRAM/Makefile
Diffstat (limited to 'cleopatre/application/spidnetsnmp/agent/mibgroup')
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/eoc-alarms-traps/EoCAlarmsAndTraps.c2
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATDevInfoGroup/eocCBATDevInfoGroup.c10
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATNetworkAttrGroup/eocCBATNetworkAttrGroup.c2
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATCardMACGroup/eocCBATCardTable/eocCBATCardTable_data_access.c2
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocSoftwareUpgradeGroup/eocSoftwareUpgradeTable/eocSoftwareUpgradeTable_data_access.c2
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTAdminGroup/modEoCCLTAdminGroup.c12
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTMACGroup/modEoCOnlineCLTTable/modEoCOnlineCLTTable_data_access.c2
-rw-r--r--cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCSoftwareUpgradeGroup/modEoCSoftwareUpgradeTable/modEoCSoftwareUpgradeTable_data_access.c2
8 files changed, 17 insertions, 17 deletions
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/eoc-alarms-traps/EoCAlarmsAndTraps.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/eoc-alarms-traps/EoCAlarmsAndTraps.c
index 9ea1dc0753..971b249d31 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/eoc-alarms-traps/EoCAlarmsAndTraps.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/eoc-alarms-traps/EoCAlarmsAndTraps.c
@@ -1467,7 +1467,7 @@ registerAlarm (char *alarm_oid_str, int state, int value)
char value_str[16];
char admin_mac_addr[6];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
oid alarm_oid[LIBSPID_OID_MAX_LEN];
size_t alarm_oid_len = LIBSPID_OID_MAX_LEN;
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATDevInfoGroup/eocCBATDevInfoGroup.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATDevInfoGroup/eocCBATDevInfoGroup.c
index 1e876143d7..f2694fe516 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATDevInfoGroup/eocCBATDevInfoGroup.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATDevInfoGroup/eocCBATDevInfoGroup.c
@@ -316,7 +316,7 @@ handle_eocCBATAdminManufactoryInfo(netsnmp_mib_handler *handler,
{
int ret;
char manufactory_info[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -388,7 +388,7 @@ handle_eocCBATAdminModelNumber(netsnmp_mib_handler *handler,
{
int ret;
char model_number[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -453,7 +453,7 @@ handle_eocCBATAdminSerialNumber(netsnmp_mib_handler *handler,
{
int ret;
char serial_number[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/* We are never called for a GETNEXT if it's registered as a
"instance", as it's "magically" handled for us. */
@@ -572,7 +572,7 @@ handle_eocCBATAdminHardwareVersion(netsnmp_mib_handler *handler,
{
int ret;
char hw_version[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/* We are never called for a GETNEXT if it's registered as a
"instance", as it's "magically" handled for us. */
@@ -640,7 +640,7 @@ handle_eocCBATAdminVendorSpecialInfo(netsnmp_mib_handler *handler,
{
int ret;
char vendor_spec_info[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/* We are never called for a GETNEXT if it's registered as a
"instance", as it's "magically" handled for us. */
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATNetworkAttrGroup/eocCBATNetworkAttrGroup.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATNetworkAttrGroup/eocCBATNetworkAttrGroup.c
index 67523f60ac..b45ec6d577 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATNetworkAttrGroup/eocCBATNetworkAttrGroup.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATAdminGroup/eocCBATNetworkAttrGroup/eocCBATNetworkAttrGroup.c
@@ -61,7 +61,7 @@ handle_eocCBATAdminMACAddress(netsnmp_mib_handler *handler,
{
int ret;
char admin_mac_addr[LIBSPID_MAC_BIN_LEN];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/* We are never called for a GETNEXT if it's registered as a
"instance", as it's "magically" handled for us. */
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATCardMACGroup/eocCBATCardTable/eocCBATCardTable_data_access.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATCardMACGroup/eocCBATCardTable/eocCBATCardTable_data_access.c
index ff6c6a53ed..6ce87b2831 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATCardMACGroup/eocCBATCardTable/eocCBATCardTable_data_access.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocCBATCardMACGroup/eocCBATCardTable/eocCBATCardTable_data_access.c
@@ -246,7 +246,7 @@ eocCBATCardTable_container_load (netsnmp_container * container)
/* declarations for calls to libspid */
char buffer[LIBSPID_CONFIG_KEY_MAX_LEN];
int ret;
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
char mtd_name[64];
spidcom_image_desc_t desc;
DEBUGMSGTL (("verbose:eocCBATCardTable:eocCBATCardTable_container_load",
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocSoftwareUpgradeGroup/eocSoftwareUpgradeTable/eocSoftwareUpgradeTable_data_access.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocSoftwareUpgradeGroup/eocSoftwareUpgradeTable/eocSoftwareUpgradeTable_data_access.c
index d50cdcb905..e490f7a349 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocSoftwareUpgradeGroup/eocSoftwareUpgradeTable/eocSoftwareUpgradeTable_data_access.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/mstar-eoc-mib/eocSoftwareUpgradeGroup/eocSoftwareUpgradeTable/eocSoftwareUpgradeTable_data_access.c
@@ -238,7 +238,7 @@ eocSoftwareUpgradeTable_container_load(netsnmp_container *container)
/* white list entries read from config file */
libspid_eoc_wl_entry_t wl_config_entries[LIBSPID_WHITE_LIST_MAX_STA_NUM];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
char mac_str[LIBSPID_MAC_STR_LEN];
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTAdminGroup/modEoCCLTAdminGroup.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTAdminGroup/modEoCCLTAdminGroup.c
index 3d6062eb3f..26d77b9156 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTAdminGroup/modEoCCLTAdminGroup.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCCLTAdminGroup/modEoCCLTAdminGroup.c
@@ -481,7 +481,7 @@ handle_modEoCCLTAdminManufactoryInfo (netsnmp_mib_handler *handler,
int ret;
char manufactory_info[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -547,7 +547,7 @@ handle_modEoCCLTAdminModelNumber (netsnmp_mib_handler *handler,
{
int ret;
char model_number[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -610,7 +610,7 @@ handle_modEoCCLTAdminSerialNumber (netsnmp_mib_handler *handler,
{
int ret;
char serial_number[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/*
@@ -731,7 +731,7 @@ handle_modEoCCLTAdminHardwareVersion (netsnmp_mib_handler *handler,
{
int ret;
char hw_version[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -793,7 +793,7 @@ handle_modEoCCLTAdminVendorSpecialInfo (netsnmp_mib_handler *handler,
{
int ret;
char vendor_spec_info[DEFAULT_SNMP_STRING_MAX_LENGTH];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/*
* We are never called for a GETNEXT if it's registered as a
@@ -855,7 +855,7 @@ handle_modEoCCLTAdminMACAddress(netsnmp_mib_handler *handler,
{
int ret;
char admin_mac_addr[6];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
/* We are never called for a GETNEXT if it's registered as a
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 928425142f..d08c5af094 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
@@ -231,7 +231,7 @@ modEoCOnlineCLTTable_container_load(netsnmp_container * container)
/* declarations for calls to libspid */
char buffer[LIBSPID_LINE_MAX_LEN];
int ret;
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
char mtd_name[64];
spidcom_image_desc_t desc;
diff --git a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCSoftwareUpgradeGroup/modEoCSoftwareUpgradeTable/modEoCSoftwareUpgradeTable_data_access.c b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCSoftwareUpgradeGroup/modEoCSoftwareUpgradeTable/modEoCSoftwareUpgradeTable_data_access.c
index d3d78f41af..50527e20b9 100644
--- a/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCSoftwareUpgradeGroup/modEoCSoftwareUpgradeTable/modEoCSoftwareUpgradeTable_data_access.c
+++ b/cleopatre/application/spidnetsnmp/agent/mibgroup/sarft-eoc-mib/modEoCSoftwareUpgradeGroup/modEoCSoftwareUpgradeTable/modEoCSoftwareUpgradeTable_data_access.c
@@ -250,7 +250,7 @@ modEoCSoftwareUpgradeTable_container_load(netsnmp_container * container)
/* white list entries read from config file */
libspid_eoc_wl_entry_t wl_config_entries[LIBSPID_WHITE_LIST_MAX_STA_NUM];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
char mac_str[LIBSPID_MAC_STR_LEN];