diff options
| author | 2019-05-30 13:26:40 -0400 | |
|---|---|---|
| committer | 2019-05-30 13:26:40 -0400 | |
| commit | ed74a3cb8b69841bd34344b1387320c0d8912979 (patch) | |
| tree | f914218f6a5965ad6c47bd9acab096ab22356d5d /src/common | |
| parent | Merge pull request #2431 from DarkLordZach/game-list-cache (diff) | |
| parent | mii_manager: Fix incorrect loop condition in mii UUID generation code (diff) | |
| download | yuzu-ed74a3cb8b69841bd34344b1387320c0d8912979.tar.gz yuzu-ed74a3cb8b69841bd34344b1387320c0d8912979.tar.xz yuzu-ed74a3cb8b69841bd34344b1387320c0d8912979.zip | |
Merge pull request #1931 from DarkLordZach/mii-database-1
mii: Implement MiiManager backend and several mii service commands
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/uuid.cpp | 33 | ||||
| -rw-r--r-- | src/common/uuid.h | 48 |
3 files changed, 83 insertions, 0 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 1e8e1b215..cb514a0d2 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -123,6 +123,8 @@ add_library(common STATIC | |||
| 123 | timer.h | 123 | timer.h |
| 124 | uint128.cpp | 124 | uint128.cpp |
| 125 | uint128.h | 125 | uint128.h |
| 126 | uuid.cpp | ||
| 127 | uuid.h | ||
| 126 | vector_math.h | 128 | vector_math.h |
| 127 | web_result.h | 129 | web_result.h |
| 128 | zstd_compression.cpp | 130 | zstd_compression.cpp |
diff --git a/src/common/uuid.cpp b/src/common/uuid.cpp new file mode 100644 index 000000000..26db03fba --- /dev/null +++ b/src/common/uuid.cpp | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | // Copyright 2018 yuzu Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include <random> | ||
| 6 | |||
| 7 | #include <fmt/format.h> | ||
| 8 | |||
| 9 | #include "common/uuid.h" | ||
| 10 | |||
| 11 | namespace Common { | ||
| 12 | |||
| 13 | UUID UUID::Generate() { | ||
| 14 | std::random_device device; | ||
| 15 | std::mt19937 gen(device()); | ||
| 16 | std::uniform_int_distribution<u64> distribution(1, std::numeric_limits<u64>::max()); | ||
| 17 | return UUID{distribution(gen), distribution(gen)}; | ||
| 18 | } | ||
| 19 | |||
| 20 | std::string UUID::Format() const { | ||
| 21 | return fmt::format("0x{:016X}{:016X}", uuid[1], uuid[0]); | ||
| 22 | } | ||
| 23 | |||
| 24 | std::string UUID::FormatSwitch() const { | ||
| 25 | std::array<u8, 16> s{}; | ||
| 26 | std::memcpy(s.data(), uuid.data(), sizeof(u128)); | ||
| 27 | return fmt::format("{:02x}{:02x}{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{" | ||
| 28 | ":02x}{:02x}{:02x}{:02x}{:02x}", | ||
| 29 | s[0], s[1], s[2], s[3], s[4], s[5], s[6], s[7], s[8], s[9], s[10], s[11], | ||
| 30 | s[12], s[13], s[14], s[15]); | ||
| 31 | } | ||
| 32 | |||
| 33 | } // namespace Common | ||
diff --git a/src/common/uuid.h b/src/common/uuid.h new file mode 100644 index 000000000..f6ad064fb --- /dev/null +++ b/src/common/uuid.h | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | // Copyright 2018 yuzu Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include <string> | ||
| 8 | |||
| 9 | #include "common/common_types.h" | ||
| 10 | |||
| 11 | namespace Common { | ||
| 12 | |||
| 13 | constexpr u128 INVALID_UUID{{0, 0}}; | ||
| 14 | |||
| 15 | struct UUID { | ||
| 16 | // UUIDs which are 0 are considered invalid! | ||
| 17 | u128 uuid = INVALID_UUID; | ||
| 18 | constexpr UUID() = default; | ||
| 19 | constexpr explicit UUID(const u128& id) : uuid{id} {} | ||
| 20 | constexpr explicit UUID(const u64 lo, const u64 hi) : uuid{{lo, hi}} {} | ||
| 21 | |||
| 22 | constexpr explicit operator bool() const { | ||
| 23 | return uuid[0] != INVALID_UUID[0] && uuid[1] != INVALID_UUID[1]; | ||
| 24 | } | ||
| 25 | |||
| 26 | constexpr bool operator==(const UUID& rhs) const { | ||
| 27 | // TODO(DarkLordZach): Replace with uuid == rhs.uuid with C++20 | ||
| 28 | return uuid[0] == rhs.uuid[0] && uuid[1] == rhs.uuid[1]; | ||
| 29 | } | ||
| 30 | |||
| 31 | constexpr bool operator!=(const UUID& rhs) const { | ||
| 32 | return !operator==(rhs); | ||
| 33 | } | ||
| 34 | |||
| 35 | // TODO(ogniK): Properly generate uuids based on RFC-4122 | ||
| 36 | static UUID Generate(); | ||
| 37 | |||
| 38 | // Set the UUID to {0,0} to be considered an invalid user | ||
| 39 | constexpr void Invalidate() { | ||
| 40 | uuid = INVALID_UUID; | ||
| 41 | } | ||
| 42 | |||
| 43 | std::string Format() const; | ||
| 44 | std::string FormatSwitch() const; | ||
| 45 | }; | ||
| 46 | static_assert(sizeof(UUID) == 16, "UUID is an invalid size!"); | ||
| 47 | |||
| 48 | } // namespace Common | ||