summaryrefslogtreecommitdiff
path: root/baseboard
diff options
context:
space:
mode:
authorYilun Lin <yllin@google.com>2018-09-08 00:31:36 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-09-13 06:13:51 -0700
commitcb49a07fd350d9b513b019f755730d298bf719e7 (patch)
tree49057db244ea0b103c1026e4b9aea2ce5037af1e /baseboard
parentc857c83cca204ab23e5d355ac1751b3cd7d95fb8 (diff)
downloadchrome-ec-cb49a07fd350d9b513b019f755730d298bf719e7.tar.gz
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 <yllin@google.com> Reviewed-on: https://chromium-review.googlesource.com/1215449 Commit-Ready: Yilun Lin <yllin@chromium.org> Tested-by: Yilun Lin <yllin@chromium.org> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'baseboard')
-rw-r--r--baseboard/grunt/baseboard.c10
-rw-r--r--baseboard/grunt/baseboard.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c
index c70a142840..8b37381f12 100644
--- a/baseboard/grunt/baseboard.c
+++ b/baseboard/grunt/baseboard.c
@@ -340,13 +340,13 @@ BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);
static struct mutex g_lid_mutex;
static struct mutex g_base_mutex;
-matrix_3x3_t grunt_base_standard_ref = {
+mat33_fp_t grunt_base_standard_ref = {
{ FLOAT_TO_FP(1), 0, 0},
{ 0, FLOAT_TO_FP(1), 0},
{ 0, 0, FLOAT_TO_FP(1)}
};
-matrix_3x3_t lid_standard_ref = {
+mat33_fp_t lid_standard_ref = {
{ FLOAT_TO_FP(1), 0, 0},
{ 0, FLOAT_TO_FP(1), 0},
{ 0, 0, FLOAT_TO_FP(1)}
@@ -369,7 +369,7 @@ struct motion_sensor_t motion_sensors[] = {
.drv_data = &g_kx022_data,
.port = I2C_PORT_SENSOR,
.addr = KX022_ADDR1,
- .rot_standard_ref = (const matrix_3x3_t *)&lid_standard_ref,
+ .rot_standard_ref = (const mat33_fp_t *)&lid_standard_ref,
.default_range = 2, /* g, enough for laptop. */
.min_frequency = KX022_ACCEL_MIN_FREQ,
.max_frequency = KX022_ACCEL_MAX_FREQ,
@@ -393,7 +393,7 @@ struct motion_sensor_t motion_sensors[] = {
.port = I2C_PORT_SENSOR,
.addr = BMI160_ADDR0,
.default_range = 2, /* g, enough for laptop */
- .rot_standard_ref = (const matrix_3x3_t *)&grunt_base_standard_ref,
+ .rot_standard_ref = (const mat33_fp_t *)&grunt_base_standard_ref,
.min_frequency = BMI160_ACCEL_MIN_FREQ,
.max_frequency = BMI160_ACCEL_MAX_FREQ,
.config = {
@@ -421,7 +421,7 @@ struct motion_sensor_t motion_sensors[] = {
.port = I2C_PORT_SENSOR,
.addr = BMI160_ADDR0,
.default_range = 1000, /* dps */
- .rot_standard_ref = (const matrix_3x3_t *)&grunt_base_standard_ref,
+ .rot_standard_ref = (const mat33_fp_t *)&grunt_base_standard_ref,
.min_frequency = BMI160_GYRO_MIN_FREQ,
.max_frequency = BMI160_GYRO_MAX_FREQ,
},
diff --git a/baseboard/grunt/baseboard.h b/baseboard/grunt/baseboard.h
index 0a3bce9824..8eef4fc998 100644
--- a/baseboard/grunt/baseboard.h
+++ b/baseboard/grunt/baseboard.h
@@ -252,7 +252,7 @@ enum sensor_id {
* Boards within the Grunt family may need to modify this definition at
* board_init() time.
*/
-extern matrix_3x3_t grunt_base_standard_ref;
+extern mat33_fp_t grunt_base_standard_ref;
/* Sensors without hardware FIFO are in forced mode */
#define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL)