diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2019-08-27 17:33:57 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2019-10-02 12:19:18 +0300 |
| commit | 8c7fbc8af3434fd9b8501825beaba7c62458cb46 (patch) | |
| tree | b0641ddf4a97e2e6ff8dd5ec85c91b0959baca55 | |
| parent | 934416e1dfa8222a0a1746a5a0951e2b08d02eae (diff) | |
card: move DRM version data to CardVersion
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
| -rw-r--r-- | kms++/inc/kms++/card.h | 20 | ||||
| -rw-r--r-- | kms++/src/card.cpp | 12 |
2 files changed, 19 insertions, 13 deletions
diff --git a/kms++/inc/kms++/card.h b/kms++/inc/kms++/card.h index 099d5b5..e734689 100644 --- a/kms++/inc/kms++/card.h +++ b/kms++/inc/kms++/card.h @@ -10,6 +10,16 @@ namespace kms { +struct CardVersion +{ + int major; + int minor; + int patchlevel; + std::string name; + std::string date; + std::string desc; +}; + class Card { friend class Framebuffer; @@ -54,7 +64,8 @@ public: int disable_all(); - const std::string& version_name() const { return m_version_name; } + const std::string& version_name() const { return m_version.name; } + const CardVersion& version() const { return m_version; } private: void setup(); @@ -76,11 +87,6 @@ private: bool m_has_universal_planes; bool m_has_dumb; - int m_version_major; - int m_version_minor; - int m_version_patchlevel; - std::string m_version_name; - std::string m_version_date; - std::string m_version_desc; + CardVersion m_version; }; } diff --git a/kms++/src/card.cpp b/kms++/src/card.cpp index 8de8b82..1509a98 100644 --- a/kms++/src/card.cpp +++ b/kms++/src/card.cpp @@ -151,12 +151,12 @@ Card::Card(const std::string& driver, uint32_t idx) void Card::setup() { drmVersionPtr ver = drmGetVersion(m_fd); - m_version_major = ver->version_major; - m_version_minor = ver->version_minor; - m_version_patchlevel = ver->version_patchlevel; - m_version_name = string(ver->name, ver->name_len); - m_version_date = string(ver->date, ver->date_len); - m_version_desc = string(ver->desc, ver->desc_len); + m_version.major = ver->version_major; + m_version.minor = ver->version_minor; + m_version.patchlevel = ver->version_patchlevel; + m_version.name = string(ver->name, ver->name_len); + m_version.date = string(ver->date, ver->date_len); + m_version.desc = string(ver->desc, ver->desc_len); drmFreeVersion(ver); int r; |