ohanar · snowxucker · Oct 13, 2012 · Dec 18, 2012 · Dec 18, 2012 · Dec 18, 2012
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -22,3 +22,7 @@ DEVICE_PACKAGE_OVERLAYS += device/samsung/p6800/overlay
 TARGET_OTA_ASSERT_DEVICE := p6800,GT-P6800
 
 TARGET_KERNEL_CONFIG := cyanogenmod_p6800_defconfig
+
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/p6800/bluetooth
+
+BOARD_HAS_EARPIECE := true
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2012 The CyanogenMod Project <http://www.cyanogenmod.org>
+ *
+ * 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 BTM_DEF_LOCAL_NAME   "GT-P6800"
+
+#endif
diff --git a/configs/etc/audio_policy.conf b/configs/etc/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_EARPIECE|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_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_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/etc/tinyalsa-audio.xml b/configs/etc/tinyalsa-audio.xml
@@ -0,0 +1,170 @@
+<tinyalsa-audio device="Galaxy Tab 7.7">
+	<output card="0" device="0"
+		rate="44100" channels="2" format="PCM_16"
+		period_size="1024" period_count="4">
+
+		<device type="default">
+			<path type="enable">
+				<ctrl name="AD Digital Volume" value="75" />
+				<ctrl name="AD Digital Switch" value="on" />
+				<ctrl name="AENG6 Volume" value="75" />
+				<ctrl name="AENG6 Switch" value="on" />
+				<ctrl name="DIR#0 Volume" value="75" />
+				<ctrl name="DIR#0 Switch" value="on" />
+				<ctrl name="DIR#1 Volume" value="75" />
+				<ctrl name="DIR#1 Switch" value="on" />
+				<ctrl name="DIR#2 Volume" value="75" />
+				<ctrl name="DIR#2 Switch" value="on" />
+				<ctrl name="DIR#0 ATT Volume" value="75" />
+				<ctrl name="DIR#0 ATT Switch" value="on" />
+				<ctrl name="DIR#1 ATT Volume" value="75" />
+				<ctrl name="DIR#1 ATT Switch" value="on" />
+				<ctrl name="DIR#2 ATT Volume" value="75" />
+				<ctrl name="DIR#2 ATT Switch" value="on" />
+				<ctrl name="Master Playback Volume" value="75" />
+				<ctrl name="Master Playback Switch" value="on" />
+				<ctrl name="DAC Playback Volume" value="75" />
+				<ctrl name="DAC Playback Switch" value="on" />
+				<ctrl name="DIT#0 Capture Volume" value="75" />
+				<ctrl name="DIT#0 Capture Switch" value="on" />
+				<ctrl name="DIT#1 Capture Volume" value="75" />
+				<ctrl name="DIT#1 Capture Switch" value="on" />
+				<ctrl name="DIT#2 Capture Volume" value="75" />
+				<ctrl name="DIT#2 Capture Switch" value="on" />
+				<ctrl name="AD Analog Volume" value="19" />
+				<ctrl name="AD Analog Switch" value="on" />
+			</path>
+		</device>
+		<device type="earpiece">
+			<path type="enable">
+				<ctrl name="Receiver Playback Volume" value="31" />
+				<ctrl name="Receiver Playback Switch" value="on" />
+			</path>
+			<path type="disable">
+				<ctrl name="Receiver Playback Volume" value="0" />
+				<ctrl name="Receiver Playback Switch" value="off" />
+			</path>
+		</device>
+		<device type="speaker">
+			<path type="enable">
+				<ctrl name="Speaker Playback Volume" value="26" />
+				<ctrl name="Speaker Playback Switch" value="on" />
+			</path>
+			<path type="disable">
+				<ctrl name="Speaker Playback Volume" value="0" />
+				<ctrl name="Speaker Playback Switch" value="off" />
+			</path>
+		</device>
+		<device type="wired-headphone">
+			<path type="enable">
+				<ctrl name="Headphone Playback Volume" value="15" />
+				<ctrl name="Headphone Playback Switch" value="on" />
+			</path>
+			<path type="disable">
+				<ctrl name="Headphone Playback Volume" value="0" />
+				<ctrl name="Headphone Playback Switch" value="off" />
+			</path>
+		</device>
+		<device type="wired-headset">
+			<path type="enable">
+				<ctrl name="Headphone Playback Volume" value="15" />
+				<ctrl name="Headphone Playback Switch" value="on" />
+			</path>
+			<path type="disable">
+				<ctrl name="Headphone Playback Volume" value="0" />
+				<ctrl name="Headphone Playback Switch" value="off" />
+			</path>
+		</device>
+	</output>
+
+	<input card="0" device="0"
+		rate="44100" channels="2" format="PCM_16"
+		period_size="1024" period_count="4">
+
+		<device type="builtin-mic">
+			<path type="enable">
+				<ctrl name="AD Analog Volume" value="26" />
+				<ctrl name="Mic 1 Gain Volume" value="2" />
+			</path>
+			<path type="disable">
+				<ctrl name="AD Analog Volume" value="19" />
+				<ctrl name="Mic 1 Gain Volume" value="0" />
+			</path>
+		</device>
+		<device type="wired-headset">
+			<path type="enable">
+				<ctrl name="AD Analog Volume" value="26" />
+				<ctrl name="Mic 2 Gain Volume" value="2" />
+			</path>
+			<path type="disable">
+				<ctrl name="AD Analog Volume" value="19" />
+				<ctrl name="Mic 2 Gain Volume" value="0" />
+			</path>
+		</device>
+	</input>
+
+	<modem card="0" device="0">
+		<device type="earpiece">
+			<path type="enable">
+				<ctrl name="AD Digital Volume" value="84" />
+				<ctrl name="DIR#1 Volume" value="80" />
+				<ctrl name="Master Playback Volume" value="76" />
+				<ctrl name="AD Analog Volume" value="22" />
+			</path>
+			<path type="disable">
+				<ctrl name="AD Digital Volume" value="75" />
+				<ctrl name="DIR#1 Volume" value="75" />
+				<ctrl name="Master Playback Volume" value="75" />
+				<ctrl name="AD Analog Volume" value="19" />
+			</path>
+		</device>
+		<device type="speaker">
+			<path type="enable">
+				<ctrl name="AD Digital Volume" value="80" />
+				<ctrl name="Speaker Playback Volume" value="31" />
+				<!-- <ctrl name="Mic 3 Gain Volume" value="3" /> -->
+			</path>
+			<path type="disable">
+				<ctrl name="AD Digital Volume" value="75" />
+				<ctrl name="Speaker Playback Volume" value="26" />
+				<!-- <ctrl name="Mic 3 Gain Volume" value="0" /> -->
+			</path>
+		</device>
+		<device type="wired-headphone">
+			<path type="enable">
+				<ctrl name="AD Digital Volume" value="84" />
+				<ctrl name="Master Playback Volume" value="69" />
+				<ctrl name="AD Analog Volume" value="22" />
+				<ctrl name="Headphone Playback Volume" value="31" />
+			</path>
+			<path type="disable">
+				<ctrl name="AD Digital Volume" value="75" />
+				<ctrl name="Master Playback Volume" value="75" />
+				<ctrl name="AD Analog Volume" value="19" />
+				<ctrl name="Headphone Playback Volume" value="15" />
+			</path>
+		</device>
+		<device type="wired-headset">
+			<path type="enable">
+				<ctrl name="Master Playback Volume" value="69" />
+				<ctrl name="AD Analog Volume" value="26" />
+				<ctrl name="Headphone Playback Volume" value="31" />
+				<ctrl name="Mic 2 Gain Volume" value="2" />
+			</path>
+			<path type="disable">
+				<ctrl name="Master Playback Volume" value="75" />
+				<ctrl name="AD Analog Volume" value="19" />
+				<ctrl name="Headphone Playback Volume" value="15" />
+				<ctrl name="Mic 2 Gain Volume" value="0" />
+			</path>
+		</device>
+		<device type="bt-sco-headset">
+			<path type="enable">
+				<ctrl name="DIR#2 Volume" value="81" />
+			</path>
+			<path type="disable">
+				<ctrl name="DIR#2 Volume" value="75" />
+			</path>
+		</device>
+	</modem>
+</tinyalsa-audio>
diff --git a/device.mk b/device.mk
@@ -13,16 +13,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$(call inherit-product, vendor/cm/config/common_full_tablet_wifionly.mk)
-$(call inherit-product, vendor/cm/config/gsm.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 $(call inherit-product, device/samsung/smdk4210-tab/device.mk)
-$(call inherit-product-if-exists, vendor/samsung/smdk4210-tab/vendor.mk)
 $(call inherit-product-if-exists, vendor/samsung/p6800/vendor.mk)
 
+# Set preferred size for assets
+PRODUCT_AAPT_PREF_CONFIG := tvdpi
+
+# Audio
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/configs/etc/tinyalsa-audio.xml:system/etc/tinyalsa-audio.xml \
+	$(LOCAL_PATH)/configs/etc/audio_policy.conf:system/etc/audio_policy.conf
+
+# International variants have proximity sensor
+PRODUCT_COPY_FILES += \
+	frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml 
+
+# GPS
+$(call inherit-product, device/common/gps/gps_eu_supl.mk)
+PRODUCT_COPY_FILES += \
+	device/samsung/smdk4210-tab/init.smdk4210.gps.rc:root/init.smdk4210.gps.rc \
+	device/samsung/smdk4210-tab/configs/etc/gps.cer:system/etc/gps.cer \
+	device/samsung/smdk4210-tab/configs/etc/gps.xml:system/etc/gps.xml
+
+# Radio
+$(call inherit-product, build/target/product/telephony.mk)
+$(call inherit-product, vendor/cm/config/gsm.mk)
+
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
-    frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml
+	frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml
 
 PRODUCT_PACKAGES += \
-    SamsungServiceMode
+	SamsungServiceMode \
+	VoiceDialer \
+	libsecril-client
diff --git a/props_lists/camera.txt b/props_lists/camera.txt
@@ -1 +1 @@
-system/lib/hw/camera.exynos4.so
+system/lib/hw/vendor-camera.exynos4.so
diff --git a/props_lists/gps.txt b/props_lists/gps.txt
@@ -0,0 +1,2 @@
+system/lib/hw/gps.exynos4.so
+system/bin/gpsd
diff --git a/props_lists/ril.txt b/props_lists/ril.txt
@@ -1,4 +1,3 @@
 system/bin/rild
-system/lib/libril.so:libsamsungril
+system/lib/libril.so
 system/lib/libsec-ril.so
-system/lib/libsecril-client.so:libsecril-client
diff --git a/system.prop b/system.prop
@@ -1,7 +1,7 @@
 # RIL
 rild.libpath=/system/lib/libsec-ril.so
 rild.libargs=-d /dev/ttyS0
-ro.telephony.ril_class=Smdk4210RIL
+ro.telephony.ril_class=SamsungExynos4RIL
 ro.ril.hsxpa=1
 ro.ril.gprsclass=10
 # tvdpi
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		system/lib/hw/camera.exynos4.so
		system/lib/hw/vendor-camera.exynos4.so