cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

Fixed: We should use guint8 array instead of guint32 and guint64 variables for decoding and encoding CSN1 bitmap.

This commit is contained in:
Ivan Kluchnikov 2012-04-11 22:02:15 +04:00
parent 1efac073e8
commit 74b459fda4
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
csn1.cpp
View File

@ -437,17 +437,23 @@ csnStreamDecoder(csnStream_t* ar, const CSN_DESCR* pDescr, BitVector *vector, si
if (no_of_bits <= 32) if (no_of_bits <= 32)
{ {
guint32 ui32 = vector->readField(readIndex, no_of_bits); for(unsigned ib = 0; ib < 4; ib++)
pui32 = pui32DATA(data, pDescr->offset); {
*pui32 = ui32; guint8 ui8 = vector->readField(readIndex, 8);
LOG(INFO) << pDescr->sz << " = " << *pui32 << "\n"; pui8 = pui8DATA(data, pDescr->offset+ib);
*pui8 = ui8;
LOG(INFO) << pDescr->sz <<"[" << ib << "]= " << (unsigned)*pui8 << "\n";
}
} }
else if (no_of_bits <= 64) else if (no_of_bits <= 64)
{ {
guint64 ui64 = vector->readField(readIndex, no_of_bits); for(unsigned ib = 0; ib < 8; ib++)
pui64 = pui64DATA(data, pDescr->offset); {
*pui64 = ui64; guint8 ui8 = vector->readField(readIndex, 8);
LOG(INFO) << pDescr->sz << " = " << *pui64 << "\n"; pui8 = pui8DATA(data, pDescr->offset+ib);
*pui8 = ui8;
LOG(INFO) << pDescr->sz <<"[" << ib << "]= " << (unsigned)*pui8 << "\n";
}
} }
else else
{ {
@ -1659,15 +1665,21 @@ gint16 csnStreamEncoder(csnStream_t* ar, const CSN_DESCR* pDescr, BitVector *vec
if (no_of_bits <= 32) if (no_of_bits <= 32)
{ {
pui32 = pui32DATA(data, pDescr->offset); for(unsigned ib = 0; ib < 4; ib++)
vector->writeField(writeIndex, *pui32, no_of_bits); {
LOG(INFO) << pDescr->sz << " = " << *pui32 << "\n"; pui8 = pui8DATA(data, pDescr->offset+ib);
vector->writeField(writeIndex, *pui8, 8);
LOG(INFO) << pDescr->sz <<"[" << ib << "]= " << (unsigned)*pui8 << "\n";
}
} }
else if (no_of_bits <= 64) else if (no_of_bits <= 64)
{ {
pui64 = pui64DATA(data, pDescr->offset); for(unsigned ib = 0; ib < 8; ib++)
vector->writeField(writeIndex, *pui64, no_of_bits); {
LOG(INFO) << pDescr->sz << " = " << *pui64 << "\n"; pui8 = pui8DATA(data, pDescr->offset+ib);
vector->writeField(writeIndex, *pui8, 8);
LOG(INFO) << pDescr->sz <<"[" << ib << "]= " << (unsigned)*pui8 << "\n";
}
} }
else else
{ {