summaryrefslogtreecommitdiff
path: root/mac/sar/test/maximus_test
diff options
context:
space:
mode:
authorlaranjeiro2007-12-17 08:34:22 +0000
committerlaranjeiro2007-12-17 08:34:22 +0000
commit1489ee73b377d9e646c4f92f17ec957a028ce1b0 (patch)
tree50f85d0839bd8ea2fea00760db7f6d1938937378 /mac/sar/test/maximus_test
parentc37597c494d219f8d760bf026f74001cf9e96852 (diff)
Update the Test with the modifications of the SAR.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1151 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'mac/sar/test/maximus_test')
-rw-r--r--mac/sar/test/maximus_test/src/Maximus_sar.cpp4
-rw-r--r--mac/sar/test/maximus_test/src/Sta_sar.c12
2 files changed, 12 insertions, 4 deletions
diff --git a/mac/sar/test/maximus_test/src/Maximus_sar.cpp b/mac/sar/test/maximus_test/src/Maximus_sar.cpp
index c5fce74efa..adbc0f9b42 100644
--- a/mac/sar/test/maximus_test/src/Maximus_sar.cpp
+++ b/mac/sar/test/maximus_test/src/Maximus_sar.cpp
@@ -186,9 +186,9 @@ int launch_x_segs (int argc, char *argv[], sar_max_job_t *sar_max_job)
maximus.init (argc, argv);
Sta station1 = maximus.create_sta ();
- station1.debug ();
+ //station1.debug ();
Sta station2 = maximus.create_sta ();
- station2.debug ();
+ //station2.debug ();
// activate the sta 1 logs
Msg fc = maximus.create_fc ("activate_logs");
diff --git a/mac/sar/test/maximus_test/src/Sta_sar.c b/mac/sar/test/maximus_test/src/Sta_sar.c
index 65350496a5..ddb3ce954f 100644
--- a/mac/sar/test/maximus_test/src/Sta_sar.c
+++ b/mac/sar/test/maximus_test/src/Sta_sar.c
@@ -55,6 +55,9 @@
#include "common/std.h"
#include "host/station.h"
+#include "mac/ca/ca.h"
+#include "mac/pbproc/pbproc.h"
+
#include "mac/sar/sar.h"
#include "mac/sar/inc/sar_context.h"
#include "mac/sar/inc/sar.h"
@@ -126,6 +129,8 @@ u16 mix_up_pbs (pb_t **first, pb_t **last);
sar_t *sar_ctx;
mac_store_t *mac_store;
+ca_t *ca;
+pbproc_t *pbproc;
extern station_ctx_t my_station;
unsigned short msg_id;
@@ -187,6 +192,9 @@ int main (void)
station_log_set_mask (&my_station, STATION_LOGTYPE_ALL);
my_station.pipe_log_fd = 1;
+ ca = blk_alloc ();
+ pbproc = blk_alloc ();
+
packets[0] = (u8 *) packet1;
packets[1] = (u8 *) packet2;
packets[2] = (u8 *) packet3;
@@ -208,7 +216,7 @@ int main (void)
fcall_register (my_station.fcall, "activate_logs", &activate_logs, NULL);
mac_store = mac_store_init ();
- sar_ctx = sar_init (mac_store);
+ sar_ctx = sar_init (mac_store, pbproc, ca);
sar_init_measure_context (sar_ctx, sar_ctx);
sar_init_mme_context (sar_ctx, sar_ctx);
@@ -830,7 +838,7 @@ int reassembly (fcall_ctx_t *fcall, fcall_param_t **param, sci_msg_t **msg,
{
diag_printf ("[REA] buffer added : %p\n", sar_buffer);
}
- sar_buffer_add_data (sar_ctx, sar_buffer);
+ sar_data_buffer_add (sar_ctx, sar_buffer);
sar_launch (sar_ctx);
}