diff options
Diffstat (limited to 'drm/DrmDevice.h')
-rw-r--r-- | drm/DrmDevice.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drm/DrmDevice.h b/drm/DrmDevice.h index 4cf0132..39d0c88 100644 --- a/drm/DrmDevice.h +++ b/drm/DrmDevice.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef ANDROID_DRM_H_ -#define ANDROID_DRM_H_ +#pragma once #include <cstdint> #include <map> @@ -24,8 +23,7 @@ #include "DrmConnector.h" #include "DrmCrtc.h" #include "DrmEncoder.h" -#include "DrmFbImporter.h" -#include "utils/UniqueFd.h" +#include "utils/fd.h" namespace android { @@ -40,8 +38,8 @@ class DrmDevice { static auto CreateInstance(std::string const &path, ResourceManager *res_man) -> std::unique_ptr<DrmDevice>; - auto GetFd() const { - return fd_.Get(); + auto &GetFd() const { + return fd_; } auto &GetResMan() { @@ -103,7 +101,7 @@ class DrmDevice { static auto IsKMSDev(const char *path) -> bool; - UniqueFd fd_; + SharedFd fd_; std::vector<std::unique_ptr<DrmConnector>> connectors_; std::vector<std::unique_ptr<DrmConnector>> writeback_connectors_; @@ -121,5 +119,3 @@ class DrmDevice { ResourceManager *const res_man_; }; } // namespace android - -#endif // ANDROID_DRM_H_ |