summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2021-11-12 14:58:50 -0600
committerCommit Bot <commit-bot@chromium.org>2021-11-18 04:55:36 +0000
commit8cd253a69df01e5bb21fa5aaf22306047ff18c44 (patch)
treea53d464e15e61b3dd63edbdbe78100bdca72a00f
parent5aac57dfd17ffd657709efb85dfab78c10863724 (diff)
downloadchrome-ec-8cd253a69df01e5bb21fa5aaf22306047ff18c44.tar.gz
Revert "chip/mt_scp: support software gain"
This reverts commit 8fe3e6a850f06b499cc60834a925736ce95171d9. BUG=b:200823466 TEST=make buildall -j Change-Id: I02223d61ec727c8b5891fa23868930ed20d7b394 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3285760 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
-rw-r--r--builtin/stdint.h3
-rw-r--r--common/audio_codec.c11
-rw-r--r--include/audio_codec.h5
3 files changed, 0 insertions, 19 deletions
diff --git a/builtin/stdint.h b/builtin/stdint.h
index dedc9de475..ada936c2d3 100644
--- a/builtin/stdint.h
+++ b/builtin/stdint.h
@@ -57,9 +57,6 @@ typedef int64_t int_fast64_t;
#ifndef INT16_MAX
#define INT16_MAX (32767U)
#endif
-#ifndef INT16_MIN
-#define INT16_MIN (-32768)
-#endif
#ifndef UINT32_MAX
#define UINT32_MAX (4294967295U)
diff --git a/common/audio_codec.c b/common/audio_codec.c
index 3f7203ad15..9895f579e8 100644
--- a/common/audio_codec.c
+++ b/common/audio_codec.c
@@ -7,7 +7,6 @@
#include "audio_codec.h"
#include "console.h"
#include "host_command.h"
-#include "util.h"
#define CPRINTS(format, args...) cprints(CC_AUDIO_CODEC, format, ## args)
@@ -145,13 +144,3 @@ int audio_codec_memmap_ap_to_ec(uintptr_t ap_addr, uintptr_t *ec_addr)
{
return EC_ERROR_UNIMPLEMENTED;
}
-
-int16_t audio_codec_s16_scale_and_clip(int16_t orig, uint8_t scalar)
-{
- int32_t val;
-
- val = (int32_t)orig * (int32_t)scalar;
- val = MIN(val, (int32_t)INT16_MAX);
- val = MAX(val, (int32_t)INT16_MIN);
- return val;
-}
diff --git a/include/audio_codec.h b/include/audio_codec.h
index b80d1c0f57..62009e6c73 100644
--- a/include/audio_codec.h
+++ b/include/audio_codec.h
@@ -58,11 +58,6 @@ int audio_codec_register_shm(uint8_t shm_id, uint8_t cap,
*/
int audio_codec_memmap_ap_to_ec(uintptr_t ap_addr, uintptr_t *ec_addr);
-/*
- * Scales a S16_LE sample by multiplying scalar.
- */
-int16_t audio_codec_s16_scale_and_clip(int16_t orig, uint8_t scalar);
-
/*
* DMIC abstract layer