diff options
| author | Yilun Lin <yllin@google.com> | 2018-09-08 00:14:36 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-09-13 06:13:48 -0700 |
| commit | 3bbcb403e6045eaa1aa0123fab622314f7154468 (patch) | |
| tree | c94150ad9e440ed03067b3e35ab8f3418e29eed9 | |
| parent | 4c1de11ed14cff24335b370f022bee598cd20ee8 (diff) | |
| download | chrome-ec-3bbcb403e6045eaa1aa0123fab622314f7154468.tar.gz | |
type: Rename vec4_t to floatv4_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: Ia61493b9f7303c720fba50d6f481316c6d75cc79
Signed-off-by: Yilun Lin <yllin@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1215444
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.c | 2 | ||||
| -rw-r--r-- | common/mat44.c | 6 | ||||
| -rw-r--r-- | include/mag_cal.h | 2 | ||||
| -rw-r--r-- | include/mat44.h | 3 | ||||
| -rw-r--r-- | include/vec4.h | 2 |
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 */ |