summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/mag_cal.c2
-rw-r--r--common/mat44.c6
-rw-r--r--include/mag_cal.h2
-rw-r--r--include/mat44.h3
-rw-r--r--include/vec4.h2
5 files changed, 8 insertions, 7 deletions
diff --git a/common/mag_cal.c b/common/mag_cal.c
index f9a0710650..6ba35025da 100644
--- a/common/mag_cal.c
+++ b/common/mag_cal.c
@@ -83,7 +83,7 @@ static int moc_eigen_test(struct mag_cal_t *moc)
static int moc_fit(struct mag_cal_t *moc, floatv3_t bias, float *radius)
{
size4_t pivot;
- vec4_t out;
+ floatv4_t out;
int success = 0;
/*
diff --git a/common/mat44.c b/common/mat44.c
index 0f7f371461..ddc586ec7a 100644
--- a/common/mat44.c
+++ b/common/mat44.c
@@ -55,13 +55,13 @@ void mat44_swap_rows(mat44_t A, const size_t i, const size_t j)
}
}
-void mat44_solve(mat44_t A, vec4_t x, const vec4_t b, const size4_t pivot)
+void mat44_solve(mat44_t A, floatv4_t x, const floatv4_t b, const size4_t pivot)
{
const size_t N = 4;
- vec4_t b_copy;
+ floatv4_t b_copy;
size_t i, k;
- memcpy(b_copy, b, sizeof(vec4_t));
+ memcpy(b_copy, b, sizeof(floatv4_t));
for (k = 0; k < N; ++k) {
if (pivot[k] != k) {
diff --git a/include/mag_cal.h b/include/mag_cal.h
index e0d6048be1..5e1a17531e 100644
--- a/include/mag_cal.h
+++ b/include/mag_cal.h
@@ -30,7 +30,7 @@ struct mag_cal_t {
* +----+----+----+----+
*/
mat44_t acc;
- vec4_t acc_w;
+ floatv4_t acc_w;
float radius;
intv3_t bias;
diff --git a/include/mat44.h b/include/mat44.h
index ae8055d5fb..eddfdeb60e 100644
--- a/include/mat44.h
+++ b/include/mat44.h
@@ -18,6 +18,7 @@ void mat44_decompose_lup(mat44_t LU, size4_t pivot);
void mat44_swap_rows(mat44_t A, const size_t i, const size_t j);
-void mat44_solve(mat44_t A, vec4_t x, const vec4_t b, const size4_t pivot);
+void mat44_solve(mat44_t A, floatv4_t x, const floatv4_t b,
+ const size4_t pivot);
#endif /* __CROS_EC_MAT_44_H */
diff --git a/include/vec4.h b/include/vec4.h
index 14e290c96e..05257e584b 100644
--- a/include/vec4.h
+++ b/include/vec4.h
@@ -7,7 +7,7 @@
#define __CROS_EC_VEC_4_H
-typedef float vec4_t[4];
+typedef float floatv4_t[4];
#endif /* __CROS_EC_VEC_4_H */