Attention is currently required from: pespin. Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/libosmocore/+/31356

to look at the new patch set (#2).

Change subject: Move libosmogsm TS 44.060 declarations under include/osmocom/gsm/ ......................................................................

Move libosmogsm TS 44.060 declarations under include/osmocom/gsm/

Currently there's a big mess where include dir osmocom/gprs/ is used by both libosmogsm and libosmogb. Most of the header files under osmocom/gprs/ are actually all the headers of libosmogb (there's no osmocom/gb/ dir). But a couple files are actually RLC/MAC (TS 44.060) related are are also stored in there. Those files have no relation/use in Gb, and are actually interused with GSM (eg System Information 13 Rest Octets). Hence, it makes sense to have the RLC/MAC related parts inside osmocom/gsm/ as they should be in libosmogsm (and they actually are, see gprs_rlc.h function implemented in src/gsm/gsm48_rest_octets.c).

The fact that some libosmogsm headers were placed in osmocom/gprs instead of osmocom/gsm already created some issues, like libosmocore.spec.in putting "%_includedir/%name/osmocom/gprs/" under libosmogb, which is wrong.

As a first step to fix the mess, we move the 2 RLC/MAC headers currently under osmocom/gprs/{gprs_rlc,protocol/gsm_04_60}.h under a single header gsm/protocol/gsm_44_060.h The two old headers are left existing for backward compatibility and now simply include the new libosmogsm header, plus a warning asking users to switch to the new header so we can eventually get rid of them. This means libosmogb depends on libosmogsm, which is fine and was already the case beforehand (libosmogb using functions like gsm48_encode_ra() and linking against it in src/gb/Makefile.am).

Change-Id: I70cc21bf25a7081070738abacb409ed19094c3b2 --- M TODO-RELEASE M include/osmocom/gprs/gprs_rlc.h M include/osmocom/gprs/protocol/gsm_04_60.h M include/osmocom/gsm/gsm48_rest_octets.h M include/osmocom/gsm/protocol/Makefile.am A include/osmocom/gsm/protocol/gsm_44_060.h M src/coding/gsm0503_coding.c M src/gsm/gprs_rlc.c 8 files changed, 261 insertions(+), 258 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/31356/2