summaryrefslogtreecommitdiff
path: root/ce/test/rx
diff options
context:
space:
mode:
authorlacour2008-02-05 09:05:14 +0000
committerlacour2008-02-05 09:05:14 +0000
commit80939396e6e1970fe0c1ecfa4a9734d00ab8ed31 (patch)
treece3d2de4c9ce56f4ae51e84b8168e2c7c6dac4fc /ce/test/rx
parent95f7689c0770357a3dd4f5eca03b09ca9d7bd302 (diff)
Move rx tests in rx/general. (test.h relative to compilation directory)
rxce_t added in rxce functions. tonemaps refresh management added in rxce process. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1362 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'ce/test/rx')
-rw-r--r--ce/test/rx/config_test.h1
-rwxr-xr-xce/test/rx/general/Makefile (renamed from ce/test/rx/Makefile)2
-rwxr-xr-xce/test/rx/general/Makefile_HOST_LINUX_SPARC (renamed from ce/test/rx/Makefile_HOST_LINUX_SPARC)0
-rw-r--r--ce/test/rx/general/Makefile_TARGET (renamed from ce/test/rx/Makefile_TARGET)11
-rwxr-xr-xce/test/rx/general/ecos.ecc.sh (renamed from ce/test/rx/ecos.ecc.sh)0
-rw-r--r--ce/test/rx/general/overide/cp/interf/Module (renamed from ce/test/rx/overide/cp/interf/Module)0
-rwxr-xr-xce/test/rx/general/overide/cp/interf/interf.h (renamed from ce/test/rx/overide/cp/interf/interf.h)0
-rwxr-xr-xce/test/rx/general/overide/cp/interf/src/interf.c (renamed from ce/test/rx/overide/cp/interf/src/interf.c)0
-rwxr-xr-xce/test/rx/general/src/test_cei.c (renamed from ce/test/rx/src/test_cei.c)0
-rwxr-xr-xce/test/rx/general/src/test_cei_param.c (renamed from ce/test/rx/src/test_cei_param.c)0
-rwxr-xr-xce/test/rx/general/src/test_frame_measurement.c (renamed from ce/test/rx/src/test_frame_measurement.c)0
-rwxr-xr-xce/test/rx/general/src/test_rx.c (renamed from ce/test/rx/src/test_rx.c)4
-rwxr-xr-xce/test/rx/general/src/test_sar_integration.c (renamed from ce/test/rx/src/test_sar_integration.c)4
-rw-r--r--ce/test/rx/general/src/test_speed.c (renamed from ce/test/rx/src/test_speed.c)0
-rw-r--r--ce/test/rx/general/src/test_spoc.c (renamed from ce/test/rx/src/test_spoc.c)0
-rw-r--r--ce/test/rx/general/src/test_spoc_opt.c (renamed from ce/test/rx/src/test_spoc_opt.c)0
-rw-r--r--ce/test/rx/general/test.h18
17 files changed, 29 insertions, 11 deletions
diff --git a/ce/test/rx/config_test.h b/ce/test/rx/config_test.h
index 0927b0848e..b8272fe735 100644
--- a/ce/test/rx/config_test.h
+++ b/ce/test/rx/config_test.h
@@ -17,5 +17,4 @@
//#define CE_DBG
-
#endif /* __config_test_h */
diff --git a/ce/test/rx/Makefile b/ce/test/rx/general/Makefile
index 241507cdb5..85f63ce6f5 100755
--- a/ce/test/rx/Makefile
+++ b/ce/test/rx/general/Makefile
@@ -1,4 +1,4 @@
-BASE = ../../..
+BASE = ../../../..
INCLUDES=ce/test/rx
diff --git a/ce/test/rx/Makefile_HOST_LINUX_SPARC b/ce/test/rx/general/Makefile_HOST_LINUX_SPARC
index 8af6f9fec5..8af6f9fec5 100755
--- a/ce/test/rx/Makefile_HOST_LINUX_SPARC
+++ b/ce/test/rx/general/Makefile_HOST_LINUX_SPARC
diff --git a/ce/test/rx/Makefile_TARGET b/ce/test/rx/general/Makefile_TARGET
index a51ec37e4c..8a39e502d6 100644
--- a/ce/test/rx/Makefile_TARGET
+++ b/ce/test/rx/general/Makefile_TARGET
@@ -1,17 +1,18 @@
-BASE = ../../..
+BASE = ../../../..
-INCLUDES = ce/test/rx
-INCLUDES += ce/test/rx/overide
+INCLUDES = ce/test/rx/
+INCLUDES += ce/test/rx/general
+INCLUDES += ce/test/rx/general/overide
#COV = y
ECOS = y
TARGET_PROGRAMS=test_rx_target_ecos_synth
test_rx_target_ecos_synth_SOURCES = test_rx.c
-test_rx_target_ecos_synth_MODULES = lib mac/common ce ce/test/common ce/test/rx/overide/cp/interf
+test_rx_target_ecos_synth_MODULES = lib mac/common ce ce/test/common ce/test/rx/general/overide/cp/interf
TARGET_PROGRAMS += test_sar_target_ecos_synth
test_sar_target_ecos_synth_SOURCES = test_sar_integration.c
-test_sar_target_ecos_synth_MODULES = lib mac/sar ce mac/common mac/sar/bridgedma mac/pbproc mac/sar/test ce/test/common ce/test/rx/overide/cp/interf
+test_sar_target_ecos_synth_MODULES = lib mac/sar ce mac/common mac/sar/bridgedma mac/pbproc mac/sar/test ce/test/common ce/test/rx/general/overide/cp/interf
mac_pbproc_MODULE_SOURCES = mfs.c
diff --git a/ce/test/rx/ecos.ecc.sh b/ce/test/rx/general/ecos.ecc.sh
index 2443d0e40f..2443d0e40f 100755
--- a/ce/test/rx/ecos.ecc.sh
+++ b/ce/test/rx/general/ecos.ecc.sh
diff --git a/ce/test/rx/overide/cp/interf/Module b/ce/test/rx/general/overide/cp/interf/Module
index 5950fd7d38..5950fd7d38 100644
--- a/ce/test/rx/overide/cp/interf/Module
+++ b/ce/test/rx/general/overide/cp/interf/Module
diff --git a/ce/test/rx/overide/cp/interf/interf.h b/ce/test/rx/general/overide/cp/interf/interf.h
index 57e74ddb84..57e74ddb84 100755
--- a/ce/test/rx/overide/cp/interf/interf.h
+++ b/ce/test/rx/general/overide/cp/interf/interf.h
diff --git a/ce/test/rx/overide/cp/interf/src/interf.c b/ce/test/rx/general/overide/cp/interf/src/interf.c
index a804861c83..a804861c83 100755
--- a/ce/test/rx/overide/cp/interf/src/interf.c
+++ b/ce/test/rx/general/overide/cp/interf/src/interf.c
diff --git a/ce/test/rx/src/test_cei.c b/ce/test/rx/general/src/test_cei.c
index e60c7b45a1..e60c7b45a1 100755
--- a/ce/test/rx/src/test_cei.c
+++ b/ce/test/rx/general/src/test_cei.c
diff --git a/ce/test/rx/src/test_cei_param.c b/ce/test/rx/general/src/test_cei_param.c
index 66a869d4d2..66a869d4d2 100755
--- a/ce/test/rx/src/test_cei_param.c
+++ b/ce/test/rx/general/src/test_cei_param.c
diff --git a/ce/test/rx/src/test_frame_measurement.c b/ce/test/rx/general/src/test_frame_measurement.c
index fdab1bfa0d..fdab1bfa0d 100755
--- a/ce/test/rx/src/test_frame_measurement.c
+++ b/ce/test/rx/general/src/test_frame_measurement.c
diff --git a/ce/test/rx/src/test_rx.c b/ce/test/rx/general/src/test_rx.c
index 03d0ac58cc..5818c18dcb 100755
--- a/ce/test/rx/src/test_rx.c
+++ b/ce/test/rx/general/src/test_rx.c
@@ -136,7 +136,7 @@ sar_noise_new (pbproc_rx_params_t *rx_params, uint noise[], uint symbol_nb)
time_noise->blk.next = (blk_t *) freq_noise;
//chandata_print (time_noise);
ce_print ("\t\t\t\t ADD NOISES\n");
- sar_mpdu_measurement_cb (NULL, rx_params, 0, NULL, NULL, (pb_t *) time_noise);
+ sar_mpdu_measurement_cb (rxce_ctx, rx_params, 0, NULL, NULL, (pb_t *) time_noise);
//my_print ("\t\t\t\t ADD FREQ NOISE\n");
//sar_mpdu_measurement_cb (NULL, rx_params, 0, NULL, NULL, (pb_t *) freq_noise);
}
@@ -262,7 +262,7 @@ cyg_user_start (int argc, char **argv)
over_pbproc_init ();
pbproc_rxce_init (pbproc_need_scf_cb);
- cyg_thread_create (RXCE_PRIORITY, &rxce_process, 0, "rxce",
+ cyg_thread_create (RXCE_PRIORITY, &rxce_process, (cyg_addrword_t) rxce_ctx, "rxce",
rxce_stack, CYGNUM_HAL_STACK_SIZE_TYPICAL,
&rxce_handle, &rxce_thread);
cyg_thread_create (FRAME_PRIORITY, &frame_process, 0, "frame_test",
diff --git a/ce/test/rx/src/test_sar_integration.c b/ce/test/rx/general/src/test_sar_integration.c
index 21a198d6f7..fab5e5016b 100755
--- a/ce/test/rx/src/test_sar_integration.c
+++ b/ce/test/rx/general/src/test_sar_integration.c
@@ -134,7 +134,7 @@ START (sar_t **sar_ctx, sta_t **sta, ca_t **ca)
pbproc_t *pbproc_ctx = pbproc_init (&mac_config, mac_store_ctx);
*ca = (ca_t *) blk_alloc();
*sar_ctx = sar_init (mac_store_ctx, pbproc_ctx, *ca);
- sar_init_measure_context (*sar_ctx, NULL);
+ sar_init_measure_context (*sar_ctx, rxce_ctx);
sar_init_measurement_cb (*sar_ctx, &sar_mpdu_measurement_cb);
mac_store_sta_add (mac_store_ctx, 1);
*sta = mac_store_sta_get (mac_store_ctx, 1);
@@ -289,7 +289,7 @@ cyg_user_start (int argc, char **argv)
tonemask_default ((u8 *)(&(mac_config.tonemask_info.tonemask)));
mac_store_ctx = mac_store_init ();
rxce_ctx = rxce_init (mac_store_ctx, &mac_config);
- cyg_thread_create (RXCE_PRIORITY, &rxce_process, 0, "rxce",
+ cyg_thread_create (RXCE_PRIORITY, &rxce_process,(cyg_addrword_t) rxce_ctx, "rxce",
rxce_stack, CYGNUM_HAL_STACK_SIZE_TYPICAL,
&rxce_handle, &rxce_thread);
cyg_thread_resume (rxce_handle);
diff --git a/ce/test/rx/src/test_speed.c b/ce/test/rx/general/src/test_speed.c
index 210b082cc3..210b082cc3 100644
--- a/ce/test/rx/src/test_speed.c
+++ b/ce/test/rx/general/src/test_speed.c
diff --git a/ce/test/rx/src/test_spoc.c b/ce/test/rx/general/src/test_spoc.c
index 44790ec09e..44790ec09e 100644
--- a/ce/test/rx/src/test_spoc.c
+++ b/ce/test/rx/general/src/test_spoc.c
diff --git a/ce/test/rx/src/test_spoc_opt.c b/ce/test/rx/general/src/test_spoc_opt.c
index 31bef0ef87..31bef0ef87 100644
--- a/ce/test/rx/src/test_spoc_opt.c
+++ b/ce/test/rx/general/src/test_spoc_opt.c
diff --git a/ce/test/rx/general/test.h b/ce/test/rx/general/test.h
new file mode 100644
index 0000000000..9c5c1a8431
--- /dev/null
+++ b/ce/test/rx/general/test.h
@@ -0,0 +1,18 @@
+#ifndef test_h
+#define test_h
+/* Cesar project {{{
+ *
+ * Copyright (C) 2008 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file test.h
+ * \brief « brief description »
+ * \ingroup « module »
+ *
+ * « long description »
+ */
+#define GENERAL_TEST
+#endif /* test_h */