From 8cd253a69df01e5bb21fa5aaf22306047ff18c44 Mon Sep 17 00:00:00 2001 From: Mary Ruthven Date: Fri, 12 Nov 2021 14:58:50 -0600 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3285760 Reviewed-by: Vadim Sukhomlinov --- builtin/stdint.h | 3 --- common/audio_codec.c | 11 ----------- include/audio_codec.h | 5 ----- 3 files changed, 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 -- cgit v1.2.1