summaryrefslogtreecommitdiff
path: root/cesar/ce/test/rx
diff options
context:
space:
mode:
authorlacour2009-04-14 15:30:01 +0000
committerlacour2009-04-14 15:30:01 +0000
commit160853e355b949b64baa66e55c9414cdd911e090 (patch)
treee1eaa029cc2a0ec0297b1021c14197e4c2db8a3b /cesar/ce/test/rx
parentfb0dacd59fb5df928f39f81f6465af3363201810 (diff)
[CE] Integration au CP.
- ce_init becomes rxce_init. - Split rx.h in ce/rx.h and ce/inc/rx.h (and tx) - Use bitstream to create/read CEI MME. - Integration of txce in CP and its fsm. - Fill other tonemap field (ble, bitperpb...). - Add Maximus test : Description : CCO/STA association. Data exchange. Bitloading. (initial step) CEI exchange. Tonemap used. TODO : Provide chandata_dma header table as interface with pbproc. Wait for development of chandata loading by pbproc. Check computation, exchange, and use of tonemap in the test. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@4456 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/ce/test/rx')
-rw-r--r--cesar/ce/test/rx/general/overide/cp/inc/context.h11
-rw-r--r--cesar/ce/test/rx/general/overide/cp/sta/mgr/src/sta_mgr.c11
-rwxr-xr-xcesar/ce/test/rx/general/src/test_cei.c22
-rwxr-xr-xcesar/ce/test/rx/general/src/test_sar_integration.c3
4 files changed, 34 insertions, 13 deletions
diff --git a/cesar/ce/test/rx/general/overide/cp/inc/context.h b/cesar/ce/test/rx/general/overide/cp/inc/context.h
new file mode 100644
index 0000000000..cb6888a736
--- /dev/null
+++ b/cesar/ce/test/rx/general/overide/cp/inc/context.h
@@ -0,0 +1,11 @@
+#ifndef overide_cp_inc_context_h
+#define overide_cp_inc_context_h
+#include "ce/tx.h"
+#include "ce/inc/tx.h"
+
+struct cp_t
+{
+ txce_t *txce;
+};
+
+#endif /* overide_cp_inc_context_h */
diff --git a/cesar/ce/test/rx/general/overide/cp/sta/mgr/src/sta_mgr.c b/cesar/ce/test/rx/general/overide/cp/sta/mgr/src/sta_mgr.c
index 64566fbf96..dbab541119 100644
--- a/cesar/ce/test/rx/general/overide/cp/sta/mgr/src/sta_mgr.c
+++ b/cesar/ce/test/rx/general/overide/cp/sta/mgr/src/sta_mgr.c
@@ -27,3 +27,14 @@ cp_sta_mgr_get_our_avln (cp_t *ctx)
return 0;
}
+mac_t
+cp_sta_own_data_get_mac_address (cp_t *ctx)
+{
+ return 0xbbccddee00;
+}
+
+bool
+cp_sta_own_data_get_authenticated_status (cp_t *ctx)
+{
+ return true;
+}
diff --git a/cesar/ce/test/rx/general/src/test_cei.c b/cesar/ce/test/rx/general/src/test_cei.c
index 76b4c44904..f31e92b6ba 100755
--- a/cesar/ce/test/rx/general/src/test_cei.c
+++ b/cesar/ce/test/rx/general/src/test_cei.c
@@ -27,14 +27,14 @@ test_exchange (test_t test, tonemaps_t *rx_tms, tonemaps_t *tx_tms,
{
u8 buffer[1536];
bitstream_t bitstream_ctx;
+ bitstream_t reader;
int i; for (i=0; i<1536; i++) buffer[i]=0;
bitstream_write_init (&bitstream_ctx, buffer, 1536);
create_tm (rx_tms, mask, tmi, max_rnd, offset);
ce_print_tonemaps (rx_tms);
cei_create (buffer, &bitstream_ctx, mask, rx_tms, tmi, TONEMAP_INDEX_NULL);
- ce_print_buffer (buffer, 1024);
- cei_decode (tx_tms, CM_CHAN_EST_IND, buffer, mask);
- ce_print_tonemaps (tx_tms);
+ bitstream_read_init (&reader, buffer, 1536);
+ cei_decode (tx_tms, CM_CHAN_EST_IND, &reader, mask);
compare_tonemaps (test, rx_tms, tx_tms, mask);
}
@@ -51,10 +51,10 @@ main (int argc, char **argv)
tonemaps_t *rx_tms = tonemaps_alloc();
tonemaps_t *tx_tms = tonemaps_alloc();
test_case_begin (test, "CE-cei-full mask");
- test_exchange (test, rx_tms, tx_tms, mask, 0, 3, 1);
- test_exchange (test, rx_tms, tx_tms, mask, 1, 2, 6);
- test_exchange (test, rx_tms, tx_tms, mask, 2, 1, 3);
- test_exchange (test, rx_tms, tx_tms, mask, 3, 0, 3);
+ test_exchange (test, rx_tms, tx_tms, mask, 4, 3, 1);
+ test_exchange (test, rx_tms, tx_tms, mask, 5, 2, 6);
+ test_exchange (test, rx_tms, tx_tms, mask, 6, 1, 3);
+ test_exchange (test, rx_tms, tx_tms, mask, 7, 0, 3);
tonemaps_release (rx_tms);
tonemaps_release (tx_tms);
test_begin (test, "check alloc/free")
@@ -66,10 +66,10 @@ main (int argc, char **argv)
tx_tms = tonemaps_alloc();
tonemask_default (mask);
test_case_begin (test, "CE-cei-default mask");
- test_exchange (test, rx_tms, tx_tms, mask, 0, 3, 1);
- test_exchange (test, rx_tms, tx_tms, mask, 1, 2, 6);
- test_exchange (test, rx_tms, tx_tms, mask, 2, 1, 3);
- test_exchange (test, rx_tms, tx_tms, mask, 3, 0, 3);
+ test_exchange (test, rx_tms, tx_tms, mask, 4, 3, 1);
+ test_exchange (test, rx_tms, tx_tms, mask, 5, 2, 6);
+ test_exchange (test, rx_tms, tx_tms, mask, 6, 1, 3);
+ test_exchange (test, rx_tms, tx_tms, mask, 7, 0, 3);
tonemaps_release (rx_tms);
tonemaps_release (tx_tms);
test_begin (test, "check alloc/free")
diff --git a/cesar/ce/test/rx/general/src/test_sar_integration.c b/cesar/ce/test/rx/general/src/test_sar_integration.c
index 8290a61060..69f1e608d3 100755
--- a/cesar/ce/test/rx/general/src/test_sar_integration.c
+++ b/cesar/ce/test/rx/general/src/test_sar_integration.c
@@ -109,6 +109,7 @@ emul_reassembly (int pb_nb, uint date, pbproc_rx_params_t **rx_params,
(*rx_params)->tei = 1;
(*rx_params)->lid = 1;
}
+
void
run_one_reassembly (sar_t *sar_ctx, uint pb_nb)
{
@@ -210,7 +211,6 @@ frame_process (cyg_addrword_t data)
}
} test_end;
END (sar_ctx, sta, ca);
-
test_case_begin (test, "Several sound frames and rxce late");
START (&sar_ctx, &sta, &ca);
test_begin (test, "check rxce status")
@@ -261,7 +261,6 @@ frame_process (cyg_addrword_t data)
}
} test_end;
END (sar_ctx, sta, ca);
-
mac_store_uninit (mac_store_ctx);
rxce_trace_print (rxce_ctx);
rxce_trace_uninit (rxce_ctx);