move types.hpp to ipmid/types.hpp for export
types.hpp is required by utility.hpp, which is exported, so it needs to
be exported as well. This moves it to the include/libipmid directory,
changes the Makefile to export it, and changes all the files that
include it so it can be found in the right place.
Change-Id: I30ec365446e4de466c266ec4faa327478460ec05
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
diff --git a/app/channel.cpp b/app/channel.cpp
index e4532c5..085464b 100644
--- a/app/channel.cpp
+++ b/app/channel.cpp
@@ -1,13 +1,13 @@
#include "channel.hpp"
#include "transporthandler.hpp"
-#include "types.hpp"
#include "user_channel/channel_layer.hpp"
#include <arpa/inet.h>
#include <boost/process/child.hpp>
#include <fstream>
+#include <ipmid/types.hpp>
#include <ipmid/utils.hpp>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/log.hpp>
diff --git a/apphandler.cpp b/apphandler.cpp
index 0993139..bb7e192 100644
--- a/apphandler.cpp
+++ b/apphandler.cpp
@@ -5,7 +5,6 @@
#include "ipmid.hpp"
#include "sys_info_param.hpp"
#include "transporthandler.hpp"
-#include "types.hpp"
#include <arpa/inet.h>
#include <ipmid/api.h>
@@ -18,6 +17,7 @@
#include <array>
#include <cstddef>
#include <fstream>
+#include <ipmid/types.hpp>
#include <ipmid/utils.hpp>
#include <memory>
#include <nlohmann/json.hpp>
diff --git a/chassishandler.cpp b/chassishandler.cpp
index 2a9057d..072a021 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -4,7 +4,6 @@
#include "ipmid.hpp"
#include "settings.hpp"
-#include "types.hpp"
#include <arpa/inet.h>
#include <endian.h>
@@ -18,6 +17,7 @@
#include <cstring>
#include <fstream>
#include <future>
+#include <ipmid/types.hpp>
#include <ipmid/utils.hpp>
#include <map>
#include <phosphor-logging/elog-errors.hpp>
diff --git a/include/Makefile.am b/include/Makefile.am
index f51e7d7..a3051dd 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -11,6 +11,7 @@
ipmid/iana.hpp \
ipmid/oemopenbmc.hpp \
ipmid/oemrouter.hpp \
+ ipmid/types.hpp \
ipmid/utility.hpp \
ipmid/utils.hpp \
ipmid-host/cmd.hpp \
diff --git a/types.hpp b/include/ipmid/types.hpp
similarity index 100%
rename from types.hpp
rename to include/ipmid/types.hpp
diff --git a/include/ipmid/utils.hpp b/include/ipmid/utils.hpp
index 09bb1b4..9ef1488 100644
--- a/include/ipmid/utils.hpp
+++ b/include/ipmid/utils.hpp
@@ -1,7 +1,7 @@
#pragma once
-#include "types.hpp"
#include <chrono>
+#include <ipmid/types.hpp>
#include <optional>
#include <sdbusplus/server.hpp>
diff --git a/ipmid-new.cpp b/ipmid-new.cpp
index a92d4c4..26c9de4 100644
--- a/ipmid-new.cpp
+++ b/ipmid-new.cpp
@@ -30,6 +30,7 @@
#include <ipmid/message.hpp>
#include <ipmid/oemrouter.hpp>
#include <ipmid/registration.hpp>
+#include <ipmid/types.hpp>
#include <map>
#include <memory>
#include <optional>
@@ -41,7 +42,6 @@
#include <sdbusplus/bus/match.hpp>
#include <sdbusplus/timer.hpp>
#include <tuple>
-#include <types.hpp>
#include <unordered_map>
#include <utility>
#include <vector>
diff --git a/read_fru_data.cpp b/read_fru_data.cpp
index 05b1b6e..17bcfe4 100644
--- a/read_fru_data.cpp
+++ b/read_fru_data.cpp
@@ -1,11 +1,11 @@
#include "read_fru_data.hpp"
#include "fruread.hpp"
-#include "types.hpp"
#include <ipmid/api.h>
#include <algorithm>
+#include <ipmid/types.hpp>
#include <ipmid/utils.hpp>
#include <map>
#include <phosphor-logging/elog-errors.hpp>
diff --git a/scripts/inventorysensor.mako.cpp b/scripts/inventorysensor.mako.cpp
index 000f758..f1ea8cd 100644
--- a/scripts/inventorysensor.mako.cpp
+++ b/scripts/inventorysensor.mako.cpp
@@ -3,7 +3,7 @@
// !!! WARNING: This is a GENERATED Code..Please do NOT Edit !!!
-#include "types.hpp"
+#include <ipmid/types.hpp>
using namespace ipmi::sensor;
extern const InvObjectIDMap invSensors = {
diff --git a/scripts/writechannel.mako.cpp b/scripts/writechannel.mako.cpp
index 922611a..83ee5cd 100644
--- a/scripts/writechannel.mako.cpp
+++ b/scripts/writechannel.mako.cpp
@@ -2,7 +2,7 @@
## into the rendered file; feel free to edit this file.
// !!! WARNING: This is a GENERATED Code..Please do NOT Edit !!!
-#include "types.hpp"
+#include <ipmid/types.hpp>
namespace ipmi
{
diff --git a/scripts/writeentity.mako.cpp b/scripts/writeentity.mako.cpp
index 9de11a0..4cfc82b 100644
--- a/scripts/writeentity.mako.cpp
+++ b/scripts/writeentity.mako.cpp
@@ -2,7 +2,7 @@
## into the rendered file; feel free to edit this file.
// !!! WARNING: This is a GENERATED Code..Please do NOT Edit !!!
-#include "types.hpp"
+#include <ipmid/types.hpp>
using namespace ipmi::sensor;
extern const EntityInfoMap entities = {
diff --git a/scripts/writesensor.mako.cpp b/scripts/writesensor.mako.cpp
index bbc80e3..559f0f9 100644
--- a/scripts/writesensor.mako.cpp
+++ b/scripts/writesensor.mako.cpp
@@ -24,9 +24,9 @@
%>\
% endfor
-#include "types.hpp"
#include "sensordatahandler.hpp"
+#include <ipmid/types.hpp>
using namespace ipmi::sensor;
extern const IdInfoMap sensors = {
diff --git a/selutility.cpp b/selutility.cpp
index b85bc40..9edc1b8 100644
--- a/selutility.cpp
+++ b/selutility.cpp
@@ -2,11 +2,10 @@
#include "selutility.hpp"
-#include "types.hpp"
-
#include <ipmid/api.h>
#include <chrono>
+#include <ipmid/types.hpp>
#include <ipmid/utils.hpp>
#include <phosphor-logging/elog-errors.hpp>
#include <vector>
diff --git a/selutility.hpp b/selutility.hpp
index 4e2855a..806f937 100644
--- a/selutility.hpp
+++ b/selutility.hpp
@@ -1,9 +1,8 @@
#pragma once
-#include "types.hpp"
-
#include <chrono>
#include <cstdint>
+#include <ipmid/types.hpp>
#include <sdbusplus/server.hpp>
namespace ipmi
diff --git a/sensordatahandler.cpp b/sensordatahandler.cpp
index 87c82b9..7903138 100644
--- a/sensordatahandler.cpp
+++ b/sensordatahandler.cpp
@@ -1,9 +1,9 @@
#include "sensordatahandler.hpp"
#include "sensorhandler.hpp"
-#include "types.hpp"
#include <bitset>
+#include <ipmid/types.hpp>
#include <ipmid/utils.hpp>
#include <optional>
#include <phosphor-logging/elog-errors.hpp>
diff --git a/sensordatahandler.hpp b/sensordatahandler.hpp
index 82ed002..8403a8d 100644
--- a/sensordatahandler.hpp
+++ b/sensordatahandler.hpp
@@ -1,11 +1,11 @@
#pragma once
#include "sensorhandler.hpp"
-#include "types.hpp"
#include <ipmid/api.h>
#include <cmath>
+#include <ipmid/types.hpp>
#include <ipmid/utils.hpp>
#include <sdbusplus/message/types.hpp>
diff --git a/sensorhandler.cpp b/sensorhandler.cpp
index cb73e71..4da40af 100644
--- a/sensorhandler.cpp
+++ b/sensorhandler.cpp
@@ -2,7 +2,6 @@
#include "fruread.hpp"
#include "ipmid.hpp"
-#include "types.hpp"
#include <ipmid/api.h>
#include <mapper.h>
@@ -11,6 +10,7 @@
#include <bitset>
#include <cmath>
#include <cstring>
+#include <ipmid/types.hpp>
#include <ipmid/utils.hpp>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/log.hpp>
diff --git a/sensorhandler.hpp b/sensorhandler.hpp
index 8fcf2b1..21d2317 100644
--- a/sensorhandler.hpp
+++ b/sensorhandler.hpp
@@ -1,10 +1,10 @@
#pragma once
-#include "types.hpp"
-
#include <ipmid/api.h>
#include <stdint.h>
+#include <ipmid/types.hpp>
+
// IPMI commands for net functions.
enum ipmi_netfn_sen_cmds
{
diff --git a/storageaddsel.cpp b/storageaddsel.cpp
index f0f0fc7..5adb673 100644
--- a/storageaddsel.cpp
+++ b/storageaddsel.cpp
@@ -2,7 +2,6 @@
#include "error-HostEvent.hpp"
#include "sensorhandler.hpp"
#include "storagehandler.hpp"
-#include "types.hpp"
#include <ipmid/api.h>
#include <mapper.h>
@@ -13,6 +12,7 @@
#include <cstring>
#include <fstream>
#include <iostream>
+#include <ipmid/types.hpp>
#include <memory>
#include <phosphor-logging/elog.hpp>
#include <vector>
diff --git a/transporthandler.hpp b/transporthandler.hpp
index f1ed8bc..04d4673 100644
--- a/transporthandler.hpp
+++ b/transporthandler.hpp
@@ -1,7 +1,6 @@
#pragma once
-#include "types.hpp"
-
+#include <ipmid/types.hpp>
#include <string>
// IPMI commands for Transport net functions.
enum ipmi_netfn_storage_cmds