commit bf06463290b7e710b5a2614296fe1d1f2c23f33d
author Patrick Venture <venture@google.com> Thu Jan 17 12:20:21 2019 -0800
committer Patrick Venture <venture@google.com> Thu Jan 17 12:31:26 2019 -0800
tree 39b955768d5aa040736a7e693a61244ada624576
parent 88ead72c28643fa4d5b81231fc3f60030420e772

lpc_aspeed: move driver path to class member

Move the driver path to class member.

Change-Id: I83e5c2649ee88ca48f6103dd119fc335e4783338
Signed-off-by: Patrick Venture <venture@google.com>

lpc_aspeed.cpp

diff --git a/lpc_aspeed.cpp b/lpc_aspeed.cpp
index 2001986..25f027a 100644
--- a/lpc_aspeed.cpp
+++ b/lpc_aspeed.cpp
@@ -25,11 +25,14 @@
 #include <cstdint>
 #include <cstring>
 #include <memory>
+#include <string>
 #include <utility>
 
 namespace blobs
 {
 
+const std::string LpcMapperAspeed::lpcControlPath = "/dev/aspeed-lpc-ctrl";
+
 std::unique_ptr<HardwareMapperInterface>
     LpcMapperAspeed::createAspeedMapper(std::size_t regionSize)
 {
@@ -73,14 +76,12 @@
                  "\n",
                  map.addr, map.size);
 
-    static const char lpcControlPath[] = "/dev/aspeed-lpc-ctrl";
-
-    const auto lpcControlFd = sys->open(lpcControlPath, O_RDWR);
+    const auto lpcControlFd = sys->open(lpcControlPath.c_str(), O_RDWR);
     if (lpcControlFd == -1)
     {
         std::fprintf(stderr,
                      "cannot open Aspeed LPC kernel control dev \"%s\"\n",
-                     lpcControlPath);
+                     lpcControlPath.c_str());
         return std::make_pair(0, 0);
     }
 

lpc_aspeed.hpp

diff --git a/lpc_aspeed.hpp b/lpc_aspeed.hpp
index a6d70af..d6a35af 100644
--- a/lpc_aspeed.hpp
+++ b/lpc_aspeed.hpp
@@ -5,6 +5,7 @@
 
 #include <cstdint>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -28,6 +29,7 @@
     std::vector<std::uint8_t> copyFrom(std::uint32_t length) override;
 
   private:
+    static const std::string lpcControlPath;
     std::size_t regionSize;
     const internal::Sys* sys;
 };