diff --git a/include/osmocore/bits.h b/include/osmocore/bits.h index 662c4a9d2..eb2cbcbaf 100644 --- a/include/osmocore/bits.h +++ b/include/osmocore/bits.h @@ -24,4 +24,16 @@ int osmo_ubit2pbit(pbit_t *out, const ubit_t *in, unsigned int num_bits); /* convert packed bits to unpacked bits, return length in bytes */ int osmo_pbit2ubit(ubit_t *out, const pbit_t *in, unsigned int num_bits); +/* convert unpacked bits to packed bits (extended options but slower), + * return length in bytes (max written ofs of output buffer + 1) */ +int osmo_ubit2pbit_ext(pbit_t *out, unsigned int out_ofs, + const ubit_t *in, unsigned int in_ofs, + unsigned int num_bits, int lsb_mode); + +/* convert packed bits to unpacked bits (extended options but slower), + * return length in bytes (max written ofs of output buffer + 1) */ +int osmo_pbit2ubit_ext(ubit_t *out, unsigned int out_ofs, + const pbit_t *in, unsigned int in_ofs, + unsigned int num_bits, int lsb_mode); + #endif diff --git a/src/bits.c b/src/bits.c index fb3c72240..029cfe550 100644 --- a/src/bits.c +++ b/src/bits.c @@ -63,3 +63,36 @@ int osmo_pbit2ubit(ubit_t *out, const pbit_t *in, unsigned int num_bits) } return cur - out; } + +/* convert unpacked bits to packed bits (extended options but slower), + * return length in bytes (max written ofs of output buffer + 1) */ +int osmo_ubit2pbit_ext(pbit_t *out, unsigned int out_ofs, + const ubit_t *in, unsigned int in_ofs, + unsigned int num_bits, int lsb_mode) +{ + int i, op, bn; + for (i=0; i>3] |= 1 << bn; + else + out[op>>3] &= ~(1 << bn); + } + return ((out_ofs + num_bits - 1) >> 3) + 1; +} + +/* convert packed bits to unpacked bits (extended options but slower), + * return length in bytes (max written ofs of output buffer + 1) */ +int osmo_pbit2ubit_ext(ubit_t *out, unsigned int out_ofs, + const pbit_t *in, unsigned int in_ofs, + unsigned int num_bits, int lsb_mode) +{ + int i, ip, bn; + for (i=0; i>3] & (1<