tetra
/
osmo-tetra
mirror of https://gerrit.osmocom.org/osmo-tetra
4
0
Fork 0
Code Issues Releases Wiki Activity

removed hard coded values - exchanged it with enum for better readability

This commit is contained in:
luckyhacky 2013-12-30 23:58:58 +01:00 committed by Harald Welte
parent 83140af8d0
commit 6f78d76052
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tetra_mac_pdu.c
View File

@ -65,14 +65,14 @@ void macpdu_decode_sysinfo(struct tetra_si_decoded *sid, const uint8_t *si_bits)
sid->option_field = bits_to_uint(cur, 2); cur += 2;
switch(sid->option_field)
{
case 0x00: // Even multiframe definition for TS mode
case 0x01: // Odd multiframe definition for TS mode
case TETRA_MAC_OPT_FIELD_EVEN_MULTIFRAME: // Even multiframe definition for TS mode
case TETRA_MAC_OPT_FIELD_ODD_MULTIFRAME: // Odd multiframe definition for TS mode
sid->frame_bitmap = bits_to_uint(cur, 20); cur += 20;
break;
case 0x02: // Default definition for access code A
case TETRA_MAC_OPT_FIELD_ACCESS_CODE: // Default definition for access code A
sid->access_code = bits_to_uint(cur, 20); cur += 20;
break;
case 0x04: // Extended services broadcast
case TETRA_MAC_OPT_FIELD_EXT_SERVICES: // Extended services broadcast
sid->ext_service = bits_to_uint(cur, 20); cur += 20;
break;
}

7
src/tetra_mac_pdu.h
View File

@ -36,6 +36,13 @@ enum tetra_bs_serv_details {
BS_SERVDET_ADV_LINK = (1 << 0),
};
enum tetra_mac_optional_field_flags {
TETRA_MAC_OPT_FIELD_EVEN_MULTIFRAME = 0,
TETRA_MAC_OPT_FIELD_ODD_MULTIFRAME = 1,
TETRA_MAC_OPT_FIELD_ACCESS_CODE = 2,
TETRA_MAC_OPT_FIELD_EXT_SERVICES = 3
};
const char *tetra_get_bs_serv_det_name(uint32_t pdu_type);
struct tetra_mle_si_decoded {