summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/cp
diff options
context:
space:
mode:
authorThierry Carré2012-05-10 17:15:36 +0200
committerThierry Carré2012-05-10 17:16:26 +0200
commit8b2d7432b331ef2e7f3a2f8ffb3a6a6f1430e5a6 (patch)
tree4eec786dc73c4cb305edabc5600cf0234bf10e56 /cesar/ce/rx/cp
parent4986c1b1af05da71301b8990e53e885d16ee907a (diff)
parent4847312bc9ff6cabc1a528233d8ac41f98149c64 (diff)
Merge branch 't2928' into eoc, closes #2928
Good luck to understand all modifications done on 3 months. But no functions have been modified in their behaviors. They have been only renamed or moved from file to another file.
Diffstat (limited to 'cesar/ce/rx/cp')
-rw-r--r--cesar/ce/rx/cp/test/Config1
-rw-r--r--cesar/ce/rx/cp/test/Makefile10
2 files changed, 6 insertions, 5 deletions
diff --git a/cesar/ce/rx/cp/test/Config b/cesar/ce/rx/cp/test/Config
index 47b4d7d423..4b20824707 100644
--- a/cesar/ce/rx/cp/test/Config
+++ b/cesar/ce/rx/cp/test/Config
@@ -1,2 +1 @@
CONFIG_MAC_SAR_EOC_PERMANENT_MFS = y
-CONFIG_CP_STA_MGR_EOC = n
diff --git a/cesar/ce/rx/cp/test/Makefile b/cesar/ce/rx/cp/test/Makefile
index 6c06aebb4e..2d2083bb47 100644
--- a/cesar/ce/rx/cp/test/Makefile
+++ b/cesar/ce/rx/cp/test/Makefile
@@ -14,16 +14,18 @@ HOST_PROGRAMS = test_mbox
# Test MME.
test_mme_SOURCES = test_mme.c stub.c
test_mme_MODULES = lib mac/common ce/rx/cp ce/common cp/msg/stub cp/sta/mgr \
- cp/fsm/stub
-test_mme_CONFIG_MODULES = mac/sar
+ cp/av/fsm/stub
+test_mme_CONFIG_MODULES = mac/sar cp
# Test mailbox.
test_mbox_SOURCES = test_mbox.c stub_mbox.c
-test_mbox_MODULES = lib mac/common ce/rx/cp ce/common cp/fsm/stub cp/msg/stub
-test_mbox_CONFIG_MODULES = mac/sar cp/sta/mgr
+test_mbox_MODULES = lib mac/common ce/rx/cp ce/common cp/msg/stub \
+ cp/av/fsm/stub
+test_mbox_CONFIG_MODULES = mac/sar cp/sta/mgr cp
# Remove sta.c to prevent multiple definition of cp_sta_get_peer.
cp_sta_mgr_MODULE_SOURCES = net.c sta_mgr.c sta_own_data.c
+cp_sta_mgr_CONFIG_MODULES = cp
# Include main Makefile.
include $(BASE)/common/make/top.mk