summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
Diffstat (limited to 'cesar')
-rw-r--r--cesar/cl/Config1
-rw-r--r--cesar/cl/src/cl.c6
-rw-r--r--cesar/cp/eoc/cco/bw/src/bw.c2
-rw-r--r--cesar/cp/eoc/cco/bw/test/utest/src/sched.c8
-rw-r--r--cesar/mac/common/src/mfs.c12
5 files changed, 22 insertions, 7 deletions
diff --git a/cesar/cl/Config b/cesar/cl/Config
new file mode 100644
index 0000000000..eec068d976
--- /dev/null
+++ b/cesar/cl/Config
@@ -0,0 +1 @@
+CONFIG_CL_EOC_CLASSIFY = n
diff --git a/cesar/cl/src/cl.c b/cesar/cl/src/cl.c
index 7e32544e43..3579544c5c 100644
--- a/cesar/cl/src/cl.c
+++ b/cesar/cl/src/cl.c
@@ -29,6 +29,7 @@
#include "mac/sar/sar.h"
#include <string.h>
+#include "config/cl/eoc.h"
static struct cl_t cl_global;
@@ -72,6 +73,11 @@ cl_classifer_get_lid (cl_t *ctx, uint tei, uint tag,
else
dbg_assert_default ();
+ if (CONFIG_CL_EOC_CLASSIFY)
+ {
+ lid = MAC_LLID_MIN;
+ }
+
CL_TRACE (CLASSIFIER, mac_ntb(), tei, *bcast, *acs, *drop, lid);
/** TODO fill the classifier */
diff --git a/cesar/cp/eoc/cco/bw/src/bw.c b/cesar/cp/eoc/cco/bw/src/bw.c
index 8762a80cb8..d23844aca7 100644
--- a/cesar/cp/eoc/cco/bw/src/bw.c
+++ b/cesar/cp/eoc/cco/bw/src/bw.c
@@ -126,7 +126,7 @@ cp_eoc_cco_bw_sched_find (cp_t *ctx)
uint
cp_eoc_cco_bw_sched_calc (uint *lid)
{
- *lid = 1;
+ *lid = MAC_LLID_MIN;
return (2 * MAC_DX567_TCK + 18 * MAC_DX417_TCK);
}
diff --git a/cesar/cp/eoc/cco/bw/test/utest/src/sched.c b/cesar/cp/eoc/cco/bw/test/utest/src/sched.c
index 092586f914..6293344963 100644
--- a/cesar/cp/eoc/cco/bw/test/utest/src/sched.c
+++ b/cesar/cp/eoc/cco/bw/test/utest/src/sched.c
@@ -47,28 +47,28 @@ test_bw_util (test_t test)
sched = cp_eoc_cco_bw_sched_read (&cp, &list_node);
test_fail_if (sched->tei != 5);
- test_fail_if (sched->lid != 1);
+ test_fail_if (sched->lid != MAC_LLID_MIN);
test_fail_if (sched->cco_tx_duration !=
2 * MAC_DX567_TCK + 18 * MAC_DX417_TCK);
sched = cp_eoc_cco_bw_sched_read (&cp, &list_node);
test_fail_if (sched->tei != 6);
- test_fail_if (sched->lid != 1);
+ test_fail_if (sched->lid != MAC_LLID_MIN);
test_fail_if (sched->cco_tx_duration !=
2 * MAC_DX567_TCK + 18 * MAC_DX417_TCK);
sched = cp_eoc_cco_bw_sched_read (&cp, &list_node);
test_fail_if (sched->tei != 8);
- test_fail_if (sched->lid != 1);
+ test_fail_if (sched->lid != MAC_LLID_MIN);
test_fail_if (sched->cco_tx_duration !=
2 * MAC_DX567_TCK + 18 * MAC_DX417_TCK);
sched = cp_eoc_cco_bw_sched_read (&cp, &list_node);
test_fail_if (sched->tei != 5);
- test_fail_if (sched->lid != 1);
+ test_fail_if (sched->lid != MAC_LLID_MIN);
test_fail_if (sched->cco_tx_duration !=
2 * MAC_DX567_TCK + 18 * MAC_DX417_TCK);
diff --git a/cesar/mac/common/src/mfs.c b/cesar/mac/common/src/mfs.c
index d859c8524d..a9604b73ea 100644
--- a/cesar/mac/common/src/mfs.c
+++ b/cesar/mac/common/src/mfs.c
@@ -15,6 +15,8 @@
#include "mac/common/mfs.h"
#include "mac/common/defs.h"
+#include "config/mac/common.h"
+
static void
mfs_common_init (mfs_common_t *mfs_common, bool tx, bool bcast, bool mme, uint
lid, uint tei)
@@ -61,7 +63,14 @@ mfs_tx_init (mfs_tx_t *mfs, bool bcast, bool mme, uint lid, uint tei)
|| (!bcast && MAC_TEI_IS_STA (tei))
|| (!bcast && mme && tei == MAC_TEI_UNASSOCIATED));
mfs_common_init (&mfs->common, true, bcast, mme, lid, tei);
- mfs->cfp = false;
+ if(CONFIG_MAC_COMMON_EOC_MFS)
+ {
+ mfs->cfp = true;
+ }
+ else
+ {
+ mfs->cfp = false;
+ }
mfs->burst_count = 0;
heap_node_init (&mfs->ca_prio_link);
list_init_node (&mfs->ca_held_link);
@@ -83,4 +92,3 @@ mfs_tx_init (mfs_tx_t *mfs, bool bcast, bool mme, uint lid, uint tei)
mfs->beacon = false;
mfs->pending_jobs = 0;
}
-