Revert "hoc-clk: add live vdd2, live boost clock and basic pwm dimming"
This reverts commit 15b7df8ef1.
This commit is contained in:
@@ -1,167 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Atmosphère-NX
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms and conditions of the GNU General Public License,
|
||||
* version 2, as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include <stratosphere.hpp>
|
||||
|
||||
namespace ams::kvdb {
|
||||
|
||||
namespace {
|
||||
|
||||
/* Convenience definitions. */
|
||||
constexpr u8 ArchiveHeaderMagic[4] = {'I', 'M', 'K', 'V'};
|
||||
constexpr u8 ArchiveEntryMagic[4] = {'I', 'M', 'E', 'N'};
|
||||
|
||||
/* Archive types. */
|
||||
struct ArchiveHeader {
|
||||
u8 magic[sizeof(ArchiveHeaderMagic)];
|
||||
u32 pad;
|
||||
u32 entry_count;
|
||||
|
||||
Result Validate() const {
|
||||
R_UNLESS(std::memcmp(this->magic, ArchiveHeaderMagic, sizeof(ArchiveHeaderMagic)) == 0, kvdb::ResultInvalidKeyValue());
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
static ArchiveHeader Make(size_t entry_count) {
|
||||
ArchiveHeader header = {};
|
||||
std::memcpy(header.magic, ArchiveHeaderMagic, sizeof(ArchiveHeaderMagic));
|
||||
header.entry_count = static_cast<u32>(entry_count);
|
||||
return header;
|
||||
}
|
||||
};
|
||||
static_assert(sizeof(ArchiveHeader) == 0xC && util::is_pod<ArchiveHeader>::value, "ArchiveHeader definition!");
|
||||
|
||||
struct ArchiveEntryHeader {
|
||||
u8 magic[sizeof(ArchiveEntryMagic)];
|
||||
u32 key_size;
|
||||
u32 value_size;
|
||||
|
||||
Result Validate() const {
|
||||
R_UNLESS(std::memcmp(this->magic, ArchiveEntryMagic, sizeof(ArchiveEntryMagic)) == 0, kvdb::ResultInvalidKeyValue());
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
static ArchiveEntryHeader Make(size_t ksz, size_t vsz) {
|
||||
ArchiveEntryHeader header = {};
|
||||
std::memcpy(header.magic, ArchiveEntryMagic, sizeof(ArchiveEntryMagic));
|
||||
header.key_size = ksz;
|
||||
header.value_size = vsz;
|
||||
return header;
|
||||
}
|
||||
};
|
||||
static_assert(sizeof(ArchiveEntryHeader) == 0xC && util::is_pod<ArchiveEntryHeader>::value, "ArchiveEntryHeader definition!");
|
||||
|
||||
}
|
||||
|
||||
/* Reader functionality. */
|
||||
Result ArchiveReader::Peek(void *dst, size_t size) {
|
||||
/* Bounds check. */
|
||||
R_UNLESS(m_offset + size <= m_buffer.GetSize(), kvdb::ResultInvalidKeyValue());
|
||||
R_UNLESS(m_offset < m_offset + size, kvdb::ResultInvalidKeyValue());
|
||||
|
||||
std::memcpy(dst, m_buffer.Get() + m_offset, size);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result ArchiveReader::Read(void *dst, size_t size) {
|
||||
R_TRY(this->Peek(dst, size));
|
||||
m_offset += size;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result ArchiveReader::ReadEntryCount(size_t *out) {
|
||||
/* This should only be called at the start of reading stream. */
|
||||
AMS_ABORT_UNLESS(m_offset == 0);
|
||||
|
||||
/* Read and validate header. */
|
||||
ArchiveHeader header;
|
||||
R_TRY(this->Read(std::addressof(header), sizeof(header)));
|
||||
R_TRY(header.Validate());
|
||||
|
||||
*out = header.entry_count;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result ArchiveReader::GetEntrySize(size_t *out_key_size, size_t *out_value_size) {
|
||||
/* This should only be called after ReadEntryCount. */
|
||||
AMS_ABORT_UNLESS(m_offset != 0);
|
||||
|
||||
/* Peek the next entry header. */
|
||||
ArchiveEntryHeader header;
|
||||
R_TRY(this->Peek(std::addressof(header), sizeof(header)));
|
||||
R_TRY(header.Validate());
|
||||
|
||||
*out_key_size = header.key_size;
|
||||
*out_value_size = header.value_size;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result ArchiveReader::ReadEntry(void *out_key, size_t key_size, void *out_value, size_t value_size) {
|
||||
/* This should only be called after ReadEntryCount. */
|
||||
AMS_ABORT_UNLESS(m_offset != 0);
|
||||
|
||||
/* Read the next entry header. */
|
||||
ArchiveEntryHeader header;
|
||||
R_TRY(this->Read(std::addressof(header), sizeof(header)));
|
||||
R_TRY(header.Validate());
|
||||
|
||||
/* Key size and Value size must be correct. */
|
||||
AMS_ABORT_UNLESS(key_size == header.key_size);
|
||||
AMS_ABORT_UNLESS(value_size == header.value_size);
|
||||
|
||||
R_ABORT_UNLESS(this->Read(out_key, key_size));
|
||||
R_ABORT_UNLESS(this->Read(out_value, value_size));
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
/* Writer functionality. */
|
||||
Result ArchiveWriter::Write(const void *src, size_t size) {
|
||||
/* Bounds check. */
|
||||
R_UNLESS(m_offset + size <= m_buffer.GetSize(), kvdb::ResultInvalidKeyValue());
|
||||
R_UNLESS(m_offset < m_offset + size, kvdb::ResultInvalidKeyValue());
|
||||
|
||||
std::memcpy(m_buffer.Get() + m_offset, src, size);
|
||||
m_offset += size;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
void ArchiveWriter::WriteHeader(size_t entry_count) {
|
||||
/* This should only be called at start of write. */
|
||||
AMS_ABORT_UNLESS(m_offset == 0);
|
||||
|
||||
ArchiveHeader header = ArchiveHeader::Make(entry_count);
|
||||
R_ABORT_UNLESS(this->Write(std::addressof(header), sizeof(header)));
|
||||
}
|
||||
|
||||
void ArchiveWriter::WriteEntry(const void *key, size_t key_size, const void *value, size_t value_size) {
|
||||
/* This should only be called after writing header. */
|
||||
AMS_ABORT_UNLESS(m_offset != 0);
|
||||
|
||||
ArchiveEntryHeader header = ArchiveEntryHeader::Make(key_size, value_size);
|
||||
R_ABORT_UNLESS(this->Write(std::addressof(header), sizeof(header)));
|
||||
R_ABORT_UNLESS(this->Write(key, key_size));
|
||||
R_ABORT_UNLESS(this->Write(value, value_size));
|
||||
}
|
||||
|
||||
/* Size helper functionality. */
|
||||
ArchiveSizeHelper::ArchiveSizeHelper() : m_size(sizeof(ArchiveHeader)) {
|
||||
/* ... */
|
||||
}
|
||||
|
||||
void ArchiveSizeHelper::AddEntry(size_t key_size, size_t value_size) {
|
||||
m_size += sizeof(ArchiveEntryHeader) + key_size + value_size;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,311 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Atmosphère-NX
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms and conditions of the GNU General Public License,
|
||||
* version 2, as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include <stratosphere.hpp>
|
||||
|
||||
namespace ams::kvdb {
|
||||
|
||||
/* Cache implementation. */
|
||||
void *FileKeyValueStore::Cache::Allocate(size_t size) {
|
||||
if (m_backing_buffer_size - m_backing_buffer_free_offset < size) {
|
||||
return nullptr;
|
||||
}
|
||||
ON_SCOPE_EXIT { m_backing_buffer_free_offset += size; };
|
||||
return m_backing_buffer + m_backing_buffer_free_offset;
|
||||
}
|
||||
|
||||
Result FileKeyValueStore::Cache::Initialize(void *buffer, size_t buffer_size, size_t capacity) {
|
||||
m_backing_buffer = static_cast<u8 *>(buffer);
|
||||
m_backing_buffer_size = buffer_size;
|
||||
m_backing_buffer_free_offset = 0;
|
||||
m_entries = nullptr;
|
||||
m_count = 0;
|
||||
m_capacity = capacity;
|
||||
|
||||
/* If we have memory to work with, ensure it's at least enough for the cache entries. */
|
||||
if (m_backing_buffer != nullptr) {
|
||||
m_entries = static_cast<decltype(m_entries)>(this->Allocate(sizeof(*m_entries) * m_capacity));
|
||||
R_UNLESS(m_entries != nullptr, kvdb::ResultBufferInsufficient());
|
||||
}
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
void FileKeyValueStore::Cache::Invalidate() {
|
||||
if (!this->HasEntries()) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* Reset the allocation pool. */
|
||||
m_backing_buffer_free_offset = 0;
|
||||
m_count = 0;
|
||||
m_entries = static_cast<decltype(m_entries)>(this->Allocate(sizeof(*m_entries) * m_capacity));
|
||||
AMS_ABORT_UNLESS(m_entries != nullptr);
|
||||
}
|
||||
|
||||
util::optional<size_t> FileKeyValueStore::Cache::TryGet(void *out_value, size_t max_out_size, const void *key, size_t key_size) {
|
||||
if (!this->HasEntries()) {
|
||||
return util::nullopt;
|
||||
}
|
||||
|
||||
/* Try to find the entry. */
|
||||
for (size_t i = 0; i < m_count; i++) {
|
||||
const auto &entry = m_entries[i];
|
||||
if (entry.key_size == key_size && std::memcmp(entry.key, key, key_size) == 0) {
|
||||
/* If we don't have enough space, fail to read from cache. */
|
||||
if (max_out_size < entry.value_size) {
|
||||
return util::nullopt;
|
||||
}
|
||||
|
||||
std::memcpy(out_value, entry.value, entry.value_size);
|
||||
return entry.value_size;
|
||||
}
|
||||
}
|
||||
|
||||
return util::nullopt;
|
||||
}
|
||||
|
||||
util::optional<size_t> FileKeyValueStore::Cache::TryGetSize(const void *key, size_t key_size) {
|
||||
if (!this->HasEntries()) {
|
||||
return util::nullopt;
|
||||
}
|
||||
|
||||
/* Try to find the entry. */
|
||||
for (size_t i = 0; i < m_count; i++) {
|
||||
const auto &entry = m_entries[i];
|
||||
if (entry.key_size == key_size && std::memcmp(entry.key, key, key_size) == 0) {
|
||||
return entry.value_size;
|
||||
}
|
||||
}
|
||||
|
||||
return util::nullopt;
|
||||
}
|
||||
|
||||
void FileKeyValueStore::Cache::Set(const void *key, size_t key_size, const void *value, size_t value_size) {
|
||||
if (!this->HasEntries()) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* Ensure key size is small enough. */
|
||||
AMS_ABORT_UNLESS(key_size <= MaxKeySize);
|
||||
|
||||
/* If we're at capacity, invalidate the cache. */
|
||||
if (m_count == m_capacity) {
|
||||
this->Invalidate();
|
||||
}
|
||||
|
||||
/* Allocate memory for the value. */
|
||||
void *value_buf = this->Allocate(value_size);
|
||||
if (value_buf == nullptr) {
|
||||
/* We didn't have enough memory for the value. Invalidating might get us enough memory. */
|
||||
this->Invalidate();
|
||||
value_buf = this->Allocate(value_size);
|
||||
if (value_buf == nullptr) {
|
||||
/* If we still don't have enough memory, just fail to put the value in the cache. */
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
auto &entry = m_entries[m_count++];
|
||||
std::memcpy(entry.key, key, key_size);
|
||||
entry.key_size = key_size;
|
||||
entry.value = value_buf;
|
||||
std::memcpy(entry.value, value, value_size);
|
||||
entry.value_size = value_size;
|
||||
}
|
||||
|
||||
bool FileKeyValueStore::Cache::Contains(const void *key, size_t key_size) {
|
||||
return this->TryGetSize(key, key_size).has_value();
|
||||
}
|
||||
|
||||
/* Store functionality. */
|
||||
FileKeyValueStore::Path FileKeyValueStore::GetPath(const void *_key, size_t key_size) {
|
||||
/* Format is "<dir>/<hex formatted key>.val" */
|
||||
FileKeyValueStore::Path key_path(m_dir_path.Get());
|
||||
key_path.Append('/');
|
||||
|
||||
/* Append hex formatted key. */
|
||||
const u8 *key = static_cast<const u8 *>(_key);
|
||||
for (size_t i = 0; i < key_size; i++) {
|
||||
key_path.AppendFormat("%02x", key[i]);
|
||||
}
|
||||
|
||||
/* Append extension. */
|
||||
key_path.Append(FileExtension);
|
||||
|
||||
return key_path;
|
||||
}
|
||||
|
||||
Result FileKeyValueStore::GetKey(size_t *out_size, void *_out_key, size_t max_out_size, const FileKeyValueStore::FileName &file_name) {
|
||||
/* Validate that the filename can be converted to a key. */
|
||||
/* TODO: Nintendo does not validate that the key is valid hex. Should we do this? */
|
||||
const size_t file_name_len = file_name.GetLength();
|
||||
const size_t key_name_len = file_name_len - FileExtensionLength;
|
||||
R_UNLESS(file_name_len >= FileExtensionLength + 2, kvdb::ResultInvalidKeyValue());
|
||||
R_UNLESS(file_name.EqualsPostfix(FileExtension), kvdb::ResultInvalidKeyValue());
|
||||
R_UNLESS(util::IsAligned(key_name_len, 2), kvdb::ResultInvalidKeyValue());
|
||||
|
||||
/* Validate that we have space for the converted key. */
|
||||
const size_t key_size = key_name_len / 2;
|
||||
R_UNLESS(key_size <= max_out_size, kvdb::ResultBufferInsufficient());
|
||||
|
||||
/* Convert the hex key back. */
|
||||
u8 *out_key = static_cast<u8 *>(_out_key);
|
||||
for (size_t i = 0; i < key_size; i++) {
|
||||
char substr[2 * sizeof(u8) + 1];
|
||||
file_name.GetSubString(substr, sizeof(substr), 2 * i, sizeof(substr) - 1);
|
||||
out_key[i] = static_cast<u8>(std::strtoul(substr, nullptr, 0x10));
|
||||
}
|
||||
|
||||
*out_size = key_size;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FileKeyValueStore::Initialize(const char *dir) {
|
||||
R_RETURN(this->InitializeWithCache(dir, nullptr, 0, 0));
|
||||
}
|
||||
|
||||
Result FileKeyValueStore::InitializeWithCache(const char *dir, void *cache_buffer, size_t cache_buffer_size, size_t cache_capacity) {
|
||||
/* Ensure that the passed path is a directory. */
|
||||
fs::DirectoryEntryType entry_type;
|
||||
R_TRY(fs::GetEntryType(std::addressof(entry_type), dir));
|
||||
R_UNLESS(entry_type == fs::DirectoryEntryType_Directory, fs::ResultPathNotFound());
|
||||
|
||||
/* Set path. */
|
||||
m_dir_path.Assign(dir);
|
||||
|
||||
/* Initialize our cache. */
|
||||
R_TRY(m_cache.Initialize(cache_buffer, cache_buffer_size, cache_capacity));
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FileKeyValueStore::Get(size_t *out_size, void *out_value, size_t max_out_size, const void *key, size_t key_size) {
|
||||
std::scoped_lock lk(m_lock);
|
||||
|
||||
/* Ensure key size is small enough. */
|
||||
R_UNLESS(key_size <= MaxKeySize, kvdb::ResultOutOfKeyResource());
|
||||
|
||||
/* Try to get from cache. */
|
||||
{
|
||||
auto size = m_cache.TryGet(out_value, max_out_size, key, key_size);
|
||||
if (size) {
|
||||
*out_size = *size;
|
||||
R_SUCCEED();
|
||||
}
|
||||
}
|
||||
|
||||
/* Open the value file. */
|
||||
fs::FileHandle file;
|
||||
R_TRY_CATCH(fs::OpenFile(std::addressof(file), this->GetPath(key, key_size), fs::OpenMode_Read)) {
|
||||
R_CONVERT(fs::ResultPathNotFound, kvdb::ResultKeyNotFound());
|
||||
} R_END_TRY_CATCH;
|
||||
ON_SCOPE_EXIT { fs::CloseFile(file); };
|
||||
|
||||
/* Get the value size. */
|
||||
s64 file_size;
|
||||
R_TRY(fs::GetFileSize(std::addressof(file_size), file));
|
||||
|
||||
/* Ensure there's enough space for the value. */
|
||||
R_UNLESS(file_size <= static_cast<s64>(max_out_size), kvdb::ResultBufferInsufficient());
|
||||
|
||||
/* Read the value. */
|
||||
const size_t value_size = static_cast<size_t>(file_size);
|
||||
R_TRY(fs::ReadFile(file, 0, out_value, value_size));
|
||||
*out_size = value_size;
|
||||
|
||||
/* Cache the newly read value. */
|
||||
m_cache.Set(key, key_size, out_value, value_size);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FileKeyValueStore::GetSize(size_t *out_size, const void *key, size_t key_size) {
|
||||
std::scoped_lock lk(m_lock);
|
||||
|
||||
/* Ensure key size is small enough. */
|
||||
R_UNLESS(key_size <= MaxKeySize, kvdb::ResultOutOfKeyResource());
|
||||
|
||||
/* Try to get from cache. */
|
||||
{
|
||||
auto size = m_cache.TryGetSize(key, key_size);
|
||||
if (size) {
|
||||
*out_size = *size;
|
||||
R_SUCCEED();
|
||||
}
|
||||
}
|
||||
|
||||
/* Open the value file. */
|
||||
fs::FileHandle file;
|
||||
R_TRY_CATCH(fs::OpenFile(std::addressof(file), this->GetPath(key, key_size), fs::OpenMode_Read)) {
|
||||
R_CONVERT(fs::ResultPathNotFound, kvdb::ResultKeyNotFound());
|
||||
} R_END_TRY_CATCH;
|
||||
ON_SCOPE_EXIT { fs::CloseFile(file); };
|
||||
|
||||
/* Get the value size. */
|
||||
s64 file_size;
|
||||
R_TRY(fs::GetFileSize(std::addressof(file_size), file));
|
||||
|
||||
*out_size = static_cast<size_t>(file_size);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FileKeyValueStore::Set(const void *key, size_t key_size, const void *value, size_t value_size) {
|
||||
std::scoped_lock lk(m_lock);
|
||||
|
||||
/* Ensure key size is small enough. */
|
||||
R_UNLESS(key_size <= MaxKeySize, kvdb::ResultOutOfKeyResource());
|
||||
|
||||
/* When the cache contains the key being set, Nintendo invalidates the cache. */
|
||||
if (m_cache.Contains(key, key_size)) {
|
||||
m_cache.Invalidate();
|
||||
}
|
||||
|
||||
/* Delete the file, if it exists. Don't check result, since it's okay if it's already deleted. */
|
||||
auto key_path = this->GetPath(key, key_size);
|
||||
fs::DeleteFile(key_path);
|
||||
|
||||
/* Create the new value file. */
|
||||
R_TRY(fs::CreateFile(key_path, value_size));
|
||||
|
||||
/* Open the value file. */
|
||||
fs::FileHandle file;
|
||||
R_TRY(fs::OpenFile(std::addressof(file), key_path, fs::OpenMode_Write));
|
||||
ON_SCOPE_EXIT { fs::CloseFile(file); };
|
||||
|
||||
/* Write the value file and flush. */
|
||||
R_TRY(fs::WriteFile(file, 0, value, value_size, fs::WriteOption::Flush));
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FileKeyValueStore::Remove(const void *key, size_t key_size) {
|
||||
std::scoped_lock lk(m_lock);
|
||||
|
||||
/* Ensure key size is small enough. */
|
||||
R_UNLESS(key_size <= MaxKeySize, kvdb::ResultOutOfKeyResource());
|
||||
|
||||
/* When the cache contains the key being set, Nintendo invalidates the cache. */
|
||||
if (m_cache.Contains(key, key_size)) {
|
||||
m_cache.Invalidate();
|
||||
}
|
||||
|
||||
/* Remove the file. */
|
||||
R_TRY_CATCH(fs::DeleteFile(this->GetPath(key, key_size))) {
|
||||
R_CONVERT(fs::ResultPathNotFound, kvdb::ResultKeyNotFound())
|
||||
} R_END_TRY_CATCH;
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user