Merge "hal: enable compilation of 8909 platform files" into nyc-mr1-dev (210e13ce) · Commits · e / os / android_hardware_qcom_audio

Android.mk

+1 −7

Original line number	Diff line number	Diff line
		# TODO: Find a better way to separate build configs for ADP vs non-ADP devices
		ifneq ($(TARGET_BOARD_AUTO),true)
		ifneq ($(filter msm8960 msm8226 msm8x26 msm8x84 msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter msm8960 msm8226 msm8x26 msm8x84 msm8084 msm8992 msm8994 msm8996 msm8909 msm8916 msm8952,$(TARGET_BOARD_PLATFORM)),)

		MY_LOCAL_PATH := $(call my-dir)

		@@ -12,11 +12,5 @@ ifneq ($(TARGET_BOARD_AUTO),true)
		include $(MY_LOCAL_PATH)/visualizer/Android.mk
		include $(MY_LOCAL_PATH)/post_proc/Android.mk
		endif
		else
		ifneq ($(filter msm8909 ,$(TARGET_BOARD_PLATFORM)),)
		#For msm8909 target
		include $(call all-named-subdir-makefiles,msm8909)
		endif

		endif
		endif

hal/Android.mk

+11 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,17 @@ ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),)
		endif
		endif

		ifneq ($(filter msm8916 msm8909 msm8952,$(TARGET_BOARD_PLATFORM)),)
		AUDIO_PLATFORM = msm8916
		LOCAL_CFLAGS := -DPLATFORM_MSM8916
		ifneq ($(filter msm8909,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_MSM8909
		endif
		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"
		LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED
		MULTIPLE_HW_VARIANTS_ENABLED := true
		endif

		LOCAL_SRC_FILES := \
		audio_hw.c \
		voice.c \

hal/msm8916/hw_info.c

0 → 100644

+122 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source 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_TAG "hardware_info"
		/#define LOG_NDEBUG 0/
		#define LOG_NDDEBUG 0

		#include <stdlib.h>
		#include <dlfcn.h>
		#include <cutils/log.h>
		#include <cutils/str_parms.h>
		#include "audio_hw.h"
		#include "platform.h"
		#include "platform_api.h"


		struct hardware_info {
		char name[HW_INFO_ARRAY_MAX_SIZE];
		char type[HW_INFO_ARRAY_MAX_SIZE];
		/* variables for handling target variants */
		uint32_t num_snd_devices;
		char dev_extn[HW_INFO_ARRAY_MAX_SIZE];
		snd_device_t *snd_devices;
		};

		#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))


		static void update_hardware_info_8x16(struct hardware_info hw_info, const char snd_card_name)
		{
		if (!strcmp(snd_card_name, "msm8x16-snd-card") \|\|
		!strcmp(snd_card_name, "msm8x16-snd-card-mtp")) {
		strlcpy(hw_info->name, "msm8x16", sizeof(hw_info->name));
		} else if (!strcmp(snd_card_name, "msm8909-snd-card") \|\|
		!strcmp(snd_card_name, "msm8909-pm8916-snd-card")) {
		strlcpy(hw_info->name, "msm8909", sizeof(hw_info->name));
		} else if (!strcmp(snd_card_name, "msm8952-snd-card") \|\|
		!strcmp(snd_card_name, "msm8952-snd-card-mtp")) {
		strlcpy(hw_info->name, "msm8952", sizeof(hw_info->name));
		} else if (!strcmp(snd_card_name, "msm8952-l9300-snd-card")) {
		strlcpy(hw_info->name, "msm8952", sizeof(hw_info->name));
		} else {
		ALOGW("%s: Not an 8x16/8909/8952 device", __func__);
		}
		}

		void hw_info_init(const char snd_card_name)
		{
		struct hardware_info *hw_info;

		hw_info = malloc(sizeof(struct hardware_info));
		if (!hw_info) {
		ALOGE("failed to allocate mem for hardware info");
		return NULL;
		}

		if (strstr(snd_card_name, "msm8x16") \|\| strstr(snd_card_name, "msm8909")
		\|\| strstr(snd_card_name, "msm8952")) {
		ALOGV("8x16 - variant soundcard");

		strlcpy(hw_info->type, "", sizeof(hw_info->type));
		strlcpy(hw_info->name, "", sizeof(hw_info->name));
		hw_info->snd_devices = NULL;
		hw_info->num_snd_devices = 0;
		strlcpy(hw_info->dev_extn, "", sizeof(hw_info->dev_extn));

		update_hardware_info_8x16(hw_info, snd_card_name);
		} else {
		ALOGE("%s: Unsupported target %s:",__func__, snd_card_name);
		free(hw_info);
		hw_info = NULL;
		}

		return hw_info;
		}

		void hw_info_deinit(void *hw_info)
		{
		struct hardware_info my_data = (struct hardware_info) hw_info;

		if(my_data)
		free(my_data);
		}

		void hw_info_append_hw_type(void *hw_info, snd_device_t snd_device,
		char *device_name)
		{
		struct hardware_info my_data = (struct hardware_info) hw_info;
		uint32_t i = 0;

		if (my_data == NULL)
		return;

		snd_device_t *snd_devices =
		(snd_device_t *) my_data->snd_devices;

		if(snd_devices != NULL) {
		for (i = 0; i < my_data->num_snd_devices; i++) {
		if (snd_device == (snd_device_t)snd_devices[i]) {
		ALOGV("extract dev_extn device %d, extn = %s",
		(snd_device_t)snd_devices[i], my_data->dev_extn);
		CHECK(strlcat(device_name, my_data->dev_extn,
		DEVICE_NAME_MAX_SIZE) < DEVICE_NAME_MAX_SIZE);
		break;
		}
		}
		}
		ALOGD("%s : device_name = %s", __func__,device_name);
		}

hal/msm8916/platform.c

+18 −2

Original line number	Diff line number	Diff line
		@@ -1045,6 +1045,24 @@ int platform_get_snd_device_name_extn(void *platform, snd_device_t snd_device,
		return 0;
		}

		bool platform_check_and_set_capture_backend_cfg(struct audio_device* adev __unused,
		struct audio_usecase *usecase __unused,
		snd_device_t snd_device)
		{
		return false;
		}

		bool platform_add_gain_level_mapping(struct amp_db_and_gain_table *tbl_entry __unused)
		{
		return false;
		}

		int platform_get_gain_level_mapping(struct amp_db_and_gain_table *mapping_tbl __unused,
		int table_size __unused)
		{
		return 0;
		}

		void platform_add_backend_name(void platform, char mixer_path,
		snd_device_t snd_device)
		{
		@@ -1533,8 +1551,6 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi
		snd_device = SND_DEVICE_OUT_USB_HEADSET;
		} else if (devices & AUDIO_DEVICE_OUT_EARPIECE) {
		snd_device = SND_DEVICE_OUT_HANDSET;
		} else if (devices & AUDIO_DEVICE_OUT_PROXY) {
		snd_device = SND_DEVICE_OUT_AFE_PROXY;
		} else {
		ALOGE("%s: Unknown device(s) %#x", __func__, devices);
		}