summaryrefslogtreecommitdiff
path: root/ce
diff options
context:
space:
mode:
authorburet2008-01-23 15:41:15 +0000
committerburet2008-01-23 15:41:15 +0000
commit2246e7272ac30954e5612f7ad658bd86732c8286 (patch)
tree42f419cb201ed7f0bc35e856121491ed34aa58ad /ce
parent4d50dfce4fa1457e5983ba300686c1fa666e419c (diff)
Maximus V2: modification in CE Maximus tests.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1321 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'ce')
-rw-r--r--ce/test/maximus/overide/mac/pbproc/pbproc.h2
-rw-r--r--ce/test/maximus/overide/mac/pbproc/src/pbproc.c14
-rw-r--r--ce/test/maximus/send_noise.py1
-rw-r--r--ce/test/maximus/src/test_rx.c9
4 files changed, 21 insertions, 5 deletions
diff --git a/ce/test/maximus/overide/mac/pbproc/pbproc.h b/ce/test/maximus/overide/mac/pbproc/pbproc.h
index f8d1b976b4..d8a3d5f278 100644
--- a/ce/test/maximus/overide/mac/pbproc/pbproc.h
+++ b/ce/test/maximus/overide/mac/pbproc/pbproc.h
@@ -99,6 +99,8 @@ int set_tonemask (fcall_ctx_t *fcall, fcall_param_t **param, sci_msg_t **msg, vo
int prepare_rx (fcall_ctx_t *fcall, fcall_param_t **param, sci_msg_t **msg, void *data);
+int maximus_rx_cb (fcall_ctx_t *fcall, fcall_param_t **param, sci_msg_t **msg, void *data);
+
pbproc_t *
pbproc_init (mac_config_t *config, mac_store_t *store);
diff --git a/ce/test/maximus/overide/mac/pbproc/src/pbproc.c b/ce/test/maximus/overide/mac/pbproc/src/pbproc.c
index 9ccef7e411..41aa9946bc 100644
--- a/ce/test/maximus/overide/mac/pbproc/src/pbproc.c
+++ b/ce/test/maximus/overide/mac/pbproc/src/pbproc.c
@@ -74,7 +74,7 @@ bool phy_pbdma_cb (void *user, u32 status_word)
ce_print ("phy_pbdma_cb ******* PB NB = %d\n",rx_pb_nb);
rx_params.tei = 1;
rx_params.lid = 0;
- pbproc_global.rx_cb (sar_ctx, NULL, NULL, &rx_params, (pb_t *) rx_pb_first,(pb_t *) rx_pb_last, rx_pb_nb,(pb_t *) rx_chandata_first);
+ //pbproc_global.rx_cb (sar_ctx, NULL, NULL, &rx_params, (pb_t *) rx_pb_first,(pb_t *) rx_pb_last, rx_pb_nb,(pb_t *) rx_chandata_first);
return true;
}
@@ -200,6 +200,18 @@ int prepare_rx (fcall_ctx_t *fcall, fcall_param_t **param, sci_msg_t **msg, void
return 0;
}
+int maximus_rx_cb (fcall_ctx_t *fcall, fcall_param_t **param, sci_msg_t **msg, void *data)
+{
+ ce_print("=> maximus_rx_cb\n");
+
+ pbproc_global.rx_cb (sar_ctx, NULL, NULL, &rx_params, (pb_t *) rx_pb_first,(pb_t *) rx_pb_last, rx_pb_nb,(pb_t *) rx_chandata_first);
+
+ /* now make the return parameter list */
+ fcall_param_reset(*param);
+
+ return 0;
+}
+
pbproc_t *
pbproc_init (mac_config_t *config, mac_store_t *store)
{
diff --git a/ce/test/maximus/send_noise.py b/ce/test/maximus/send_noise.py
index 11b017a028..bff82e4f82 100644
--- a/ce/test/maximus/send_noise.py
+++ b/ce/test/maximus/send_noise.py
@@ -78,6 +78,7 @@ def send_queue():
for i in range(frame_nb) :
prepare_rx_param_init().send(sta)
send_queue()
+ maximus.create_fcall('maximus_rx_cb').send(sta)
ce_check_stock_fcall.send(sta)
ce_start_fcall.send(sta)
diff --git a/ce/test/maximus/src/test_rx.c b/ce/test/maximus/src/test_rx.c
index 1ef81b9a59..ccc228e321 100644
--- a/ce/test/maximus/src/test_rx.c
+++ b/ce/test/maximus/src/test_rx.c
@@ -120,11 +120,11 @@ ce_check_stock (fcall_ctx_t *fcall, fcall_param_t **param, sci_msg_t **msg, void
}
pb_measurement_t m = *(ber_blk->data+(pb_ix%(BLK_SIZE/sizeof(pb_measurement_t))));
//dbg_assert (m.halfit == 0x04);
- //dbg_assert ( m.ber == (1<< ((pb_ix%31)%16)) );
- //dbg_assert ( m.crc_error == ((pb_ix%31)%2) );
+ //dbg_assert ( m.ber == (1<< (pb_ix%16)) );
+ //dbg_assert ( m.crc_error == (pb_ix%2) );
test_fail_if (m.halfit != 0x04);
- test_fail_if ( m.ber != (1<< ((pb_ix%31)%16)) );
- test_fail_if ( m.crc_error != ((pb_ix%31)%2) );
+ test_fail_if ( m.ber != (1<< (pb_ix%16)) );
+ test_fail_if ( m.crc_error != (pb_ix%2) );
}
//phy_chandata_t *nrj_symbol = fm_stock[fm_ix].type_head[PHY_CHANDATA_TYPE_NRJ_SYMBOL];
}
@@ -178,6 +178,7 @@ int main(void)
fcall_register(my_station.fcall, "ce_check_computation", (void*)&ce_check_computation, NULL);
fcall_register(my_station.fcall, "set_tonemask", (void*)&set_tonemask, NULL);
fcall_register(my_station.fcall, "prepare_rx", (void*)&prepare_rx, NULL);
+ fcall_register(my_station.fcall, "maximus_rx_cb", (void*)&maximus_rx_cb, NULL);
fcall_register(my_station.fcall, "test_result_get", (void*)&test_result_get, NULL);
tonemask_default ((u8 *)(&(mac_config_ctx.tonemask_info.tonemask)));