diff options
author | Marius Schilder <mschilder@google.com> | 2018-02-23 15:41:27 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-02-23 23:13:01 -0800 |
commit | 3c4800e59452a7124c34f563d548e09849d59b8d (patch) | |
tree | 24d3662e78c60791366d3761f54d5a615ca0fb7d /common/crc.c | |
parent | d57e5eb3128774732e3b3fe40c0f939d9aaeff1a (diff) | |
download | chrome-ec-3c4800e59452a7124c34f563d548e09849d59b8d.tar.gz |
ec: add crc32_ctx..() to take context parameter.
Add crc32_ctx.. functions to take context parameter.
This allows for multiple instances to exist in parallel.
Signed-off-by: mschilder@google.com
TEST=make buildall -j8 succeeds
BRANCH=none
BUG=b:73832883
Change-Id: I66bbc56377eeebf01c790caad0bc4c7a51a1bc58
Reviewed-on: https://chromium-review.googlesource.com/935825
Commit-Ready: Marius Schilder <mschilder@chromium.org>
Tested-by: Marius Schilder <mschilder@chromium.org>
Reviewed-by: Marius Schilder <mschilder@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'common/crc.c')
-rw-r--r-- | common/crc.c | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/common/crc.c b/common/crc.c index 31054ad732..79d405eb13 100644 --- a/common/crc.c +++ b/common/crc.c @@ -56,9 +56,6 @@ static const uint32_t crc32_tab[] = { 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; -/* Accumulator for the CRC */ -static uint32_t crc_; - static uint32_t crc32_hash(uint32_t crc, const void *buf, int size) { const uint8_t *p; @@ -73,22 +70,50 @@ static uint32_t crc32_hash(uint32_t crc, const void *buf, int size) return crc; } +void crc32_ctx_init(uint32_t *crc) +{ + *crc = CRC32_INITIAL; +} + +void crc32_ctx_hash32(uint32_t *crc, uint32_t val) +{ + *crc = crc32_hash(*crc, &val, sizeof(val)); +} + +void crc32_ctx_hash16(uint32_t *crc, uint16_t val) +{ + *crc = crc32_hash(*crc, &val, sizeof(val)); +} + +void crc32_ctx_hash8(uint32_t *crc, uint8_t val) +{ + *crc = crc32_hash(*crc, &val, sizeof(val)); +} + +uint32_t crc32_ctx_result(uint32_t *crc) +{ + return *crc ^ 0xFFFFFFFF; +} + +/* Accumulator for the CRC */ +static uint32_t crc_; + void crc32_init(void) { - crc_ = CRC32_INITIAL; + crc32_ctx_init(&crc_); } void crc32_hash32(uint32_t val) { - crc_ = crc32_hash(crc_, &val, sizeof(uint32_t)); + crc32_ctx_hash32(&crc_, val); } void crc32_hash16(uint16_t val) { - crc_ = crc32_hash(crc_, &val, sizeof(uint16_t)); + crc32_ctx_hash16(&crc_, val); } uint32_t crc32_result(void) { - return crc_ ^ 0xFFFFFFFF; + return crc32_ctx_result(&crc_); } |