summaryrefslogtreecommitdiff
path: root/cesar/station
diff options
context:
space:
mode:
authordufour2009-05-11 15:21:55 +0000
committerdufour2009-05-11 15:21:55 +0000
commitf7225dbd1c15a97bda3eb04500635f779d535fb9 (patch)
tree9ff6c2356e3b8c369b3280a1e11e09424d8b1282 /cesar/station
parent6fd0504686cc5e0302b8f8975884e632e57ca880 (diff)
* ce, ce/rx, cp, common/test, station, test_general:
- add the base version of the CE in RX (ecos thread creation and destruction), - integrate into CP and station context, - add in nightly test, - add a ce Module that includes ce/rx, ce/tx and ce/common, - update general tests to use the new ce module. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@4622 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/station')
-rw-r--r--cesar/station/src/station.c9
-rw-r--r--cesar/station/station.h6
2 files changed, 8 insertions, 7 deletions
diff --git a/cesar/station/src/station.c b/cesar/station/src/station.c
index c9d05f006b..ac347477c3 100644
--- a/cesar/station/src/station.c
+++ b/cesar/station/src/station.c
@@ -67,12 +67,13 @@ cesar_init (void)
/* Initialise the hal timer. */
cesar.hal_timer = hal_timer_init (pbproc_get_phy(cesar.pbproc));
+ /* Initialize the CE in RX. */
+ cesar.ce_rx = ce_rx_init (cesar.mac_store);
+
/* Initialise the CP. */
cesar.cp = cp_init (&cesar.mac_config, cesar.interface, cesar.hal_timer,
cesar.pbproc, cesar.mac_store, cesar.sar, cesar.cl,
- seed);
-
- cesar.rxce = rxce_init(cesar.sar, cesar.mac_store, &cesar.mac_config, cesar.cp);
+ cesar.ce_rx, seed);
// start HLE...
hle_activate(cesar.hle, true);
@@ -94,7 +95,7 @@ cesar_uninit (cesar_t *ctx)
cl_uninit (ctx->cl);
sar_uninit (ctx->sar);
pbproc_uninit (ctx->pbproc);
- rxce_uninit (ctx->rxce);
+ ce_rx_uninit (ctx->ce_rx);
mac_store_uninit (ctx->mac_store);
hal_timer_uninit (cesar.hal_timer);
diff --git a/cesar/station/station.h b/cesar/station/station.h
index 2adb8a36d8..2876b9c3c4 100644
--- a/cesar/station/station.h
+++ b/cesar/station/station.h
@@ -21,7 +21,7 @@
#include "interface/interface.h"
#include "cp/cp.h"
#include "hal/timer/timer.h"
-#include "ce/rx.h"
+#include "ce/rx/rx.h"
struct cesar_t
{
@@ -49,8 +49,8 @@ struct cesar_t
/** Control Plane. */
cp_t *cp;
- /** CE. */
- rxce_t *rxce;
+ /** CE in RX. */
+ ce_rx_t *ce_rx;
/* Hal timer. */
hal_timer_t *hal_timer;