Rename CRC functions to be more generic
These will be useful for UART communications too.
Change-Id: I443ca555c91aa5522dae493b1a5e83ae622dafc5
diff --git a/y2019/jevois/BUILD b/y2019/jevois/BUILD
index e99a264..7d26c1e 100644
--- a/y2019/jevois/BUILD
+++ b/y2019/jevois/BUILD
@@ -1,7 +1,7 @@
load("//tools:environments.bzl", "mcu_cpus")
load("//motors:macros.bzl", "hex_from_elf")
-spi_crc_args = [
+jevois_crc_args = [
"$(location //third_party/pycrc:pycrc_main)",
"--width=16",
# This is the recommendation from
@@ -17,24 +17,24 @@
"--xor-out=0xffff",
"--std=C99",
"--algorithm=table-driven",
- "--symbol-prefix=jevois_spi_crc_",
+ "--symbol-prefix=jevois_crc_",
"--crc-type=uint16_t",
]
genrule(
- name = "gen_spi_crc",
+ name = "gen_jevois_crc",
outs = [
- "spi_crc.h",
- "spi_crc.c",
+ "jevois_crc.h",
+ "jevois_crc.c",
],
cmd = " && ".join([
- " ".join(spi_crc_args + [
+ " ".join(jevois_crc_args + [
"--generate=h",
- "--output=$(location spi_crc.h)",
+ "--output=$(location jevois_crc.h)",
]),
- " ".join(spi_crc_args + [
+ " ".join(jevois_crc_args + [
"--generate=c",
- "--output=$(location spi_crc.c)",
+ "--output=$(location jevois_crc.c)",
]),
]),
tools = [
@@ -43,12 +43,12 @@
)
cc_library(
- name = "spi_crc",
+ name = "jevois_crc",
srcs = [
- "spi_crc.c",
+ "jevois_crc.c",
],
hdrs = [
- "spi_crc.h",
+ "jevois_crc.h",
],
deps = [
"//third_party/GSL",
@@ -77,7 +77,7 @@
"spi.h",
],
deps = [
- ":spi_crc",
+ ":jevois_crc",
":structures",
"//aos/util:bitpacking",
"//third_party/GSL",
diff --git a/y2019/jevois/spi.cc b/y2019/jevois/spi.cc
index 0500860..fee4f24 100644
--- a/y2019/jevois/spi.cc
+++ b/y2019/jevois/spi.cc
@@ -4,7 +4,7 @@
#include "aos/util/bitpacking.h"
#include "third_party/GSL/include/gsl/gsl"
-#include "y2019/jevois/spi_crc.h"
+#include "y2019/jevois/jevois_crc.h"
// SPI transfer format (6x 8 bit frames):
// 1. 1-byte brightness for each beacon channel.
@@ -171,10 +171,10 @@
remaining_space = remaining_space.subspan(1);
}
{
- uint16_t crc = jevois_spi_crc_init();
- crc = jevois_spi_crc_update(crc, transfer.data(),
- transfer.size() - remaining_space.size());
- crc = jevois_spi_crc_finalize(crc);
+ uint16_t crc = jevois_crc_init();
+ crc = jevois_crc_update(crc, transfer.data(),
+ transfer.size() - remaining_space.size());
+ crc = jevois_crc_finalize(crc);
assert(static_cast<size_t>(remaining_space.size()) >= sizeof(crc));
memcpy(&remaining_space[0], &crc, sizeof(crc));
remaining_space = remaining_space.subspan(sizeof(crc));
@@ -216,11 +216,11 @@
remaining_input = remaining_input.subspan(1);
}
{
- uint16_t calculated_crc = jevois_spi_crc_init();
+ uint16_t calculated_crc = jevois_crc_init();
calculated_crc =
- jevois_spi_crc_update(calculated_crc, transfer.data(),
- transfer.size() - remaining_input.size());
- calculated_crc = jevois_spi_crc_finalize(calculated_crc);
+ jevois_crc_update(calculated_crc, transfer.data(),
+ transfer.size() - remaining_input.size());
+ calculated_crc = jevois_crc_finalize(calculated_crc);
uint16_t received_crc;
assert(static_cast<size_t>(remaining_input.size()) >= sizeof(received_crc));
memcpy(&received_crc, &remaining_input[0], sizeof(received_crc));