summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArian <arian.kulmer@web.de>2020-12-12 23:37:16 +0100
committerArian <arian.kulmer@web.de>2020-12-19 15:17:51 +0100
commitc9eafdaec6d961675c064b8d8c924f675e3d2152 (patch)
tree2fafcc8450b4b6301dc9634d0702112812bf05fd
parent1dcae43dc9431100281d168dcfbaf558974ce662 (diff)
shinano-common: Remove tfa9890_amp
* This is unused since we use the stock Audio HAL Change-Id: I05c9a6119f55f4ba2550a4b336eb6a61350a7f1d
-rw-r--r--rootdir/etc/init.qcom.rc7
-rw-r--r--shinano.mk3
-rw-r--r--tfa9890/Android.mk20
-rw-r--r--tfa9890/tfa9890.c158
-rw-r--r--tfa9890/tfa9890.h92
-rw-r--r--tfa9890/tfa9890_amp.c21
6 files changed, 0 insertions, 301 deletions
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index bc88e17..0743cc0 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -510,10 +510,3 @@ service hvdcp /vendor/bin/hvdcp
class core
user root
disabled
-
-# TFA9890 AMP
-service tfa9890_amp /vendor/bin/tfa9890_amp
- class late_start
- user root
- group root
- oneshot
diff --git a/shinano.mk b/shinano.mk
index 53d9cbe..d54cde9 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -38,9 +38,6 @@ PRODUCT_COPY_FILES += \
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
-PRODUCT_PACKAGES += \
- tfa9890_amp
-
# Bluetooth
PRODUCT_PACKAGES += \
android.hardware.bluetooth@1.0-impl
diff --git a/tfa9890/Android.mk b/tfa9890/Android.mk
deleted file mode 100644
index 8808fac..0000000
--- a/tfa9890/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SHARED_LIBRARIES := \
- liblog libutils libcutils
-
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-
-LOCAL_SRC_FILES := \
- tfa9890.c \
- tfa9890_amp.c
-
-LOCAL_MODULE := tfa9890_amp
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_VENDOR_MODULE := true
-
-include $(BUILD_EXECUTABLE)
diff --git a/tfa9890/tfa9890.c b/tfa9890/tfa9890.c
deleted file mode 100644
index 69d8feb..0000000
--- a/tfa9890/tfa9890.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2013-2014, The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//#define LOG_NDEBUG 0
-#define LOG_TAG "tfa9890"
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <log/log.h>
-#include <cutils/misc.h>
-#include <sys/ioctl.h>
-#include <system/audio.h>
-
-#include "tfa9890.h"
-#include "tfa9890_eq.h"
-
-struct tfa98xx_param_data tfa9890_param_data = {
- .size = 0,
- .type = 0,
- .data = NULL
-};
-
-/* Module functions */
-
-int tfa9890_prepare_for_ioctl(const char *file_name, unsigned int type) {
- int ret = 0;
- unsigned int size;
- unsigned char *buf;
-
- ALOGV("Preparing %s", file_name);
-
- /* Reset values */
- tfa9890_param_data.size = 0;
- tfa9890_param_data.type = 0;
- free(tfa9890_param_data.data);
-
- buf = (unsigned char*) load_file(file_name, &size);
-
- if (buf == NULL) {
- ret = -1;
- return ret;
- } else {
- ret = size;
- }
-
- /* Set the data for the ioctl arg */
- if (size)
- tfa9890_param_data.size = size;
- if (type)
- tfa9890_param_data.type = type;
- /* Already checked above */
- tfa9890_param_data.data = buf;
-
- return ret;
-}
-
-int tfa9890_prepare_for_ioctl_eq(const char *file_name, unsigned int type) {
- unsigned int size;
- unsigned char buf[PARAM_SIZE_MAX] = {0};
-
- ALOGV("Preparing %s", file_name);
-
- /* Reset values */
- tfa9890_param_data.size = 0;
- tfa9890_param_data.type = 0;
- tfa9890_param_data.data = NULL;
-
- size = sizeof(eq_data[type]);
- memcpy(buf, eq_data[type], size);
-
- /* Set the data for the ioctl arg */
- if (size) {
- tfa9890_param_data.size = size;
- tfa9890_param_data.data = buf;
- }
- if (type)
- tfa9890_param_data.type = type;
-
- return 0;
-}
-
-/* Public functions */
-
-int tfa9890_init(void) {
- int fd;
- int ret = 0;
-
- ALOGV("enter %s", __func__);
-
- /* Open the amplifier device */
- if ((fd = open(TFA9890_DEVICE, O_RDWR)) < 0) {
- ALOGE("Error opening amplifier device %s", TFA9890_DEVICE);
- return -1;
- }
-
- /* The ".patch" files */
- TFA9890_IOCTL(TFA98XX_PATCH_PARAM, PATCH_DSP_FILE, PATCH_DSP)
- TFA9890_IOCTL(TFA98XX_PATCH_PARAM, PATCH_COLDBOOT_FILE, PATCH_COLDBOOT)
-
- /* The ".config" files */
- TFA9890_IOCTL(TFA98XX_CONFIG_PARAM, CONFIG_TOP, AMP_TOP)
- TFA9890_IOCTL(TFA98XX_CONFIG_PARAM, CONFIG_BOTTOM, AMP_BOTTOM)
- TFA9890_IOCTL(TFA98XX_CONFIG_PARAM, CONFIG_RECEIVER, AMP_RECEIVER)
-
- /* The ".speaker" files */
- TFA9890_IOCTL(TFA98XX_SPEAKER_PARAM, SPEAKER_TOP, AMP_TOP)
- TFA9890_IOCTL(TFA98XX_SPEAKER_PARAM, SPEAKER_BOTTOM, AMP_BOTTOM)
-
- /* The ".preset" files */
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_HIFISPEAKER_TOP, TYPE_HIFISPEAKER_TOP)
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_HIFISPEAKER_BOTTOM, TYPE_HIFISPEAKER_BOTTOM)
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_HIFISPEAKER_RING_TOP, TYPE_HIFISPEAKER_RING_TOP)
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_HIFISPEAKER_RING_BOTTOM, TYPE_HIFISPEAKER_RING_BOTTOM)
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_HIFISPEAKER_SFORCE_TOP, TYPE_HIFISPEAKER_SFORCE_TOP)
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_HIFISPEAKER_SFORCE_BOTTOM, TYPE_HIFISPEAKER_SFORCE_BOTTOM)
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_VOICECALLSPEAKER_TOP, TYPE_VOICECALLSPEAKER_TOP)
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_VOICECALLSPEAKER_BOTTOM, TYPE_VOICECALLSPEAKER_BOTTOM)
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_FMSPEAKER_TOP, TYPE_FMSPEAKER_TOP)
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_FMSPEAKER_BOTTOM, TYPE_FMSPEAKER_BOTTOM)
- TFA9890_IOCTL(TFA98XX_PRESET_PARAM, PRESET_VOICECALLEARPICE_TOP, TYPE_VOICECALLEARPICE_TOP)
-
- /* The ".eq" files */
- TFA9890_IOCTL_EQ(EQ_HIFISPEAKER_TOP, TYPE_HIFISPEAKER_TOP)
- TFA9890_IOCTL_EQ(EQ_HIFISPEAKER_BOTTOM, TYPE_HIFISPEAKER_BOTTOM)
- TFA9890_IOCTL_EQ(EQ_HIFISPEAKER_RING_TOP, TYPE_HIFISPEAKER_RING_TOP)
- TFA9890_IOCTL_EQ(EQ_HIFISPEAKER_RING_BOTTOM, TYPE_HIFISPEAKER_RING_BOTTOM)
- TFA9890_IOCTL_EQ(EQ_HIFISPEAKER_SFORCE_TOP, TYPE_HIFISPEAKER_SFORCE_TOP)
- TFA9890_IOCTL_EQ(EQ_HIFISPEAKER_SFORCE_BOTTOM, TYPE_HIFISPEAKER_SFORCE_BOTTOM)
- TFA9890_IOCTL_EQ(EQ_VOICECALLSPEAKER_TOP, TYPE_VOICECALLSPEAKER_TOP)
- TFA9890_IOCTL_EQ(EQ_VOICECALLSPEAKER_BOTTOM, TYPE_VOICECALLSPEAKER_BOTTOM)
- TFA9890_IOCTL_EQ(EQ_FMSPEAKER_TOP, TYPE_FMSPEAKER_TOP)
- TFA9890_IOCTL_EQ(EQ_FMSPEAKER_BOTTOM, TYPE_FMSPEAKER_BOTTOM)
- TFA9890_IOCTL_EQ(EQ_VOICECALLEARPICE_TOP, TYPE_VOICECALLEARPICE_TOP)
-
-error:
- ALOGV("exit %s with %d", __func__, ret);
- close(fd);
- return ret;
-}
diff --git a/tfa9890/tfa9890.h b/tfa9890/tfa9890.h
deleted file mode 100644
index c01e32a..0000000
--- a/tfa9890/tfa9890.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2014-2016 The CyanogenMod Project
- * Copyright (C) 2017-2019 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Kernel header */
-#include <sound/tfa98xx.h>
-
-#define TFA9890_DEVICE "/dev/tfa98xx"
-
-/* All the files in /vendor/etc/tfa98xx */
-#define PATCH_DSP_FILE "/vendor/etc/tfa98xx/TFA9890.patch"
-#define PATCH_COLDBOOT_FILE "/vendor/etc/tfa98xx/coldboot.patch"
-
-#define CONFIG_TOP "/vendor/etc/tfa98xx/TFA9890_top.config"
-#define CONFIG_BOTTOM "/vendor/etc/tfa98xx/TFA9890_btm.config"
-#define CONFIG_RECEIVER "/vendor/etc/tfa98xx/TFA9890_Receiver.config"
-
-#define SPEAKER_TOP "/vendor/etc/tfa98xx/top.speaker"
-#define SPEAKER_BOTTOM "/vendor/etc/tfa98xx/btm.speaker"
-
-#define PRESET_HIFISPEAKER_TOP "/vendor/etc/tfa98xx/HiFiSpeaker_top.preset"
-#define PRESET_HIFISPEAKER_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeaker_btm.preset"
-#define PRESET_HIFISPEAKER_RING_TOP "/vendor/etc/tfa98xx/HiFiSpeakerRing_top.preset"
-#define PRESET_HIFISPEAKER_RING_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeakerRing_btm.preset"
-#define PRESET_HIFISPEAKER_SFORCE_TOP "/vendor/etc/tfa98xx/HiFiSpeakerSforce_top.preset"
-#define PRESET_HIFISPEAKER_SFORCE_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeakerSforce_btm.preset"
-#define PRESET_VOICECALLSPEAKER_TOP "/vendor/etc/tfa98xx/VoiceCallSpeaker_top.preset"
-#define PRESET_VOICECALLSPEAKER_BOTTOM "/vendor/etc/tfa98xx/VoiceCallSpeaker_btm.preset"
-#define PRESET_FMSPEAKER_TOP "/vendor/etc/tfa98xx/FMSpeaker_top.preset"
-#define PRESET_FMSPEAKER_BOTTOM "/vendor/etc/tfa98xx/FMSpeaker_btm.preset"
-#define PRESET_VOICECALLEARPICE_TOP "/vendor/etc/tfa98xx/VoiceCallEarpice_top.preset"
-
-#define EQ_HIFISPEAKER_TOP "/vendor/etc/tfa98xx/HiFiSpeaker_top.eq"
-#define EQ_HIFISPEAKER_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeaker_btm.eq"
-#define EQ_HIFISPEAKER_RING_TOP "/vendor/etc/tfa98xx/HiFiSpeakerRing_top.eq"
-#define EQ_HIFISPEAKER_RING_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeakerRing_btm.eq"
-#define EQ_HIFISPEAKER_SFORCE_TOP "/vendor/etc/tfa98xx/HiFiSpeakerSforce_top.eq"
-#define EQ_HIFISPEAKER_SFORCE_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeakerSforce_btm.eq"
-#define EQ_VOICECALLSPEAKER_TOP "/vendor/etc/tfa98xx/VoiceCallSpeaker_top.eq"
-#define EQ_VOICECALLSPEAKER_BOTTOM "/vendor/etc/tfa98xx/VoiceCallSpeaker_btm.eq"
-#define EQ_FMSPEAKER_TOP "/vendor/etc/tfa98xx/FMSpeaker_top.eq"
-#define EQ_FMSPEAKER_BOTTOM "/vendor/etc/tfa98xx/FMSpeaker_btm.eq"
-#define EQ_VOICECALLEARPICE_TOP "/vendor/etc/tfa98xx/VoiceCallEarpice_top.eq"
-
-/* Macros for ioctl with above files
- * This macro calls tfa9890_prepare_for_ioctl()
- * to setup the ioctl arg,
- * and then calls ioctl() */
-#define TFA9890_IOCTL(ioctltype, filename, filetype) \
- ret = tfa9890_prepare_for_ioctl(filename, filetype); \
- if (ret > 0) { \
- ALOGV("ioctl %s", filename); \
- ret = ioctl(fd, ioctltype, &tfa9890_param_data); \
- if (ret == -1) { \
- ALOGE("ioctl failed for %s with %d", filename, errno); \
- goto error; \
- } \
- } else \
- goto error; \
-
-/* Macro for only ".eq"/EQ_ files
- * Same as above but calls a different function
- * to setup the ioctl arg */
-#define TFA9890_IOCTL_EQ(filename, filetype) \
- ret = tfa9890_prepare_for_ioctl_eq(filename, filetype); \
- if (!ret) { \
- ALOGV("ioctl %s", filename); \
- ret = ioctl(fd, TFA98XX_EQ_PARAM, &tfa9890_param_data); \
- if (ret == -1) { \
- ret = errno; \
- ALOGE("ioctl failed for %s with %d", filename, ret); \
- goto error; \
- } \
- } else \
- goto error; \
-
-int tfa9890_prepare_for_ioctl(const char*, unsigned int);
-int tfa9890_prepare_for_ioctl_eq(const char*, unsigned int);
-int tfa9890_init(void);
diff --git a/tfa9890/tfa9890_amp.c b/tfa9890/tfa9890_amp.c
deleted file mode 100644
index 81f4792..0000000
--- a/tfa9890/tfa9890_amp.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2014, The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "tfa9890.h"
-
-int main(void) {
- return tfa9890_init();
-}