summaryrefslogtreecommitdiff
path: root/ce
diff options
context:
space:
mode:
authorlacour2008-03-18 16:42:00 +0000
committerlacour2008-03-18 16:42:00 +0000
commit569cbbe4724d6188721e66cca8ad5017de4343ad (patch)
treef4e63eddc38ccde8489ea1efd1911e1a7a2a7dbc /ce
parentcf3d7008fc640dbec82f5b1ef2d39e7c71d41dee (diff)
Add any RXCE_TRACE.
Delete ce_print. Redefine config test via makefiles and not anymore file.h. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1619 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'ce')
-rwxr-xr-xce/Module2
-rwxr-xr-xce/inc/cei.h4
-rw-r--r--ce/inc/ecos_time.h (renamed from ce/test/common/ecos_time.h)0
-rw-r--r--ce/inc/trace.h9
-rwxr-xr-xce/src/mpdu_measure_store.c1
-rwxr-xr-xce/src/rx.c20
-rwxr-xr-xce/src/tx.c1
-rwxr-xr-xce/test/common/print_utils.h1
-rw-r--r--ce/test/rx/config_test.h20
-rw-r--r--ce/test/rx/general/overide/cp/src/cp.c1
-rwxr-xr-xce/test/rx/general/src/test_cei.c1
-rw-r--r--ce/test/rx/general/target-Makefile5
-rw-r--r--ce/test/rx/general/test.h18
-rw-r--r--ce/test/rx/maximus/Makefile1
-rw-r--r--ce/test/rx/maximus/config_test.h19
-rw-r--r--ce/test/rx/maximus/test.h18
-rw-r--r--ce/test/rx/tonemap_refresh/Makefile6
-rw-r--r--ce/test/rx/tonemap_refresh/src/test_tonemaps_refresh.c3
-rw-r--r--ce/test/rx/tonemap_refresh/test.h18
-rw-r--r--ce/test/tx/config_test.h18
-rw-r--r--ce/test/tx/src/test_expiration.c3
21 files changed, 29 insertions, 140 deletions
diff --git a/ce/Module b/ce/Module
index 84d2b93da6..d4db642c42 100755
--- a/ce/Module
+++ b/ce/Module
@@ -1,4 +1,4 @@
-SOURCES := rx.c tx.c rxce_stats.c bitloading.c
+SOURCES := rx.c tx.c rxce_stats.c bitloading.c mpdu_measure_store.c cei_param.c
ifeq ($(CONFIG_TRACE),y)
SOURCES += trace.c
endif
diff --git a/ce/inc/cei.h b/ce/inc/cei.h
index 3dc96ff78c..15e64a341b 100755
--- a/ce/inc/cei.h
+++ b/ce/inc/cei.h
@@ -17,10 +17,10 @@
//#include "ce/inc/cei_param.h"
#include "mac/common/tonemask.h"
#include "mac/common/timings.h"
-#include "ce/test/common/print_utils.h"
+//#include "ce/test/common/print_utils.h"
#include "lib/bitstream.h"
#include "cyg/kernel/kapi.h"
-#include "ecos_time.h"
+#include "ce/inc/ecos_time.h"
#define CM_CHAN_EST_IND 0x6014
#define CM_TM_UPDATE_IND 0x6018
diff --git a/ce/test/common/ecos_time.h b/ce/inc/ecos_time.h
index 853099a067..853099a067 100644
--- a/ce/test/common/ecos_time.h
+++ b/ce/inc/ecos_time.h
diff --git a/ce/inc/trace.h b/ce/inc/trace.h
index 249dcf3a40..edeb703772 100644
--- a/ce/inc/trace.h
+++ b/ce/inc/trace.h
@@ -26,7 +26,14 @@
enum
{
RXCE_TRACE_INIT,
- RXCE_TRACE_PB_MEASUREMENT,
+ RXCE_TRACE_SAR_MEASUREMENT_CB,
+ RXCE_TRACE_MEASURE_DROPPED,
+ RXCE_TRACE_PROCESS_WAIT,
+ RXCE_TRACE_PROCESS_TRIGGERED,
+ RXCE_TRACE_SCF_PROCESS,
+ RXCE_TRACE_CEI_PROCESS,
+ RXCE_TRACE_BITLOADING_PROCESS,
+ RXCE_TRACE_REFRESH_PROCESS,
};
BEGIN_DECLS
diff --git a/ce/src/mpdu_measure_store.c b/ce/src/mpdu_measure_store.c
index e118b3adee..dadd4610cc 100755
--- a/ce/src/mpdu_measure_store.c
+++ b/ce/src/mpdu_measure_store.c
@@ -14,7 +14,6 @@
*/
#include "common/std.h"
#include "ce/inc/mpdu_measure_store.h"
-#include "ce/test/common/print_utils.h"
#include "hal/phy/defs.h"
static mpdu_measure_store_t mpdu_measure_store_global;
diff --git a/ce/src/rx.c b/ce/src/rx.c
index 86230ff2c1..28d618799b 100755
--- a/ce/src/rx.c
+++ b/ce/src/rx.c
@@ -13,7 +13,6 @@
* « long description »
*/
//#include "../../config_test.h"
-#include "test.h"
#include "common/std.h"
#include "common/defs/ethernet.h"
#include "ce/inc/rx.h"
@@ -21,13 +20,11 @@
#include "ce/inc/bitloading.h"
#define RXCE //for static functions of cei.h
#include "ce/inc/cei.h"
-#include "ce/test/common/print_utils.h"
#include "cp/interf/interf.h"
#include "ce/test/rx/inc/test_rx.h" // Should be an overrided pbproc...
#if CONFIG_TRACE
#include "mac/common/ntb.h"
#endif
-#include "ecos_time.h"
static rxce_t ce_global;
@@ -83,17 +80,16 @@ sar_mpdu_measurement_cb (void *user, pbproc_rx_params_t *rx_params,
{
dbg_assert (user);
rxce_t *ctx = (rxce_t *) user;
- ce_print ("\t\t\tRXCE CALLBACK -> RXCE add measurement...\n");
+ RXCE_TRACE (SAR_MEASUREMENT_CB, mac_ntb());
dbg_assert (rx_params);
bool b;
pb_measure_blk_t **first = (pb_measure_blk_t **) f;
pb_measure_blk_t **last = (pb_measure_blk_t **) l;
// Allocate block if necessary. The SAR will fill blocks after !couldn't be stopped by RXCE!.
- RXCE_TRACE (PB_MEASUREMENT, mac_ntb());
b = mpdu_measure_store_append (ctx->mpdu_measure_store_ctx, rx_params, pb_nb, first, last, (phy_chandata_t *) noise, n);
// Give 'job' to RXCE that will process the previous frame.
if (b) cyg_semaphore_post (&(ctx->job));
- else ce_print ("\t\t\tmpdu measure has been dropped\n");
+ else RXCE_TRACE (MEASURE_DROPPED, mac_ntb());
return (b);
}
@@ -213,14 +209,15 @@ rxce_process (cyg_addrword_t data)
rxce_t *ctx = (rxce_t *) data;
while (true)
{
- ce_print ("\t\t\t\t\t\t\t\t\t\t\t\trxce wait\n");
+ RXCE_TRACE (PROCESS_WAIT, mac_ntb());
cyg_semaphore_timed_wait (&(ctx->job), watchdog);
- ce_print ("\t\t\t\t\t\t\t\t\t\t\t\trxce works\n");
+ RXCE_TRACE (PROCESS_TRIGGERED, mac_ntb());
if (ctx->pbproc_need_scf) // At first, verify if pbproc waits information about scf.
{
// todo : Not sure that this part of code will not be interrupted
// by pbproc_need_scf_cb and so, the answer could not correspond to
// the last situation {src,tei} given by pbproc.
+ RXCE_TRACE (SCF_PROCESS, mac_ntb());
bool b = rxce_scf_compute (ctx);
if (b)
{
@@ -233,7 +230,7 @@ rxce_process (cyg_addrword_t data)
{
if (cei_param_fifo.number > 0 ) // Then Create CEI if waited.
{
- ce_print ("writing in mme buffer\n");
+ RXCE_TRACE (CEI_PROCESS, mac_ntb());
mme = interf_mme_get ();
dbg_assert (mme);
cei_param_t *param = cei_param_get ();
@@ -242,7 +239,6 @@ rxce_process (cyg_addrword_t data)
expiration_test (param->dtei);
#endif
cei_created_status_t cei_status = cei_create (mme->mm_entry, ctx->mask, param->tms, param->new_tmi, param->old_tmi);
- ce_print_buffer (mme->mm_entry, ETH_PACKET_MAX_SIZE);
mme->length = cei_status.length;
mme->dtei = param->dtei;
mme->mm_type = cei_status.mm_type;
@@ -256,12 +252,16 @@ rxce_process (cyg_addrword_t data)
{
if (ctx->mpdu_measure_store_ctx->measure_nb) //Then Compute measurement
{
+ RXCE_TRACE (BITLOADING_PROCESS, mac_ntb());
rxce_next_measurement_compute (ctx);
}
}
}
if (cyg_current_time() > watchdog)
+ {
+ RXCE_TRACE (REFRESH_PROCESS, mac_ntb());
watchdog = rxce_tonemaps_refresh_management(ctx);
+ }
}
}
diff --git a/ce/src/tx.c b/ce/src/tx.c
index b0a41abbfc..d6426fce6f 100755
--- a/ce/src/tx.c
+++ b/ce/src/tx.c
@@ -57,7 +57,6 @@ txce_expiration_tonemaps_management (txce_t *ctx)
cyg_tick_count_t expiration_date = tms->expiration_rtc_date;
if (current_rtc_date >= expiration_date )
{
- ce_print ("tonemaps expiration of sta[%d] @%llu\n", tei, cyg_current_time());
int tmi;
for (tmi = 0; tmi<TONEMAP_INDEX_NB; tmi++)
{
diff --git a/ce/test/common/print_utils.h b/ce/test/common/print_utils.h
index 3eb7ec6432..1f0fe63bb0 100755
--- a/ce/test/common/print_utils.h
+++ b/ce/test/common/print_utils.h
@@ -15,7 +15,6 @@
#include "mac/common/tonemap.h"
#include "hal/phy/pbdma.h"
#include "ce/inc/mpdu_measure_store.h"
-#include "config_test.h"
#ifdef CE_DBG
BEGIN_DECLS
diff --git a/ce/test/rx/config_test.h b/ce/test/rx/config_test.h
deleted file mode 100644
index b8272fe735..0000000000
--- a/ce/test/rx/config_test.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __config_test_h
-#define __config_test_h
-/* Cesar project {{{
- *
- * Copyright (C) 2007 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file ./config_test.h
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-
-//#define CE_DBG
-
-#endif /* __config_test_h */
diff --git a/ce/test/rx/general/overide/cp/src/cp.c b/ce/test/rx/general/overide/cp/src/cp.c
index 56bd94e26e..c810c1d82c 100644
--- a/ce/test/rx/general/overide/cp/src/cp.c
+++ b/ce/test/rx/general/overide/cp/src/cp.c
@@ -77,7 +77,6 @@ cp_emul_cei_reception (cp_t *ctx)
sta_t *lsta = mac_store_sta_get (ctx->mac_store_ctx, rnd_tei);
if (lsta->tx_tonemaps->tm[rnd_tmi] == NULL)
{
- ce_print ("adding sta[%d]->tx_tonemaps->tm[%d] @%llu\n", rnd_tei, rnd_tmi, cyg_current_time());
create_tm (lsta->tx_tonemaps, ctx->tonemask, rnd_tmi, 1, 4);
cei_create (ctx->cei_buffer, ctx->tonemask, lsta->tx_tonemaps, rnd_tmi, TONEMAP_INDEX_NULL);
txce (ctx->txce_ctx, rnd_tei, CM_CHAN_EST_IND, ctx->cei_buffer);
diff --git a/ce/test/rx/general/src/test_cei.c b/ce/test/rx/general/src/test_cei.c
index b7abaa3b36..3c883cbd71 100755
--- a/ce/test/rx/general/src/test_cei.c
+++ b/ce/test/rx/general/src/test_cei.c
@@ -19,6 +19,7 @@
#include "lib/test.h"
#include "mac/common/tonemask.h"
#include "ce/test/common/tonemap_utils.h"
+#include "ce/test/common/print_utils.h"
void
test_exchange (test_t test, tonemaps_t *rx_tms, tonemaps_t *tx_tms,
diff --git a/ce/test/rx/general/target-Makefile b/ce/test/rx/general/target-Makefile
index 4317c3e7e2..954e55126c 100644
--- a/ce/test/rx/general/target-Makefile
+++ b/ce/test/rx/general/target-Makefile
@@ -5,7 +5,6 @@ INCLUDES += ce/test/rx/general
INCLUDES += ce/test/rx/general/overide
INCLUDES += ce/test/common
-#COV = y
ECOS = y
TARGET_PROGRAMS=test_rx_target_ecos_synth
@@ -17,8 +16,8 @@ test_sar_target_ecos_synth_MODULES = lib mac/sar ce mac/common mac/sar/bridgedma
mac_pbproc_MODULE_SOURCES = mfs.c
-ce_MODULE_SOURCES = bitloading.c cei_param.c mpdu_measure_store.c rx.c trace.c
-ce_test_common_MODULE_SOURCES = print_utils.c
+#ce_MODULE_SOURCES = bitloading.c cei_param.c mpdu_measure_store.c rx.c trace.c
+#ce_test_common_MODULE_SOURCES = print_utils.c
VARIANT = target
diff --git a/ce/test/rx/general/test.h b/ce/test/rx/general/test.h
deleted file mode 100644
index 9c5c1a8431..0000000000
--- a/ce/test/rx/general/test.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#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 */
diff --git a/ce/test/rx/maximus/Makefile b/ce/test/rx/maximus/Makefile
index 6df0211848..3e64bc166e 100644
--- a/ce/test/rx/maximus/Makefile
+++ b/ce/test/rx/maximus/Makefile
@@ -8,6 +8,7 @@ INCLUDES += ce/test/rx/general/overide
INCLUDES += ce/test/common
ECOS = y
+EXTRA_TARGET_CFLAGS=-DMAXIMUS_TEST
TARGET_PROGRAMS = test_rx
test_rx_SOURCES = test_rx.c
test_rx_MODULES=lib host mac/common hal/phy/maximus mac/sar ce ce/test/rx/maximus/overide/mac/pbproc ce/test/rx/general/overide/cp/interf ce/test/common
diff --git a/ce/test/rx/maximus/config_test.h b/ce/test/rx/maximus/config_test.h
deleted file mode 100644
index 5d4bd8a7e4..0000000000
--- a/ce/test/rx/maximus/config_test.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __config_test_h
-#define __config_test_h
-/* Cesar project {{{
- *
- * Copyright (C) 2007 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file ./config_test.h
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-#define MAXIMUS_TEST
-//#define CE_DBG
-#endif /* __config_test_h */
diff --git a/ce/test/rx/maximus/test.h b/ce/test/rx/maximus/test.h
deleted file mode 100644
index 2be7038cce..0000000000
--- a/ce/test/rx/maximus/test.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef test_h
-#define test_h
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file test.h
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-#define MAXIMUS_TEST
-#endif /* test_h */
diff --git a/ce/test/rx/tonemap_refresh/Makefile b/ce/test/rx/tonemap_refresh/Makefile
index 67cbee1f23..081b333cf0 100644
--- a/ce/test/rx/tonemap_refresh/Makefile
+++ b/ce/test/rx/tonemap_refresh/Makefile
@@ -7,14 +7,12 @@ INCLUDES += ce/test/common
ECOS = y
-TARGET_PROGRAMS+=test_tonemaps_refresh_target_ecos_synth
+EXTRA_TARGET_CFLAGS=-DEXPIRATION_TEST
+TARGET_PROGRAMS=test_tonemaps_refresh_target_ecos_synth
test_tonemaps_refresh_target_ecos_synth_SOURCES = test_tonemaps_refresh.c
test_tonemaps_refresh_target_ecos_synth_MODULES = lib mac/common ce ce/test/common ce/test/rx/general/overide/cp/interf
-ce_MODULE_SOURCES = cei_param.c mpdu_measure_store.c rx.c trace.c bitloading.c
-ce_test_common_MODULE_SOURCES = print_utils.c
-
include $(BASE)/common/make/top.mk
diff --git a/ce/test/rx/tonemap_refresh/src/test_tonemaps_refresh.c b/ce/test/rx/tonemap_refresh/src/test_tonemaps_refresh.c
index bffc53a344..1258b8a80c 100644
--- a/ce/test/rx/tonemap_refresh/src/test_tonemaps_refresh.c
+++ b/ce/test/rx/tonemap_refresh/src/test_tonemaps_refresh.c
@@ -12,13 +12,12 @@
*
* « long description »
*/
-#include "test.h"
#include "common/std.h"
#include "lib/rnd.h"
#include "lib/test.h"
#include "ce/inc/rx.h"
#include "ce/test/common/print_utils.h"
-#include "ecos_time.h"
+#include "ce/inc/ecos_time.h"
#define TEST_REFRESH_NUMBER 5000
#define CPU_LOAD_PRIORITY 10
diff --git a/ce/test/rx/tonemap_refresh/test.h b/ce/test/rx/tonemap_refresh/test.h
deleted file mode 100644
index bd8f335a0f..0000000000
--- a/ce/test/rx/tonemap_refresh/test.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef test_h
-#define test_h
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file test.h
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-#define EXPIRATION_TEST
-#endif /* test_h */
diff --git a/ce/test/tx/config_test.h b/ce/test/tx/config_test.h
deleted file mode 100644
index fce1521d1b..0000000000
--- a/ce/test/tx/config_test.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __config_test_h
-#define __config_test_h
-/* Cesar project {{{
- *
- * Copyright (C) 2007 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file ./config_test.h
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-//#define CE_DBG
-#endif /* __config_test_h */
diff --git a/ce/test/tx/src/test_expiration.c b/ce/test/tx/src/test_expiration.c
index 34ab4dc3ee..e26a473608 100644
--- a/ce/test/tx/src/test_expiration.c
+++ b/ce/test/tx/src/test_expiration.c
@@ -16,11 +16,10 @@
#include "cyg/kernel/kapi.h"
#include "ce/inc/tx.h"
#include "lib/test.h"
-#include "config_test.h"
#include "cp/interf/interf.h"
#include "cp/cp.h"
#include "mac/common/tonemap.h"
-#include "ecos_time.h"
+#include "ce/inc/ecos_time.h"
#define CP_PRIORITY 20
cyg_thread cp_thread;