Changes to silence compiler warnings on OSX
diff --git a/lib/flow_control/burst_sdcch_subslot_splitter_impl.cc b/lib/flow_control/burst_sdcch_subslot_splitter_impl.cc
index 260fe11..0a2a3be 100644
--- a/lib/flow_control/burst_sdcch_subslot_splitter_impl.cc
+++ b/lib/flow_control/burst_sdcch_subslot_splitter_impl.cc
@@ -74,6 +74,17 @@
void burst_sdcch_subslot_splitter_impl::process_burst(pmt::pmt_t msg)
{
+ // hardcoded subslots of the channels, both SDCCH and the associated SACCH
+ // -1 means that the particular position in the frame is not SDCCH
+ static const int8_t subslots_sdcch4[102] = {
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 1, 1, 1, 1,-1,-1, 2, 2, 2, 2, 3, 3, 3, 3,-1,-1, 0, 0, 0, 0, 1, 1, 1, 1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 1, 1, 1, 1,-1,-1, 2, 2, 2, 2, 3, 3, 3, 3,-1,-1, 2, 2, 2, 2, 3, 3, 3, 3,-1
+ };
+ static const int8_t subslots_sdcch8[102] = {
+ 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,-1,-1,-1,
+ 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7,-1,-1,-1
+ };
+
pmt::pmt_t header_plus_burst = pmt::cdr(msg);
gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_plus_burst);
@@ -81,14 +92,14 @@
uint32_t fn_mod102 = frame_nr % 102;
int8_t subslot;
-
+
if (d_mode == SPLITTER_SDCCH8)
{
- subslot = d_subslots_sdcch8[fn_mod102];
+ subslot = subslots_sdcch8[fn_mod102];
}
else if (d_mode == SPLITTER_SDCCH4)
{
- subslot = d_subslots_sdcch4[fn_mod102];
+ subslot = subslots_sdcch4[fn_mod102];
}
if ((subslot == -1) || (d_mode == SPLITTER_SDCCH4 && subslot > 3))