5 files changed, 79 insertions, 13 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7c6771a..e0196a5 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -91,12 +91,9 @@ BOARD_WLAN_DEVICE           := bcmdhd
 BOARD_WLAN_DEVICE_REV       := bcm4330_b1
 WIFI_DRIVER_MODULE_NAME     := "bcmdhd"
 WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/bcmdhd/parameters/firmware_path"
-WIFI_DRIVER_FW_PATH_STA     := "/system/vendor/firmware/fw_bcmdhd.bin"
-WIFI_DRIVER_FW_PATH_P2P     := "/system/vendor/firmware/fw_bcmdhd_p2p.bin"
-WIFI_DRIVER_FW_PATH_AP      := "/system/vendor/firmware/fw_bcmdhd_apsta.bin"
-
-# Touchscreen
-#BOARD_USE_LEGACY_TOUCHSCREEN := true
+WIFI_DRIVER_FW_PATH_STA     := "/vendor/firmware/fw_bcmdhd.bin"
+WIFI_DRIVER_FW_PATH_P2P     := "/vendor/firmware/fw_bcmdhd_p2p.bin"
+WIFI_DRIVER_FW_PATH_AP      := "/vendor/firmware/fw_bcmdhd_apsta.bin"
 
 # Bluetooth
 BOARD_HAVE_BLUETOOTH := true
diff --git a/configs/main.conf b/configs/main.conf
new file mode 100755
index 0000000..b9fb19d
--- /dev/null
+++ b/configs/main.conf
@@ -0,0 +1,66 @@
+[General]
+
+# List of plugins that should not be loaded on bluetoothd startup
+#DisablePlugins = network,input
+
+# Default adaper name
+# %h - substituted for hostname
+# %d - substituted for adapter id
+# %b - substituted for ro.product.brand
+# %m - substituted for ro.product.model
+# %n - substituted for ro.product.name
+Name = %m
+
+# Default device class. Only the major and minor device class bits are
+# considered.
+# Local device class
+#     0x400000  - Service class: Telephony
+#     0x000200  - Major class: Phone
+#     0x00000C  - Minor class: Smart phone
+Class = 0x40020C
+
+# How long to stay in discoverable mode before going back to non-discoverable
+# The value is in seconds. Default is 180, i.e. 3 minutes.
+# 0 = disable timer, i.e. stay discoverable forever
+DiscoverableTimeout = 120
+
+# How long to stay in pairable mode before going back to non-discoverable
+# The value is in seconds. Default is 0.
+# 0 = disable timer, i.e. stay pairable forever
+PairableTimeout = 0
+
+# Use some other page timeout than the controller default one
+# which is 16384 (10 seconds).
+PageTimeout = 8192
+
+# Discover scheduler interval used in Adapter.DiscoverDevices
+# The value is in seconds. Defaults is 0 to use controller scheduler.
+DiscoverSchedulerInterval = 0
+
+# What value should be assumed for the adapter Powered property when
+# SetProperty(Powered, ...) hasn't been called yet. Defaults to true
+InitiallyPowered = true
+
+# Remember the previously stored Powered state when initializing adapters
+RememberPowered = true
+
+# Use vendor, product and version information for DID profile support.
+# The values are separated by ":" and VID, PID and version.
+DeviceID = android:generic:1.5
+
+# Do reverse service discovery for previously unknown devices that connect to
+# us. This option is really only needed for qualification since the BITE tester
+# doesn't like us doing reverse SDP for some test cases (though there could in
+# theory be other useful purposes for this too). Defaults to true.
+ReverseServiceDiscovery = true
+
+# Enable name resolving after inquiry. Set it to 'false' if you don't need
+# remote devices name and want shorter discovery cycle. Defaults to 'true'.
+NameResolving = true
+
+# The link policy for connections. By default it's set to 15(0x000f) which is
+# a bitwise OR of role switch(0x0001), hold mode(0x0002), sniff mode(0x0004)
+# and park state(0x0008) are all enabled. However, some devices have
+# connection stability issue or fail to setup SCO when the link is in park
+# state, which requires park state bit cleared.
+DefaultLinkPolicy = 7
+\ No newline at end of file
diff --git a/galaxynote.mk b/galaxynote.mk
index d96a9d8..2e2ee04 100755
--- a/galaxynote.mk
+++ b/galaxynote.mk
@@ -59,21 +59,18 @@ PRODUCT_COPY_FILES += \
 	device/samsung/galaxynote/configs/vold.fstab:system/etc/vold.fstab
 	
 # Bluetooth configuration files
-#PRODUCT_COPY_FILES += \
-#	system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf
+PRODUCT_COPY_FILES += \
+	device/samsung/galaxynote/configs/main.conf:system/etc/bluetooth/main.conf
 
 # Wifi
 PRODUCT_COPY_FILES += \
 	device/samsung/galaxynote/configs/nvram_net.txt:system/etc/nvram_net.txt \
-#	device/samsung/galaxynote/configs/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
 	device/samsung/galaxynote/configs/bcmdhd.cal:system/etc/wifi/bcmdhd.cal
 
 PRODUCT_PROPERTY_OVERRIDES := \
 	wifi.interface=wlan0 \
 	wifi.supplicant_scan_interval=20
 
-$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk)
-
 # Gps
 PRODUCT_COPY_FILES += \
 	device/samsung/galaxynote/configs/gps.conf:system/etc/gps.conf \
@@ -84,7 +81,6 @@ PRODUCT_PACKAGES := \
 	audio.primary.smdkv310 \
 	gps.smdkv310 \
     smdkv310_hdcp_keys \
-	audio.a2dp.default \
     com.android.future.usb.accessory
 
 # Charger
@@ -105,7 +101,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.telephony.ril_class=samsung \
     ro.telephony.ril.v3=icccardstatus,datacall,signalstrength,facilitylock \
-    mobiledata.interfaces=pdp0,eth0,gprs,ppp0
+    mobiledata.interfaces=pdp0,wlan0,gprs,ppp0
 
 # Filesystem management tools
 PRODUCT_PACKAGES += \
@@ -155,6 +151,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.kernel.android.checkjni=0 \
     dalvik.vm.checkjni=false
 
+# enable Google-specific location features,
+# like NetworkLocationProvider and LocationCollector
+PRODUCT_PROPERTY_OVERRIDES += \
+        ro.com.google.locationfeatures=1 \
+        ro.com.google.networklocation=1
+	
 PRODUCT_TAGS += dalvik.gc.type-precise
 
 # Set default USB interface
@@ -187,5 +189,6 @@ endif
 PRODUCT_COPY_FILES += \
     $(LOCAL_KERNEL):kernel
 
+$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk)
 $(call inherit-product, frameworks/base/build/phone-xhdpi-1024-dalvik-heap.mk)
 $(call inherit-product-if-exists, vendor/samsung/galaxynote/galaxynote-vendor.mk)
 \ No newline at end of file
diff --git a/modules/bthid.ko b/modules/bthid.ko
deleted file mode 100755
index 8c77747..0000000
--- a/modules/bthid.ko
+++ /dev/null
diff --git a/modules/dhd.ko b/modules/dhd.ko
deleted file mode 100755
index 6d70b79..0000000
--- a/modules/dhd.ko
+++ /dev/null