[kernel][lib][fixed_point] trivial C to C++ change
No code to convert except an empty .c file.
Run clang-format on the result.
Change-Id: Icd3d9d146a115fe5807eb676da06c86c04a6050c
Tested: make sure it still builds.
diff --git a/kernel/lib/fixed_point/fixed_point.c b/kernel/lib/fixed_point/fixed_point.cpp
similarity index 98%
rename from kernel/lib/fixed_point/fixed_point.c
rename to kernel/lib/fixed_point/fixed_point.cpp
index 6fceac9..2ad2663 100644
--- a/kernel/lib/fixed_point/fixed_point.c
+++ b/kernel/lib/fixed_point/fixed_point.cpp
@@ -3,4 +3,3 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file or at
// https://opensource.org/licenses/MIT
-
diff --git a/kernel/lib/fixed_point/include/lib/fixed_point.h b/kernel/lib/fixed_point/include/lib/fixed_point.h
index 47128bf..c52f57f 100644
--- a/kernel/lib/fixed_point/include/lib/fixed_point.h
+++ b/kernel/lib/fixed_point/include/lib/fixed_point.h
@@ -5,7 +5,6 @@
// license that can be found in the LICENSE file or at
// https://opensource.org/licenses/MIT
-
#pragma once
#include <stdint.h>
@@ -15,16 +14,15 @@
#endif
struct fp_32_64 {
- uint32_t l0; /* unshifted value */
- uint32_t l32; /* value shifted left 32 bits (or bit -1 to -32) */
- uint32_t l64; /* value shifted left 64 bits (or bit -33 to -64) */
+ uint32_t l0; /* unshifted value */
+ uint32_t l32; /* value shifted left 32 bits (or bit -1 to -32) */
+ uint32_t l64; /* value shifted left 64 bits (or bit -33 to -64) */
};
#include "fixed_point_debug.h"
static void
-fp_32_64_div_32_32(struct fp_32_64 *result, uint32_t dividend, uint32_t divisor)
-{
+fp_32_64_div_32_32(struct fp_32_64* result, uint32_t dividend, uint32_t divisor) {
uint64_t tmp;
uint32_t rem;
@@ -37,16 +35,14 @@
}
static uint64_t
-mul_u32_u32(uint32_t a, uint32_t b, int a_shift, int b_shift)
-{
+mul_u32_u32(uint32_t a, uint32_t b, int a_shift, int b_shift) {
uint64_t ret = (uint64_t)a * b;
debug_mul_u32_u32(a, b, a_shift, b_shift, ret);
return ret;
}
static uint64_t
-u64_mul_u32_fp32_64(uint32_t a, struct fp_32_64 b)
-{
+u64_mul_u32_fp32_64(uint32_t a, struct fp_32_64 b) {
uint64_t tmp;
uint64_t res_0;
uint64_t res_l32;
@@ -68,8 +64,7 @@
}
static uint32_t
-u32_mul_u64_fp32_64(uint64_t a, struct fp_32_64 b)
-{
+u32_mul_u64_fp32_64(uint64_t a, struct fp_32_64 b) {
uint32_t a_r32 = (uint32_t)(a >> 32);
uint32_t a_0 = (uint32_t)a;
uint64_t res_l32;
@@ -80,7 +75,7 @@
res_l32 += mul_u32_u32(a_r32, b.l32, 32, -32) << 32;
res_l32 += mul_u32_u32(a_0, b.l32, 0, -32);
res_l32 += mul_u32_u32(a_r32, b.l64, 32, -64);
- res_l32 += mul_u32_u32(a_0, b.l64, 0, -64) >> 32; /* Improve rounding accuracy */
+ res_l32 += mul_u32_u32(a_0, b.l64, 0, -64) >> 32; /* Improve rounding accuracy */
ret = (uint32_t)((res_l32 >> 32) + ((uint32_t)res_l32 >> 31)); /* Round to nearest integer */
debug_u32_mul_u64_fp32_64(a, b, res_l32, ret);
@@ -89,8 +84,7 @@
}
static uint64_t
-u64_mul_u64_fp32_64(uint64_t a, struct fp_32_64 b)
-{
+u64_mul_u64_fp32_64(uint64_t a, struct fp_32_64 b) {
uint32_t a_r32 = (uint32_t)(a >> 32);
uint32_t a_0 = (uint32_t)a;
uint64_t res_0;
@@ -115,10 +109,9 @@
res_l32 += tmp >> 32;
res_0 += res_l32 >> 32;
res_l32_32 = (uint32_t)(res_l32);
- ret = res_0 + (res_l32_32 >> 31); /* Round to nearest integer */
+ ret = res_0 + (res_l32_32 >> 31); /* Round to nearest integer */
debug_u64_mul_u64_fp32_64(a, b, res_0, res_l32_32, ret);
return ret;
}
-
diff --git a/kernel/lib/fixed_point/rules.mk b/kernel/lib/fixed_point/rules.mk
index f348903..a2637cb 100644
--- a/kernel/lib/fixed_point/rules.mk
+++ b/kernel/lib/fixed_point/rules.mk
@@ -10,6 +10,6 @@
MODULE := $(LOCAL_DIR)
MODULE_SRCS += \
- $(LOCAL_DIR)/fixed_point.c
+ $(LOCAL_DIR)/fixed_point.cpp
include make/module.mk
