summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-04-23 14:00:22 +0200
committerNélio Laranjeiro2012-05-03 10:45:06 +0200
commit54aa53ea889184c0c8840c58539a4ba6d9ade751 (patch)
treeb821a8e17771e7033ceddd2b682e2e1c468edb42 /cesar
parent8c331198157e62ed494a8345d437280652a298ba (diff)
parent7bba91c6d5b94748a0afeefccdaab059a4ea8805 (diff)
Merge branch 't3005-3006-3008-remove-unuse-mme' into eoc-t3005-3006-3008-remove-unuse-mme
Conflicts: cesar/cp/mme.h
Diffstat (limited to 'cesar')
-rw-r--r--cesar/cp/eoc/cco/action/test/utest/src/msg_stub.c4
-rw-r--r--cesar/cp/mme.h2
-rw-r--r--cesar/cp/msg/src/msg.c4
3 files changed, 0 insertions, 10 deletions
diff --git a/cesar/cp/eoc/cco/action/test/utest/src/msg_stub.c b/cesar/cp/eoc/cco/action/test/utest/src/msg_stub.c
index 2c0ed88ae5..e1cb92a12e 100644
--- a/cesar/cp/eoc/cco/action/test/utest/src/msg_stub.c
+++ b/cesar/cp/eoc/cco/action/test/utest/src/msg_stub.c
@@ -185,8 +185,6 @@ cp_msg_mme_allowed_t cp_msg_mme_allowed[] =
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_VERSION_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_RESET_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_RESET_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
-// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_MFG_INFO_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
-// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_MFG_INFO_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_NVRAM_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_NVRAM_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_LOOPBACK_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
@@ -199,8 +197,6 @@ cp_msg_mme_allowed_t cp_msg_mme_allowed[] =
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_ETH_PHY_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_ETH_STATS_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_ETH_STATS_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
-// CP_MSG_MME_ALLOWED_ENTRY (VS_PLC_STATS_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
-// CP_MSG_MME_ALLOWED_ENTRY (VS_PLC_STATS_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_STATUS_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_STATUS_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
CP_MSG_MME_ALLOWED_ENTRY (VS_GET_TONEMAP_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, VS_GET_TONEMAP_REQ),
diff --git a/cesar/cp/mme.h b/cesar/cp/mme.h
index 02884a619d..497b545304 100644
--- a/cesar/cp/mme.h
+++ b/cesar/cp/mme.h
@@ -117,14 +117,12 @@
/* MMTYPE base values for VS MME messages. */
#define VS_GET_VERSION 0xA000
#define VS_RESET 0xA008
-#define VS_GET_MFG_INFO 0xA00C
#define VS_GET_NVRAM 0xA010
#define VS_GET_LOOPBACK 0xA014
#define VS_SET_LOOPBACK 0xA018
#define VS_GET_TONEMASK 0xA01C
#define VS_GET_ETH_PHY 0xA020
#define VS_ETH_STATS 0xA024
-#define VS_PLC_STATS 0xA028
#define VS_SNIFFER 0xA02C
#define VS_GET_STATUS 0xA030
#define VS_GET_TONEMAP 0xA034
diff --git a/cesar/cp/msg/src/msg.c b/cesar/cp/msg/src/msg.c
index 9379554bb0..003b0f7a11 100644
--- a/cesar/cp/msg/src/msg.c
+++ b/cesar/cp/msg/src/msg.c
@@ -188,8 +188,6 @@ cp_msg_mme_allowed_t cp_msg_mme_allowed[] =
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_VERSION_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_RESET_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_RESET_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
-// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_MFG_INFO_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
-// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_MFG_INFO_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_NVRAM_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_NVRAM_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_LOOPBACK_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
@@ -202,8 +200,6 @@ cp_msg_mme_allowed_t cp_msg_mme_allowed[] =
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_ETH_PHY_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_ETH_STATS_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_ETH_STATS_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
-// CP_MSG_MME_ALLOWED_ENTRY (VS_PLC_STATS_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
-// CP_MSG_MME_ALLOWED_ENTRY (VS_PLC_STATS_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_STATUS_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, NO_EVENT),
// CP_MSG_MME_ALLOWED_ENTRY (VS_GET_STATUS_CNF, STA_UNASSOC, NEK_ENC_NO, FROM_H1_NO, NO_EVENT),
CP_MSG_MME_ALLOWED_ENTRY (VS_GET_TONEMAP_REQ, STA_UNASSOC, NEK_ENC_NO, FROM_H1_YES, VS_GET_TONEMAP_REQ),