From db30b7fbd83268b5c73c4b92d12dc9086fcb58b7 Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Fri, 27 May 2016 16:05:11 -0700
Subject: msm8916: Enable DPM/CNE

* Move CNE board/product definitions to device, since these are
  dependent on proprietary libraries being present or not.
* Move libcnefeatureconfig package to qcom-radio
* Create nsrm directory
* Add cnd, dpmd service entries

Change-Id: I0bb1eb5bf097ae2baf1ad745f4691d88c06d02e2
---
 board/qcom-cne.mk        |  5 -----
 product/qcom-cne.mk      |  8 --------
 product/qcom-radio.mk    |  1 +
 rootdir/etc/init.qcom.rc | 15 +++++++++------
 4 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 board/qcom-cne.mk
 delete mode 100644 product/qcom-cne.mk

diff --git a/board/qcom-cne.mk b/board/qcom-cne.mk
deleted file mode 100644
index e83beb8..0000000
--- a/board/qcom-cne.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# CNE
-ifneq ($(QCPATH),)
-BOARD_USES_QCNE := true
-TARGET_LDPRELOAD := libNimsWrap.so
-endif
diff --git a/product/qcom-cne.mk b/product/qcom-cne.mk
deleted file mode 100644
index c33e912..0000000
--- a/product/qcom-cne.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# CNE
-PRODUCT_PACKAGES += \
-    libcnefeatureconfig
-
-ifeq ($(BOARD_USES_QCNE),true)
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.cne.feature=4
-endif
diff --git a/product/qcom-radio.mk b/product/qcom-radio.mk
index 1b515b1..ec3af2c 100644
--- a/product/qcom-radio.mk
+++ b/product/qcom-radio.mk
@@ -17,5 +17,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # RIL
 PRODUCT_PACKAGES += \
+    libcnefeatureconfig \
     librmnetctl \
     libxml2
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index a46cc3f..0393b74 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -88,17 +88,12 @@ on post-fs-data
 
     # Create the directories used by CnE subsystem
     mkdir /data/connectivity 0771 system system
-    chown system system /data/connectivity
-
     mkdir /data/connectivity/nsrm 0771 system system
-    chown system system /data/connectivity/nsrm
 
     # Create the directories used by DPM subsystem
     mkdir /data/dpm 0771 system system
-    chown system system /data/dpm
-
     mkdir /data/dpm/fdMgr 0771 system system
-    chown system system /data/dpm/fdMgr
+    mkdir /data/dpm/nsrm 0771 system system
 
     # Create directory used by audio subsystem
     mkdir /data/misc/audio 0770 audio audio
@@ -314,6 +309,14 @@ service config_bluetooth /system/bin/sh /system/etc/init.qcom.bt.sh "onboot"
     seclabel u:r:bluetooth_loader:s0
     oneshot
 
+service cnd /system/bin/cnd
+    class late_start
+    socket cnd stream 660 root inet
+
+service dpmd /system/bin/dpmd
+    class late_start
+    socket dpmd stream 660 root system
+
 service hciattach /system/bin/sh /system/etc/init.qcom.bt.sh
     class late_start
     user bluetooth
-- 
cgit v1.2.3