cellular-infrastructure
/
cellmgr-ng
Archived
9
0
Fork 0
Code Releases Activity

mtp: Fix the address mask, macro to extract opc/dpc 

Fix the address mask, add macro to extract the DPC
and OPC from an address. Write a test case for this.
This commit is contained in:
Holger Hans Peter Freyther 2011-01-20 12:20:46 +01:00
parent 460a8eb865
commit 925d566c18
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/mtp_level3.h
View File

@ -65,7 +65,7 @@
#define SCCP_SSA 0x01
#define MTP_LINK_MASK 0x0F
#define MTP_ADDR_MASK 0x0FFF
#define MTP_ADDR_MASK 0x3FFF
#define MTP_APOC_MASK 0x3f
@ -77,6 +77,10 @@
((link) & MTP_LINK_MASK) << 28)
#define MTP_MAKE_APOC(apoc) \
(apoc & 0x3fff)
#define MTP_ADDR_DPC(addr) \
(addr & MTP_ADDR_MASK)
#define MTP_ADDR_OPC(addr) \
((addr >> 14) & MTP_ADDR_MASK)
#elif __BYTE_ORDER == __BIG_ENDIAN
static inline uint32_t c_swap_32(uint32_t in)
{
@ -97,6 +101,10 @@ static inline uint16_t c_swap_16(uint16_t in)
((link) & MTP_LINK_MASK) << 28)
#define MTP_MAKE_APOC(apoc) \
c_swap_16((apoc & 0x3fff))
#define MTP_ADDR_DPC(addr) \
(c_swap_32(addr) & MTP_ADDR_MASK)
#define MTP_ADDR_OPC(addr) \
((c_swap_32(addr) >> 14) & MTP_ADDR_MASK)
#endif

12
tests/mtp/mtp_parse_test.c
View File

@ -589,6 +589,18 @@ int main(int argc, char **argv)
tests[2].hdr.addr = MTP_ADDR(0x00, 136, 91);
tests[2].prohib.apoc = MTP_MAKE_APOC(86);
addr = MTP_ADDR(0x00, 0x2AAA, 0x1555);
if (MTP_ADDR_OPC(addr) != 0x1555) {
fprintf(stderr, "Failed to extract OPC: %d\n",
MTP_ADDR_OPC(addr));
abort();
}
if (MTP_ADDR_DPC(addr) != 0x2AAA) {
fprintf(stderr, "Failed to extract DPC: %d\n",
MTP_ADDR_DPC(addr));
abort();
}
for (i = 0; i < ARRAY_SIZE(tests); ++i) {
check_hdr(tests[i].input, &tests[i].hdr);
if (tests[i].has_mng)