summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYilun Lin <yllin@google.com>2018-09-08 00:16:55 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-09-13 06:13:49 -0700
commit5afb2520926c5b0205ce074afc29b92434b9033e (patch)
treebe4ede9ec69b6ce9a6d7f18123ebf7046d49c976
parent3bbcb403e6045eaa1aa0123fab622314f7154468 (diff)
downloadchrome-ec-5afb2520926c5b0205ce074afc29b92434b9033e.tar.gz
type: Rename size4_t to sizev4_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: I3b63b4b1eb4c9ca4166ad207a5646e0c307cd418 Signed-off-by: Yilun Lin <yllin@google.com> Reviewed-on: https://chromium-review.googlesource.com/1215445 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.c2
-rw-r--r--common/mat44.c8
-rw-r--r--include/mat44.h6
3 files changed, 7 insertions, 9 deletions
diff --git a/common/mag_cal.c b/common/mag_cal.c
index 6ba35025da..08d5f7afd2 100644
--- a/common/mag_cal.c
+++ b/common/mag_cal.c
@@ -82,7 +82,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;
+ sizev4_t pivot;
floatv4_t out;
int success = 0;
diff --git a/common/mat44.c b/common/mat44.c
index ddc586ec7a..36ed487841 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, size4_t pivot)
+void mat44_decompose_lup(mat44_t LU, sizev4_t pivot)
{
const size_t N = 4;
size_t i, j, k;
@@ -55,7 +55,8 @@ 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, const size4_t pivot)
+void mat44_solve(mat44_t A, floatv4_t x, const floatv4_t b,
+ const sizev4_t pivot)
{
const size_t N = 4;
floatv4_t b_copy;
@@ -80,6 +81,3 @@ void mat44_solve(mat44_t A, floatv4_t x, const floatv4_t b, const size4_t pivot)
for (i = k + 1; i < N; ++i)
x[k] -= x[i] * A[k][i];
}
-
-
-
diff --git a/include/mat44.h b/include/mat44.h
index eddfdeb60e..953cb5dddc 100644
--- a/include/mat44.h
+++ b/include/mat44.h
@@ -12,13 +12,13 @@
#include "util.h"
typedef float mat44_t[4][4];
-typedef size_t size4_t[4];
+typedef size_t sizev4_t[4];
-void mat44_decompose_lup(mat44_t LU, size4_t pivot);
+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_solve(mat44_t A, floatv4_t x, const floatv4_t b,
- const size4_t pivot);
+ const sizev4_t pivot);
#endif /* __CROS_EC_MAT_44_H */