diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-10-28 05:20:47 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2014-12-23 01:02:36 +0200 |
| commit | de5cd82f97969866b4e7e5d24bf66782e8241804 (patch) | |
| tree | 564c8ca92cbfce2219dcf3353c121b84f9921bc2 | |
| parent | 208e0484fc83d4a4d8fa2afd9fccf0fae014370a (diff) | |
find7s: Re-organize tree to become find7s device tree
Change-Id: Id37a4e6ef643b86c3fda0d0cf3e314225d96ec49
31 files changed, 62 insertions, 2745 deletions
@@ -16,8 +16,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),find7) - -include $(call all-makefiles-under,$(LOCAL_PATH)) - +ifeq ($(TARGET_DEVICE),find7s) +include $(call all-subdir-makefiles,$(LOCAL_PATH)) endif diff --git a/BoardConfig.mk b/BoardConfig.mk index f98521b..4669db4 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,37 +14,8 @@ # limitations under the License. # -# Inherit from MSM8974 common --include device/oppo/msm8974-common/BoardConfigCommon.mk - -# Kernel -BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 -TARGET_KERNEL_CONFIG := cyanogenmod_find7_defconfig - -# Bluetooth -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/oppo/find7/bluetooth - -# Camera -USE_DEVICE_SPECIFIC_CAMERA := true -COMMON_GLOBAL_CFLAGS += -DOPPO_CAMERA_HARDWARE - -# Filesystem -BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216 -BOARD_CACHEIMAGE_PARTITION_SIZE := 536870912 -BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432 -BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16777216 -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824 -BOARD_USERDATAIMAGE_PARTITION_SIZE := 13747929088 # 13747945472 - 16384 for crypto footer -#BOARD_USERDATAIMAGE_PARTITION_SIZE := 3221225472 - -# Init -TARGET_INIT_VENDOR_LIB := libinit_find7 - -# Recovery -TARGET_RECOVERY_FSTAB := device/oppo/find7/rootdir/etc/fstab.qcom +# Inherit from find7-common +-include device/oppo/find7-common/BoardConfigCommon.mk # Assert -TARGET_OTA_ASSERT_DEVICE := find7,find7a,X9007,X9006,FIND7 - -# inherit from the proprietary version --include vendor/oppo/find7/BoardConfigVendor.mk +TARGET_OTA_ASSERT_DEVICE := find7,find7a,find7s,X9007,X9006,FIND7 @@ -1,4 +1,3 @@ -Device tree for Oppo Find7 - -Copyright 2014, The CyanogenMod Project +Copyright 2014 - The CyanogenMod Project +Device configuration for Oppo Find7. diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf deleted file mode 100644 index 1088f8f..0000000 --- a/audio/audio_policy.conf +++ /dev/null @@ -1,134 +0,0 @@ -# Global configuration section: lists input and output devices always present on the device -# as well as the output device selected by default. -# Devices are designated by a string that corresponds to the enum in audio.h - -global_configuration { - attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_TELEPHONY_TX - default_output_device AUDIO_DEVICE_OUT_SPEAKER - attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_TELEPHONY_TX -} - -# audio hardware module section: contains descriptors for all audio hw modules present on the -# device. Each hw module node is named after the corresponding hw module library base name. -# For instance, "primary" corresponds to audio.primary.<device>.so. -# The "primary" module is mandatory and must include at least one output with -# AUDIO_OUTPUT_FLAG_PRIMARY flag. -# Each module descriptor contains one or more output profile descriptors and zero or more -# input profile descriptors. Each profile lists all the parameters supported by a given output -# or input stream category. -# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding -# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n". - -audio_hw_modules { - primary { - outputs { - primary { - sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|88200|96000|176400|192000 - channel_masks AUDIO_CHANNEL_OUT_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_FM|AUDIO_DEVICE_OUT_FM_TX - flags AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST - } - multichannel { - sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|96000 - channel_masks dynamic - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY - flags AUDIO_OUTPUT_FLAG_DIRECT - } - compress_offload { - sampling_rates 8000|11025|16000|22050|32000|44100|48000|64000|88200|96000|176400|192000 - channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1 - formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_MP2|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_FM_TX - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - } - incall_music { - sampling_rates 8000|16000|48000 - channel_masks AUDIO_CHANNEL_OUT_MONO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_INCALL_MUSIC - } - voice_tx { - sampling_rates 8000|16000|48000 - channel_masks AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_MONO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_TELEPHONY_TX - } - voip_rx { - sampling_rates 8000|16000 - channel_masks AUDIO_CHANNEL_OUT_MONO - formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB|AUDIO_FORMAT_EVRCNW - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO - flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX - } - } - inputs { - primary { - sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000 - channel_masks AUDIO_CHANNEL_IN_5POINT1|AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK - formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB|AUDIO_FORMAT_EVRCNW - devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_FM_RX|AUDIO_DEVICE_IN_FM_RX_A2DP|AUDIO_DEVICE_IN_VOICE_CALL - } - voice_rx { - sampling_rates 8000|16000|48000 - channel_masks AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_MONO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_IN_TELEPHONY_RX - } - } - } - a2dp { - outputs { - a2dp { - sampling_rates 44100 - channel_masks AUDIO_CHANNEL_OUT_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_ALL_A2DP - } - } - } - usb { - outputs { - usb_accessory { - sampling_rates 44100 - channel_masks AUDIO_CHANNEL_OUT_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_USB_ACCESSORY - } - usb_device { - sampling_rates dynamic - channel_masks dynamic - formats dynamic - devices AUDIO_DEVICE_OUT_USB_DEVICE - } - } - inputs { - usb_device { - sampling_rates dynamic - channel_masks AUDIO_CHANNEL_IN_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_IN_USB_DEVICE - } - } - } - r_submix { - outputs { - submix { - sampling_rates 48000 - channel_masks AUDIO_CHANNEL_OUT_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_REMOTE_SUBMIX - } - } - inputs { - submix { - sampling_rates 48000 - channel_masks AUDIO_CHANNEL_IN_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_IN_REMOTE_SUBMIX - } - } - } -} diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml deleted file mode 100644 index 386673e..0000000 --- a/audio/mixer_paths.xml +++ /dev/null @@ -1,956 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<mixer> - <!-- These are the initial mixer settings --> - <ctl name="Voice Rx Device Mute" id="0" value="0" /> - <ctl name="Voice Rx Device Mute" id="1" value="-1" /> - <ctl name="Voice Rx Device Mute" id="2" value="20" /> - <ctl name="Voice Tx Mute" id="0" value="0" /> - <ctl name="Voice Tx Mute" id="1" value="-1" /> - <ctl name="Voice Tx Mute" id="2" value="500" /> - <ctl name="Voice Rx Gain" id="0" value="0" /> - <ctl name="Voice Rx Gain" id="1" value="-1" /> - <ctl name="Voice Rx Gain" id="2" value="20" /> - <ctl name="Voip Tx Mute" id="0" value="0" /> - <ctl name="Voip Tx Mute" id="1" value="500" /> - <ctl name="Voip Rx Gain" id="0" value="0" /> - <ctl name="Voip Rx Gain" id="1" value="20" /> - <ctl name="Voip Mode Config" value="12" /> - <ctl name="Voip Rate Config" value="0" /> - <ctl name="Voip Evrc Min Max Rate Config" id="0" value="1" /> - <ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" /> - <ctl name="Voip Dtx Mode" value="0" /> - <ctl name="TTY Mode" value="OFF" /> - <ctl name="LINEOUT1 Volume" value="0" /> - <ctl name="LINEOUT2 Volume" value="0" /> - <ctl name="LINEOUT3 Volume" value="0" /> - <ctl name="LINEOUT4 Volume" value="0" /> - <ctl name="HPHL Volume" value="0" /> - <ctl name="HPHR Volume" value="0" /> - <ctl name="RX1 Digital Volume" value="0" /> - <ctl name="RX2 Digital Volume" value="0" /> - <ctl name="RX3 Digital Volume" value="0" /> - <ctl name="RX4 Digital Volume" value="0" /> - <ctl name="RX5 Digital Volume" value="0" /> - <ctl name="RX6 Digital Volume" value="0" /> - <ctl name="RX7 Digital Volume" value="-" /> - <ctl name="ADC1 Volume" value="0" /> - <ctl name="ADC2 Volume" value="0" /> - <ctl name="ADC3 Volume" value="19" /> - <ctl name="ADC4 Volume" value="0" /> - <ctl name="ADC5 Volume" value="0" /> - <ctl name="ADC6 Volume" value="0" /> - <ctl name="DEC1 Volume" value="0" /> - <ctl name="DEC2 Volume" value="0" /> - <ctl name="DEC3 Volume" value="0" /> - <ctl name="DEC4 Volume" value="84" /> - <ctl name="DEC5 Volume" value="0" /> - <ctl name="DEC6 Volume" value="0" /> - <ctl name="DEC7 Volume" value="0" /> - <ctl name="DEC8 Volume" value="0" /> - <ctl name="DEC9 Volume" value="0" /> - <ctl name="DEC10 Volume" value="0" /> - <ctl name="COMP0 Switch" value="0" /> - <ctl name="COMP1 Switch" value="0" /> - <ctl name="COMP2 Switch" value="0" /> - <ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" /> - <ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" /> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia2" value="0" /> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia3" value="0" /> - <ctl name="AUX_PCM_RX Audio Mixer MultiMedia5" value="0" /> - <ctl name="AUX_PCM_RX_Voice Mixer CSVoice" value="0" /> - <ctl name="SEC_AUX_PCM_RX_Voice Mixer CSVoice" value="0" /> - <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" /> - <ctl name="Voice_Tx Mixer SEC_AUX_PCM_TX_Voice" value="0" /> - <!-- Audio BTSCO --> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="0" /> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="0" /> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia5" value="0" /> - <ctl name="MultiMedia1 Mixer INTERNAL_BT_SCO_TX" value="0" /> - <!-- Voice BTSCO --> - <ctl name="Internal BTSCO SampleRate" value="8000" /> - <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" /> - <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" /> - <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" /> - <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" /> - <ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia1" value="0" /> - <ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia2" value="0" /> - <ctl name="MultiMedia5 Mixer SLIM_0_TX" value="0" /> - <ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" /> - <ctl name="MultiMedia1 Mixer MI2S_TX" value="0" /> - <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="0" /> - <ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" /> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" /> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" /> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" /> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" /> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" /> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia6" value="0" /> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" /> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia8" value="0" /> - <ctl name="IIR1 INP1 MUX" value="ZERO" /> - <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="ZERO" /> - <ctl name="SLIM TX10 MUX" value="ZERO" /> - <ctl name="SLIM TX9 MUX" value="ZERO" /> - <ctl name="SLIM TX8 MUX" value="ZERO" /> - <ctl name="SLIM TX7 MUX" value="ZERO" /> - <ctl name="SLIM TX6 MUX" value="ZERO" /> - <ctl name="SLIM TX5 MUX" value="ZERO" /> - <ctl name="SLIM TX4 MUX" value="ZERO" /> - <ctl name="SLIM TX3 MUX" value="ZERO" /> - <ctl name="SLIM TX2 MUX" value="ZERO" /> - <ctl name="SLIM TX1 MUX" value="ZERO" /> - <ctl name="DEC10 MUX" value="ZERO" /> - <ctl name="DEC9 MUX" value="ZERO" /> - <ctl name="DEC8 MUX" value="ZERO" /> - <ctl name="DEC7 MUX" value="ZERO" /> - <ctl name="DEC6 MUX" value="ZERO" /> - <ctl name="DEC5 MUX" value="ZERO" /> - <ctl name="DEC4 MUX" value="ZERO" /> - <ctl name="DEC3 MUX" value="ZERO" /> - <ctl name="DEC2 MUX" value="ZERO" /> - <ctl name="DEC1 MUX" value="ZERO" /> - <ctl name="RX2 MIX2 INP2" value="ZERO" /> - <ctl name="RX2 MIX2 INP1" value="ZERO" /> - <ctl name="RX1 MIX2 INP2" value="ZERO" /> - <ctl name="RX1 MIX2 INP1" value="ZERO" /> - <ctl name="RX7 MIX1 INP2" value="ZERO" /> - <ctl name="RX7 MIX1 INP1" value="ZERO" /> - <ctl name="RX6 MIX1 INP2" value="ZERO" /> - <ctl name="RX6 MIX1 INP1" value="ZERO" /> - <ctl name="RX5 MIX1 INP2" value="ZERO" /> - <ctl name="RX5 MIX1 INP1" value="ZERO" /> - <ctl name="RX4 MIX1 INP2" value="ZERO" /> - <ctl name="RX4 MIX1 INP1" value="ZERO" /> - <ctl name="RX3 MIX1 INP2" value="ZERO" /> - <ctl name="RX3 MIX1 INP1" value="ZERO" /> - <ctl name="RX2 MIX1 INP2" value="ZERO" /> - <ctl name="RX2 MIX1 INP1" value="ZERO" /> - <ctl name="RX1 MIX1 INP3" value="ZERO" /> - <ctl name="RX1 MIX1 INP2" value="ZERO" /> - <ctl name="RX1 MIX1 INP1" value="ZERO" /> - <ctl name="HPHL DAC Switch" value="0" /> - <ctl name="DAC1 Switch" value="0" /> - <ctl name="SLIM_0_RX Channels" value="One" /> - <ctl name="SLIM_0_TX Channels" value="One" /> - <ctl name="SLIM RX1 MUX" value="ZERO" /> - <ctl name="EAR PA Gain" value="POS_0_DB" /> - <ctl name="SLIM RX2 MUX" value="ZERO" /> - <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" /> - <ctl name="AIF1_CAP Mixer SLIM TX8" value="0"/> - <ctl name="CLASS_H_DSM MUX" value="ZERO" /> - <ctl name="RDAC5 MUX" value="ZERO" /> - - <!-- usb headset --> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" /> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" /> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" /> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="0" /> - <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="0" /> - <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="0" /> - <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="0" /> - <!-- usb headset end --> - - <!-- Incall Recording --> - <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="0" /> - <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="0" /> - - <!-- VoLTE --> - <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" /> - <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" /> - <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoLTE" value="0" /> - <ctl name="VoLTE_Tx Mixer INTERNAL_BT_SCO_TX_VoLTE" value="0" /> - <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="0" /> - <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="0" /> - <!-- VoLTE end--> - - <!-- Voice2 --> - <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" /> - <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" /> - <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" /> - <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voice2" value="0" /> - <ctl name="Voice2_Tx Mixer INTERNAL_BT_SCO_TX_Voice2" value="0" /> - <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="0" /> - <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="0" /> - <!-- Voice2 End--> - - <!-- compress-voip-call --> - <ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" /> - <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" /> - <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" /> - <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" /> - <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="0" /> - <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="0" /> - <!-- compress-voip-call End--> - - <!-- audio record compress--> - <ctl name="MultiMedia8 Mixer SLIM_0_TX" value="0" /> - <ctl name="MultiMedia8 Mixer INTERNAL_BT_SCO_TX" value="0" /> - <ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" /> - <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="0" /> - <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="0" /> - <!-- audio record compress end--> - - <!-- listen --> - <ctl name="LSM1 MUX" value="None" /> - <ctl name="LSM2 MUX" value="None" /> - <ctl name="LSM3 MUX" value="None" /> - <ctl name="LSM4 MUX" value="None" /> - <ctl name="LSM5 MUX" value="None" /> - <ctl name="LSM6 MUX" value="None" /> - <ctl name="LSM7 MUX" value="None" /> - <ctl name="LSM8 MUX" value="None" /> - <ctl name="SLIMBUS_5_TX LSM Function" value="None" /> - <ctl name="MADONOFF Switch" value="0" /> - <ctl name="MAD Input" value="ADC3" /> - <!-- listen end--> - - <!-- EC_REF --> - <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" /> - - <!-- afe-proxy --> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" /> - <!-- afe-proxy end--> - - <!-- BT SCO samplerate --> - <path name="bt-sco-samplerate"> - <ctl name="Internal BTSCO SampleRate" value="8000" /> - </path> - - <!-- BT SCO WB Sample Rate --> - <path name="bt-sco-wb-samplerate"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - </path> - - <!-- 24bit/96KHz toggle --> - <ctl name="SLIM_0_RX Format" value="S16_LE" /> - <ctl name="SLIM_0_RX SampleRate" value="KHZ_48" /> - - <!-- These are audio route (FE to BE) specific mixer settings --> - <path name="deep-buffer-playback"> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="1" /> - </path> - - <path name="deep-buffer-playback bt-sco"> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="1" /> - </path> - - <path name="deep-buffer-playback bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="deep-buffer-playback bt-sco" /> - </path> - - <path name="deep-buffer-playback afe-proxy"> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="1" /> - </path> - - <path name="deep-buffer-playback usb-headphones"> - <path name="deep-buffer-playback afe-proxy" /> - </path> - - <path name="deep-buffer-playback speaker-and-usb-headphones"> - <path name="deep-buffer-playback usb-headphones" /> - <path name="deep-buffer-playback" /> - </path> - - <path name="low-latency-playback"> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="1" /> - </path> - - <path name="low-latency-playback bt-sco"> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia5" value="1" /> - </path> - - <path name="low-latency-playback bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="low-latency-playback bt-sco" /> - </path> - - <path name="low-latency-playback afe-proxy"> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" /> - </path> - - <path name="low-latency-playback usb-headphones"> - <path name="low-latency-playback afe-proxy" /> - </path> - - <path name="low-latency-playback speaker-and-usb-headphones"> - <path name="low-latency-playback usb-headphones" /> - <path name="low-latency-playback" /> - </path> - - <path name="multi-channel-playback afe-proxy"> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" /> - </path> - - <path name="compress-offload-playback"> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="1" /> - </path> - - <path name="compress-offload-playback bt-sco"> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="1" /> - </path> - - <path name="compress-offload-playback bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="compress-offload-playback bt-sco" /> - </path> - - <path name="compress-offload-playback afe-proxy"> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" /> - </path> - - <path name="compress-offload-playback usb-headphones"> - <path name="compress-offload-playback afe-proxy" /> - </path> - - <path name="compress-offload-playback speaker-and-usb-headphones"> - <path name="compress-offload-playback usb-headphones" /> - <path name="compress-offload-playback" /> - </path> - - <path name="compress-offload-playback2"> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia6" value="1" /> - </path> - - <path name="compress-offload-playback2 bt-sco"> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" /> - </path> - - <path name="compress-offload-playback2 bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="compress-offload-playback2 bt-sco" /> - </path> - - <path name="compress-offload-playback2 afe-proxy"> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia6" value="1" /> - </path> - - <path name="compress-offload-playback2 usb-headphones"> - <path name="compress-offload-playback2 afe-proxy" /> - </path> - - <path name="compress-offload-playback2 speaker-and-usb-headphones"> - <path name="compress-offload-playback2 usb-headphones" /> - <path name="compress-offload-playback2" /> - </path> - - <path name="compress-offload-playback3"> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="1" /> - </path> - - <path name="compress-offload-playback3 bt-sco"> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia7" value="1" /> - </path> - - <path name="compress-offload-playback3 bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="compress-offload-playback3 bt-sco" /> - </path> - - <path name="compress-offload-playback3 afe-proxy"> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" /> - </path> - - <path name="compress-offload-playback3 usb-headphones"> - <path name="compress-offload-playback3 afe-proxy" /> - </path> - - <path name="compress-offload-playback3 speaker-and-usb-headphones"> - <path name="compress-offload-playback3 usb-headphones" /> - <path name="compress-offload-playback3" /> - </path> - - <path name="compress-offload-playback8"> - <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia8" value="1" /> - </path> - - <path name="compress-offload-playback8 bt-sco"> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia8" value="1" /> - </path> - - <path name="compress-offload-playback8 bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="compress-offload-playback8 bt-sco" /> - </path> - - <path name="compress-offload-playback8 afe-proxy"> - <ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" /> - </path> - - <path name="compress-offload-playback8 usb-headphones"> - <path name="compress-offload-playback8 afe-proxy" /> - </path> - - <path name="compress-offload-playback8 speaker-and-usb-headphones"> - <path name="compress-offload-playback8 usb-headphones" /> - <path name="compress-offload-playback8" /> - </path> - - - <path name="audio-record"> - <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" /> - </path> - - <path name="audio-record usb-headset-mic"> - <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="1" /> - </path> - - <path name="audio-record bt-sco"> - <ctl name="MultiMedia1 Mixer INTERNAL_BT_SCO_TX" value="1" /> - </path> - - <path name="audio-record bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="audio-record bt-sco" /> - </path> - - <path name="audio-record-compress"> - <ctl name="MultiMedia8 Mixer SLIM_0_TX" value="1" /> - </path> - - <path name="audio-record-compress bt-sco"> - <ctl name="MultiMedia8 Mixer INTERNAL_BT_SCO_TX" value="1" /> - </path> - - <path name="audio-record-compress bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="audio-record-compress bt-sco" /> - </path> - - <path name="audio-record-compress usb-headset-mic"> - <ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="1" /> - </path> - - <path name="voice-call"> - <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="1" /> - <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" /> - </path> - - <path name="voice-call bt-sco"> - <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="1" /> - <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="1" /> - </path> - - <path name="voice-call bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="voice-call bt-sco" /> - </path> - - <path name="voice-call afe-proxy"> - <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="1" /> - <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" /> - </path> - - <path name="afe-proxy-playback afe-proxy"> - </path> - - <path name="afe-proxy-record afe-proxy"> - </path> - - <path name="voice-call usb-headphones"> - <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="1" /> - <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" /> - </path> - - <path name="voice2-call"> - <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" /> - <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" /> - </path> - - <path name="voice2-call bt-sco"> - <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voice2" value="1" /> - <ctl name="Voice2_Tx Mixer INTERNAL_BT_SCO_TX_Voice2" value="1" /> - </path> - - <path name="voice2-call bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="voice2-call bt-sco" /> - </path> - - <path name="voice2-call usb-headphones"> - <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="1" /> - <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" /> - </path> - - <path name="hfp-sco"> - <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" /> - <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" /> - <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" /> - <ctl name="SLIMBUS_DL_HL Switch" value="1" /> - </path> - - <path name="hfp-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="hfp-sco" /> - </path> - - <path name="incall-rec-uplink"> - <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" /> - </path> - - <path name="incall-rec-uplink bt-sco"> - <path name="incall-rec-uplink" /> - </path> - - <path name="incall-rec-uplink bt-sco-wb"> - <path name="incall-rec-uplink" /> - </path> - - <path name="incall-rec-uplink usb-headset-mic"> - <path name="incall-rec-uplink" /> - </path> - - <path name="incall-rec-uplink-compress"> - <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" /> - </path> - - <path name="incall-rec-uplink-compress bt-sco"> - <path name="incall-rec-uplink-compress" /> - </path> - - <path name="incall-rec-uplink-compress bt-sco-wb"> - <path name="incall-rec-uplink-compress" /> - </path> - - <path name="incall-rec-uplink-compress usb-headset-mic"> - <path name="incall-rec-uplink-compress" /> - </path> - - <path name="incall-rec-downlink"> - <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" /> - </path> - - <path name="incall-rec-downlink bt-sco"> - <path name="incall-rec-downlink" /> - </path> - - <path name="incall-rec-downlink bt-sco-wb"> - <path name="incall-rec-downlink" /> - </path> - - <path name="incall-rec-downlink usb-headset-mic"> - <path name="incall-rec-downlink" /> - </path> - - <path name="incall-rec-downlink-compress"> - <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="1" /> - </path> - - <path name="incall-rec-downlink-compress bt-sco"> - <path name="incall-rec-downlink-compress" /> - </path> - - <path name="incall-rec-downlink-compress bt-sco-wb"> - <path name="incall-rec-downlink-compress" /> - </path> - - <path name="incall-rec-downlink-compress usb-headset-mic"> - <path name="incall-rec-downlink-compress" /> - </path> - - <path name="incall-rec-uplink-and-downlink"> - <path name="incall-rec-uplink" /> - <path name="incall-rec-downlink" /> - </path> - - <path name="incall-rec-uplink-and-downlink bt-sco"> - <path name="incall-rec-uplink-and-downlink" /> - </path> - - <path name="incall-rec-uplink-and-downlink bt-sco-wb"> - <path name="incall-rec-uplink-and-downlink" /> - </path> - - <path name="incall-rec-uplink-and-downlink usb-headset-mic"> - <path name="incall-rec-uplink-and-downlink" /> - </path> - - <path name="incall-rec-uplink-and-downlink-compress"> - <path name="incall-rec-uplink-compress" /> - <path name="incall-rec-downlink-compress" /> - </path> - - <path name="incall-rec-uplink-and-downlink-compress bt-sco"> - <path name="incall-rec-uplink-and-downlink-compress" /> - </path> - - <path name="incall-rec-uplink-and-downlink-compress bt-sco-wb"> - <path name="incall-rec-uplink-and-downlink-compress" /> - </path> - - <path name="incall-rec-uplink-and-downlink-compress usb-headset-mic"> - <path name="incall-rec-uplink-and-downlink-compress" /> - </path> - - <path name="volte-call"> - <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" /> - <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" /> - </path> - - <path name="volte-call bt-sco"> - <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoLTE" value="1" /> - <ctl name="VoLTE_Tx Mixer INTERNAL_BT_SCO_TX_VoLTE" value="1" /> - </path> - - <path name="volte-call bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="volte-call bt-sco" /> - </path> - - <path name="volte-call usb-headphones"> - <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="1" /> - <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" /> - </path> - - <path name="compress-voip-call"> - <ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" /> - <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" /> - </path> - - <path name="compress-voip-call bt-sco"> - <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" /> - <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" /> - </path> - - <path name="compress-voip-call bt-sco-wb"> - <ctl name="Internal BTSCO SampleRate" value="16000" /> - <path name="compress-voip-call bt-sco" /> - </path> - - <path name="compress-voip-call usb-headphones"> - <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="1" /> - <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" /> - </path> - - <path name="listen-voice-wakeup-1"> - <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" /> - <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - </path> - - <path name="listen-voice-wakeup-2"> - <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" /> - <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - </path> - - <path name="listen-voice-wakeup-3"> - <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" /> - <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - </path> - - <path name="listen-voice-wakeup-4"> - <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" /> - <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - </path> - - <path name="listen-voice-wakeup-5"> - <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" /> - <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - </path> - - <path name="listen-voice-wakeup-6"> - <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" /> - <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - </path> - - <path name="listen-voice-wakeup-7"> - <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" /> - <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - </path> - - <path name="listen-voice-wakeup-8"> - <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" /> - <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - </path> - - - <!-- Analog output devices --> - <path name="ear"> - <ctl name="RX1 MIX1 INP1" value="RX1" /> - <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" /> - <ctl name="RX1 Digital Volume" value="84" /> - <ctl name="EAR PA Gain" value="POS_6_DB" /> - <ctl name="DAC1 Switch" value="1" /> - </path> - - <path name="spk"> - <ctl name="SLIM RX1 MUX" value="AIF1_PB" /> - <ctl name="SLIM_0_RX Channels" value="One" /> - <ctl name="RX3 MIX1 INP1" value="RX1" /> - <ctl name="RDAC5 MUX" value="DEM3_INV" /> - <ctl name="COMP2 Switch" value="1" /> - <ctl name="LINEOUT1 Volume" value="13" /> - <ctl name="LINEOUT3 Volume" value="13" /> - </path> - - <path name="hph"> - <ctl name="SLIM RX1 MUX" value="AIF1_PB" /> - <ctl name="SLIM RX2 MUX" value="AIF1_PB" /> - <ctl name="SLIM_0_RX Channels" value="Two" /> - <ctl name="RX1 MIX1 INP1" value="RX1" /> - <ctl name="RX2 MIX1 INP1" value="RX2" /> - <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" /> - <ctl name="HPHL DAC Switch" value="1" /> - <ctl name="COMP1 Switch" value="1" /> - <ctl name="HPHL Volume" value="20" /> - <ctl name="HPHR Volume" value="20" /> - </path> - - <path name="spk-hph"> - <path name="hph" /> - <ctl name="RX3 MIX1 INP1" value="RX1" /> - <ctl name="RDAC5 MUX" value="DEM3_INV" /> - <ctl name="COMP2 Switch" value="1" /> - <ctl name="LINEOUT1 Volume" value="14" /> - <ctl name="LINEOUT3 Volume" value="14" /> - </path> - - - <!-- Output paths --> - <path name="handset"> - <ctl name="SLIM RX1 MUX" value="AIF1_PB" /> - <ctl name="SLIM_0_RX Channels" value="One" /> - <path name="ear" /> - </path> - - <path name="voice-handset"> - <path name="handset" /> - </path> - - <path name="speaker"> - <path name="spk" /> - <ctl name="RX3 Digital Volume" value="80" /> - <ctl name="RX4 Digital Volume" value="80" /> - </path> - - <path name="voice-speaker"> - <path name="spk" /> - <ctl name="RX3 Digital Volume" value="84" /> - <ctl name="RX4 Digital Volume" value="84" /> - </path> - - <path name="headphones"> - <path name="hph" /> - <ctl name="RX1 Digital Volume" value="84" /> - <ctl name="RX2 Digital Volume" value="84" /> - </path> - - <path name="voice-headphones"> - <path name="hph" /> - <ctl name="RX1 Digital Volume" value="85" /> - <ctl name="RX2 Digital Volume" value="85" /> - </path> - - <path name="speaker-and-headphones"> - <path name="spk-hph" /> - <ctl name="RX1 Digital Volume" value="84" /> - <ctl name="RX2 Digital Volume" value="84" /> - <ctl name="RX3 Digital Volume" value="80" /> - <ctl name="RX4 Digital Volume" value="80" /> - </path> - - - <!-- Analog input devices --> - <path name="hph-mic"> - <ctl name="DEC5 MUX" value="ADC2" /> - <ctl name="IIR1 INP1 MUX" value="DEC5" /> - <ctl name="DEC5 Volume" value="84" /> - </path> - - <path name="main-mic"> - <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/> - <ctl name="SLIM TX7 MUX" value="DEC4" /> - <ctl name="DEC4 MUX" value="ADC3" /> - <ctl name="DEC4 Volume" value="84" /> - </path> - - <path name="sec-mic"> - <ctl name="DEC3 MUX" value="ADC4" /> - <ctl name="ADC4 Volume" value="19" /> - <ctl name="DEC3 Volume" value="84" /> - </path> - - <path name="anc-mic"> - <ctl name="DEC2 MUX" value="ADC5" /> - <ctl name="ADC5 Volume" value="19" /> - <ctl name="DEC2 Volume" value="84" /> - </path> - - - <!-- Recording paths --> - <path name="handset-mic"> - <path name="main-mic" /> - <ctl name="SLIM_0_TX Channels" value="One" /> - <ctl name="ADC3 Volume" value="19" /> - </path> - - <path name="speaker-mic"> - <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" /> - <ctl name="SLIM_0_TX Channels" value="One" /> - <ctl name="SLIM TX7 MUX" value="DEC3" /> - <path name="sec-mic" /> - </path> - - <path name="headset-mic"> - <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/> - <ctl name="SLIM_0_TX Channels" value="One" /> - <ctl name="SLIM TX7 MUX" value="DEC5" /> - <ctl name="ADC2 Volume" value="13" /> - <path name="hph-mic" /> - </path> - - <path name="voice-rec-mic"> - <path name="main-mic" /> - <ctl name="SLIM_0_TX Channels" value="One" /> - <ctl name="ADC3 Volume" value="19" /> - </path> - - <path name="voice-speaker-mic"> - <path name="speaker-mic" /> - </path> - - <path name="voice-headset-mic"> - <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" /> - <ctl name="SLIM_0_TX Channels" value="One" /> - <ctl name="SLIM TX7 MUX" value="DEC5" /> - <ctl name="ADC2 Volume" value="13" /> - <path name="hph-mic" /> - </path> - - - <!-- USB digital audio --> - <path name="usb-headphones"> - </path> - - <path name="speaker-and-usb-headphones"> - <path name="speaker" /> - <path name="usb-headphones" /> - </path> - - <path name="usb-headset-mic"> - </path> - - - <!-- AFE proxy --> - <path name="afe-proxy"> - </path> - - - <!-- Bluetooth --> - <path name="bt-sco-headset"> - </path> - - <path name="bt-sco-mic"> - </path> - - <path name="bt-sco-headset-wb"> - </path> - - <path name="bt-sco-mic-wb"> - </path> - - <!-- Dual-mic recording --> - <path name="handset-dmic"> - <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" /> - <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" /> - <ctl name="SLIM_0_TX Channels" value="Two" /> - <ctl name="SLIM TX7 MUX" value="DEC4" /> - <ctl name="DEC4 MUX" value="ADC3" /> - <ctl name="DEC4 Volume" value="84" /> - <ctl name="SLIM TX8 MUX" value="DEC3" /> - <ctl name="DEC3 MUX" value="ADC4" /> - <ctl name="DEC3 Volume" value="84" /> - </path> - - <path name="dmic-endfire"> - <path name="handset-dmic" /> - <ctl name="ADC3 Volume" value="9" /> - <ctl name="ADC4 Volume" value="9" /> - </path> - - <path name="voice-dmic-ef"> - <path name="dmic-endfire" /> - </path> - - - <!-- Stereo recording --> - <path name="speaker-stereo-dmic-ef"> - <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" /> - <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" /> - <ctl name="SLIM_0_TX Channels" value="Two" /> - <ctl name="SLIM TX7 MUX" value="DEC4" /> - <ctl name="DEC4 MUX" value="ADC3" /> - <ctl name="DEC4 Volume" value="84" /> - <ctl name="SLIM TX8 MUX" value="DEC2" /> - <ctl name="DEC2 MUX" value="ADC5" /> - <ctl name="DEC2 Volume" value="84" /> - <ctl name="ADC3 Volume" value="19" /> - <ctl name="ADC5 Volume" value="19" /> - </path> - - <path name="handset-stereo-dmic-ef"> - <path name="handset-dmic" /> - <ctl name="ADC3 Volume" value="19" /> - <ctl name="ADC4 Volume" value="19" /> - </path> - - <path name="camcorder-mic"> - <path name="speaker-stereo-dmic-ef" /> - </path> - - - <!-- TTY devices --> - <path name="tty-headphones"> - <ctl name="SLIM RX1 MUX" value="AIF1_PB" /> - <ctl name="SLIM_0_RX Channels" value="One" /> - <ctl name="RX1 MIX1 INP1" value="RX1" /> - <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" /> - <ctl name="HPHL DAC Switch" value="1" /> - <ctl name="COMP1 Switch" value="1" /> - <ctl name="HPHL Volume" value="20" /> - </path> - - <path name="voice-tty-full-headphones"> - <ctl name="TTY Mode" value="FULL" /> - <path name="tty-headphones" /> - </path> - - <path name="voice-tty-vco-headphones"> - <ctl name="TTY Mode" value="VCO" /> - <path name="tty-headphones" /> - </path> - - <path name="voice-tty-hco-handset"> - <ctl name="TTY Mode" value="HCO" /> - <path name="handset" /> - </path> - - <path name="voice-tty-full-headset-mic"> - <path name="hph-mic" /> - <ctl name="ADC2 Volume" value="12" /> - </path> - - <path name="voice-tty-hco-headset-mic"> - <path name="voice-tty-full-headset-mic" /> - </path> - - <path name="voice-tty-vco-handset-mic"> - <path name="handset-mic" /> - </path> - - - <!-- MAD --> - <path name="listen-handset-mic"> - <ctl name="MADONOFF Switch" value="1" /> - <ctl name="MAD Input" value="ADC3" /> - </path> - - <path name="voice-rx"> - </path> - - <path name="voice-tx"> - </path> - - <path name="echo-reference"> - <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" /> - </path> -</mixer> diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h deleted file mode 100644 index db72b4c..0000000 --- a/bluetooth/bdroid_buildcfg.h +++ /dev/null @@ -1,32 +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. - */ - -#ifndef _BDROID_BUILDCFG_H -#define _BDROID_BUILDCFG_H - -#define BLUETOOTH_QTI_SW TRUE - -#define BTM_DEF_LOCAL_NAME "Oppo Find7" -#define MAX_ACL_CONNECTIONS 7 -#define MAX_L2CAP_CHANNELS 16 - -#define BTA_SKIP_BLE_READ_REMOTE_FEAT FALSE -#define BTA_BLE_SKIP_CONN_UPD FALSE - -#define BLE_VND_INCLUDED TRUE -#define BLE_PERIPHERAL_ADV_NAME TRUE - -#endif diff --git a/camera/Android.mk b/camera/Android.mk deleted file mode 100644 index 791369f..0000000 --- a/camera/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -ifeq ($(USE_DEVICE_SPECIFIC_CAMERA),true) - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_C_INCLUDES := \ - system/media/camera/include - -LOCAL_SRC_FILES := \ - CameraWrapper.cpp - -LOCAL_SHARED_LIBRARIES := \ - libhardware liblog libcamera_client libutils - -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw -LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) -#include $(BUILD_HEAPTRACKED_SHARED_LIBRARY) - -endif diff --git a/camera/CameraWrapper.cpp b/camera/CameraWrapper.cpp deleted file mode 100644 index f204916..0000000 --- a/camera/CameraWrapper.cpp +++ /dev/null @@ -1,642 +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. - */ - -/** -* @file CameraWrapper.cpp -* -* This file wraps a vendor camera module. -* -*/ - -//#define LOG_NDEBUG 0 - -#define LOG_TAG "CameraWrapper" -#include <cutils/log.h> - -#include <utils/threads.h> -#include <utils/String8.h> -#include <hardware/hardware.h> -#include <hardware/camera.h> -#include <camera/Camera.h> -#include <camera/CameraParameters.h> - -static android::Mutex gCameraWrapperLock; -static camera_module_t *gVendorModule = 0; - -static char **fixed_set_params = NULL; - -static int camera_device_open(const hw_module_t *module, const char *name, - hw_device_t **device); -static int camera_get_number_of_cameras(void); -static int camera_get_camera_info(int camera_id, struct camera_info *info); - -static struct hw_module_methods_t camera_module_methods = { - .open = camera_device_open -}; - -camera_module_t HAL_MODULE_INFO_SYM = { - .common = { - .tag = HARDWARE_MODULE_TAG, - .module_api_version = CAMERA_MODULE_API_VERSION_1_0, - .hal_api_version = HARDWARE_HAL_API_VERSION, - .id = CAMERA_HARDWARE_MODULE_ID, - .name = "Find7 Camera Wrapper", - .author = "The CyanogenMod Project", - .methods = &camera_module_methods, - .dso = NULL, /* remove compilation warnings */ - .reserved = {0}, /* remove compilation warnings */ - }, - .get_number_of_cameras = camera_get_number_of_cameras, - .get_camera_info = camera_get_camera_info, - .set_callbacks = NULL, /* remove compilation warnings */ - .get_vendor_tag_ops = NULL, /* remove compilation warnings */ - .open_legacy = NULL, /* remove compilation warnings */ - .reserved = {0}, /* remove compilation warnings */ -}; - -typedef struct wrapper_camera_device { - camera_device_t base; - int id; - camera_device_t *vendor; -} wrapper_camera_device_t; - -#define VENDOR_CALL(device, func, ...) ({ \ - wrapper_camera_device_t *__wrapper_dev = (wrapper_camera_device_t*) device; \ - __wrapper_dev->vendor->ops->func(__wrapper_dev->vendor, ##__VA_ARGS__); \ -}) - -#define CAMERA_ID(device) (((wrapper_camera_device_t *)(device))->id) - -static int check_vendor_module() -{ - int rv = 0; - ALOGV("%s", __FUNCTION__); - - if (gVendorModule) - return 0; - - rv = hw_get_module_by_class("camera", "vendor", - (const hw_module_t**)&gVendorModule); - if (rv) - ALOGE("failed to open vendor camera module"); - return rv; -} - -static const char *KEY_EXPOSURE_TIME = "exposure-time"; -static const char *KEY_EXPOSURE_TIME_VALUES = "exposure-time-values"; - -static char *camera_fixup_getparams(int id, const char *settings) -{ - bool videoMode = false; - const char *exposureTimeValues = "0,1,500000,1000000,2000000,4000000,8000000,16000000,32000000,64000000"; - const char *supportedSceneModes = "auto,asd,landscape,snow,beach,sunset,night,portrait,backlight,sports,steadyphoto,flowers,candlelight,fireworks,party,night-portrait,theatre,action,AR"; - - android::CameraParameters params; - params.unflatten(android::String8(settings)); - -#if !LOG_NDEBUG - ALOGV("%s: original parameters:", __FUNCTION__); - params.dump(); -#endif - - if (params.get(android::CameraParameters::KEY_RECORDING_HINT)) { - videoMode = (!strcmp(params.get( - android::CameraParameters::KEY_RECORDING_HINT), "true")); - } - - if (!videoMode) { - /* Back camera */ - if (id == 0) { - /* Set supported exposure time values */ - params.set(KEY_EXPOSURE_TIME_VALUES, exposureTimeValues); - } - - /* Front camera */ - if (id == 1) { - /* Remove HDR scene mode */ - params.set(android::CameraParameters::KEY_SUPPORTED_SCENE_MODES, - supportedSceneModes); - } - } - -#if !LOG_NDEBUG - ALOGV("%s: fixed parameters:", __FUNCTION__); - params.dump(); -#endif - - android::String8 strParams = params.flatten(); - char *ret = strdup(strParams.string()); - - return ret; -} - -static char *camera_fixup_setparams(int id, const char *settings) -{ - bool videoMode = false; - bool slowShutterMode = false; - - android::CameraParameters params; - params.unflatten(android::String8(settings)); - -#if !LOG_NDEBUG - ALOGV("%s: original parameters:", __FUNCTION__); - params.dump(); -#endif - - if (params.get(android::CameraParameters::KEY_RECORDING_HINT)) { - videoMode = (!strcmp(params.get( - android::CameraParameters::KEY_RECORDING_HINT), "true")); - } - - if (params.get(KEY_EXPOSURE_TIME)) { - slowShutterMode = (strcmp(params.get(KEY_EXPOSURE_TIME), "0")); - } - - /* Disable flash if slow shutter is enabled */ - if (!videoMode) { - if (id == 0) { - if (slowShutterMode) { - params.set(android::CameraParameters::KEY_FLASH_MODE, - android::CameraParameters::FLASH_MODE_OFF); - } - } - } - -#if !LOG_NDEBUG - ALOGV("%s: fixed parameters:", __FUNCTION__); - params.dump(); -#endif - - android::String8 strParams = params.flatten(); - if (fixed_set_params[id]) - free(fixed_set_params[id]); - fixed_set_params[id] = strdup(strParams.string()); - char *ret = fixed_set_params[id]; - - return ret; -} - -/******************************************************************* - * implementation of camera_device_ops functions - *******************************************************************/ - -static int camera_set_preview_window(struct camera_device *device, - struct preview_stream_ops *window) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - return VENDOR_CALL(device, set_preview_window, window); -} - -static void camera_set_callbacks(struct camera_device *device, - camera_notify_callback notify_cb, - camera_data_callback data_cb, - camera_data_timestamp_callback data_cb_timestamp, - camera_request_memory get_memory, - void *user) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return; - - VENDOR_CALL(device, set_callbacks, notify_cb, data_cb, data_cb_timestamp, - get_memory, user); -} - -static void camera_enable_msg_type(struct camera_device *device, - int32_t msg_type) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return; - - VENDOR_CALL(device, enable_msg_type, msg_type); -} - -static void camera_disable_msg_type(struct camera_device *device, - int32_t msg_type) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return; - - VENDOR_CALL(device, disable_msg_type, msg_type); -} - -static int camera_msg_type_enabled(struct camera_device *device, - int32_t msg_type) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return 0; - - return VENDOR_CALL(device, msg_type_enabled, msg_type); -} - -static int camera_start_preview(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - return VENDOR_CALL(device, start_preview); -} - -static void camera_stop_preview(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return; - - VENDOR_CALL(device, stop_preview); -} - -static int camera_preview_enabled(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - return VENDOR_CALL(device, preview_enabled); -} - -static int camera_store_meta_data_in_buffers(struct camera_device *device, - int enable) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - return VENDOR_CALL(device, store_meta_data_in_buffers, enable); -} - -static int camera_start_recording(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return EINVAL; - - return VENDOR_CALL(device, start_recording); -} - -static void camera_stop_recording(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return; - - VENDOR_CALL(device, stop_recording); -} - -static int camera_recording_enabled(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - return VENDOR_CALL(device, recording_enabled); -} - -static void camera_release_recording_frame(struct camera_device *device, - const void *opaque) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return; - - VENDOR_CALL(device, release_recording_frame, opaque); -} - -static int camera_auto_focus(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - - return VENDOR_CALL(device, auto_focus); -} - -static int camera_cancel_auto_focus(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - return VENDOR_CALL(device, cancel_auto_focus); -} - -static int camera_take_picture(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - return VENDOR_CALL(device, take_picture); -} - -static int camera_cancel_picture(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - return VENDOR_CALL(device, cancel_picture); -} - -static int camera_set_parameters(struct camera_device *device, - const char *params) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - char *tmp = NULL; - tmp = camera_fixup_setparams(CAMERA_ID(device), params); - - int ret = VENDOR_CALL(device, set_parameters, tmp); - return ret; -} - -static char *camera_get_parameters(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return NULL; - - char *params = VENDOR_CALL(device, get_parameters); - - char *tmp = camera_fixup_getparams(CAMERA_ID(device), params); - VENDOR_CALL(device, put_parameters, params); - params = tmp; - - return params; -} - -static void camera_put_parameters(struct camera_device *device, char *params) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (params) - free(params); -} - -static int camera_send_command(struct camera_device *device, - int32_t cmd, int32_t arg1, int32_t arg2) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - return VENDOR_CALL(device, send_command, cmd, arg1, arg2); -} - -static void camera_release(struct camera_device *device) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return; - - VENDOR_CALL(device, release); -} - -static int camera_dump(struct camera_device *device, int fd) -{ - ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, - (uintptr_t)(((wrapper_camera_device_t*)device)->vendor)); - - if (!device) - return -EINVAL; - - return VENDOR_CALL(device, dump, fd); -} - -extern "C" void heaptracker_free_leaked_memory(void); - -static int camera_device_close(hw_device_t *device) -{ - int ret = 0; - wrapper_camera_device_t *wrapper_dev = NULL; - - ALOGV("%s", __FUNCTION__); - - android::Mutex::Autolock lock(gCameraWrapperLock); - - if (!device) { - ret = -EINVAL; - goto done; - } - - for (int i = 0; i < camera_get_number_of_cameras(); i++) { - if (fixed_set_params[i]) - free(fixed_set_params[i]); - } - - wrapper_dev = (wrapper_camera_device_t*) device; - - wrapper_dev->vendor->common.close((hw_device_t*)wrapper_dev->vendor); - if (wrapper_dev->base.ops) - free(wrapper_dev->base.ops); - free(wrapper_dev); -done: -#ifdef HEAPTRACKER - heaptracker_free_leaked_memory(); -#endif - return ret; -} - -/******************************************************************* - * implementation of camera_module functions - *******************************************************************/ - -/* open device handle to one of the cameras - * - * assume camera service will keep singleton of each camera - * so this function will always only be called once per camera instance - */ - -static int camera_device_open(const hw_module_t *module, const char *name, - hw_device_t **device) -{ - int rv = 0; - int num_cameras = 0; - int cameraid; - wrapper_camera_device_t *camera_device = NULL; - camera_device_ops_t *camera_ops = NULL; - - android::Mutex::Autolock lock(gCameraWrapperLock); - - ALOGV("%s", __FUNCTION__); - - if (name != NULL) { - if (check_vendor_module()) - return -EINVAL; - - cameraid = atoi(name); - num_cameras = gVendorModule->get_number_of_cameras(); - - fixed_set_params = (char **) malloc(sizeof(char *) * num_cameras); - if (!fixed_set_params) { - ALOGE("parameter memory allocation fail"); - rv = -ENOMEM; - goto fail; - } - memset(fixed_set_params, 0, sizeof(char *) * num_cameras); - - if (cameraid > num_cameras) { - ALOGE("camera service provided cameraid out of bounds, " - "cameraid = %d, num supported = %d", - cameraid, num_cameras); - rv = -EINVAL; - goto fail; - } - - camera_device = (wrapper_camera_device_t*)malloc(sizeof(*camera_device)); - if (!camera_device) { - ALOGE("camera_device allocation fail"); - rv = -ENOMEM; - goto fail; - } - memset(camera_device, 0, sizeof(*camera_device)); - camera_device->id = cameraid; - - rv = gVendorModule->common.methods->open( - (const hw_module_t*)gVendorModule, name, - (hw_device_t**)&(camera_device->vendor)); - if (rv) { - ALOGE("vendor camera open fail"); - goto fail; - } - ALOGV("%s: got vendor camera device 0x%08X", - __FUNCTION__, (uintptr_t)(camera_device->vendor)); - - camera_ops = (camera_device_ops_t*)malloc(sizeof(*camera_ops)); - if (!camera_ops) { - ALOGE("camera_ops allocation fail"); - rv = -ENOMEM; - goto fail; - } - - memset(camera_ops, 0, sizeof(*camera_ops)); - - camera_device->base.common.tag = HARDWARE_DEVICE_TAG; - camera_device->base.common.version = 0; - camera_device->base.common.module = (hw_module_t *)(module); - camera_device->base.common.close = camera_device_close; - camera_device->base.ops = camera_ops; - - camera_ops->set_preview_window = camera_set_preview_window; - camera_ops->set_callbacks = camera_set_callbacks; - camera_ops->enable_msg_type = camera_enable_msg_type; - camera_ops->disable_msg_type = camera_disable_msg_type; - camera_ops->msg_type_enabled = camera_msg_type_enabled; - camera_ops->start_preview = camera_start_preview; - camera_ops->stop_preview = camera_stop_preview; - camera_ops->preview_enabled = camera_preview_enabled; - camera_ops->store_meta_data_in_buffers = camera_store_meta_data_in_buffers; - camera_ops->start_recording = camera_start_recording; - camera_ops->stop_recording = camera_stop_recording; - camera_ops->recording_enabled = camera_recording_enabled; - camera_ops->release_recording_frame = camera_release_recording_frame; - camera_ops->auto_focus = camera_auto_focus; - camera_ops->cancel_auto_focus = camera_cancel_auto_focus; - camera_ops->take_picture = camera_take_picture; - camera_ops->cancel_picture = camera_cancel_picture; - camera_ops->set_parameters = camera_set_parameters; - camera_ops->get_parameters = camera_get_parameters; - camera_ops->put_parameters = camera_put_parameters; - camera_ops->send_command = camera_send_command; - camera_ops->release = camera_release; - camera_ops->dump = camera_dump; - - *device = &camera_device->base.common; - } - - return rv; - -fail: - if (camera_device) { - free(camera_device); - camera_device = NULL; - } - if (camera_ops) { - free(camera_ops); - camera_ops = NULL; - } - *device = NULL; - return rv; -} - -static int camera_get_number_of_cameras(void) -{ - ALOGV("%s", __FUNCTION__); - if (check_vendor_module()) - return 0; - return gVendorModule->get_number_of_cameras(); -} - -static int camera_get_camera_info(int camera_id, struct camera_info *info) -{ - ALOGV("%s", __FUNCTION__); - if (check_vendor_module()) - return 0; - return gVendorModule->get_camera_info(camera_id, info); -} diff --git a/cm.dependencies b/cm.dependencies index aa14cbc..507096e 100644 --- a/cm.dependencies +++ b/cm.dependencies @@ -1,6 +1,6 @@ [ { - "repository": "android_device_oppo_msm8974-common", - "target_path": "device/oppo/msm8974-common" + "repository": "android_device_oppo_find7-common", + "target_path": "device/oppo/find7-common" } ] @@ -1,4 +1,4 @@ -$(call inherit-product, device/oppo/find7/full_find7.mk) +$(call inherit-product, device/oppo/find7s/full_find7s.mk) # Enhanced NFC $(call inherit-product, vendor/cm/config/nfc_enhanced.mk) @@ -6,9 +6,11 @@ $(call inherit-product, vendor/cm/config/nfc_enhanced.mk) # Inherit some common CM stuff. $(call inherit-product, vendor/cm/config/common_full_phone.mk) -PRODUCT_NAME := cm_find7 -PRODUCT_DEVICE := find7 +PRODUCT_NAME := cm_find7s +PRODUCT_DEVICE := find7s PRODUCT_GMS_CLIENTID_BASE := android-oppo -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_FINGERPRINT=4.4.2/KVT49L/1390465867:user/release-keys PRIVATE_BUILD_DESC="msm8974-user 4.4.2 KVT49L eng.root.20141017.144947 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += \ + BUILD_FINGERPRINT=4.4.2/KVT49L/1390465867:user/release-keys \ + PRIVATE_BUILD_DESC="msm8974-user 4.4.2 KVT49L eng.root.20141017.144947 release-keys" diff --git a/device-proprietary-files.txt b/device-proprietary-files.txt deleted file mode 100644 index 44c28df..0000000 --- a/device-proprietary-files.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Camera -lib/hw/camera.msm8974.so:lib/hw/camera.vendor.msm8974.so -vendor/lib/libchromatix_imx214_common.so -vendor/lib/libchromatix_imx214_default_video.so -vendor/lib/libchromatix_imx214_hfr_120.so -vendor/lib/libchromatix_imx214_hfr_60.so -vendor/lib/libchromatix_imx214_liveshot.so -vendor/lib/libchromatix_imx214_preview.so -vendor/lib/libchromatix_imx214_snapshot.so -vendor/lib/libchromatix_imx214_snapshot_hdr.so -vendor/lib/libchromatix_imx214_video_binning.so -vendor/lib/libchromatix_imx214_video_hdr.so -vendor/lib/libchromatix_ov5648_common.so -vendor/lib/libchromatix_ov5648_default_video.so -vendor/lib/libchromatix_ov5648_preview.so -vendor/lib/libchromatix_ov5648_zsl.so - -# NFC -etc/firmware/libpn544_fw.so:vendor/firmware/libpn544_fw.so diff --git a/extract-files.sh b/extract-files.sh index 8309cd6..26654f2 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -2,6 +2,4 @@ set -e -export VENDOR=oppo -export DEVICE=find7 -./../../oppo/msm8974-common/extract-files.sh $@ +./../../oppo/find7-common/extract-files.sh diff --git a/find7.mk b/find7.mk deleted file mode 100644 index 47043f5..0000000 --- a/find7.mk +++ /dev/null @@ -1,68 +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. -# - -# overlays -DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay - -# Boot animation -TARGET_SCREEN_HEIGHT := 1920 -TARGET_SCREEN_WIDTH := 1080 - -# Ramdisk -PRODUCT_PACKAGES += \ - fstab.qcom \ - init.qcom.rc \ - init.qcom.usb.rc \ - libinit_find7 - -# Audio -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \ - $(LOCAL_PATH)/audio/mixer_paths.xml:system/etc/mixer_paths.xml - -# Camera -PRODUCT_PACKAGES += \ - camera.msm8974 - -# NFC packages -PRODUCT_PACKAGES += \ - nfc.msm8974 \ - libnfc \ - libnfc_jni \ - Nfc \ - Tag \ - com.android.nfc_extras - -# Permissions -PRODUCT_COPY_FILES += \ - frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \ - frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml - -# Device uses high-density artwork where available -PRODUCT_AAPT_CONFIG := normal hdpi xhdpi xxhdpi -PRODUCT_AAPT_PREF_CONFIG := xxhdpi - -# call dalvik heap config -$(call inherit-product-if-exists, frameworks/native/build/phone-xxhdpi-2048-dalvik-heap.mk) - -# call hwui memory config -$(call inherit-product-if-exists, frameworks/native/build/phone-xxhdpi-2048-hwui-memory.mk) - -# call the proprietary setup -$(call inherit-product-if-exists, vendor/oppo/find7/find7-vendor.mk) - -# Inherit from msm8974-common -$(call inherit-product, device/oppo/msm8974-common/msm8974.mk) diff --git a/find7s.mk b/find7s.mk new file mode 100644 index 0000000..199506b --- /dev/null +++ b/find7s.mk @@ -0,0 +1,35 @@ +# +# 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. +# + +# Overlays +DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay + +# Boot animation +TARGET_SCREEN_HEIGHT := 2560 +TARGET_SCREEN_WIDTH := 1440 + +# Device uses high-density artwork where available +PRODUCT_AAPT_CONFIG := normal hdpi xhdpi xxhdpi xxxhdpi +PRODUCT_AAPT_PREF_CONFIG := xxxhdpi + +# call dalvik heap config +$(call inherit-product-if-exists, frameworks/native/build/phone-xxhdpi-2048-dalvik-heap.mk) + +# call hwui memory config +$(call inherit-product-if-exists, frameworks/native/build/phone-xxhdpi-2048-hwui-memory.mk) + +# Inherit from find7-common +$(call inherit-product, device/oppo/find7-common/find7.mk) diff --git a/full_find7.mk b/full_find7s.mk index 1ca8916..225ef44 100644 --- a/full_find7.mk +++ b/full_find7s.mk @@ -15,12 +15,12 @@ # Inherit from those products. Most specific first. $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) -# Inherit from find7 device -$(call inherit-product, device/oppo/find7/find7.mk) +# Inherit from find7s device +$(call inherit-product, device/oppo/find7s/find7s.mk) # Discard inherited values and use our own instead. -PRODUCT_NAME := full_find7 -PRODUCT_DEVICE := find7 +PRODUCT_NAME := full_find7s +PRODUCT_DEVICE := find7s PRODUCT_BRAND := OPPO PRODUCT_MANUFACTURER := OPPO PRODUCT_MODEL := Find7 diff --git a/init/Android.mk b/init/Android.mk deleted file mode 100644 index d7b34ea..0000000 --- a/init/Android.mk +++ /dev/null @@ -1,27 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := system/core/init -LOCAL_CFLAGS := -Wall -LOCAL_SRC_FILES := init_find7.c -LOCAL_MODULE := libinit_find7 - -include $(BUILD_STATIC_LIBRARY) diff --git a/init/init_find7.c b/init/init_find7.c deleted file mode 100644 index 92636a0..0000000 --- a/init/init_find7.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - Copyright (c) 2014, The CyanogenMod Project - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of The Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <stdlib.h> - -#include "vendor_init.h" -#include "property_service.h" -#include "log.h" -#include "util.h" - -static void import_kernel_nv(char *name, int for_emulator) -{ - char *value = strchr(name, '='); - int name_len = strlen(name); - - if (value == 0) return; - *value++ = 0; - if (name_len == 0) return; - - if (!strcmp(name, "oppo.pcb_version")) { - if (!strcmp(value, "20") || - !strcmp(value, "21") || - !strcmp(value, "22") || - !strcmp(value, "23")) { - property_set("ro.sf.lcd_density", "640"); - property_set("ro.oppo.device", "find7s"); - } else { - property_set("ro.sf.lcd_density", "480"); - property_set("ro.oppo.device", "find7a"); - } - } -} - -void vendor_load_properties() -{ - import_kernel_cmdline(0, import_kernel_nv); -} diff --git a/nfc/Android.mk b/nfc/Android.mk deleted file mode 100644 index 0d014fd..0000000 --- a/nfc/Android.mk +++ /dev/null @@ -1,26 +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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := nfc.msm8974 -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw -LOCAL_SRC_FILES := nfc_hw.c -LOCAL_SHARED_LIBRARIES := liblog libcutils -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -D$(TARGET_DEVICE) - -include $(BUILD_SHARED_LIBRARY) diff --git a/nfc/nfc_hw.c b/nfc/nfc_hw.c deleted file mode 100644 index 7199023..0000000 --- a/nfc/nfc_hw.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (C) 2013 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. - */ -#include <errno.h> -#include <string.h> - -#include <hardware/hardware.h> -#include <hardware/nfc.h> - -static uint8_t pn544_eedata_settings[][4] = { - // DIFFERENTIAL_ANTENNA - - // RF Settings - {0x00,0x9B,0xD1,0x0D} // Tx consumption higher than 0x0D (average 50mA) - ,{0x00,0x9B,0xD2,0x24} // GSP setting for this threshold - ,{0x00,0x9B,0xD3,0x0A} // Tx consumption higher than 0x0A (average 40mA) - ,{0x00,0x9B,0xD4,0x22} // GSP setting for this threshold - ,{0x00,0x9B,0xD5,0x08} // Tx consumption higher than 0x08 (average 30mA) - ,{0x00,0x9B,0xD6,0x1E} // GSP setting for this threshold - ,{0x00,0x9B,0xDD,0x1C} // GSP setting for this threshold - ,{0x00,0x9B,0x84,0x13} // ANACM2 setting - - // Enable PBTF - ,{0x00,0x98,0x00,0x3F} // SECURE_ELEMENT_CONFIGURATION - No Secure Element - ,{0x00,0x9F,0x09,0x00} // SWP_PBTF_RFU - ,{0x00,0x9F,0x0A,0x05} // SWP_PBTF_RFLD --> RFLEVEL Detector for PBTF - ,{0x00,0x9E,0xD1,0xA1} // - - // Change RF Level Detector ANARFLDWU - ,{0x00,0x99,0x23,0x00} // Default Value is 0x01 - - // Low-power polling - ,{0x00,0x9E,0x74,0xB0} // Default Value is 0x00, bits 0->2: sensitivity (0==max, 6==min), - // bit 3: RFU, - // bits 4,5 hybrid low-power: # of low-power polls per regular poll - // bit 6: RFU - // bit 7: (0 -> disabled, 1 -> enabled) - ,{0x00,0x9E,0x7D,0xB0} // bits 0->3: RFU, - // bits 4,5: # retries after low power detection - // 0=1 retry, 1=2 retry, 2=3 retry, 3=4 retry - // bit 6: RFU, - // bit 7: Enable or disable retry mechanism (0: disable, 1: enable) - ,{0x00,0x9F,0x28,0x01} // bits 0->7: # of measurements per low-power poll - - // Polling Loop - Card Emulation Timeout - ,{0x00,0x9F,0x35,0x14} // Time for which PN544 stays in Card Emulation mode after leaving RF field - ,{0x00,0x9F,0x36,0x60} // Default value 0x0411 = 50 ms ---> New Value : 0x1460 = 250 ms - - //LLC Timer - ,{0x00,0x9C,0x31,0x00} // Guard host time-out in ms (MSB) - ,{0x00,0x9C,0x32,0xC8} // Guard host time-out in ms (LSB) - ,{0x00,0x9C,0x19,0x40} // Max RX retry (PN544=>host?) - ,{0x00,0x9C,0x1A,0x40} // Max TX retry (PN544=>host?) - - ,{0x00,0x9C,0x0C,0x00} // - ,{0x00,0x9C,0x0D,0x00} // - ,{0x00,0x9C,0x12,0x00} // - ,{0x00,0x9C,0x13,0x00} // - - // NFC-DEP Target Waiting Time (WT) - ,{0x00,0x98,0xA2,0x08} // Set to 0x08 as required by [digital] (default value: 09) - - //SE GPIO - ,{0x00, 0x98, 0x93, 0x40} - - // Set NFCT ATQA - ,{0x00, 0x98, 0x7D, 0x02} - ,{0x00, 0x98, 0x7E, 0x00} - - // Enable CEA detection mechanism - ,{0x00, 0x9F, 0xC8, 0x01} - // Set NFC-F poll RC=0x00 - ,{0x00, 0x9F, 0x9A, 0x00} - // Setting for EMD support for ISO 14443-4 Reader - ,{0x00,0x9F,0x09,0x00} // 0x00 - Disable EMD support, 0x01 - Enable EMD support -}; - -static int pn544_close(hw_device_t *dev) { - free(dev); - - return 0; -} - -/* - * Generic device handling - */ - -static int nfc_open(const hw_module_t* module, const char* name, - hw_device_t** device) { - if (strcmp(name, NFC_PN544_CONTROLLER) == 0) { - nfc_pn544_device_t *dev = calloc(1, sizeof(nfc_pn544_device_t)); - - dev->common.tag = HARDWARE_DEVICE_TAG; - dev->common.version = 0; - dev->common.module = (struct hw_module_t*) module; - dev->common.close = pn544_close; - - dev->num_eeprom_settings = sizeof(pn544_eedata_settings) / 4; - dev->eeprom_settings = (uint8_t*)pn544_eedata_settings; - dev->linktype = PN544_LINK_TYPE_I2C; - dev->device_node = "/dev/pn544"; - dev->enable_i2c_workaround = 0; - *device = (hw_device_t*) dev; - return 0; - } else { - return -EINVAL; - } -} - -static struct hw_module_methods_t nfc_module_methods = { - .open = nfc_open, -}; - -struct nfc_module_t HAL_MODULE_INFO_SYM = { - .common = { - .tag = HARDWARE_MODULE_TAG, - .version_major = 1, - .version_minor = 0, - .id = NFC_HARDWARE_MODULE_ID, - .name = "Find7 NFC HW HAL", - .author = "The Android Open Source Project", - .methods = &nfc_module_methods, - }, -}; diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml deleted file mode 100644 index de6d3d7..0000000 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2013, 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. -*/ ---> - -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support. - The N entries of this array define N 1 zones as follows: - - Zone 0: 0 <= LUX < array[0] - Zone 1: array[0] <= LUX < array[1] - ... - Zone N: array[N - 1] <= LUX < array[N] - Zone N + 1 array[N] <= LUX < infinity - - Must be overridden in platform specific overlays --> - <integer-array name="config_autoBrightnessLevels"> - <item>10</item> - <item>50</item> - <item>100</item> - <item>200</item> - <item>400</item> - <item>500</item> - <item>800</item> - <item>1000</item> - <item>1600</item> - <item>3000</item> - <item>10000</item> - </integer-array> - - <!-- Array of output values for LCD backlight corresponding to the LUX values - in the config_autoBrightnessLevels array. This array should have size one greater - than the size of the config_autoBrightnessLevels array. - This must be overridden in platform specific overlays --> - <integer-array name="config_autoBrightnessLcdBacklightValues"> - <item>14</item> <!-- 0-10 --> - <item>28</item> <!-- 10-50 --> - <item>37</item> <!-- 50-100 --> - <item>51</item> <!-- 100-200 --> - <item>71</item> <!-- 200-400 --> - <item>80</item> <!-- 400-500 --> - <item>96</item> <!-- 500-800 --> - <item>108</item> <!-- 800-1000 --> - <item>144</item> <!-- 1000-1600 --> - <item>181</item> <!-- 1600-3000 --> - <item>254</item> <!-- 3000-10000 --> - <item>255</item> <!-- 10000+ --> - </integer-array> - - <!-- Array of output values for button backlight corresponding to the LUX values - in the config_autoBrightnessLevels array. This array should have size one greater - than the size of the config_autoBrightnessLevels array. - This must be overridden in platform specific overlays --> - <integer-array name="config_autoBrightnessButtonBacklightValues"> - <item>14</item> <!-- 0-10 --> - <item>28</item> <!-- 10-50 --> - <item>37</item> <!-- 50-100 --> - <item>51</item> <!-- 100-200 --> - <item>71</item> <!-- 200-400 --> - <item>80</item> <!-- 400-500 --> - <item>96</item> <!-- 500-800 --> - <item>108</item> <!-- 800-1000 --> - <item>144</item> <!-- 1000-1600 --> - <item>181</item> <!-- 1600-3000 --> - <item>254</item> <!-- 3000-10000 --> - <item>255</item> <!-- 10000+ --> - </integer-array> - - <!-- Minimum screen brightness setting allowed by the power manager. - The user is forbidden from setting the brightness below this level. --> - <integer name="config_screenBrightnessSettingMinimum">2</integer> - - <!-- Maximum screen brightness allowed by the power manager. - The user is forbidden from setting the brightness above this level. --> - <integer name="config_screenBrightnessSettingMaximum">255</integer> - - <!-- Default screen brightness setting. - Must be in the range specified by minimum and maximum. --> - <integer name="config_screenBrightnessSettingDefault">255</integer> - - <!-- Screen brightness used to dim the screen when the user activity - timeout expires. May be less than the minimum allowed brightness setting - that can be set by the user. --> - <integer name="config_screenBrightnessDim">20</integer> - - <!-- Indicate whether closing the lid causes the device to go to sleep and opening - it causes the device to wake up. - The default is false. --> - <bool name="config_lidControlsSleep">true</bool> - - <!-- Default color for notification LED is blue. --> - <color name="config_defaultNotificationColor">#ff0000ff</color> - - <!-- Default value for led color when battery is low on charge --> - <integer name="config_notificationsBatteryLowARGB">0xff0000ff</integer> - - <!-- Default value for led color when battery is medium charged --> - <integer name="config_notificationsBatteryMediumARGB">0xff0000ff</integer> - - <!-- Default value for led color when battery is fully charged --> - <integer name="config_notificationsBatteryFullARGB">0xff0000ff</integer> -</resources> diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml deleted file mode 100644 index eb72d56..0000000 --- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 2011, 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. -*/ ---> - -<!-- See storage config details at http://source.android.com/tech/storage/ --> - -<StorageList xmlns:android="http://schemas.android.com/apk/res/android"> - - <!-- internal SD card --> - <storage android:mountPoint="/storage/sdcard0" - android:storageDescription="@string/storage_internal" - android:primary="true" - android:emulated="false" - android:mtpReserve="100" /> - - <!-- external SD card --> - <storage android:mountPoint="/storage/sdcard1" - android:storageDescription="@string/storage_sd_card" - android:primary="false" - android:emulated="false" - android:removable="true" - android:allowMassStorage="true" /> - - <!-- external usb storage --> - <storage android:mountPoint="/storage/usbdisk" - android:storageDescription="@string/storage_usb" - android:primary="false" - android:emulated="false" - android:removable="true" /> - -</StorageList> diff --git a/overlay/packages/apps/Camera2/res/values/config.xml b/overlay/packages/apps/Camera2/res/values/config.xml deleted file mode 100644 index b442aa4..0000000 --- a/overlay/packages/apps/Camera2/res/values/config.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2011, 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. -*/ ---> - -<resources> - <!-- Use ZSL mode for Qualcomm cameras --> - <bool name="enableZSL">true</bool> -</resources> diff --git a/overlay/packages/apps/Camera2/res/values/qcomstrings.xml b/overlay/packages/apps/Camera2/res/values/qcomstrings.xml deleted file mode 100644 index 302a358..0000000 --- a/overlay/packages/apps/Camera2/res/values/qcomstrings.xml +++ /dev/null @@ -1,9 +0,0 @@ -<!-- - Copyright (C) 2014 The CyanogenMod Project ---> - -<resources> - - <string name="pref_camera_denoise_default" translatable="false">denoise-on</string> - -</resources> diff --git a/overlay/packages/apps/Torch/res/values/config.xml b/overlay/packages/apps/Torch/res/values/config.xml deleted file mode 100644 index 86eded7..0000000 --- a/overlay/packages/apps/Torch/res/values/config.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2013, 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. -*/ ---> - -<!-- These resources are around just to allow their values to be customized - for different hardware and product builds. --> -<resources> - <bool name="useCameraInterface">true</bool> -</resources> diff --git a/rootdir/Android.mk b/rootdir/Android.mk deleted file mode 100644 index aff3375..0000000 --- a/rootdir/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# Device init files - -include $(CLEAR_VARS) -LOCAL_MODULE := fstab.qcom -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/fstab.qcom -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.qcom.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.qcom.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.qcom.usb.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.qcom.usb.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom deleted file mode 100644 index e5c1683..0000000 --- a/rootdir/etc/fstab.qcom +++ /dev/null @@ -1,16 +0,0 @@ -# Android fstab file. -#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - -/dev/block/platform/msm_sdcc.1/by-name/system /system ext4 ro,barrier=1 wait -/dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,journal_async_commit,errors=panic wait,check,encryptable=footer,length=-16384 -/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,journal_async_commit,errors=panic wait,check -/dev/block/platform/msm_sdcc.1/by-name/persist /persist ext4 nosuid,nodev,barrier=1,data=ordered,nodelalloc,nomblk_io_submit,errors=panic wait -/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults -/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults -/dev/block/platform/msm_sdcc.1/by-name/modem /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait - -/devices/msm_sdcc.1/mmc_host auto ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,nodelalloc,uid=1023,gid=1023,dmask=0007,fmask=0007 voldmanaged=sdcard0:29,nonremovable,noemulatedsd -/devices/msm_sdcc.2/mmc_host auto vfat defaults voldmanaged=sdcard1:auto -/devices/platform/xhci-hcd auto vfat defaults voldmanaged=usbdisk:auto diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc deleted file mode 100644 index bd593a8..0000000 --- a/rootdir/etc/init.qcom.rc +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright 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. -# - -import /init.qcom-common.rc - -on fs - mount_all ./fstab.qcom - restorecon_recursive /persist - setprop ro.crypto.fuse_sdcard true - -on init - # See storage config details at http://source.android.com/tech/storage/ - chmod 0701 /mnt/media_rw - mkdir /mnt/media_rw/sdcard0 0775 system system - mkdir /mnt/media_rw/sdcard1 0775 system system - mkdir /mnt/media_rw/usbdisk 0775 system system - - mkdir /storage/sdcard0 0000 system system - mkdir /storage/sdcard1 0000 system system - mkdir /storage/usbdisk 0000 system system - - export EXTERNAL_STORAGE /storage/sdcard0 - export SECONDARY_STORAGE /storage/sdcard1:/storage/usbdisk - - # Support legacy paths - symlink /storage/sdcard0 /sdcard - symlink /storage/sdcard0 /mnt/sdcard - -on boot - # For find7s notification LED - chown system system /sys/class/leds/led:rgb_red/brightness - chown system system /sys/class/leds/led:rgb_red/ramp_step_ms - chown system system /sys/class/leds/led:rgb_red/duty_pcts - chown system system /sys/class/leds/led:rgb_red/blink - chown system system /sys/class/leds/led:rgb_green/brightness - chown system system /sys/class/leds/led:rgb_green/ramp_step_ms - chown system system /sys/class/leds/led:rgb_green/duty_pcts - chown system system /sys/class/leds/led:rgb_green/blink - chown system system /sys/class/leds/led:rgb_blue/brightness - chown system system /sys/class/leds/led:rgb_blue/ramp_step_ms - chown system system /sys/class/leds/led:rgb_blue/duty_pcts - chown system system /sys/class/leds/led:rgb_blue/blink - -on post-fs-data - # Torch - chown system camera /sys/devices/qcom,camera-led-flash.81/test - chmod 0660 /sys/devices/qcom,camera-led-flash.81/test - -service fuse_sdcard0 /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/sdcard0 /storage/sdcard0 - class late_start - disabled - -service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/sdcard1 /storage/sdcard1 - class late_start - disabled - -service fuse_usbdisk /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/usbdisk /storage/usbdisk - class late_start - disabled - diff --git a/rootdir/etc/init.qcom.usb.rc b/rootdir/etc/init.qcom.usb.rc deleted file mode 100644 index 69a717a..0000000 --- a/rootdir/etc/init.qcom.usb.rc +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of Code Aurora nor -# the names of its contributors may be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -on boot - write /sys/class/android_usb/android0/iSerial ${ro.serialno} - write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer} - write /sys/class/android_usb/android0/iProduct ${ro.product.model} - write /sys/class/android_usb/android0/f_rndis/manufacturer ${ro.product.manufacturer} - write /sys/class/android_usb/android0/f_rndis/vendorID 22D9 - write /sys/class/android_usb/android0/f_rndis/wceis 1 - -on property:sys.usb.config=mtp - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2764 - write /sys/class/android_usb/android0/functions mtp - write /sys/class/android_usb/android0/enable 1 - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=mtp,adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2765 - write /sys/class/android_usb/android0/functions mtp,adb - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=rndis,adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2766 - write /sys/class/android_usb/android0/functions rndis,adb - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=mass_storage,adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2767 - write /sys/class/android_usb/android0/functions adb,mass_storage - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=mass_storage - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2768 - write /sys/class/android_usb/android0/functions mass_storage - write /sys/class/android_usb/android0/enable 1 - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=adb - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2769 - write /sys/class/android_usb/android0/functions adb - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=rndis - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 276A - write /sys/class/android_usb/android0/functions rndis - write /sys/class/android_usb/android0/enable 1 - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=diag,adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/iSerial 0123456789ABCDEF - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 276C - write /sys/class/android_usb/android0/f_diag/clients diag - write /sys/class/android_usb/android0/f_serial/transports tty - write /sys/class/android_usb/android0/functions diag,adb - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=diag_mdm,adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/iSerial 0123456789ABCDEF - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 276D - write /sys/class/android_usb/android0/f_diag/clients diag_mdm - write /sys/class/android_usb/android0/f_serial/transports hsic - write /sys/class/android_usb/android0/f_rmnet/transports hsic,hsic - write /sys/class/android_usb/android0/functions diag,adb - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=diag,diag_mdm,serial_hsic,serial_tty,rmnet_hsic,mass_storage,adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/iSerial 0123456789ABCDEF - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 276F - write /sys/class/android_usb/android0/f_diag/clients diag,diag_mdm - write /sys/class/android_usb/android0/f_serial/transports hsic,tty - write /sys/class/android_usb/android0/f_serial/transport_names serial_hsic - write /sys/class/android_usb/android0/f_rmnet/transports hsic,hsic - write /sys/class/android_usb/android0/f_rmnet/transport_names rmnet_hsic - write /sys/class/android_usb/android0/functions diag,adb,serial,rmnet,mass_storage - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} - -#added some configs for support ptp and cdrom by zhangzhilong 2013-12-09 -on property:sys.usb.config=ptp - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2771 - write /sys/class/android_usb/android0/functions ptp - write /sys/class/android_usb/android0/enable 1 - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=ptp,adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2772 - write /sys/class/android_usb/android0/functions ptp,adb - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=mtp,mass_storage - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2773 - write /sys/class/android_usb/android0/functions mtp,mass_storage - write /sys/class/android_usb/android0/enable 1 - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=mtp,mass_storage,adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2774 - write /sys/class/android_usb/android0/functions mtp,mass_storage,adb - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=rndis,diag,adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/iSerial 0123456789ABCDEF - write /sys/class/android_usb/android0/idVendor 22D9 - write /sys/class/android_usb/android0/idProduct 2775 - write /sys/class/android_usb/android0/f_diag/clients diag - write /sys/class/android_usb/android0/functions rndis,diag,adb - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} - -on property:sys.usb.config=diag,serial_smd,serial_tty,rmnet_bam,mass_storage,adb - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/iSerial 0123456789ABCDEF - write /sys/class/android_usb/android0/idVendor 05C6 - write /sys/class/android_usb/android0/idProduct 9025 - write /sys/class/android_usb/android0/f_diag/clients diag - write /sys/class/android_usb/android0/f_serial/transports smd,tty - write /sys/class/android_usb/android0/f_rmnet/transports smd,bam - write /sys/class/android_usb/android0/functions diag,adb,serial,rmnet,mass_storage - write /sys/class/android_usb/android0/enable 1 - start adbd - setprop sys.usb.state ${sys.usb.config} diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 99212cd..ebdb9ec 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -2,6 +2,4 @@ set -e -export DEVICE=find7 -export VENDOR=oppo -./../../oppo/msm8974-common/setup-makefiles.sh $@ +./../../oppo/find7-common/setup-makefiles.sh diff --git a/system.prop b/system.prop index 2d850dc..1289cfc 100644 --- a/system.prop +++ b/system.prop @@ -1,22 +1,6 @@ # -# system.prop for find7 +# system.prop for find7s # -#ro.sf.lcd_density=480 -rild.libpath=/system/vendor/lib/libril-qc-qmi-1.so -persist.radio.add_power_save=1 - -# sensors -ro.qc.sdk.camera.facialproc=true -ro.qc.sdk.gestures.camera=false -ro.qti.sdk.sensors.gestures=true -ro.qti.sensors.bte=true -ro.qti.sensors.gtap=true -ro.qti.sensors.vmd=true - -# gps -persist.gps.qc_nlp_in_use=0 -ro.gps.agps_provider=1 - -# cabl is handled by the panel -ro.qualcomm.cabl=0 +ro.sf.lcd_density=640 +ro.oppo.device=find7s diff --git a/vendorsetup.sh b/vendorsetup.sh index 4228aca..7a7515b 100755 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -1,3 +1,3 @@ -add_lunch_combo cm_find7-user -add_lunch_combo cm_find7-userdebug -add_lunch_combo cm_find7-eng +add_lunch_combo cm_find7s-user +add_lunch_combo cm_find7s-userdebug +add_lunch_combo cm_find7s-eng |