<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17621">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_rlcmac: Use 'struct bitvec' instead of 'bitvec'<br><br>The later is only accepted when compiling as c++.<br><br>Change-Id: Ib5004643d4eff3bc9d11b66ddaf262f1c0d2aef6<br>---<br>M src/gsm_rlcmac.cpp<br>M src/gsm_rlcmac.h<br>M tests/rlcmac/RLCMACTest.cpp<br>3 files changed, 20 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/21/17621/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp</span><br><span>index a2aae90..0d769ce 100644</span><br><span>--- a/src/gsm_rlcmac.cpp</span><br><span>+++ b/src/gsm_rlcmac.cpp</span><br><span>@@ -188,7 +188,7 @@</span><br><span> CSN_DESCR_END     (EGPRS_AckNack_Desc_t)</span><br><span> </span><br><span> /*< EGPRS Ack/Nack Description IE >*/</span><br><span style="color: hsl(0, 100%, 40%);">-gint16 Egprs_Ack_Nack_Desc_w_len_Dissector(csnStream_t* ar, bitvec *vector, unsigned *readIndex, void* data)</span><br><span style="color: hsl(120, 100%, 40%);">+gint16 Egprs_Ack_Nack_Desc_w_len_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data)</span><br><span> {</span><br><span>   if (ar->direction == 0)</span><br><span>   {</span><br><span>@@ -749,7 +749,7 @@</span><br><span>   M_UINT       (Receive_N_PDU_Number_t,  value,  8),</span><br><span> CSN_DESCR_END  (Receive_N_PDU_Number_t)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-gint16 Receive_N_PDU_Number_list_Dissector(csnStream_t* ar, bitvec *vector, unsigned *readIndex, void* data)</span><br><span style="color: hsl(120, 100%, 40%);">+gint16 Receive_N_PDU_Number_list_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data)</span><br><span> {</span><br><span>   if (ar->direction == 0)</span><br><span>   {</span><br><span>@@ -885,7 +885,7 @@</span><br><span> </span><br><span> CSN_DESCR_END         (Content_t)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-gint16 Content_Dissector(csnStream_t* ar, bitvec *vector, unsigned *readIndex, void* data)</span><br><span style="color: hsl(120, 100%, 40%);">+gint16 Content_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data)</span><br><span> {</span><br><span>   if (ar->direction == 0)</span><br><span>     {</span><br><span>@@ -909,7 +909,7 @@</span><br><span>   M_REC_TARRAY        (Additional_access_technologies_t, Additional_access_technologies, Additional_access_technologies_struct_t, Count_additional_access_technologies),</span><br><span> CSN_DESCR_END         (Additional_access_technologies_t)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-gint16 Additional_access_technologies_Dissector(csnStream_t* ar, bitvec* vector, unsigned *readIndex, void* data)</span><br><span style="color: hsl(120, 100%, 40%);">+static gint16 Additional_access_technologies_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data)</span><br><span> {</span><br><span>   if (ar->direction == 0)</span><br><span>   {</span><br><span>@@ -4951,7 +4951,7 @@</span><br><span> };</span><br><span> </span><br><span> /* Returns 0 on success, negative on error. */</span><br><span style="color: hsl(0, 100%, 40%);">-int decode_gsm_rlcmac_uplink(bitvec * vector, RlcMacUplink_t * data)</span><br><span style="color: hsl(120, 100%, 40%);">+int decode_gsm_rlcmac_uplink(struct bitvec *vector, RlcMacUplink_t * data)</span><br><span> {</span><br><span>   csnStream_t      ar;</span><br><span>   int ret;</span><br><span>@@ -5076,7 +5076,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Returns 0 on success, negative on error. */</span><br><span style="color: hsl(0, 100%, 40%);">-int decode_gsm_rlcmac_downlink(bitvec * vector, RlcMacDownlink_t * data)</span><br><span style="color: hsl(120, 100%, 40%);">+int decode_gsm_rlcmac_downlink(struct bitvec *vector, RlcMacDownlink_t * data)</span><br><span> {</span><br><span>   csnStream_t  ar;</span><br><span>   /* See RLC/MAC downlink control block structure in TS 44.060 / 10.3.1 */</span><br><span>@@ -5288,7 +5288,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Returns 0 on success, negative on error. */</span><br><span style="color: hsl(0, 100%, 40%);">-int encode_gsm_rlcmac_uplink(bitvec * vector, RlcMacUplink_t * data)</span><br><span style="color: hsl(120, 100%, 40%);">+int encode_gsm_rlcmac_uplink(struct bitvec *vector, RlcMacUplink_t * data)</span><br><span> {</span><br><span>   csnStream_t      ar;</span><br><span>   unsigned writeIndex = 0;</span><br><span>@@ -5400,7 +5400,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Returns 0 on success, negative on error. */</span><br><span style="color: hsl(0, 100%, 40%);">-int encode_gsm_rlcmac_downlink(bitvec * vector, RlcMacDownlink_t * data)</span><br><span style="color: hsl(120, 100%, 40%);">+int encode_gsm_rlcmac_downlink(struct bitvec *vector, RlcMacDownlink_t * data)</span><br><span> {</span><br><span>   csnStream_t  ar;</span><br><span>   int ret;</span><br><span>@@ -5609,7 +5609,7 @@</span><br><span>   return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void decode_gsm_rlcmac_uplink_data(bitvec * vector, RlcMacUplinkDataBlock_t * data)</span><br><span style="color: hsl(120, 100%, 40%);">+void decode_gsm_rlcmac_uplink_data(struct bitvec *vector, RlcMacUplinkDataBlock_t * data)</span><br><span> {</span><br><span>   unsigned readIndex = 0;</span><br><span>   //unsigned dataLen = 0;</span><br><span>@@ -5687,7 +5687,7 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void encode_gsm_rlcmac_downlink_data(bitvec * vector, RlcMacDownlinkDataBlock_t * data)</span><br><span style="color: hsl(120, 100%, 40%);">+void encode_gsm_rlcmac_downlink_data(struct bitvec *vector, RlcMacDownlinkDataBlock_t * data)</span><br><span> {</span><br><span>   unsigned writeIndex = 0;</span><br><span> </span><br><span>@@ -5745,7 +5745,7 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t *data)</span><br><span style="color: hsl(120, 100%, 40%);">+int decode_gsm_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t *data)</span><br><span> {</span><br><span>   csnStream_t      ar;</span><br><span>   int ret;</span><br><span>@@ -5771,7 +5771,7 @@</span><br><span> /* This function is not actually used by osmo-pcu itself, and only needed for</span><br><span>  * the RLCMAC unit test. Having it here is better than making the internal</span><br><span>  * CSN.1 definitions (in particular, MS_Radio_Access_capability_t) non-static. */</span><br><span style="color: hsl(0, 100%, 40%);">-int encode_gsm_ra_cap(bitvec *vector, MS_Radio_Access_capability_t *data)</span><br><span style="color: hsl(120, 100%, 40%);">+int encode_gsm_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t *data)</span><br><span> {</span><br><span>   unsigned writeIndex = 0;</span><br><span>   csnStream_t ar;</span><br><span>diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h</span><br><span>index d0bd9f6..1a448e4 100644</span><br><span>--- a/src/gsm_rlcmac.h</span><br><span>+++ b/src/gsm_rlcmac.h</span><br><span>@@ -5328,11 +5328,11 @@</span><br><span> </span><br><span> } EnhancedMeasurementReport_t;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int decode_gsm_rlcmac_uplink(bitvec *vector, RlcMacUplink_t *data);</span><br><span style="color: hsl(0, 100%, 40%);">- int decode_gsm_rlcmac_downlink(bitvec *vector, RlcMacDownlink_t *data);</span><br><span style="color: hsl(0, 100%, 40%);">- int encode_gsm_rlcmac_downlink(bitvec *vector, RlcMacDownlink_t *data);</span><br><span style="color: hsl(0, 100%, 40%);">- int encode_gsm_rlcmac_uplink(bitvec *vector, RlcMacUplink_t *data);</span><br><span style="color: hsl(0, 100%, 40%);">- void decode_gsm_rlcmac_uplink_data(bitvec * vector, RlcMacUplinkDataBlock_t * data);</span><br><span style="color: hsl(0, 100%, 40%);">- void encode_gsm_rlcmac_downlink_data(bitvec * vector, RlcMacDownlinkDataBlock_t * data);</span><br><span style="color: hsl(0, 100%, 40%);">- int decode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t * data);</span><br><span style="color: hsl(120, 100%, 40%);">+ int decode_gsm_rlcmac_uplink(struct bitvec *vector, RlcMacUplink_t *data);</span><br><span style="color: hsl(120, 100%, 40%);">+ int decode_gsm_rlcmac_downlink(struct bitvec *vector, RlcMacDownlink_t *data);</span><br><span style="color: hsl(120, 100%, 40%);">+ int encode_gsm_rlcmac_downlink(struct bitvec *vector, RlcMacDownlink_t *data);</span><br><span style="color: hsl(120, 100%, 40%);">+ int encode_gsm_rlcmac_uplink(struct bitvec *vector, RlcMacUplink_t *data);</span><br><span style="color: hsl(120, 100%, 40%);">+ void decode_gsm_rlcmac_uplink_data(struct bitvec *vector, RlcMacUplinkDataBlock_t * data);</span><br><span style="color: hsl(120, 100%, 40%);">+ void encode_gsm_rlcmac_downlink_data(struct bitvec *vector, RlcMacDownlinkDataBlock_t * data);</span><br><span style="color: hsl(120, 100%, 40%);">+ int decode_gsm_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t * data);</span><br><span> #endif /* __PACKET_GSM_RLCMAC_H__ */</span><br><span>diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp</span><br><span>index 200cac8..a21c22d 100644</span><br><span>--- a/tests/rlcmac/RLCMACTest.cpp</span><br><span>+++ b/tests/rlcmac/RLCMACTest.cpp</span><br><span>@@ -215,7 +215,7 @@</span><br><span>   msgb_free(m);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int encode_gsm_ra_cap(bitvec * vector, MS_Radio_Access_capability_t * data);</span><br><span style="color: hsl(120, 100%, 40%);">+int encode_gsm_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t * data);</span><br><span> </span><br><span> void testRAcap(void *test_ctx)</span><br><span> {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17621">change 17621</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/c/osmo-pcu/+/17621"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib5004643d4eff3bc9d11b66ddaf262f1c0d2aef6 </div>
<div style="display:none"> Gerrit-Change-Number: 17621 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>