summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYilun Lin <yllin@google.com>2018-09-08 00:28:07 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-09-13 06:13:51 -0700
commitc857c83cca204ab23e5d355ac1751b3cd7d95fb8 (patch)
tree4bdcf1096694cb5973bdb27b17d7b2a23afb852d
parent25091ec77eb8bec64011cd340fb01d3b63b88446 (diff)
downloadchrome-ec-c857c83cca204ab23e5d355ac1751b3cd7d95fb8.tar.gz
type: Rename mat44_t to mat44_float_t.
Naming of many vector types and matrix types are not clear enough. For example, we have: vector_3_t, which is a vector of three int. vec3_t, which is a vector of three float. size4_t, which is a vector of four size_t. mat33_t, which is a 3x3 matrix of float. matrix_3x3_t, which is a 3x3 matrix of fixed point. Besides, we have types like int8_t, uint16_t types. To clearly distinguished types, the CL propose to, For vector types, naming should be `$type + 'v' + $num + '_t'`: vector_3_t becomes intv3_t vec3_t becomes floatv3_t vector 4 of uint16_t becomes uint16v4_t (which doesn't exist yet) For matrix types, naming should be `mat$N$N_` + $type + '_t', where $N is the matrix size: matrix_3x3_t becomes mat33_fp_t # fp: fixed point mat33_t becomes mat33_float_t TEST=make buildall -j BUG=b:114662791 Change-Id: I188305fc2f4fcff6ec4343f68e1aa1d2d185f6cf Signed-off-by: Yilun Lin <yllin@google.com> Reviewed-on: https://chromium-review.googlesource.com/1215448 Commit-Ready: Yilun Lin <yllin@chromium.org> Tested-by: Yilun Lin <yllin@chromium.org> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
-rw-r--r--common/mag_cal.c4
-rw-r--r--common/mat44.c8
-rw-r--r--include/mag_cal.h2
-rw-r--r--include/mat44.h8
4 files changed, 11 insertions, 11 deletions
diff --git a/common/mag_cal.c b/common/mag_cal.c
index 160530c2b9..6e5a48b6b1 100644
--- a/common/mag_cal.c
+++ b/common/mag_cal.c
@@ -107,9 +107,9 @@ static int moc_fit(struct mag_cal_t *moc, floatv3_t bias, float *radius)
moc->acc_w[Z] *= -1;
moc->acc_w[W] *= -1;
- mat44_decompose_lup(moc->acc, pivot);
+ mat44_float_decompose_lup(moc->acc, pivot);
- mat44_solve(moc->acc, out, moc->acc_w, pivot);
+ mat44_float_solve(moc->acc, out, moc->acc_w, pivot);
/*
* spherei is defined by:
diff --git a/common/mat44.c b/common/mat44.c
index 36ed487841..2ca3b69c32 100644
--- a/common/mat44.c
+++ b/common/mat44.c
@@ -10,7 +10,7 @@
#define K_EPSILON 1E-5f
-void mat44_decompose_lup(mat44_t LU, sizev4_t pivot)
+void mat44_float_decompose_lup(mat44_float_t LU, sizev4_t pivot)
{
const size_t N = 4;
size_t i, j, k;
@@ -26,7 +26,7 @@ void mat44_decompose_lup(mat44_t LU, sizev4_t pivot)
}
if (pivot[k] != k)
- mat44_swap_rows(LU, k, pivot[k]);
+ mat44_float_swap_rows(LU, k, pivot[k]);
if (fabsf(LU[k][k]) < K_EPSILON)
continue;
@@ -40,7 +40,7 @@ void mat44_decompose_lup(mat44_t LU, sizev4_t pivot)
}
}
-void mat44_swap_rows(mat44_t A, const size_t i, const size_t j)
+void mat44_float_swap_rows(mat44_float_t A, const size_t i, const size_t j)
{
const size_t N = 4;
size_t k;
@@ -55,7 +55,7 @@ void mat44_swap_rows(mat44_t A, const size_t i, const size_t j)
}
}
-void mat44_solve(mat44_t A, floatv4_t x, const floatv4_t b,
+void mat44_float_solve(mat44_float_t A, floatv4_t x, const floatv4_t b,
const sizev4_t pivot)
{
const size_t N = 4;
diff --git a/include/mag_cal.h b/include/mag_cal.h
index 5e1a17531e..753052f55f 100644
--- a/include/mag_cal.h
+++ b/include/mag_cal.h
@@ -29,7 +29,7 @@ struct mag_cal_t {
* | x | y | z | 1 |
* +----+----+----+----+
*/
- mat44_t acc;
+ mat44_float_t acc;
floatv4_t acc_w;
float radius;
diff --git a/include/mat44.h b/include/mat44.h
index 953cb5dddc..d8a8209055 100644
--- a/include/mat44.h
+++ b/include/mat44.h
@@ -11,14 +11,14 @@
#include "vec4.h"
#include "util.h"
-typedef float mat44_t[4][4];
+typedef float mat44_float_t[4][4];
typedef size_t sizev4_t[4];
-void mat44_decompose_lup(mat44_t LU, sizev4_t pivot);
+void mat44_float_decompose_lup(mat44_float_t LU, sizev4_t pivot);
-void mat44_swap_rows(mat44_t A, const size_t i, const size_t j);
+void mat44_float_swap_rows(mat44_float_t A, const size_t i, const size_t j);
-void mat44_solve(mat44_t A, floatv4_t x, const floatv4_t b,
+void mat44_float_solve(mat44_float_t A, floatv4_t x, const floatv4_t b,
const sizev4_t pivot);
#endif /* __CROS_EC_MAT_44_H */