<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14080">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "Change GSM48_PDISC_* to enum type"<br><br>This reverts commit ece1d8509d5c5af7a60ab5e1a5dddade1b181dc9<br>which causes build failures due to compile warnings everywhere.<br><br>Change-Id: Ic131439ea206a0b0f57968ef701667da73711b51<br>---<br>M include/osmocom/gsm/protocol/gsm_04_08.h<br>1 file changed, 18 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h</span><br><span>index 767af8d..16910c3 100644</span><br><span>--- a/include/osmocom/gsm/protocol/gsm_04_08.h</span><br><span>+++ b/include/osmocom/gsm/protocol/gsm_04_08.h</span><br><span>@@ -1370,32 +1370,30 @@</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span> /* Section 10.2 + GSM 04.07 12.2.3.1.1 + 3GPP TS 24.007 11.2.3.1.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-enum osmo_gsm48_pdisc {</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_GROUP_CC = 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_BCAST_CC = 0x01,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_PDSS1 = 0x02, /* 04.07 only */</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_CC = 0x03,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_PDSS2 = 0x04, /* 04.07 only */</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_GTTP = 0x04, /* 24.007 only */</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_MM = 0x05,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_RR = 0x06,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_MM_GPRS = 0x08,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_SMS = 0x09,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_SM_GPRS = 0x0a,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_NC_SS = 0x0b,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_LOC = 0x0c,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_EXTEND = 0x0e,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_TEST = 0x0f, /* as per 11.10, 04.14 */</span><br><span style="color: hsl(0, 100%, 40%);">- GSM48_PDISC_MASK = 0x0f,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_GROUP_CC 0x00</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_BCAST_CC 0x01</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_PDSS1 0x02 /* 04.07 only */</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_CC 0x03</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_PDSS2 0x04 /* 04.07 only */</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_GTTP 0x04 /* 24.007 only */</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_MM 0x05</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_RR 0x06</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_MM_GPRS 0x08</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_SMS 0x09</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_SM_GPRS 0x0a</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_NC_SS 0x0b</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_LOC 0x0c</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_EXTEND 0x0e</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_TEST 0x0f /* as per 11.10, 04.14 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM48_PDISC_MASK 0x0f</span><br><span> </span><br><span> extern const struct value_string gsm48_pdisc_names[];</span><br><span style="color: hsl(0, 100%, 40%);">-static inline const char *gsm48_pdisc_name(enum osmo_gsm48_pdisc val)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *gsm48_pdisc_name(uint8_t val)</span><br><span> { return get_value_string(gsm48_pdisc_names, val); }</span><br><span> </span><br><span> bool gsm48_hdr_gmm_cipherable(const struct gsm48_hdr *hdr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline enum osmo_gsm48_pdisc gsm48_hdr_pdisc(const struct gsm48_hdr *hdr)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline uint8_t gsm48_hdr_pdisc(const struct gsm48_hdr *hdr)</span><br><span> {</span><br><span> /*</span><br><span> * 3GPP TS 24.007 version 12.0.0 Release 12,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14080">change 14080</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/14080"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic131439ea206a0b0f57968ef701667da73711b51 </div>
<div style="display:none"> Gerrit-Change-Number: 14080 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>