diff options
Diffstat (limited to 'drivers/staging/cxt1e1/sbecrc.c')
-rw-r--r-- | drivers/staging/cxt1e1/sbecrc.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/staging/cxt1e1/sbecrc.c b/drivers/staging/cxt1e1/sbecrc.c index b4fabe142ff..f95728eb239 100644 --- a/drivers/staging/cxt1e1/sbecrc.c +++ b/drivers/staging/cxt1e1/sbecrc.c | |||
@@ -49,11 +49,9 @@ genCrcTable (u_int32_t *CRCTable) | |||
49 | int ii, jj; | 49 | int ii, jj; |
50 | u_int32_t crc; | 50 | u_int32_t crc; |
51 | 51 | ||
52 | for (ii = 0; ii < CRC_TABLE_ENTRIES; ii++) | 52 | for (ii = 0; ii < CRC_TABLE_ENTRIES; ii++) { |
53 | { | ||
54 | crc = ii; | 53 | crc = ii; |
55 | for (jj = 8; jj > 0; jj--) | 54 | for (jj = 8; jj > 0; jj--) { |
56 | { | ||
57 | if (crc & 1) | 55 | if (crc & 1) |
58 | crc = (crc >> 1) ^ CRC32_POLYNOMIAL; | 56 | crc = (crc >> 1) ^ CRC32_POLYNOMIAL; |
59 | else | 57 | else |
@@ -98,15 +96,13 @@ sbeCrc (u_int8_t *buffer, /* data buffer to crc */ | |||
98 | * checking this every time sbeCrc() is called, since CRC calculations | 96 | * checking this every time sbeCrc() is called, since CRC calculations |
99 | * are already time consuming | 97 | * are already time consuming |
100 | */ | 98 | */ |
101 | if (!crcTableInit) | 99 | if (!crcTableInit) { |
102 | { | ||
103 | #ifdef STATIC_CRC_TABLE | 100 | #ifdef STATIC_CRC_TABLE |
104 | tbl = &CRCTable; | 101 | tbl = &CRCTable; |
105 | genCrcTable (tbl); | 102 | genCrcTable (tbl); |
106 | #else | 103 | #else |
107 | tbl = (u_int32_t *) OS_kmalloc (CRC_TABLE_ENTRIES * sizeof (u_int32_t)); | 104 | tbl = (u_int32_t *) OS_kmalloc (CRC_TABLE_ENTRIES * sizeof (u_int32_t)); |
108 | if (tbl == 0) | 105 | if (tbl == 0) { |
109 | { | ||
110 | *result = 0; /* dummy up return value due to malloc | 106 | *result = 0; /* dummy up return value due to malloc |
111 | * failure */ | 107 | * failure */ |
112 | return; | 108 | return; |
@@ -117,8 +113,7 @@ sbeCrc (u_int8_t *buffer, /* data buffer to crc */ | |||
117 | /* inverting bits makes ZMODEM & PKZIP compatible */ | 113 | /* inverting bits makes ZMODEM & PKZIP compatible */ |
118 | crc = initialCrc ^ 0xFFFFFFFFL; | 114 | crc = initialCrc ^ 0xFFFFFFFFL; |
119 | 115 | ||
120 | while (count-- != 0) | 116 | while (count-- != 0) { |
121 | { | ||
122 | temp1 = (crc >> 8) & 0x00FFFFFFL; | 117 | temp1 = (crc >> 8) & 0x00FFFFFFL; |
123 | temp2 = tbl[((int) crc ^ *buffer++) & 0xff]; | 118 | temp2 = tbl[((int) crc ^ *buffer++) & 0xff]; |
124 | crc = temp1 ^ temp2; | 119 | crc = temp1 ^ temp2; |