broken build, reverting CHREQ_T_PDCH_ONE_PHASE and CHREQ_T_PDCH_TWO_PHASE

historical

Heads up, the current openbsc build is broken, as verified by
https://jenkins.osmocom.org/jenkins/job/OpenBSC/

This is due to below libosmocore commit, which adds two items to enum
chreq_type, thereby implicitly enlarging the ctype_by_chreq struct and breaking
the static assert for gsm_network->ctype_by_chreq's size:

../../../src/libbsc/gsm_04_08_utils.c:138:1: error: size of array ‘dummyassert_size’ is negative
 osmo_static_assert(sizeof(ctype_by_chreq) ==
 ^

What this patch lacks is

* adjustment of ctype_by_chreq[] according to the new additions in
  libbsc/gsm_04_08_utils.c
* same for reason_by_chreq[], also in libbsc/gsm_04_08_utils.c
* enlarge ctype_by_chreq[] in gsm_network to 18, in openbsc/gsm_data.h.

I could try to guess what the ctype_by_chreq[] and reason_by_chreq[] items
should be, but to not get distracted from my current task, and since the values
don't seem to be used by the current master branches yet, I decided to simply
revert the libosmocore commit and leave it up to the original authors to follow
up. (No need to mention that those should be merged to libosmocore and openbsc
"at the same time" to avoid builds failing.)

Thanks and apologies for any inconvenience...

~Neels


commit c3c28528de78fd5d50c3a141c2176c0da5dd7075
Refs: 0.9.0-299-gc3c2852
Author:     Alexander Couzens <lynxis at fe80.eu>
AuthorDate: Tue Nov 29 12:42:05 2016 +0100
Commit:     Harald Welte <laforge at gnumonks.org>
CommitDate: Thu Dec 1 15:26:29 2016 +0000

    gsm0408: add chreq_type for CHREQ_T_PDCH_ONE_PHASE and CHREQ_T_PDCH_TWO_PHASE

    For BSC-located pcu the BSC must understand the PDCH chan request.

    Change-Id: Ice44dcaaf798f93af3652a96c567f8e16a6cf784
---
 include/osmocom/gsm/protocol/gsm_04_08.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h
index 767aa3d..c05b62e 100644
--- a/include/osmocom/gsm/protocol/gsm_04_08.h
+++ b/include/osmocom/gsm/protocol/gsm_04_08.h
@@ -1456,6 +1456,8 @@ enum chreq_type {
        CHREQ_T_PAG_R_TCH_F,
        CHREQ_T_PAG_R_TCH_FH,
        CHREQ_T_LMU,
+       CHREQ_T_PDCH_ONE_PHASE,
+       CHREQ_T_PDCH_TWO_PHASE,
        CHREQ_T_RESERVED_SDCCH,
        CHREQ_T_RESERVED_IGNORE,
 };


-- 
- Neels Hofmeyr <nhofmeyr at sysmocom.de>          http://www.sysmocom.de/
=======================================================================
* sysmocom - systems for mobile communications GmbH
* Alt-Moabit 93
* 10559 Berlin, Germany
* Sitz / Registered office: Berlin, HRB 134158 B
* Geschäftsführer / Managing Directors: Harald Welte
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.osmocom.org/pipermail/openbsc/attachments/20161202/e06a4ee1/attachment.bin>
