summaryrefslogtreecommitdiff
path: root/ce
diff options
context:
space:
mode:
authorlacour2008-03-13 09:10:21 +0000
committerlacour2008-03-13 09:10:21 +0000
commit0beea2f1815883f589670f33ba463dcfdc278bcf (patch)
tree1cd694bc1a9a2d2f26d91a9351343a063bbe281c /ce
parentf0b33b90efa6e8be3b4a905b52dfa172e6fe44ed (diff)
Overided cp interface changed : 'buf[]' becomes an mme_t.
Makefile verbose less. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1594 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'ce')
-rw-r--r--ce/doc/architecture.odtbin73462 -> 73373 bytes
-rwxr-xr-xce/src/rx.c17
-rw-r--r--ce/test/rx/general/Makefile4
-rwxr-xr-xce/test/rx/general/overide/cp/interf/interf.h19
-rwxr-xr-xce/test/rx/general/overide/cp/interf/src/interf.c11
-rw-r--r--ce/test/rx/maximus/Makefile4
-rw-r--r--ce/test/tx/Makefile4
7 files changed, 41 insertions, 18 deletions
diff --git a/ce/doc/architecture.odt b/ce/doc/architecture.odt
index 6d412ba5dd..59fc9275ca 100644
--- a/ce/doc/architecture.odt
+++ b/ce/doc/architecture.odt
Binary files differ
diff --git a/ce/src/rx.c b/ce/src/rx.c
index 758360522e..86230ff2c1 100755
--- a/ce/src/rx.c
+++ b/ce/src/rx.c
@@ -209,7 +209,7 @@ rxce_process (cyg_addrword_t data)
{
dbg_assert (data);
cyg_tick_count_t watchdog = 0;
- u8 *buf;
+ mme_t *mme;
rxce_t *ctx = (rxce_t *) data;
while (true)
{
@@ -234,19 +234,22 @@ rxce_process (cyg_addrword_t data)
if (cei_param_fifo.number > 0 ) // Then Create CEI if waited.
{
ce_print ("writing in mme buffer\n");
- buf = interf_give_buf ();
- dbg_assert (buf);
+ mme = interf_mme_get ();
+ dbg_assert (mme);
cei_param_t *param = cei_param_get ();
dbg_assert (param);
#ifdef EXPIRATION_TEST
expiration_test (param->dtei);
#endif
- cei_created_status_t cei_status = cei_create (buf, ctx->mask, param->tms, param->new_tmi, param->old_tmi);
- ce_print_buffer (buf, ETH_PACKET_MAX_SIZE);
- interf_send (buf, cei_status.length, param->dtei, param->priority);
+ 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;
+ interf_mme_send (mme);
#ifdef MAXIMUS_TEST
sta_t *sta = mac_store_sta_get (ctx->mac_store_ctx, param->dtei);
- cei_decode (sta->tx_tonemaps, cei_status.mm_type, buf, ctx->mask);
+ cei_decode (sta->tx_tonemaps, cei_status.mm_type, mme->mm_entry, ctx->mask);
#endif
}
else
diff --git a/ce/test/rx/general/Makefile b/ce/test/rx/general/Makefile
index 76ef4baa2e..b0e6e8d3fa 100644
--- a/ce/test/rx/general/Makefile
+++ b/ce/test/rx/general/Makefile
@@ -1,6 +1,6 @@
all :
- $(MAKE) -f host-Makefile
- $(MAKE) -f target-Makefile
+ $(MAKE) -f host-Makefile --no-print-directory
+ $(MAKE) -f target-Makefile --no-print-directory
clean :
$(MAKE) -f host-Makefile clean
diff --git a/ce/test/rx/general/overide/cp/interf/interf.h b/ce/test/rx/general/overide/cp/interf/interf.h
index 641fb8dd3c..8c3545604e 100755
--- a/ce/test/rx/general/overide/cp/interf/interf.h
+++ b/ce/test/rx/general/overide/cp/interf/interf.h
@@ -32,16 +32,29 @@ struct interf_t
};
typedef struct interf_t interf_t;
+struct mme_t
+{
+ /** Destination TEI of the MME.*/
+ uint dtei;
+ /** Length of the MM_ENTRY.*/
+ uint length;
+ /** Type of the MME.*/
+ uint mm_type;
+ /** Pointer to the start of the MM_ENTRY.*/
+ u8 * mm_entry;
+};
+typedef struct mme_t mme_t;
+
BEGIN_DECLS
interf_t *
interf_init ( interf_event_add_cb_t event_add_cb, void* userdata);
-u8 *
-interf_give_buf (void);
+mme_t *
+interf_mme_get (void);
void
-interf_send (u8 *buf, uint len, uint dtei, uint priority);
+interf_mme_send (mme_t *mme);
void
interf_event_add (interf_t *interf, uint type_event);
diff --git a/ce/test/rx/general/overide/cp/interf/src/interf.c b/ce/test/rx/general/overide/cp/interf/src/interf.c
index 9bf978769e..424b9426b3 100755
--- a/ce/test/rx/general/overide/cp/interf/src/interf.c
+++ b/ce/test/rx/general/overide/cp/interf/src/interf.c
@@ -18,6 +18,7 @@
#include "ce/inc/cei.h"
static interf_t interf_global;
+mme_t mme;
interf_t *
interf_init ( interf_event_add_cb_t event_add_cb, void* userdata)
@@ -28,15 +29,17 @@ interf_init ( interf_event_add_cb_t event_add_cb, void* userdata)
return (interf);
}
-u8 *
-interf_give_buf (void)
+mme_t *
+interf_mme_get (void)
{
- return buf;
+ mme.mm_entry = buf;
+ return &mme;
}
void
-interf_send (u8 *buf, uint len, uint dtei, uint priority)
+interf_mme_send (mme_t *mme_to_send)
{
+ dbg_assert (mme_to_send = &mme);
return;
}
diff --git a/ce/test/rx/maximus/Makefile b/ce/test/rx/maximus/Makefile
index 7b330fff79..6df0211848 100644
--- a/ce/test/rx/maximus/Makefile
+++ b/ce/test/rx/maximus/Makefile
@@ -1,3 +1,6 @@
+all :
+ $(MAKE) -C ../../../../maximus/python --no-print-directory
+
BASE = ../../../..
INCLUDES = ce/test/rx/maximus/overide
INCLUDES += ce/test/rx/maximus
@@ -11,5 +14,6 @@ test_rx_MODULES=lib host mac/common hal/phy/maximus mac/sar ce ce/test/rx/maximu
ce_MODULE_SOURCES = cei_param.c mpdu_measure_store.c rx.c trace.c bitloading.c
+
include $(BASE)/common/make/top.mk
diff --git a/ce/test/tx/Makefile b/ce/test/tx/Makefile
index 76ef4baa2e..b0e6e8d3fa 100644
--- a/ce/test/tx/Makefile
+++ b/ce/test/tx/Makefile
@@ -1,6 +1,6 @@
all :
- $(MAKE) -f host-Makefile
- $(MAKE) -f target-Makefile
+ $(MAKE) -f host-Makefile --no-print-directory
+ $(MAKE) -f target-Makefile --no-print-directory
clean :
$(MAKE) -f host-Makefile clean