summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authordufour2010-06-03 09:42:20 +0000
committerdufour2010-06-03 09:42:20 +0000
commit050d1479f73e92a4046726a246cbf2ca08b1325b (patch)
tree636a46357660cf8c1ff055432ad5511cfc13cf7a /cesar
parent8e28c26c561dfce2699616f25c73682e3b1c14d6 (diff)
cesar/ce/{rx,tx}: fix unitary tests for new BSU module
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@7155 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar')
-rw-r--r--cesar/ce/rx/cp/test/override/cp/inc/context.h3
-rw-r--r--cesar/ce/rx/test/override/cp/inc/context.h4
-rw-r--r--cesar/ce/tx/test/Makefile6
-rw-r--r--cesar/ce/tx/test/override/cp/inc/context.h8
-rw-r--r--cesar/ce/tx/test/src/stub.c21
-rw-r--r--cesar/ce/tx/test/src/test_mme.c2
6 files changed, 35 insertions, 9 deletions
diff --git a/cesar/ce/rx/cp/test/override/cp/inc/context.h b/cesar/ce/rx/cp/test/override/cp/inc/context.h
index 28733e7f09..14b454d045 100644
--- a/cesar/ce/rx/cp/test/override/cp/inc/context.h
+++ b/cesar/ce/rx/cp/test/override/cp/inc/context.h
@@ -21,6 +21,7 @@
#include "cp/sta/mgr/inc/sta_mgr.h"
#include "cl/cl.h"
#include "mac/sar/sar.h"
+#include "lib/rnd.h"
struct cp_t
{
@@ -42,6 +43,8 @@ struct cp_t
/** SAR layer. */
sar_t *sar;
+ lib_rnd_t rnd;
+
/** For test. */
u8 *vect;
bitstream_t *vect_bt;
diff --git a/cesar/ce/rx/test/override/cp/inc/context.h b/cesar/ce/rx/test/override/cp/inc/context.h
index cd71e107b5..1d3ad67988 100644
--- a/cesar/ce/rx/test/override/cp/inc/context.h
+++ b/cesar/ce/rx/test/override/cp/inc/context.h
@@ -21,6 +21,7 @@
#include "mac/sar/sar.h"
#include "ce/rx/rx.h"
#include "lib/bitstream.h"
+#include "lib/rnd.h"
struct cp_t
{
@@ -42,6 +43,9 @@ struct cp_t
/** SAR layer. */
sar_t *sar;
+ /** Random. */
+ lib_rnd_t rnd;
+
/** For test. */
u8 *vect;
bitstream_t *vect_bt;
diff --git a/cesar/ce/tx/test/Makefile b/cesar/ce/tx/test/Makefile
index 21b14024cd..63f32658a8 100644
--- a/cesar/ce/tx/test/Makefile
+++ b/cesar/ce/tx/test/Makefile
@@ -5,17 +5,17 @@ BASE = ../../..
INCLUDES = ce/tx/test/override cp/sta/core/stub
# Common modules.
-common_MODULES = lib mac/common ce/tx cp/pwl/stub cp/sta/mgr \
+common_MODULES = lib mac/common ce/tx cp/sta/mgr \
cp/fsm/stub cl/stub cp/sta/core/stub mac/sar/stub \
cp/cco/action/stub ce/common cp/msg/stub
# For host program.
HOST_PROGRAMS = test_expiration test_mme
-test_expiration_SOURCES = test_expiration.c mme.c
+test_expiration_SOURCES = test_expiration.c mme.c stub.c
test_expiration_MODULES = $(common_MODULES)
-test_mme_SOURCES = test_mme.c mme.c
+test_mme_SOURCES = test_mme.c mme.c stub.c
test_mme_MODULES = $(common_MODULES)
# Include main Makefile.
diff --git a/cesar/ce/tx/test/override/cp/inc/context.h b/cesar/ce/tx/test/override/cp/inc/context.h
index 1e7ff02014..42e84823b7 100644
--- a/cesar/ce/tx/test/override/cp/inc/context.h
+++ b/cesar/ce/tx/test/override/cp/inc/context.h
@@ -23,7 +23,7 @@
#include "cp/sta/mgr/inc/sta_mgr.h"
#include "cp/cl_interf/cl_interf.h"
#include "cp/cl_interf/inc/context.h"
-#include "cp/pwl/inc/pwl.h"
+#include "bsu/aclf/aclf.h"
struct cp_t
{
@@ -42,9 +42,6 @@ struct cp_t
/** Convergence layer context. */
cl_t *cl;
- /** PWL. */
- cp_pwl_t pwl;
-
/** SAR layer. */
sar_t *sar;
@@ -54,6 +51,9 @@ struct cp_t
/** Random generator. */
lib_rnd_t rnd;
+ /** BSU. */
+ bsu_aclf_t *bsu_aclf;
+
/** For test. */
u8 *vect;
bitstream_t *vect_bt;
diff --git a/cesar/ce/tx/test/src/stub.c b/cesar/ce/tx/test/src/stub.c
new file mode 100644
index 0000000000..f65074a5e6
--- /dev/null
+++ b/cesar/ce/tx/test/src/stub.c
@@ -0,0 +1,21 @@
+/* Cesar project {{{
+ *
+ * Copyright (C) 2010 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file ce/tx/test/src/stub.c
+ * \brief Stub for test.
+ * \ingroup test
+ */
+#include "common/std.h"
+
+#include "bsu/aclf/aclf.h"
+
+u32
+bsu_aclf_beacon_period (bsu_aclf_t *ctx)
+{
+ return 0x4242;
+}
diff --git a/cesar/ce/tx/test/src/test_mme.c b/cesar/ce/tx/test/src/test_mme.c
index 17dc7605fe..c0d7e8794b 100644
--- a/cesar/ce/tx/test/src/test_mme.c
+++ b/cesar/ce/tx/test/src/test_mme.c
@@ -21,7 +21,6 @@
#include "cp/inc/context.h"
#include "cl/inc/context.h"
#include "mac/sar/inc/context.h"
-#include "cp/pwl/pwl.h"
#include "mac/common/timings.h"
#include "ce/common/mme.h"
@@ -193,7 +192,6 @@ mme_test_suite (test_t t)
mac_config_init (cp.mac_config);
cp.cl = &cl;
cp.sar = &sar;
- cp.pwl.per_ntb = cp_pwl_get_beacon_period_ntb (&cp);
cp.mac_config->tonemask_info.carrier_nb = tonemask_default
(cp.mac_config->tonemask_info.tonemask);