From cb49a07fd350d9b513b019f755730d298bf719e7 Mon Sep 17 00:00:00 2001 From: Yilun Lin Date: Sat, 8 Sep 2018 00:31:36 +0800 Subject: type: Rename matrix_3x3_t to mat33_fp_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: I51d88d44252184e4b7b3564236833b0b892edc39 Signed-off-by: Yilun Lin Reviewed-on: https://chromium-review.googlesource.com/1215449 Commit-Ready: Yilun Lin Tested-by: Yilun Lin Reviewed-by: Nicolas Boichat --- include/math_util.h | 6 +++--- include/motion_lid.h | 4 ++-- include/motion_sense.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/math_util.h b/include/math_util.h index d94084f30d..1bcff13525 100644 --- a/include/math_util.h +++ b/include/math_util.h @@ -96,7 +96,7 @@ static inline fp_t fp_abs(fp_t a) * Note that constant matrices MUST be initialized using FLOAT_TO_FP() * or INT_TO_FP() for all non-zero values. */ -typedef fp_t matrix_3x3_t[3][3]; +typedef fp_t mat33_fp_t[3][3]; /* Integer vector */ typedef int intv3_t[3]; @@ -141,7 +141,7 @@ fp_t cosine_of_angle_diff(const intv3_t v1, const intv3_t v2); * @param R Rotation matrix. * @param res Resultant vector. */ -void rotate(const intv3_t v, const matrix_3x3_t R, intv3_t res); +void rotate(const intv3_t v, const mat33_fp_t R, intv3_t res); /** * Rotate vector v by rotation matrix R^-1. @@ -150,6 +150,6 @@ void rotate(const intv3_t v, const matrix_3x3_t R, intv3_t res); * @param R Rotation matrix. * @param res Resultant vector. */ -void rotate_inv(const intv3_t v, const matrix_3x3_t R, intv3_t res); +void rotate_inv(const intv3_t v, const mat33_fp_t R, intv3_t res); #endif /* __CROS_EC_MATH_UTIL_H */ diff --git a/include/motion_lid.h b/include/motion_lid.h index 6ce299c0e5..110d614811 100644 --- a/include/motion_lid.h +++ b/include/motion_lid.h @@ -17,13 +17,13 @@ */ struct accel_orientation { /* Rotation matrix to rotate positive 90 degrees around the hinge. */ - matrix_3x3_t rot_hinge_90; + mat33_fp_t rot_hinge_90; /* * Rotation matrix to rotate 180 degrees around the hinge. The value * here should be rot_hinge_90 ^ 2. */ - matrix_3x3_t rot_hinge_180; + mat33_fp_t rot_hinge_180; /* Vector pointing along hinge axis. */ intv3_t hinge_axis; diff --git a/include/motion_sense.h b/include/motion_sense.h index bbc82a0f71..a63fc7ae79 100644 --- a/include/motion_sense.h +++ b/include/motion_sense.h @@ -90,7 +90,7 @@ struct motion_sensor_t { */ uint8_t in_spoof_mode; - const matrix_3x3_t *rot_standard_ref; + const mat33_fp_t *rot_standard_ref; /* * default_range: set by default by the EC. -- cgit v1.2.1