From 85d97f05f6f8e4c1d73cd2bb096806839d16f3b0 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 31 10月 2020 10:27:16 +0800
Subject: [PATCH] Pc identifier Mac address issues #108 & #107
---
src/library/hw_identifier/hw_identifier.cpp | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/library/hw_identifier/hw_identifier.cpp b/src/library/hw_identifier/hw_identifier.cpp
index b0d31f8..2b14c3e 100644
--- a/src/library/hw_identifier/hw_identifier.cpp
+++ b/src/library/hw_identifier/hw_identifier.cpp
@@ -31,7 +31,7 @@
HwIdentifier::HwIdentifier(const HwIdentifier& other) : m_data(other.m_data) {}
-void HwIdentifier::set_identification_strategy(LCC_API_IDENTIFICATION_STRATEGY strategy) {
+void HwIdentifier::set_identification_strategy(LCC_API_HW_IDENTIFICATION_STRATEGY strategy) {
if (strategy == STRATEGY_NONE || strategy == STRATEGY_DEFAULT) {
throw logic_error("Only known strategies are permitted");
}
@@ -47,19 +47,6 @@
}
}
-void HwIdentifier::set_virtual_environment(VIRTUALIZATION virt) {
- // 110000 0x30
- m_data[0] = (m_data[0] & ~0x30) | virt << 4;
-}
-
-void HwIdentifier::set_virtualization(VIRTUALIZATION_DETAIL virtualization_detail) {
- m_data[0] = (m_data[0] & ~0x0F) | virtualization_detail;
-}
-
-void HwIdentifier::set_cloud_provider(CLOUD_PROVIDER cloud_provider) {
- m_data[0] = (m_data[0] & ~0x0F) | cloud_provider | 0x08;
-}
-
void HwIdentifier::set_data(const std::array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA>& data) {
m_data[1] = (m_data[1] & (~0x1f)) | (data[0] & 0x1f);
for (int i = 1; i < HW_IDENTIFIER_PROPRIETARY_DATA; i++) {
@@ -73,9 +60,9 @@
return result.substr(0, result.size() - 1);
}
-LCC_API_IDENTIFICATION_STRATEGY HwIdentifier::get_identification_strategy() const {
+LCC_API_HW_IDENTIFICATION_STRATEGY HwIdentifier::get_identification_strategy() const {
uint8_t stratMov = m_data[1] >> 5;
- return static_cast<LCC_API_IDENTIFICATION_STRATEGY>(stratMov);
+ return static_cast<LCC_API_HW_IDENTIFICATION_STRATEGY>(stratMov);
}
bool HwIdentifier::data_match(const std::array<uint8_t, HW_IDENTIFIER_PROPRIETARY_DATA>& data) const {
--
Gitblit v1.9.1