Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338084
b: refs/heads/master
c: 0b7ccbe
h: refs/heads/master
v: v3
  • Loading branch information
Johan Meiring authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 1249e03 commit 431dd05
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 77c84b29959f66401400a7eeeec7723648ec2a30
refs/heads/master: 0b7ccbeda03a19cfba24f6d6319e5f48e16364a9
106 changes: 53 additions & 53 deletions trunk/drivers/staging/cxt1e1/sbecrc.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,23 @@ static u_int32_t CRCTable[CRC_TABLE_ENTRIES];
static void
genCrcTable (u_int32_t *CRCTable)
{
int ii, jj;
u_int32_t crc;

for (ii = 0; ii < CRC_TABLE_ENTRIES; ii++)
{
crc = ii;
for (jj = 8; jj > 0; jj--)
{
if (crc & 1)
crc = (crc >> 1) ^ CRC32_POLYNOMIAL;
else
crc >>= 1;
}
CRCTable[ii] = crc;
}

crcTableInit++;
int ii, jj;
u_int32_t crc;

for (ii = 0; ii < CRC_TABLE_ENTRIES; ii++)
{
crc = ii;
for (jj = 8; jj > 0; jj--)
{
if (crc & 1)
crc = (crc >> 1) ^ CRC32_POLYNOMIAL;
else
crc >>= 1;
}
CRCTable[ii] = crc;
}

crcTableInit++;
}


Expand All @@ -86,51 +86,51 @@ genCrcTable (u_int32_t *CRCTable)

void
sbeCrc (u_int8_t *buffer, /* data buffer to crc */
u_int32_t count, /* length of block in bytes */
u_int32_t initialCrc, /* starting CRC */
u_int32_t *result)
u_int32_t count, /* length of block in bytes */
u_int32_t initialCrc, /* starting CRC */
u_int32_t *result)
{
u_int32_t *tbl = 0;
u_int32_t temp1, temp2, crc;

/*
* if table not yet created, do so. Don't care about "extra" time
* checking this every time sbeCrc() is called, since CRC calculations are
* already time consuming
*/
if (!crcTableInit)
{
u_int32_t *tbl = 0;
u_int32_t temp1, temp2, crc;

/*
* if table not yet created, do so. Don't care about "extra" time
* checking this every time sbeCrc() is called, since CRC calculations
* are already time consuming
*/
if (!crcTableInit)
{
#ifdef STATIC_CRC_TABLE
tbl = &CRCTable;
genCrcTable (tbl);
tbl = &CRCTable;
genCrcTable (tbl);
#else
tbl = (u_int32_t *) OS_kmalloc (CRC_TABLE_ENTRIES * sizeof (u_int32_t));
if (tbl == 0)
{
*result = 0; /* dummy up return value due to malloc
* failure */
return;
}
genCrcTable (tbl);
tbl = (u_int32_t *) OS_kmalloc (CRC_TABLE_ENTRIES * sizeof (u_int32_t));
if (tbl == 0)
{
*result = 0; /* dummy up return value due to malloc
* failure */
return;
}
genCrcTable (tbl);
#endif
}
/* inverting bits makes ZMODEM & PKZIP compatible */
crc = initialCrc ^ 0xFFFFFFFFL;
}
/* inverting bits makes ZMODEM & PKZIP compatible */
crc = initialCrc ^ 0xFFFFFFFFL;

while (count-- != 0)
{
temp1 = (crc >> 8) & 0x00FFFFFFL;
temp2 = tbl[((int) crc ^ *buffer++) & 0xff];
crc = temp1 ^ temp2;
}
while (count-- != 0)
{
temp1 = (crc >> 8) & 0x00FFFFFFL;
temp2 = tbl[((int) crc ^ *buffer++) & 0xff];
crc = temp1 ^ temp2;
}

crc ^= 0xFFFFFFFFL;
crc ^= 0xFFFFFFFFL;

*result = crc;
*result = crc;

#ifndef STATIC_CRC_TABLE
crcTableInit = 0;
OS_kfree (tbl);
crcTableInit = 0;
OS_kfree (tbl);
#endif
}

Expand Down

0 comments on commit 431dd05

Please sign in to comment.