summaryrefslogtreecommitdiff
path: root/mac
diff options
context:
space:
mode:
authorlaranjeiro2007-09-27 09:18:00 +0000
committerlaranjeiro2007-09-27 09:18:00 +0000
commit47ff525d5b44fc5df556f609854401673fe35409 (patch)
treed660045fdb74dcd33c94b4f8f7261871a3f7b26b /mac
parentfa277808fc5bd2729cbf86b9998f8c1bc4c297c9 (diff)
removed the number of the mfs in the sar unit test segmentation_complete.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@755 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'mac')
-rw-r--r--mac/sar/test/maximus_test/src/Maximus_sar.cpp12
-rw-r--r--mac/sar/test/maximus_test/src/Sta_sar.c3
-rw-r--r--mac/sar/test/unit_test/segmentation_complete/src/segmentation_complete.c1
3 files changed, 7 insertions, 9 deletions
diff --git a/mac/sar/test/maximus_test/src/Maximus_sar.cpp b/mac/sar/test/maximus_test/src/Maximus_sar.cpp
index b457286c20..adbc0f9b42 100644
--- a/mac/sar/test/maximus_test/src/Maximus_sar.cpp
+++ b/mac/sar/test/maximus_test/src/Maximus_sar.cpp
@@ -38,9 +38,6 @@ using namespace std;
#include "mac/sar/test/maximus_test/inc/blk_t.h"
#include "mac/sar/test/maximus_test/inc/max_job.h"
-#define debug_info true
-#define PACKETS_ARRAY_LENGTH 2
-
typedef void (station_cb_t) (Msg &msg);
/**
@@ -191,7 +188,7 @@ int launch_x_segs (int argc, char *argv[], sar_max_job_t *sar_max_job)
Sta station1 = maximus.create_sta ();
//station1.debug ();
Sta station2 = maximus.create_sta ();
-// station2.debug ();
+ //station2.debug ();
// activate the sta 1 logs
Msg fc = maximus.create_fc ("activate_logs");
@@ -252,8 +249,9 @@ void station1_cb (Msg &msg)
void *msg_return;
blk_t *blk;
- char * buffer = new char [FUNCTION_CALL_PARAM_MAX_SIZE];
- unsigned long length = FUNCTION_CALL_PARAM_MAX_SIZE*sizeof(char);
+ //char * buffer = new char [FUNCTION_CALL_PARAM_MAX_SIZE];
+ char * buffer = new char [512];
+ unsigned long length = 512*sizeof(char);
// Try to get the error message if the segmentation fail.
msg_return = msg.bind_param ("type", length, (unsigned char * &) buffer);
@@ -274,7 +272,7 @@ void station1_cb (Msg &msg)
strcpy (id, "pb");
strcat (id, value);
- length = FUNCTION_CALL_PARAM_MAX_SIZE*sizeof(char);
+ length = 512*sizeof(char);
msg_return = msg.bind_param (id, length,
(unsigned char * &) buffer);
diff --git a/mac/sar/test/maximus_test/src/Sta_sar.c b/mac/sar/test/maximus_test/src/Sta_sar.c
index 7143f2ca50..f0f340c87a 100644
--- a/mac/sar/test/maximus_test/src/Sta_sar.c
+++ b/mac/sar/test/maximus_test/src/Sta_sar.c
@@ -61,6 +61,7 @@
#include "mac/sar/test/inc/reassembly_unit_test_functions.h"
#include "mac/sar/test/inc/eth_packets.h"
+#include "mac/sar/test/inc/ce.h"
#include "mac/sar/test/maximus_test/inc/max_job.h"
/**
@@ -200,7 +201,7 @@ int main (void)
sar_init_segmentation_mme_cb (&sar_ctx, sar_complete_segmentation_done);
mme_ctx = sar_init_reassembly_mme_cb (&sar_ctx,
sar_complete_reassembly_done);
- sar_init_measurement_cb (&sar_ctx, test_sar_rx_pb_measurement_cb);
+ sar_init_measurement_cb (&sar_ctx, ce_measurements);
sar_init_noise_cb (&sar_ctx, test_sar_rx_noise_cb);
sar_ctx.bridgedma_ctx = phy_bridgedma_init (NULL,
diff --git a/mac/sar/test/unit_test/segmentation_complete/src/segmentation_complete.c b/mac/sar/test/unit_test/segmentation_complete/src/segmentation_complete.c
index 69a41dfc0c..0f6f337338 100644
--- a/mac/sar/test/unit_test/segmentation_complete/src/segmentation_complete.c
+++ b/mac/sar/test/unit_test/segmentation_complete/src/segmentation_complete.c
@@ -102,7 +102,6 @@ void segmentation_complete_init (test_t test)
mfs->common.expiration_date = 1000;
mfs->common.expiration_delay = 200;
- mfs->common.number = 0;
mfs->head = NULL;
mfs->tail = NULL;