summaryrefslogtreecommitdiff
path: root/cesar/ce
diff options
context:
space:
mode:
Diffstat (limited to 'cesar/ce')
-rw-r--r--cesar/ce/rx/bitloading/inc/ber.h4
-rw-r--r--cesar/ce/rx/bitloading/src/ber.c139
2 files changed, 95 insertions, 48 deletions
diff --git a/cesar/ce/rx/bitloading/inc/ber.h b/cesar/ce/rx/bitloading/inc/ber.h
index 732cd8c833..2d3b268e75 100644
--- a/cesar/ce/rx/bitloading/inc/ber.h
+++ b/cesar/ce/rx/bitloading/inc/ber.h
@@ -24,7 +24,7 @@
/**
* Degree maximum of polynomial.
*/
-#define CE_RX_BL_BER_POLY_MAX_DEGREE 5
+#define CE_RX_BL_BER_POLY_MAX_DEGREE 2
/**
* Default theoretical BER value when NSR is under range.
@@ -44,7 +44,7 @@
/**
* Number maximum of polynomial per modulation.
*/
-#define CE_RX_BL_BER_POLY_PER_MOD 3
+#define CE_RX_BL_BER_POLY_PER_MOD 10
/**
* Quantification factor for the bit per tone.
diff --git a/cesar/ce/rx/bitloading/src/ber.c b/cesar/ce/rx/bitloading/src/ber.c
index e40cf1811c..77d479a776 100644
--- a/cesar/ce/rx/bitloading/src/ber.c
+++ b/cesar/ce/rx/bitloading/src/ber.c
@@ -26,79 +26,126 @@
*/
s64 ce_rx_bl_ber_margin_[] = { 0ll, 0ll };
-/* Imported from
+/* Imported from 2 files:
* http://stestephe/svn/spidcom_digital_svn/projects/DSP_350/DSP_chain/SW/Bit_Loading/BER_vs_NSR/Polynomes_BERinq_vs_NSRq_normalises.m
- * Revision: 18241.
+ * http://stestephe/svn/spidcom_digital_svn/projects/DSP_350/DSP_chain/SW/Bit_Loading/BitAllocationNSRLines.m
+ * Revision: 19108.
*/
ce_rx_bl_ber_poly_coef_t ce_rx_bl_ber_poly_coef[CE_MOD_COUNT - 1] =
{
{
- 1,
- { 3 },
- {
- { 2ll, -614142ll, 69770329856ll, -362383471042474ll },
- },
- { 5461, 131070 },
+ 5,
+ { 1,1,1,1,1 },
+ {
+ { 48707229072ll, -231502078889845ll },
+ { 51034114569ll, -255095996583158ll },
+ { 49101951152ll, -221873016034784ll },
+ { 34830906051ll, 169909117254752ll },
+ { 31231854645ll, 327698216309011ll },
+ },
+ { 5461,10138,17193,27451,43840,133705 },
},
{
- 1,
- { 3 },
- {
- { 21ll, -3182001ll, 154673115663ll, -388385849742766ll },
- },
- { 2654, 35212 },
+ 8,
+ { 1,1,1,1,1,1,1,1 },
+ {
+ { 106867077906ll, -247035833261242ll },
+ { 115226016318ll, -288276656914692ll },
+ { 109008654922ll, -238837611246974ll },
+ { 87714814011ll, -20038024183413ll },
+ { 69036631737ll, 223512099062993ll },
+ { 58835483755ll, 396512911174249ll },
+ { 39647808559ll, 816495774781217ll },
+ { 40020862919ll, 805934726920136ll },
+ },
+ { 2654,4932,7950,10274,13038,16957,21887,28308,92392 },
},
{
- 1,
- { 3 },
- {
- { 445ll, -19298713ll, 343639234529ll, -279649449376397ll },
- },
- { 854, 29538 },
+ 7,
+ { 1,1,1,1,1,1,1 },
+ {
+ { 233587358663ll, -171155435491478ll },
+ { 277235450254ll, -238059028343662ll },
+ { 250979527275ll, -173894916650781ll },
+ { 170121467858ll, 138759948740058ll },
+ { 120561024923ll, 454916356836180ll },
+ { 73528170603ll, 941003011986941ll },
+ { 46281993046ll, 1388661227541923ll },
+ },
+ { 854,1531,2442,3865,6378,10334,16429,67302 },
},
{
- 1,
- { 3 },
- {
- { 2204ll, -55355989ll, 564885755970ll, -264069612527883ll },
- },
- { 491, 17534 },
+ 7,
+ { 1,1,1,1,1,1,1 },
+ {
+ { 416967936517ll, -189160325514678ll },
+ { 464351365540ll, -234875159184782ll },
+ { 396074764261ll, -130220392038170ll },
+ { 273650540604ll, 170471217490103ll },
+ { 185629177496ll, 509911263344670ll },
+ { 109564768618ll, 973610181232647ll },
+ { 75999460853ll, 1316904718037186ll },
+ },
+ { 607,963,1531,2455,3855,6095,10226,41929 },
},
{
- 1,
- { 4 },
- {
- { -10ll, 134707ll, -659991499ll, 1736969891776ll, -177145201462823ll },
- },
- { 107, 4225 },
+ 9,
+ { 1,1,1,1,1,1,1,1,1 },
+ {
+ { 1195842099902ll, -116472031098039ll },
+ { 1541877600934ll, -182922717796973ll },
+ { 1432873345932ll, -149753660819387ll },
+ { 1051908742909ll, 32981592496052ll },
+ { 723479068330ll, 285933360045175ll },
+ { 552405600686ll, 494199375182367ll },
+ { 416730011388ll, 758328584740550ll },
+ { 236934801623ll, 1311288936216613ll },
+ { 121246948902ll, 1880002881788720ll },
+ },
+ { 121,191,303,478,769,1216,1945,3074,4914,21637 },
},
{
- 2,
- { 5, 2 },
- {
- { 1ll, -3453ll, 7709283ll, -8478165747ll, 5556178345777ll, -134510842708508ll }, { -364008233ll, 1538554532136ll, 694716911324961ll },
- },
- { 26, 716, 2000 },
+ 7,
+ { 1,1,1,1,1,1,1 },
+ {
+ { 4928645393988ll, -136377286929978ll },
+ { 4256324898860ll, -84804952052015ll },
+ { 2698880614434ll, 154178754550135ll },
+ { 1686129960873ll, 463628500311706ll },
+ { 1057111588868ll, 848637525966814ll },
+ { 489834158584ll, 1535265641130321ll },
+ { 188319045722ll, 2275983211494540ll },
+ },
+ { 39,76,152,305,611,1209,2456,11828 },
},
{
- 3,
- { 5, 5, 2 },
- {
- { -2176940ll, 501510782ll, -42003152968ll, 1463943172712ll, -5749724784237ll, 7848129503347ll }, { 2ll, -8614ll, 15590615ll, -14246266067ll, 7477723391941ll, 320248474620364ll }, { -187676521ll, 983964789862ll, 1638081773113356ll },
- },
- { 2, 80, 800, 1200 },
+ 8,
+ { 1,1,1,1,1,1,1,1 },
+ {
+ { 15193205993312ll, -96041022323229ll },
+ { 15420451694819ll, -99599159146680ll },
+ { 10303752668273ll, 57836000947648ll },
+ { 6595162108049ll, 286536853846374ll },
+ { 3893159790166ll, 613725600089774ll },
+ { 2248929120557ll, 1009209348320871ll },
+ { 995369059154ll, 1606569684183974ll },
+ { 439141615597ll, 2153227132873060ll },
+ },
+ { 8,15,30,61,120,240,476,982,5351 },
},
};
static const s64
-ce_rx_bl_ber_consign_coefs_av[PHY_FEC_RATE_NB][CE_RX_BL_BER_POLY_MAX_DEGREE] = {
+ce_rx_bl_ber_consign_coefs_av[PHY_FEC_RATE_NB][CE_RX_BL_BER_POLY_MAX_DEGREE] =
+{
{ -106541828252ll, 841188148187808ll },
{ -5639041049ll, 127893477397182ll },
};
static const u8 ce_rx_bl_ber_consign_degrees_av[PHY_FEC_RATE_NB] = { 1, 1, };
static const s64
-ce_rx_bl_ber_consign_coefs_eoc[PHY_FEC_RATE_NB][CE_RX_BL_BER_POLY_MAX_DEGREE] = {
+ce_rx_bl_ber_consign_coefs_eoc[PHY_FEC_RATE_NB][CE_RX_BL_BER_POLY_MAX_DEGREE] =
+{
{ 520279884440399ll },
{ 39597018917606ll },
};