Commit a7a44c2f authored by villa's avatar villa

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4002 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 762dfbe3
...@@ -948,40 +948,29 @@ u32 _allocRBs(options_t *opts,int ind) ...@@ -948,40 +948,29 @@ u32 _allocRBs(options_t *opts,int ind)
else else
allocRB=0x1e00; allocRB=0x1e00;
break; break;
case 91: // 17/8 case 91: // 2/23 force the 2nd round with QPSK
if (ind==0) { if (ind==0) {
allocRB=0x1fe1; allocRB=0x1000;
opts->mcs=3;} opts->mcs=4;}
else else{
allocRB=0x1e; allocRB=0xfff;
break; opts->mcs=2;}
case 92: // 17/8
if (ind==0) {
allocRB=0xff1;
opts->mcs=3;}
else
allocRB=0x100e;
break;
case 93: // 17/8
if (ind==0) {
allocRB=0x7f9;
opts->mcs=3;}
else
allocRB=0x1806;
break; break;
case 94: // 17/8 case 92: // 6/19 force the 2nd round with QPSK
if (ind==0) { if (ind==0) {
allocRB=0x199f; allocRB=0x1c00;
opts->mcs=3;} opts->mcs=11;}
else else{
allocRB=0x660; allocRB=0x3ff;
opts->mcs=2;}
break; break;
case 95: // 17/8 case 93: // 4/21 force the 2nd round with QPSK
if (ind==0) { if (ind==0) {
allocRB=0x1e1f; allocRB=0x1800;
opts->mcs=3;} opts->mcs=14;}
else else{
allocRB=0x1e0; allocRB=0x7ff;
opts->mcs=2;}
break; break;
case 10: // 19/6 case 10: // 19/6
if (ind==0) { if (ind==0) {
...@@ -996,6 +985,10 @@ u32 _allocRBs(options_t *opts,int ind) ...@@ -996,6 +985,10 @@ u32 _allocRBs(options_t *opts,int ind)
opts->mcs=2;} opts->mcs=2;}
else else
allocRB=0x1800; allocRB=0x1800;
break;
default:
allocRB = 0x1fff;
opts->mcs=0;
break;} break;}
break; break;
case 50: case 50:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment