aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/include/openbsc/rest_octets.h
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2017-04-12 15:30:54 +0200
committerMax <msuraev@sysmocom.de>2017-04-28 08:45:36 +0000
commit6f0e50c8337355eb59033903ede9ab6528890835 (patch)
treed272206d3708f575ed73d5d8e96ea359d3d5310b /openbsc/include/openbsc/rest_octets.h
parenta18001d50605b0c7d4ae54c812b8766f8e7f5f61 (diff)
Prepare for extended SI2quater support
Supporting SI2quater as per 3GPP TS 44.018 will require chnages to the way System Information is stored because it uses 1:n instead of 1:1 mapping between SI type and generated SI content. This should not affect other SI types though. To facilitate this transition: * convert the code to always use GSM_BTS_SI helper instead of accessing buffer directly * make helper more robust by adding extra parenthesis * add similar helper for gsm_lchan * add function estimating number of SI2quater message to hold configured number of (U|E)ARFCNs * add SI2q index/count fields and pass them to rest_octets generator explicitly * internalize buffer access in generate_si* functions Change-Id: I74e4e3cb86364cec869a1472a41b4a95af0d50dd Related: RT#8792
Diffstat (limited to 'openbsc/include/openbsc/rest_octets.h')
-rw-r--r--openbsc/include/openbsc/rest_octets.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/openbsc/include/openbsc/rest_octets.h b/openbsc/include/openbsc/rest_octets.h
index 3b4e598bf..73ce57b26 100644
--- a/openbsc/include/openbsc/rest_octets.h
+++ b/openbsc/include/openbsc/rest_octets.h
@@ -5,12 +5,15 @@
#include <openbsc/gsm_04_08.h>
#include <osmocom/gsm/sysinfo.h>
+/* 16 is the max. number of SI2quater messages according to 3GPP TS 44.018: 4-bit index is used */
+#define SI2Q_MAX_NUM 16
+/* length in bits (for single SI2quater message) */
#define SI2Q_MAX_LEN 160
#define SI2Q_MIN_LEN 18
/* generate SI1 rest octets */
int rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net);
-int rest_octets_si2quater(uint8_t *data, const struct osmo_earfcn_si2q *e,
+int rest_octets_si2quater(uint8_t *data, uint8_t index, uint8_t count, const struct osmo_earfcn_si2q *e,
const uint16_t *u, const uint16_t *sc, size_t u_len);
int rest_octets_si6(uint8_t *data, bool is1800_net);