summaryrefslogtreecommitdiff
path: root/cesar/cp
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-11-21 07:34:32 +0100
committerNélio Laranjeiro2012-12-12 13:04:11 +0100
commit6c1e90844f96797be4462ff832a0e8d31342232e (patch)
treeb5cfe0bf5e51e5de1664370aca676feef246ca0e /cesar/cp
parenta90e6b8378341fa7582ed3e7466713f1bd4b13eb (diff)
parente4e8dc666d13217ffbd663c7271dd3ca20008ca3 (diff)
Merge branch 'master-t3344-sar-configs' into eoc-drv-t3344-sar-configs
Conflicts: cesar/mac/sar/Config cesar/mac/sar/src/brg.c cesar/mac/sar/src/expiration.c cesar/mac/sar/src/mf_header.c cesar/mac/sar/src/rx.c
Diffstat (limited to 'cesar/cp')
-rw-r--r--cesar/cp/eoc/cco/action/src/cco_action.c4
-rw-r--r--cesar/cp/eoc/cco/action/test/utest_eoc/actions-Config1
-rw-r--r--cesar/cp/eoc/cco/action/test/utest_eoc/fsm-Config1
-rw-r--r--cesar/cp/eoc/multi_sta/action/test/utest/actions-Config3
-rw-r--r--cesar/cp/eoc/multi_sta/action/test/utest/fsm-Config1
-rw-r--r--cesar/cp/eoc/sta/action/src/assoc_slave.c4
-rw-r--r--cesar/cp/eoc/sta/action/test/utest/actions-Config1
-rw-r--r--cesar/cp/eoc/sta/action/test/utest/fsm-Config1
8 files changed, 5 insertions, 11 deletions
diff --git a/cesar/cp/eoc/cco/action/src/cco_action.c b/cesar/cp/eoc/cco/action/src/cco_action.c
index 3f48a6eecc..731bc44891 100644
--- a/cesar/cp/eoc/cco/action/src/cco_action.c
+++ b/cesar/cp/eoc/cco/action/src/cco_action.c
@@ -174,8 +174,8 @@ cp_eoc_cco_action_send_central_beacon (cp_t *ctx)
sprintf (temp, "cco=%d blk=%d sar[%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d]"
" pb[%d,%d]\n",
auth_time, blk_free_nb (),
- SUB_STAT (rx_jobs_count),
- ctx->sar->stats.rx_jobs_waiting_count,
+ SUB_STAT (rx_jobs_nb),
+ ctx->sar->stats.rx_jobs_waiting_nb,
SUB_STAT (rx_pb_count),
SUB_STAT (pb_data_before_ssn_min),
SUB_STAT (pb_data_duplicated),
diff --git a/cesar/cp/eoc/cco/action/test/utest_eoc/actions-Config b/cesar/cp/eoc/cco/action/test/utest_eoc/actions-Config
index a8d0824ce7..c052411539 100644
--- a/cesar/cp/eoc/cco/action/test/utest_eoc/actions-Config
+++ b/cesar/cp/eoc/cco/action/test/utest_eoc/actions-Config
@@ -6,7 +6,6 @@ CONFIG_CP_EOC_MULTI_STA_FSM_DEF="cp/eoc/multi_sta_fsm/src/fsm/multi_sta.fsm"
CONFIG_CP_MSG_EOC_MULTI_STA_MME = y
CONFIG_ATU_FACTOR = 3
CONFIG_MAC_COMMON_EOC_SCHED = y
-CONFIG_MAC_SAR_EOC_PERMANENT_MFS = y
CONFIG_CP_MSG_EOC_DRV_MME = y
CONFIG_MAC_COMMON_EOC_MFS = y
diff --git a/cesar/cp/eoc/cco/action/test/utest_eoc/fsm-Config b/cesar/cp/eoc/cco/action/test/utest_eoc/fsm-Config
index 727e6c8e14..474d63c1b6 100644
--- a/cesar/cp/eoc/cco/action/test/utest_eoc/fsm-Config
+++ b/cesar/cp/eoc/cco/action/test/utest_eoc/fsm-Config
@@ -6,4 +6,3 @@ CONFIG_CP_EOC_MULTI_STA_FSM_DEF="cp/eoc/multi_sta_fsm/src/fsm/multi_sta.fsm"
CONFIG_CP_MSG_EOC_MULTI_STA_MME = y
CONFIG_ATU_FACTOR = 3
CONFIG_MAC_COMMON_EOC_SCHED = y
-CONFIG_MAC_SAR_EOC_PERMANENT_MFS = y
diff --git a/cesar/cp/eoc/multi_sta/action/test/utest/actions-Config b/cesar/cp/eoc/multi_sta/action/test/utest/actions-Config
index b33953f564..53b2b131ce 100644
--- a/cesar/cp/eoc/multi_sta/action/test/utest/actions-Config
+++ b/cesar/cp/eoc/multi_sta/action/test/utest/actions-Config
@@ -9,7 +9,6 @@ CONFIG_MAC_COMMON_EOC_SCHED = y
CONFIG_TRACE_ON_FATAL = y
CONFIG_TRACE = n
CONFIG_CP_MSG_EOC_MULTI_STA_MME = y
-CONFIG_MAC_SAR_EOC_PERMANENT_MFS = y
CONFIG_MAC_COMMON_EOC_TEI = y
CONFIG_CL_EOC_ROUTE = y
-CONFIG_RESTRACK = y \ No newline at end of file
+CONFIG_RESTRACK = y
diff --git a/cesar/cp/eoc/multi_sta/action/test/utest/fsm-Config b/cesar/cp/eoc/multi_sta/action/test/utest/fsm-Config
index 21394fada0..4e2aa9e19f 100644
--- a/cesar/cp/eoc/multi_sta/action/test/utest/fsm-Config
+++ b/cesar/cp/eoc/multi_sta/action/test/utest/fsm-Config
@@ -6,7 +6,6 @@ CONFIG_CP_FSM_DEF = "cp/eoc/fsm/src/fsm/cp_eoc_cco.fsm"
CONFIG_MAC_PBPROC_EOC_FC = y
CONFIG_CP_EOC_SCHEDULER = y
CONFIG_MAC_COMMON_EOC_SCHED = y
-CONFIG_MAC_SAR_EOC_PERMANENT_MFS = y
CONFIG_MAC_COMMON_EOC_TEI = y
CONFIG_CP_STA_MGR_CCO_EOC = y
CONFIG_CP_EOC_DBG_PRINT_LEVEL = 1
diff --git a/cesar/cp/eoc/sta/action/src/assoc_slave.c b/cesar/cp/eoc/sta/action/src/assoc_slave.c
index 862e86e05c..9e6bff8dad 100644
--- a/cesar/cp/eoc/sta/action/src/assoc_slave.c
+++ b/cesar/cp/eoc/sta/action/src/assoc_slave.c
@@ -180,8 +180,8 @@ cp_eoc_sta_action_auth__beacon_received (cp_t *ctx, bsu_beacon_t *beacon,
sprintf (temp, "sta=%d snid=%d blk=%d"
" sar[%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d] pb[%d]\n",
auth_time, cp_sta_own_data_get_snid (ctx), blk_free_nb (),
- SUB_STAT (rx_jobs_count),
- ctx->sar->stats.rx_jobs_waiting_count,
+ SUB_STAT (rx_jobs_nb),
+ ctx->sar->stats.rx_jobs_waiting_nb,
SUB_STAT (rx_pb_count),
SUB_STAT (pb_data_before_ssn_min),
SUB_STAT (pb_data_duplicated),
diff --git a/cesar/cp/eoc/sta/action/test/utest/actions-Config b/cesar/cp/eoc/sta/action/test/utest/actions-Config
index 942f83f58f..64ad77436f 100644
--- a/cesar/cp/eoc/sta/action/test/utest/actions-Config
+++ b/cesar/cp/eoc/sta/action/test/utest/actions-Config
@@ -3,7 +3,6 @@ CONFIG_CP_MSG_EOC_DRV_MME = y
CONFIG_DEBUG_FATAL_CATCH = y
CONFIG_CP_FSM_DEF = "cp/eoc/fsm/src/fsm/cp_eoc_sta.fsm"
CONFIG_GPIO_LED_TRAFFIC = y
-CONFIG_MAC_SAR_EOC_PERMANENT_MFS = y
CONFIG_MAC_PBPROC_EOC_FC = y
CONFIG_MAC_COMMON_EOC_TONEMASK = y
CONFIG_CP_EOC_STA_CON_ALLOWED = n
diff --git a/cesar/cp/eoc/sta/action/test/utest/fsm-Config b/cesar/cp/eoc/sta/action/test/utest/fsm-Config
index cfd9d43a04..8e23e37b10 100644
--- a/cesar/cp/eoc/sta/action/test/utest/fsm-Config
+++ b/cesar/cp/eoc/sta/action/test/utest/fsm-Config
@@ -2,4 +2,3 @@ CONFIG_CP_EOC = y
CONFIG_CP_MSG_EOC_DRV_MME = y
CONFIG_DEBUG_FATAL_CATCH = y
CONFIG_CP_FSM_DEF = "cp/eoc/fsm/src/fsm/cp_eoc_sta.fsm"
-CONFIG_MAC_SAR_EOC_PERMANENT_MFS = y