summaryrefslogtreecommitdiff
path: root/cesar/mac/sar
diff options
context:
space:
mode:
authorlaranjeiro2009-12-14 08:50:29 +0000
committerlaranjeiro2009-12-14 08:50:29 +0000
commit78a42f927c58fdf745c90dedb7359aad0396a808 (patch)
tree2acfa5bfceb28fd4c325baf50da8ba88e9cdd7c6 /cesar/mac/sar
parent6640efb0d94ce4cfe95a60381f8716a2d2f94802 (diff)
cesar/mac/sar: remove stdio call and memset
* Remove all useless memset from unit tests and source code. * Include string in files which needs memset. * Initialise mac_config in several test cause of the mac_ntb() function which use the offset tick value in it. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6538 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/mac/sar')
-rw-r--r--cesar/mac/sar/src/sar.c2
-rw-r--r--cesar/mac/sar/src/sar_expiration.c4
-rw-r--r--cesar/mac/sar/test/functional/src/test_functions.c1
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/activate.c7
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/crc_error.c3
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/detect_mf.c5
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/expiration.c6
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/mfs_create.c5
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/mfs_ssn_resize.c2
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/msdu_timeout.c2
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/reassembly.c43
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/reassembly_measurement.c5
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/reassembly_two_jobs.c2
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/sar_call_back_ul.c12
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/sar_manage_expiration.c14
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/sar_mf_function_test.c1
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/sar_remove_sta.c2
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/sar_tx_job_desc_create.c1
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/src/segmentation.c2
-rw-r--r--cesar/mac/sar/test/unit_test/host/src/lib_sar_mf.c1
20 files changed, 50 insertions, 70 deletions
diff --git a/cesar/mac/sar/src/sar.c b/cesar/mac/sar/src/sar.c
index 7ca3d310cd..84293f9820 100644
--- a/cesar/mac/sar/src/sar.c
+++ b/cesar/mac/sar/src/sar.c
@@ -27,8 +27,8 @@
#include "hal/arch/arch.h"
#include "common/defs/priority.h"
-
#include "config/sar.h"
+#include <string.h>
#define SAR_PBPOOL_SIZE 250
diff --git a/cesar/mac/sar/src/sar_expiration.c b/cesar/mac/sar/src/sar_expiration.c
index a3f0bbf8a0..88f48c3c51 100644
--- a/cesar/mac/sar/src/sar_expiration.c
+++ b/cesar/mac/sar/src/sar_expiration.c
@@ -18,9 +18,7 @@
#include "mac/sar/inc/sar_context.h"
#include "mac/sar/inc/sar_expiration.h"
#include "mac/sar/inc/trace.h"
-
#include "mac/common/ntb.h"
-#include "string.h"
/**
* Get the expiration date of the MFS from the PB expiration date or the MFS
@@ -102,8 +100,6 @@ sar_expiration_init (sar_t *ctx, mac_store_t *mac_store,
dbg_assert (mac_store);
dbg_assert (ca);
- memset (ctx, 0, sizeof (sar_expiration_t));
-
// init the expiration mechanism for the PBs and MFSs.
heap_init (&ctx->expiration.mfs_expiration_heap, sar_expiration_mfs_less);
diff --git a/cesar/mac/sar/test/functional/src/test_functions.c b/cesar/mac/sar/test/functional/src/test_functions.c
index 029aa7f382..7bd89584de 100644
--- a/cesar/mac/sar/test/functional/src/test_functions.c
+++ b/cesar/mac/sar/test/functional/src/test_functions.c
@@ -27,7 +27,6 @@
#include "hal/trace/trace.h"
#include "hal/phy/inc/bridgedma_soft.h"
-#include <stdio.h>
#include <cyg/kernel/kapi.h>
#include <cyg/hal/hal_arch.h>
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/activate.c b/cesar/mac/sar/test/unit_test/ecos/src/activate.c
index 8143a4a5e0..da9cb107ad 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/activate.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/activate.c
@@ -34,6 +34,8 @@ test_case__sar_activate_segmentation_done (void *user,
void
test_case__sar_activate (test_t test)
{
+ mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
test_case_begin (test, "SAR not activate with some jobs");
test_begin (test, "SAR not activate")
@@ -43,7 +45,6 @@ test_case__sar_activate (test_t test)
pbproc_t *pbproc;
ca_t *ca;
uint phy;
- mac_config_t mac_config;
uint nb_jobs = 3;
sar_job_mfs_t *jobs[nb_jobs];
@@ -151,7 +152,6 @@ test_case__sar_activate (test_t test)
pbproc_t *pbproc;
ca_t *ca;
uint phy;
- mac_config_t mac_config;
pbproc_rx_desc_t *rx_desc;
pb_t *pb_first;
@@ -201,6 +201,8 @@ test_case__sar_activate (test_t test)
void
test_case__sar_dissociate (test_t test)
{
+ mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
test_case_begin (test, "Station associated going to unassoc mode.");
test_begin (test, "SAR")
@@ -210,7 +212,6 @@ test_case__sar_dissociate (test_t test)
pbproc_t *pbproc;
ca_t *ca;
uint phy;
- mac_config_t mac_config;
bool added;
mfs_t *mfs;
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/crc_error.c b/cesar/mac/sar/test/unit_test/ecos/src/crc_error.c
index b5894053b7..96ae3f0dfd 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/crc_error.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/crc_error.c
@@ -36,6 +36,7 @@ test_crc_error_init (test_crc_error_ctx_t *test_ctx)
dbg_assert (test_ctx);
/* Initialise the mac NTB. */
+ test_ctx->mac_config.ntb_offset_tck = 0;
mac_ntb_init (INVALID_PTR, &test_ctx->mac_config);
/* Initialise the store. */
@@ -86,8 +87,6 @@ test_suite_crc_error_fill_mpdu (sar_mpdu_t *sar_mpdu)
{
dbg_assert (sar_mpdu);
- memset (sar_mpdu, 0, sizeof (sar_mpdu_t));
-
sar_mpdu->expiration_ntb = 0xffffffff;
sar_mpdu->rx.params.tei = 1;
sar_mpdu->rx.params.lid = 2;
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/detect_mf.c b/cesar/mac/sar/test/unit_test/ecos/src/detect_mf.c
index 1ae1ebba6e..5241f732b1 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/detect_mf.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/detect_mf.c
@@ -19,8 +19,7 @@
#include "lib/blk.h"
#include "mac/sar/sar.h"
#include "mac/sar/inc/sar_job_mfs.h"
-
-#include "stdio.h"
+#include <string.h>
sar_job_mfs_t *
sar_rx_mfs_detect_and_reconstitute_mf (sar_t *ctx, mfs_rx_t *mfs);
@@ -86,7 +85,6 @@ test_case_sar_detect_mf (test_t test)
bitstream_direct_write (pb_first->data, 2, 1420, 14);
mfs = blk_alloc ();
- memset (mfs, 0, sizeof (BLK_SIZE));
mfs_rx_init (mfs, false, false, 1, 1);
mfs->head = pb_first;
@@ -123,7 +121,6 @@ test_case_sar_detect_mf (test_t test)
ETH_PACKET_MIN_SIZE_ALLOWED - 2, 14);
mfs = blk_alloc ();
- memset (mfs, 0, sizeof (BLK_SIZE));
mfs_rx_init (mfs, false, false, 1, 1);
mfs->head = pb_first;
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/expiration.c b/cesar/mac/sar/test/unit_test/ecos/src/expiration.c
index 54c2ec2630..32097802f0 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/expiration.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/expiration.c
@@ -29,6 +29,8 @@
void
test_reassembly_process_expired_mfs (test_t test)
{
+ mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
test_case_begin (test, "MFS with PBs");
test_begin (test, "MFS should not expire")
@@ -39,7 +41,6 @@ test_reassembly_process_expired_mfs (test_t test)
mac_store_t *mac_store;
mfs_rx_t *mfs;
bool added;
- mac_config_t mac_config;
pb_t *mfs_pb_last;
mac_ntb_init ((phy_t *) &ca, &mac_config);
@@ -94,7 +95,6 @@ test_reassembly_process_expired_mfs (test_t test)
mac_store_t *mac_store;
mfs_rx_t *mfs;
bool added;
- mac_config_t mac_config;
pb_t *mfs_pb_last;
mac_ntb_init ((phy_t *) &ca, &mac_config);
@@ -144,9 +144,9 @@ test_expiration_tx_rx (test_t test)
mac_config_t mac_config;
sar_t *sar = NULL;
+ mac_config.ntb_offset_tck = 0;
test_case_begin (test, "Expiration MFS");
- memset (&mac_config, 0, sizeof (mac_config));
mac_store = mac_store_init ();
mac_ntb_init ((phy_t *) &phy, &mac_config);
sar = sar_init (mac_store, (pbproc_t *) &pbproc, (ca_t *) &ca, 0x1);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/mfs_create.c b/cesar/mac/sar/test/unit_test/ecos/src/mfs_create.c
index 3ebcbd9578..af7df5af01 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/mfs_create.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/mfs_create.c
@@ -29,7 +29,7 @@
#include "mac/sar/inc/sar.h"
#include "ce/rx/rx.h"
-#include <stdio.h>
+#include <string.h>
/* Stubs. */
bool ce_measurements (void *user, pbproc_rx_params_t *rx_params, uint pb_nb,
@@ -45,13 +45,12 @@ void test_without_mfs (test_t test, uint lid, bool mme, bool bcast)
sar_t *sar_ctx = NULL;
mac_store_t *mac_store = NULL;
+ mac_config.ntb_offset_tck = 0;
uint pbproc = 0;
uint ca = 0;
uint phy = 0;
// init the store and the sar
- memset (&mac_config, 0, sizeof (mac_config_t));
-
mac_store = mac_store_init ();
ce_rx_init (INVALID_PTR, INVALID_PTR, INVALID_PTR, INVALID_PTR);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/mfs_ssn_resize.c b/cesar/mac/sar/test/unit_test/ecos/src/mfs_ssn_resize.c
index 4e4d715b40..41540c5483 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/mfs_ssn_resize.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/mfs_ssn_resize.c
@@ -16,8 +16,6 @@
#include "mac/sar/sar.h"
#include "mac/common/ntb.h"
-#include "stdio.h"
-
/* Stubbed modules. */
#include "ce/rx/rx.h"
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/msdu_timeout.c b/cesar/mac/sar/test/unit_test/ecos/src/msdu_timeout.c
index 44bd23af51..709747177f 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/msdu_timeout.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/msdu_timeout.c
@@ -31,8 +31,8 @@ test_case__sar_msdu_expiration (test_t test)
uint phy;
test_case_begin (test, "MSDU expiration");
- memset (&mac_config, 0, sizeof (mac_config_t));
phy = 0;
+ mac_config.ntb_offset_tck = 0;
mac_ntb_init ((phy_t *) &phy, &mac_config);
test_begin (test, "MME Expiration")
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/reassembly.c b/cesar/mac/sar/test/unit_test/ecos/src/reassembly.c
index 1c4e6753cb..ee49d03add 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/reassembly.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/reassembly.c
@@ -31,6 +31,7 @@
#include "config/sar.h"
#include "ce/rx/rx.h"
+#include <string.h>
bool
sar_bridge_dma_interruption (void *user, u32 status_word);
@@ -78,8 +79,6 @@ test_fill_mpdu (sar_mpdu_t *sar_mpdu)
{
dbg_assert (sar_mpdu);
- memset (sar_mpdu, 0, sizeof (sar_mpdu_t));
-
sar_mpdu->expiration_ntb = 0xffffffff;
sar_mpdu->rx.params.tei = 1;
sar_mpdu->rx.params.lid = 2;
@@ -148,6 +147,8 @@ test_create_mpdu (sar_mpdu_t *mpdu, u16 ssn)
void
test_case_brodcast (test_t test)
{
+ mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
test_case_begin (test, "Broadcast links Full MPDU");
test_begin (test, "MPDU receive 0 1 2 and 6 7 8")
@@ -157,7 +158,6 @@ test_case_brodcast (test_t test)
uint pbproc;
uint ca;
uint phy;
- mac_config_t mac_config;
sar_mpdu_t mpdu;
pb_t *pb;
uint ssn;
@@ -227,7 +227,6 @@ test_case_brodcast (test_t test)
uint pbproc;
uint ca;
uint phy;
- mac_config_t mac_config;
sar_mpdu_t mpdu;
pb_t *pb;
uint ssn;
@@ -297,7 +296,6 @@ test_case_brodcast (test_t test)
uint pbproc;
uint ca;
uint phy;
- mac_config_t mac_config;
sar_mpdu_t mpdu;
pb_t *pb;
uint ssn;
@@ -369,7 +367,6 @@ test_case_brodcast (test_t test)
uint pbproc;
uint ca;
uint phy;
- mac_config_t mac_config;
sar_mpdu_t mpdu;
pb_t *pb;
uint ssn;
@@ -439,6 +436,8 @@ test_case_brodcast (test_t test)
void
test_case_unicast (test_t test)
{
+ mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
test_case_begin (test, "Unicast links Full MPDU");
test_begin (test, "MPDU ordered")
@@ -448,7 +447,6 @@ test_case_unicast (test_t test)
uint pbproc;
uint ca;
uint phy;
- mac_config_t mac_config;
sar_mpdu_t mpdu;
pb_t *pb;
uint ssn;
@@ -519,7 +517,6 @@ test_case_unicast (test_t test)
uint pbproc;
uint ca;
uint phy;
- mac_config_t mac_config;
sar_mpdu_t mpdu;
pb_t *pb;
uint ssn;
@@ -588,6 +585,8 @@ test_case_unicast (test_t test)
void
test_case_example (test_t test)
{
+ mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
/**
* An full example to test the reassembly Mac Frame detection.
* 11 PBs, missing PBs are, 3, 6, 8, 11.
@@ -605,7 +604,6 @@ test_case_example (test_t test)
uint pbproc;
uint ca;
uint phy;
- mac_config_t mac_config;
mfs_rx_t *mfs;
uint pb_ssn_list[] = {0, 1, 2, 4, 5, 7, 9, 10};
uint i;
@@ -715,7 +713,6 @@ test_case_example (test_t test)
uint pbproc;
uint ca;
uint phy;
- mac_config_t mac_config;
mfs_rx_t *mfs;
uint pb_ssn_list[] = {0, 1, 2, 4, 5};
uint i;
@@ -812,7 +809,6 @@ test_case_example (test_t test)
uint pbproc;
uint ca;
uint phy;
- mac_config_t mac_config;
mfs_rx_t *mfs;
uint pb_ssn_list[] = {0, 1, 2, 3};
uint i;
@@ -921,7 +917,6 @@ test_case_example (test_t test)
uint pbproc;
uint ca;
uint phy;
- mac_config_t mac_config;
mfs_rx_t *mfs;
uint pb_ssn_list[] = {2, 1, 0, 4, 5, 6};
uint i;
@@ -980,6 +975,8 @@ test_case_example (test_t test)
void
test_case_reassembly_one_pb_opsf (test_t test)
{
+ mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
test_case_begin (test, "OPSF");
test_begin (test, "1 PB, OPSF")
@@ -991,8 +988,7 @@ test_case_reassembly_one_pb_opsf (test_t test)
sar_mpdu_t rx;
sar_job_mfs_t *job;
uint toto;
- mac_config_t mac_config;
- uint phy;
+ uint phy = 0;
pb_t *mfs_pb_last;
mac_ntb_init ((phy_t*) &phy, &mac_config);
@@ -1005,17 +1001,22 @@ test_case_reassembly_one_pb_opsf (test_t test)
mfs = (mfs_rx_t *) mac_store_mfs_add (mac_store, false, false, false,
1, 1, &added);
mfs->head = (pb_t*) blk_alloc_desc_range (2, (blk_t **) &mfs_pb_last);
+ mfs->head->phy_pb.pb_rx.pb_measurement.crc_error = false;
+ mfs->head->next->phy_pb.pb_rx.pb_measurement.crc_error = false;
+
mfs_pb_last->next = NULL;
mfs->head->header.ssn = 0;
mfs->head->header.mfbo = 0;
mfs->head->header.mfbf = true;
mfs->head->header.vpbf = true;
+ mfs->head->header.mmqf = false;
mfs->head->next->header.ssn = 2;
mfs->head->next->header.mfbo = 0;
mfs->head->next->header.mfbf = true;
mfs->head->next->header.vpbf = true;
+ mfs->head->next->header.mmqf = false;
/* First Frame complete. */
bitstream_direct_write (mfs->head->data, 0, SAR_MF_TYPE_DATA, 2);
@@ -1033,9 +1034,10 @@ test_case_reassembly_one_pb_opsf (test_t test)
sar_mfs_add (ctx, (mfs_t *) mfs);
- memset (&rx, 0, sizeof (sar_mpdu_t));
rx.rx.params.lid = 1;
rx.rx.params.tei = 1;
+ rx.rx.params.bcast = false;
+ rx.rx.params.eks = MAC_EKS_MIN;
rx.rx.pb_nb = 1;
rx.rx.pb_first = (pb_t *) blk_alloc_desc ();
rx.rx.pb_last = rx.rx.pb_first;
@@ -1045,16 +1047,16 @@ test_case_reassembly_one_pb_opsf (test_t test)
rx.rx.params.mfs_cmd_data = MFS_FSM_CMD_RE_SYNC;
rx.rx.params.mfs_cmd_mme = MFS_FSM_CMD_NOP;
rx.rx.chandata_nb = 0;
+ rx.rx.chandata_first = NULL;
rx.expiration_ntb = mac_ntb() + 10;
- rx.rx.params.eks = MAC_EKS_MIN;
+ rx.rx.pb_first->header.mmqf = false;
rx.rx.pb_first->header.mfbo = 0;
rx.rx.pb_first->header.mfbf = 0;
rx.rx.pb_first->header.opsf = true;
rx.rx.pb_first->header.ssn = 3;
rx.rx.pb_first->header.vpbf = true;
rx.rx.pb_first->phy_pb.pb_rx.pb_measurement.crc_error = false;
-
sar_reassembly_run (ctx, &rx);
/* Verify... */
@@ -1083,6 +1085,8 @@ test_case_reassembly_one_pb_opsf (test_t test)
void
test_case_reassembly_severals_pb_groups (test_t test)
{
+ mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
test_case_begin (test, "Several Groups of PBs");
test_begin (test, "")
@@ -1094,7 +1098,6 @@ test_case_reassembly_severals_pb_groups (test_t test)
sar_t *sar;
mac_store_t *mac_store;
pb_t *pb;
- mac_config_t mac_config;
mac_ntb_init (INVALID_PTR, &mac_config);
mac_store = mac_store_init ();
@@ -1140,6 +1143,8 @@ test_case_reassembly_severals_pb_groups (test_t test)
void
test_case_reassembly (test_t test)
{
+ mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
test_case_begin (test, "Reassembly with all offsets");
test_begin (test, "do it")
@@ -1150,7 +1155,6 @@ test_case_reassembly (test_t test)
mfs_rx_t *mfs;
bool added;
u8 buffer[ETH_PACKET_MAX_SIZE];
- mac_config_t mac_config;
pbproc_rx_desc_t *rx_desc;
pb_t *pb_current;
uint ssn;
@@ -1158,7 +1162,6 @@ test_case_reassembly (test_t test)
uint j;
struct test_reassembly_completed_t rea_comp;
- memset (&mac_config, 0, sizeof (mac_config_t));
mac_ntb_init (INVALID_PTR, &mac_config);
/* Initialise the mac store. */
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/reassembly_measurement.c b/cesar/mac/sar/test/unit_test/ecos/src/reassembly_measurement.c
index 49062a1845..419813dba4 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/reassembly_measurement.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/reassembly_measurement.c
@@ -19,7 +19,7 @@
#include "mac/common/store.h"
#include "mac/common/ntb.h"
#include "ce/rx/rx.h"
-#include <stdio.h>
+#include <string.h>
#define NB_PB 200
@@ -36,12 +36,11 @@ test_case_ce_measures (test_t test)
uint pbproc = 0;
uint ca = 0;
uint phy = 0;
+ mac_config.ntb_offset_tck = 0;
blk_t *blk_curr;
uint blk_offset;
- memset (&mac_config, 0, sizeof (mac_config_t));
-
ce_ctx = ce_rx_init (INVALID_PTR, INVALID_PTR, INVALID_PTR, INVALID_PTR);
mac_store = mac_store_init ();
mac_ntb_init ((phy_t *) &phy, &mac_config);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/reassembly_two_jobs.c b/cesar/mac/sar/test/unit_test/ecos/src/reassembly_two_jobs.c
index 398f510b17..002c93d433 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/reassembly_two_jobs.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/reassembly_two_jobs.c
@@ -33,8 +33,6 @@
#include "ce/rx/rx.h"
-#include <stdio.h>
-
void sar_reassembly_done_stub (void *user, u8* buffer, uint length, mfs_rx_t *mfs, bool encrypted)
{
dbg_assert (user);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_call_back_ul.c b/cesar/mac/sar/test/unit_test/ecos/src/sar_call_back_ul.c
index d0d8073263..cf3a3353a8 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_call_back_ul.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/sar_call_back_ul.c
@@ -70,19 +70,17 @@ void
test_case_sar_ul (test_t test)
{
mac_store_t *mac_store;
- mac_config_t *mac_config;
pbproc_t *pbproc;
ca_t *ca;
- phy_t *phy;
+ mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
mac_store = mac_store_init ();
- mac_config = blk_alloc ();
- phy = blk_alloc ();
- mac_ntb_init (phy, mac_config);
- pbproc = pbproc_init (mac_config, mac_store);
+ pbproc = pbproc_init (&mac_config, mac_store);
ca = blk_alloc ();
sar_ctx = sar_init (mac_store, pbproc, ca, 0x1);
+ mac_ntb_init (INVALID_PTR, &mac_config);
sar_init_data_context (sar_ctx, &sar_ctx);
sar_init_mme_context (sar_ctx, &sar_ctx);
@@ -134,8 +132,6 @@ test_case_sar_ul (test_t test)
mac_store_uninit (mac_store);
mac_ntb_uninit();
blk_release (ca);
- blk_release (phy);
- blk_release (mac_config);
}
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_manage_expiration.c b/cesar/mac/sar/test/unit_test/ecos/src/sar_manage_expiration.c
index 2c284426ee..d00ebd0ae7 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_manage_expiration.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/sar_manage_expiration.c
@@ -42,10 +42,10 @@ bool seg_done;
sar_t *sar_ctx;
mac_store_t *mac_store;
-mac_config_t *mac_config;
pbproc_t *pbproc;
ca_t *ca;
-phy_t *phy;
+mac_config_t mac_config;
+uint phy;
void
sar_segmentation_done (void *user, u8* buffer)
@@ -207,17 +207,15 @@ test_expiration_test_init (void)
{
trace_init ();
+ mac_config.ntb_offset_tck = 0;
// init the sar and the store
mac_store = mac_store_init ();
- mac_config = blk_alloc ();
ca = blk_alloc ();
- phy = blk_alloc ();
+ phy = -1;
- *(u32*)phy = -1;
-
- mac_ntb_init (phy, mac_config);
pbproc = pbproc_init (mac_config, mac_store);
sar_ctx = sar_init (mac_store, pbproc, ca, 0x1);
+ mac_ntb_init ((phy_t*) &phy, mac_config);
sar_init_mme_context (sar_ctx, &sar_ctx);
// add a sta to the store.
@@ -236,9 +234,7 @@ test_expiration_test_uninit (void)
mac_store_uninit (mac_store);
pbproc_uninit (pbproc);
mac_ntb_uninit ();
- blk_release (mac_config);
blk_release (ca);
- blk_release (phy);
}
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_mf_function_test.c b/cesar/mac/sar/test/unit_test/ecos/src/sar_mf_function_test.c
index d247e94ec1..a7d16d8641 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_mf_function_test.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/sar_mf_function_test.c
@@ -13,7 +13,6 @@
#include <cyg/kernel/kapi.h>
#include <cyg/hal/hal_arch.h>
-#include <stdio.h>
#include "common/std.h"
#include "mac/sar/sar.h"
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_remove_sta.c b/cesar/mac/sar/test/unit_test/ecos/src/sar_remove_sta.c
index 1bafa238ee..77466c4710 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_remove_sta.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/sar_remove_sta.c
@@ -29,6 +29,7 @@ test_case_sar_sta_remove__station_without_mfs (test_t test)
pbproc_t *pbproc;
uint phy;
mac_config_t mac_config;
+ mac_config.ntb_offset_tck = 0;
test_case_begin (test, "Adding some station without MFS");
@@ -36,7 +37,6 @@ test_case_sar_sta_remove__station_without_mfs (test_t test)
{
uint i;
sta_t *sta;
- memset (&mac_config, 0, sizeof (mac_config_t));
mac_store = mac_store_init ();
ca = blk_alloc ();
pbproc = blk_alloc ();
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_tx_job_desc_create.c b/cesar/mac/sar/test/unit_test/ecos/src/sar_tx_job_desc_create.c
index 5a7dbeac91..94920d1c0c 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_tx_job_desc_create.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/sar_tx_job_desc_create.c
@@ -15,6 +15,7 @@
#include "lib/test.h"
#include "mac/sar/inc/sar_context.h"
+#include <string.h>
pb_t*
sar_tx_job_desc_create (sar_t *ctx, sar_msdu_t *md_data, mfs_tx_t * mfs,
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/segmentation.c b/cesar/mac/sar/test/unit_test/ecos/src/segmentation.c
index 59b454b828..9200b8e560 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/segmentation.c
+++ b/cesar/mac/sar/test/unit_test/ecos/src/segmentation.c
@@ -143,7 +143,7 @@ test_case_segmentation (test_t test)
mac_config_t mac_config;
sar_mf_t sar_mf;
- memset (&mac_config, 0, sizeof (mac_config_t));
+ mac_config_init (&mac_config);
mac_ntb_init (INVALID_PTR, &mac_config);
/* Initialise the mac store. */
mac_store = mac_store_init ();
diff --git a/cesar/mac/sar/test/unit_test/host/src/lib_sar_mf.c b/cesar/mac/sar/test/unit_test/host/src/lib_sar_mf.c
index 1256400d94..641ce6ed89 100644
--- a/cesar/mac/sar/test/unit_test/host/src/lib_sar_mf.c
+++ b/cesar/mac/sar/test/unit_test/host/src/lib_sar_mf.c
@@ -18,7 +18,6 @@
#include "lib/bitstream.h"
#include "mac/sar/sar_mf.h"
-#include <stdio.h>
#include <string.h>
void