diff options
| -rw-r--r-- | configs/audio_policy.conf | 82 | ||||
| -rw-r--r-- | configs/tiny_hw.xml | 225 | ||||
| -rw-r--r-- | p5110.mk | 5 | ||||
| -rw-r--r-- | proprietary-common-files.txt | 26 | ||||
| -rw-r--r-- | recovery.fstab | 4 | ||||
| -rw-r--r-- | system.prop | 1 |
6 files changed, 315 insertions, 28 deletions
diff --git a/configs/audio_policy.conf b/configs/audio_policy.conf new file mode 100644 index 0000000..924811f --- /dev/null +++ b/configs/audio_policy.conf @@ -0,0 +1,82 @@ +# 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_SPEAKER + default_output_device AUDIO_DEVICE_OUT_SPEAKER + attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC +} + +# 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 44100 + channel_masks AUDIO_CHANNEL_OUT_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET + flags AUDIO_OUTPUT_FLAG_PRIMARY + } + deep_buffer { + sampling_rates 44100 + channel_masks AUDIO_CHANNEL_OUT_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE + flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER + } + hdmi { + sampling_rates 44100|48000 + channel_masks dynamic + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_AUX_DIGITAL + flags AUDIO_OUTPUT_FLAG_DIRECT + } + } + inputs { + primary { + sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000 + channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET + } + } + } + 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 44100 + channel_masks AUDIO_CHANNEL_OUT_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_USB_DEVICE + } + } + } +} diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml new file mode 100644 index 0000000..f6fcc55 --- /dev/null +++ b/configs/tiny_hw.xml @@ -0,0 +1,225 @@ +<!-- TinyHAL configuration file for Samsung Galaxy Tab 2 --> +<tinyhal> +<!-- +We are able to have most of our routing static so do that +--> +<path> + <!-- general --> + <ctl name="IN1L ZC Switch" val="0"/> + <ctl name="IN1R ZC Switch" val="0"/> + <ctl name="IN2L ZC Switch" val="0"/> + <ctl name="IN2R ZC Switch" val="0"/> + <ctl name="Output ZC Switch" val="0"/> + <ctl name="Speaker ZC Switch" val="0"/> + <ctl name="Headphone ZC Switch" val="0"/> + + <!-- AIF1->DAC1 --> + <ctl name="DAC1L Mixer AIF1.1 Switch" val="1"/> + <ctl name="DAC1R Mixer AIF1.1 Switch" val="1"/> + <ctl name="DAC1 Switch" val="1"/> + + <!-- ADC->AIF2 --> + <ctl name="AIF2DAC2L Mixer Left Sidetone Switch" val="1"/> + <ctl name="AIF2DAC2L Mixer Right Sidetone Switch" val="0"/> + <ctl name="AIF2DAC2R Mixer Left Sidetone Switch" val="0"/> + <ctl name="AIF2DAC2R Mixer Right Sidetone Switch" val="1"/> + <ctl name="DAC2 Left Sidetone Volume" val="12"/> + <ctl name="DAC2 Right Sidetone Volume" val="12"/> + <ctl name="DAC2 Switch" val="1"/> + + <!-- DAC1->HP --> + <ctl name="Left Headphone Mux" val="DAC"/> + <ctl name="Right Headphone Mux" val="DAC"/> + + <!-- DAC1->SPKL/R->SPKL/R Boost->SPK --> + <ctl name="SPKL DAC1 Switch" val="1"/> + <ctl name="SPKR DAC1 Switch" val="1"/> + <ctl name="SPKL Boost SPKL Switch" val="1"/> + <ctl name="SPKL Boost SPKR Switch" val="0"/> + <ctl name="SPKR Boost SPKL Switch" val="0"/> + <ctl name="SPKR Boost SPKR Switch" val="1"/> + <ctl name="Speaker Mixer Volume" val="3"/> + + <!-- DAC->Output mixer->Earpiece --> + <ctl name="Left Output Mixer DAC Switch" val="1"/> + <ctl name="Right Output Mixer DAC Switch" val="1"/> + <ctl name="Earpiece Mixer Left Output Switch" val="1"/> + <ctl name="Earpiece Mixer Right Output Switch" val="1"/> + <ctl name="Earpiece Switch" val="1"/> + <ctl name="LINEOUT1N Mixer Right Output Switch" val="1"/> + <ctl name="LINEOUT1P Mixer Left Output Switch" val="1"/> + + <!-- Main Mic->IN1LP/N->Input Mixer with +30dB at mixer --> + <ctl name="IN1L PGA IN1LP Switch" val="1"/> + <ctl name="IN1L PGA IN1LN Switch" val="1"/> + <ctl name="MIXINL IN1L Volume" val="1"/> + <ctl name="IN1L Switch" val="1"/> + + <!-- Sub Mic->IN2RP/N->Input Mixer with +30dB at mixer --> + <ctl name="IN2R PGA IN2RP Switch" val="1"/> + <ctl name="IN2R PGA IN2RN Switch" val="1"/> + <ctl name="MIXINR IN2R Volume" val="1"/> + <ctl name="IN2R Switch" val="1"/> + + <!-- Ear Mic->IN1RP/N->Input Mixer with +30dB at mixer --> + <ctl name="IN1R PGA IN1RP Switch" val="1"/> + <ctl name="IN1R PGA IN1RN Switch" val="1"/> + <ctl name="MIXINR IN1R Volume" val="1"/> + <ctl name="IN1R Switch" val="1"/> + + <!-- Input mixer->ADC->AIF1 --> + <ctl name="AIF1ADC1L Mixer ADC/DMIC Switch" val="1"/> + <ctl name="AIF1ADC1R Mixer ADC/DMIC Switch" val="1"/> + <ctl name="ADCL Mux" val="ADC"/> + + <!-- Work around core issue --> + <ctl name="ADCL Mux" val="DMIC"/> + <ctl name="ADCL Mux" val="ADC"/> + <ctl name="ADCR Mux" val="DMIC"/> + <ctl name="ADCR Mux" val="ADC"/> + + <!-- Default all outputs off --> + <ctl name="HP Switch" val="0"/> + <ctl name="SPK Switch" val="0"/> + <ctl name="RCV Switch" val="0"/> + <ctl name="LINEOUT Switch" val="0"/> + + <!-- Default all inputs off --> + <ctl name="Main Mic Switch" val="0"/> + <ctl name="Headset Mic Switch" val="0"/> +</path> +<device name="speaker"> + <path name="on"> + <ctl name="SPK Switch" val="1"/> + <ctl name="AIF1DAC1 Volume" val="96"/> + <ctl name="AIF1 Boost Volume" val="0"/> + <ctl name="DAC1 Volume" val="96"/> + <ctl name="SPKL DAC1 Volume" val="1"/> + <ctl name="SPKR DAC1 Volume" val="1"/> + <ctl name="Speaker Mixer Volume" val="3"/> + <ctl name="Speaker Boost Volume" val="6"/> + <ctl name="Speaker Volume" val="59"/> + </path> + <path name="off"> + <ctl name="SPK Switch" val="0"/> + <ctl name="AIF1DAC1 Volume" val="96"/> + <ctl name="AIF1 Boost Volume" val="0"/> + <ctl name="DAC1 Volume" val="96"/> + <ctl name="SPKL DAC1 Volume" val="1"/> + <ctl name="SPKR DAC1 Volume" val="1"/> + <ctl name="Speaker Mixer Volume" val="0"/> + <ctl name="Speaker Volume" val="57"/> + <ctl name="Speaker Boost Volume" val="0"/> + </path> +</device> +<device name="headphone"> + <path name="on"> + <ctl name="HP Switch" val="1"/> + <ctl name="Headphone ZC Switch" val="0"/> + <ctl name="AIF1DAC1 Volume" val="96"/> + <ctl name="AIF1 Boost Volume" val="0"/> + <ctl name="DAC1 Volume" val="96"/> + <ctl name="Headphone Volume" val="50"/> + </path> + <path name="off"> + <ctl name="HP Switch" val="0"/> + <ctl name="Headphone ZC Switch" val="0"/> + <ctl name="AIF1DAC1 Volume" val="96"/> + <ctl name="AIF1 Boost Volume" val="0"/> + <ctl name="DAC1 Volume" val="96"/> + <ctl name="Headphone Volume" val="45"/> + </path> +</device> +<device name="sco-out"> + <path name="on"> + <ctl name="AIF3ADC Mux" val="1"/> + <ctl name="AIF2DAC2L Mixer AIF1.1 Switch" val="1"/> + <ctl name="AIF2DAC2R Mixer AIF1.1 Switch" val="1"/> + <ctl name="AIF2ADCL Source" val="Left"/> + <ctl name="AIF2ADCR Source" val="Left"/> + </path> + <path name="off"> + <ctl name="AIF3ADC Mux" val="0"/> + <ctl name="AIF2DAC2L Mixer AIF1.1 Switch" val="0"/> + <ctl name="AIF2DAC2R Mixer AIF1.1 Switch" val="0"/> + </path> +</device> +<device name="analog-dock"> + <path name="on"> + <ctl name="LINEOUT1N Switch" val="1"/> + <ctl name="LINEOUT1P Switch" val="1"/> + <ctl name="LINEOUT Switch" val="1"/> + <ctl name="AIF1DAC1 Volume" val="96"/> + <ctl name="AIF1 Boost Volume" val="0"/> + <ctl name="DAC1 Volume" val="96"/> + <ctl name="Left Output Mixer DAC Volume" val="7"/> + <ctl name="Right Output Mixer DAC Volume" val="7"/> + <ctl name="Output Volume" val="56"/> + <ctl name="LINEOUT1 Volume" val="1"/> + </path> + <path name="off"> + <ctl name="LINEOUT1N Switch" val="0"/> + <ctl name="LINEOUT1P Switch" val="0"/> + <ctl name="LINEOUT Switch" val="0"/> + <ctl name="AIF1DAC1 Volume" val="96 "/> + <ctl name="AIF1 Boost Volume" val="0"/> + <ctl name="DAC1 Volume" val="96 "/> + <ctl name="Left Output Mixer DAC Volume" val="7"/> + <ctl name="Right Output Mixer DAC Volume" val="7"/> + <ctl name="Output Volume" val="57 "/> + <ctl name="LINEOUT1 Volume" val="1"/> + </path> +</device> +<device name="builtin-mic"> + <path name="on"> + <ctl name="Main Mic Switch" val="1"/> + <ctl name="AIF1ADCL Source" val="Left"/> + <ctl name="AIF1ADCR Source" val="Left"/> + <ctl name="AIF2ADCL Source" val="Left"/> + <ctl name="AIF2ADCR Source" val="Left"/> + <ctl name="MIXINL IN1L Switch" val="1"/> + <ctl name="AIF1ADC1 HPF Mode" val="1"/> + <ctl name="AIF1ADC1 HPF Switch" val="1"/> + <ctl name="AIF2 Mode" val="Master"/> + <ctl name="AIF2DAC Mux" val="AIF3DACDAT"/> + </path> + <path name="off"> + <ctl name="Main Mic Switch" val="0"/> + <ctl name="MIXINL IN1L Switch" val="0"/> + <ctl name="AIF1ADC1 HPF Mode" val="0"/> + <ctl name="AIF1ADC1 HPF Switch" val="0"/> + <ctl name="AIF2 Mode" val="Slave"/> + <ctl name="AIF2DAC Mux" val="AIF2DACDAT"/> + </path> +</device> +<device name="headset-in"> + <path name="on"> + <ctl name="Headset Mic Switch" val="1"/> + <ctl name="AIF1ADCL Source" val="Right"/> + <ctl name="AIF1ADCR Source" val="Right"/> + <ctl name="AIF2ADCL Source" val="Right"/> + <ctl name="AIF2ADCR Source" val="Right"/> + <ctl name="MIXINR IN1R Switch" val="1"/> + </path> + <path name="off"> + <ctl name="Headset Mic Switch" val="0"/> + <ctl name="MIXINR IN1R Switch" val="0"/> + </path> +</device> +<device name="sco-in"> + <path name="on"> + <ctl name="AIF2ADC Mux" val="1"/> + <ctl name="AIF1ADCL Source" val="Left"/> + <ctl name="AIF1ADCR Source" val="Left"/> + <ctl name="AIF2ADCL Source" val="Left"/> + <ctl name="AIF2ADCR Source" val="Left"/> + <ctl name="AIF1ADC1R Mixer AIF2 Switch" val="1"/> + <ctl name="AIF1ADC1L Mixer AIF2 Switch" val="1"/> + </path> + <path name="off"> + <ctl name="AIF2ADC Mux" val="0"/> + <ctl name="AIF1ADC1R Mixer AIF2 Switch" val="0"/> + <ctl name="AIF1ADC1L Mixer AIF2 Switch" val="0"/> + </path> +</device> +</tinyhal> @@ -20,5 +20,10 @@ LOCAL_PATH := device/samsung/p5110 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +# Audio +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/espresso10wifi \ + $(LOCAL_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf + # Use the non-open-source parts, if they're present $(call inherit-product, vendor/samsung/p51xx/p5110-vendor.mk) diff --git a/proprietary-common-files.txt b/proprietary-common-files.txt index 1c092d4..546367e 100644 --- a/proprietary-common-files.txt +++ b/proprietary-common-files.txt @@ -1,26 +1,12 @@ system/bin/geomagneticd system/bin/gpsd system/bin/orientationd -system/etc/audio/LVVEFS_Rx_Configuration.txt -system/etc/audio/LVVEFS_Tx_Configuration.txt -system/etc/audio/Rx_ControlParams_BLUETOOTH_HEADSET.txt -system/etc/audio/Rx_ControlParams_EARPIECE_WIDEBAND.txt -system/etc/audio/Rx_ControlParams_SPEAKER_WIDEBAND.txt -system/etc/audio/Rx_ControlParams_WIRED_HEADPHONE_WIDEBAND.txt -system/etc/audio/Rx_ControlParams_WIRED_HEADSET_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_BLUETOOTH_HEADSET.txt -system/etc/audio/Tx_ControlParams_EARPIECE_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_SPEAKER_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_WIRED_HEADPHONE_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_WIRED_HEADSET_WIDEBAND.txt system/etc/wifi/bcmdhd_apsta.bin system/etc/wifi/bcmdhd_mfg.bin system/etc/wifi/bcmdhd_p2p.bin system/etc/wifi/bcmdhd_sta.bin system/etc/wifi/nvram_mfg.txt system/etc/wifi/nvram_net.txt -system/lib/hw/audio.primary.piranha.so -system/lib/hw/audio_policy.piranha.so system/lib/hw/camera.omap4.so system/lib/hw/gps.omap4.so system/lib/hw/sensors.omap4.so @@ -33,25 +19,13 @@ system/lib/libOMX.TI.DUCATI1.VIDEO.H264E.so system/lib/libOMX.TI.DUCATI1.VIDEO.MPEG4E.so system/lib/libOMX_Core.so system/lib/libQmageDecoder.so -system/lib/lib_SamsungRec_V01003.so -system/lib/lib_Samsung_Resampler.so -system/lib/lib_Samsung_SB_AM_for_ICS_v03002.so -system/lib/lib_SoundAlive_for_ICS_V01012.so -system/lib/libaudiopolicy_sec.so -system/lib/libcontrolcsc.so system/lib/libdomx.so system/lib/libion.so -system/lib/liblibSoundAlive_VSP_ver305.so -system/lib/liblvvefs.so system/lib/libmm_osal.so system/lib/libril.so -system/lib/libsamsungRecord.so -system/lib/libsamsungSoundbooster.so system/lib/libsec-ril.so system/lib/libsecnativefeature.so system/lib/libsecril-client.so -system/lib/libsoundalive.so -system/lib/libtinyalsa.so system/lib/libtiutils.so system/vendor/bin/pvrsrvinit system/vendor/firmware/BCM4330.hcd diff --git a/recovery.fstab b/recovery.fstab index 673990a..3de882f 100644 --- a/recovery.fstab +++ b/recovery.fstab @@ -10,5 +10,5 @@ /bootloader emmc /dev/block/mmcblk0p2 /preload ext4 /dev/block/mmcblk0p11 -/emmc datamedia /dev/null -/sdcard vfat /dev/block/mmcblk1p1 +/sdcard datamedia /dev/null +/external_sd vfat /dev/block/mmcblk1p1 diff --git a/system.prop b/system.prop index 113af17..83ef816 100644 --- a/system.prop +++ b/system.prop @@ -4,3 +4,4 @@ rild.libpath=/vendor/lib/libsec-ril.so rild.libargs=-d /dev/ttys0 telephony.lteOnCdmaDevice=0 +ro.sf.lcd_density=160 |