aboutsummaryrefslogtreecommitdiffstats
path: root/include/osmocom
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-05-28 19:49:47 +0200
committerHarald Welte <laforge@gnumonks.org>2019-05-28 20:02:04 +0200
commit86156de20e46e8bd1aa89589b233f4cdfcab1e06 (patch)
treec9a072010a8b2709d1a14b49b61cb911b267e1d1 /include/osmocom
parentf85b33f68fcf9b34e723e4571078d7eeb0de5d59 (diff)
rest_octets: Implement actual SI6 rest octets encoding
There's very little sense behind introducing a function into libosmogsm which doesn't implement 90% of the spec. Let's allow the caller to provide the various optional bits of information to the encoder, rather than generating mostly static SI6 rest octets. Change-Id: Id75005a0c4a02ce7f809692d58b3bd226bc582b2
Diffstat (limited to 'include/osmocom')
-rw-r--r--include/osmocom/gsm/gsm48_rest_octets.h39
1 files changed, 38 insertions, 1 deletions
diff --git a/include/osmocom/gsm/gsm48_rest_octets.h b/include/osmocom/gsm/gsm48_rest_octets.h
index bc5023a6..7163672c 100644
--- a/include/osmocom/gsm/gsm48_rest_octets.h
+++ b/include/osmocom/gsm/gsm48_rest_octets.h
@@ -20,7 +20,44 @@ int osmo_gsm48_rest_octets_si2quater_encode(uint8_t *data, uint8_t si2q_index, u
size_t *e_offset);
int osmo_gsm48_rest_octets_si2ter_encode(uint8_t *data);
int osmo_gsm48_rest_octets_si2bis_encode(uint8_t *data);
-int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, bool is1800_net);
+
+struct osmo_gsm48_si_pch_nch_info {
+ bool present;
+ bool paging_channel_restructuring;
+ uint8_t nln_sacch;
+ bool call_priority_present;
+ uint8_t call_priority;
+ bool nln_status_sacch;
+};
+
+struct osmo_gsm48_si_vbs_vgcs_options {
+ bool present;
+ bool inband_notifications;
+ bool inband_pagings;
+};
+
+struct osmo_gsm48_si_dtm_support {
+ bool present;
+ uint8_t rac;
+ uint8_t max_lapdm;
+};
+
+struct osmo_gsm48_si_gprs_ms_txpwr_max_ccch {
+ bool present;
+ uint8_t max_txpwr;
+};
+
+struct osmo_gsm48_si6_ro_info {
+ struct osmo_gsm48_si_pch_nch_info pch_nch_info;
+ struct osmo_gsm48_si_vbs_vgcs_options vbs_vgcs_options;
+ struct osmo_gsm48_si_dtm_support dtm_support;
+ bool band_indicator_1900;
+ struct osmo_gsm48_si_gprs_ms_txpwr_max_ccch gprs_ms_txpwr_max_ccch;
+ /* MBMS: not supported in Osmocom */
+ /* AMR config (group channel): not supported in Osmocom */
+};
+
+int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, const struct osmo_gsm48_si6_ro_info *in);
struct osmo_gsm48_si_selection_params {
uint16_t penalty_time:5,