From 5ea0290d08f34f1f86a85ce6092d4d80d81ef513 Mon Sep 17 00:00:00 2001
From: OzzysCmAcc <oskarkratochvil86@yahoo.com>
Date: Thu, 16 Feb 2017 21:56:11 +0100
Subject: [PATCH] klte-common: Move WiFi NVRAM paths to our own macloader
 header

Change-Id: Ia6af356646aed9a9df0eff3dac3397b65c815e0d
---
 BoardConfigCommon.mk        |  2 --
 include/samsung_macloader.h | 40 +++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 include/samsung_macloader.h

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 7f54f82..3cde509 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -104,8 +104,6 @@ WIFI_DRIVER_MODULE_AP_ARG   := "firmware_path=/system/etc/wifi/bcmdhd_apsta.bin
 WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/dhd/parameters/firmware_path"
 WIFI_DRIVER_FW_PATH_STA     := "/system/etc/wifi/bcmdhd_sta.bin"
 WIFI_DRIVER_FW_PATH_AP      := "/system/etc/wifi/bcmdhd_apsta.bin"
-WIFI_DRIVER_NVRAM_PATH_PARAM:= "/sys/module/dhd/parameters/nvram_path"
-WIFI_DRIVER_NVRAM_PATH      := "/system/etc/wifi/nvram_net.txt"
 
 # inherit from the proprietary version
 -include vendor/samsung/klte-common/BoardConfigVendor.mk
diff --git a/include/samsung_macloader.h b/include/samsung_macloader.h
new file mode 100644
index 0000000..a9ad655
--- /dev/null
+++ b/include/samsung_macloader.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The LineageOS 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 SAMSUNG_MACLOADER_H
+#define SAMSUNG_MACLOADER_H
+
+/*
+ * Board specific nodes
+ *
+ * If your kernel exposes these controls in another place, you can either
+ * symlink to the locations given here, or override this header in your
+ * device tree.
+ */
+
+/* NVRAM calibration, NULL if calibration unneeded */
+#define WIFI_DRIVER_NVRAM_PATH "/system/etc/wifi/nvram_net.txt"
+
+/* NVRAM calibration parameters */
+#define WIFI_DRIVER_NVRAM_PATH_PARAM "/sys/module/dhd/parameters/nvram_path"
+
+/* Physical address (MAC) */
+#define MACADDR_PATH "/efs/wifi/.mac.info"
+
+/* Consumer identification number (CID) */
+#define CID_PATH "/data/.cid.info"
+
+#endif // SAMSUNG_MACLOADER_H