colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wmc: namespace stuff properly

Browse Source
This commit is contained in:
Dan Williams
2012-05-30 11:40:20 -05:00
parent 9fb8158279
commit 96166e4b75
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwmc/src/utils.c
View File

@@ -33,7 +33,7 @@
*/ */
/* Table of CRCs for each possible byte, with a generator polynomial of 0x8408 */ /* Table of CRCs for each possible byte, with a generator polynomial of 0x8408 */
const u_int16_t crc_table[256] = { static const u_int16_t crc_table[256] = {
0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
@@ -70,7 +70,7 @@ const u_int16_t crc_table[256] = {
/* Calculate the CRC for a buffer using a seed of 0xffff */ /* Calculate the CRC for a buffer using a seed of 0xffff */
u_int16_t u_int16_t
crc16 (const char *buffer, size_t len, u_int16_t seed) wmc_crc16 (const char *buffer, size_t len, u_int16_t seed)
{ {
u_int16_t crc = seed ? seed : 0xFFFF; u_int16_t crc = seed ? seed : 0xFFFF;
@@ -209,7 +209,7 @@ hdlc_encapsulate_buffer (char *inbuf,
wmc_return_val_if_fail (outbuf != NULL, 0); wmc_return_val_if_fail (outbuf != NULL, 0);
/* Add the CRC */ /* Add the CRC */
crc = crc16 (inbuf, cmd_len, crc_seed ? crc_seed : 0xFFFF); crc = wmc_crc16 (inbuf, cmd_len, crc_seed ? crc_seed : 0xFFFF);
inbuf[cmd_len++] = crc & 0xFF; inbuf[cmd_len++] = crc & 0xFF;
inbuf[cmd_len++] = (crc >> 8) & 0xFF; inbuf[cmd_len++] = (crc >> 8) & 0xFF;
@@ -402,7 +402,7 @@ hdlc_decapsulate_buffer (const char *inbuf,
} }
/* Check the CRC of the packet's data */ /* Check the CRC of the packet's data */
crc = crc16 (outbuf, unesc_len - 2, 0); crc = wmc_crc16 (outbuf, unesc_len - 2, 0);
pkt_crc = outbuf[unesc_len - 2] & 0xFF; pkt_crc = outbuf[unesc_len - 2] & 0xFF;
pkt_crc |= (outbuf[unesc_len - 1] & 0xFF) << 8; pkt_crc |= (outbuf[unesc_len - 1] & 0xFF) << 8;
if (crc != pkt_crc) { if (crc != pkt_crc) {

8
libwmc/src/utils.h
View File

@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef UTILS_H #ifndef LIBWMC_UTILS_H
#define UTILS_H #define LIBWMC_UTILS_H
#include <sys/types.h> #include <sys/types.h>
@@ -33,7 +33,7 @@ typedef u_int8_t wmcbool;
/* Utility and testcase functions */ /* Utility and testcase functions */
u_int16_t crc16 (const char *buffer, size_t len, u_int16_t seed); u_int16_t wmc_crc16 (const char *buffer, size_t len, u_int16_t seed);
size_t hdlc_escape (const char *inbuf, size_t hdlc_escape (const char *inbuf,
size_t inbuf_len, size_t inbuf_len,
@@ -84,5 +84,5 @@ wmcbool wmc_decapsulate (const char *inbuf,
wmcbool *out_need_more, wmcbool *out_need_more,
wmcbool uml290); wmcbool uml290);
#endif /* UTILS_H */ #endif /* LIBWMC_UTILS_H */

4
libwmc/tests/test-wmc-crc.c
View File

@@ -42,7 +42,7 @@ test_crc16_2 (void *f, void *data)
guint16 expected = 0x6D69; guint16 expected = 0x6D69;
/* CRC check */ /* CRC check */
crc = crc16 (buf, sizeof (buf), 0); crc = wmc_crc16 (buf, sizeof (buf), 0);
g_assert (crc == expected); g_assert (crc == expected);
} }
@@ -59,7 +59,7 @@ test_crc16_1 (void *f, void *data)
guint16 expected = 0x097A; guint16 expected = 0x097A;
/* CRC check */ /* CRC check */
crc = crc16 (buf, sizeof (buf), 0); crc = wmc_crc16 (buf, sizeof (buf), 0);
g_assert (crc == expected); g_assert (crc == expected);
} }