summaryrefslogtreecommitdiff
path: root/ce
diff options
context:
space:
mode:
authorschodet2008-02-28 13:25:12 +0000
committerschodet2008-02-28 13:25:12 +0000
commit83e82813907d7503b5d9aeccf97395a52afe7403 (patch)
tree69405e1221844b665fd367234ad3bceeb7b886d4 /ce
parent0ddf00a2192b549eb6d8081fd92604511a0458f4 (diff)
* mac/common:
- added mac_config_init to tests. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1494 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'ce')
-rwxr-xr-xce/test/rx/general/src/test_rx.c2
-rw-r--r--ce/test/rx/maximus/src/test_rx.c2
-rwxr-xr-xce/test/tx/Makefile1
-rw-r--r--ce/test/tx/src/test_expiration.c2
-rwxr-xr-xce/test/tx/src/test_tx.c4
5 files changed, 5 insertions, 6 deletions
diff --git a/ce/test/rx/general/src/test_rx.c b/ce/test/rx/general/src/test_rx.c
index d9b8e52fce..8f77c51deb 100755
--- a/ce/test/rx/general/src/test_rx.c
+++ b/ce/test/rx/general/src/test_rx.c
@@ -255,7 +255,7 @@ cyg_user_start (int argc, char **argv)
phy_ctx = blk_alloc();
test_init (test, argc, argv);
mac_config_t mac_config;
- tonemask_default ((u8 *)(&(mac_config.tonemask_info.tonemask)));
+ mac_config_init (&mac_config);
status.mac_store_ctx = mac_store_init ();
mac_ntb_init (phy_ctx, &mac_config);
rxce_ctx = rxce_init (status.mac_store_ctx, &mac_config);
diff --git a/ce/test/rx/maximus/src/test_rx.c b/ce/test/rx/maximus/src/test_rx.c
index 6a5c82f6fd..389a7b18fb 100644
--- a/ce/test/rx/maximus/src/test_rx.c
+++ b/ce/test/rx/maximus/src/test_rx.c
@@ -176,7 +176,7 @@ int main(void)
fcall_register(my_station.fcall, "prepare_rx", (void*)&prepare_rx, NULL);
fcall_register(my_station.fcall, "test_result_get", (void*)&test_result_get, NULL);
- tonemask_default ((u8 *)(&(mac_config_ctx.tonemask_info.tonemask)));
+ mac_config_init (&mac_config_ctx);
//int i;
//for (i=0; i<(PHY_CARRIER_NB+7)/8; i++) mac_config_ctx.tonemask_info.tonemask[i] = 0xFF;
//mac_config_ctx.tonemask_info.tonemask[i-1] = ((1<<(PHY_CARRIER_NB%8))-1);
diff --git a/ce/test/tx/Makefile b/ce/test/tx/Makefile
index 7fdc3f1b06..364f0c9b67 100755
--- a/ce/test/tx/Makefile
+++ b/ce/test/tx/Makefile
@@ -11,6 +11,5 @@ test_tx_MODULES = lib mac/common ce ce/test/common ce/test/common/ecos_overide/c
ce_MODULE_SOURCES = tx.c rxce_stats.c
ce_test_common_MODULE_SOURCES = print_utils.c
-mac_common_MODULE_SOURCES = tonemap.c tonemask.c store.c mfs.c sta.c
include $(BASE)/common/make/top.mk
diff --git a/ce/test/tx/src/test_expiration.c b/ce/test/tx/src/test_expiration.c
index 7f6aad229b..108856b7e1 100644
--- a/ce/test/tx/src/test_expiration.c
+++ b/ce/test/tx/src/test_expiration.c
@@ -97,7 +97,7 @@ cyg_user_start (int argc, char **argv)
{
test_init (test, argc, argv);
mac_config_t mac_config;
- tonemask_default ((u8 *)(&(mac_config.tonemask_info.tonemask)));
+ mac_config_init (&mac_config);
mac_store_ctx = mac_store_init();
cp_ctx = cp_init (mac_store_ctx, &mac_config);
cyg_thread_create (CP_PRIORITY, &cp_process,(cyg_addrword_t) cp_ctx, "cp",
diff --git a/ce/test/tx/src/test_tx.c b/ce/test/tx/src/test_tx.c
index 96c4ec57b9..53429a6481 100755
--- a/ce/test/tx/src/test_tx.c
+++ b/ce/test/tx/src/test_tx.c
@@ -37,7 +37,7 @@ main (int argc, char **argv)
test_t test;
mac_config_t mac_config;
test_init (test, argc, argv);
- tonemask_default ((u8 *)(&(mac_config.tonemask_info.tonemask)));
+ mac_config_init (&mac_config);
//for (i=0; i< PHY_CARRIER_NB/8; i++) mac_config.tonemask_info.tonemask[i] = 0xFF;
u16 MAX_FL_FL = MAC_MAX_FL_MAX_FL;
u8 RIFS1 = MAC_RIFS_AV_ONE_SYM_FL;
@@ -77,7 +77,7 @@ main (int argc, char **argv)
bitstream_access (writer, &GI, 8);
bitstream_access (writer, &CBDENC, 8);
- uint mask_len = tonemask_carrier_nb ((u8 * ) &(mac_config.tonemask_info.tonemask));
+ uint mask_len = mac_config.tonemask_info.carrier_nb;
bitstream_access (writer, &mask_len, 16);
u8 tonemap[PHY_CARRIER_NB];