Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

boxcat: Implement events global field

Browse source
This commit is contained in:
Zach Hilman 2019-06-20 20:31:17 -04:00
parent 2d410ddf4d
commit bcf1eafb8b
7 changed files with 44 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/core/hle/service/bcat/backend/backend.cpp
View file

@ -13,7 +13,7 @@ namespace Service::BCAT {
ProgressServiceBackend::ProgressServiceBackend(std::string event_name) : impl{} {
auto& kernel{Core::System::GetInstance().Kernel()};
event = Kernel::WritableEvent::CreateEventPair(
kernel, Kernel::ResetType::OneShot, "ProgressServiceBackend:UpdateEvent:" + event_name);
kernel, Kernel::ResetType::Automatic, "ProgressServiceBackend:UpdateEvent:" + event_name);
}
Kernel::SharedPtr<Kernel::ReadableEvent> ProgressServiceBackend::GetEvent() {
@ -48,8 +48,10 @@ void ProgressServiceBackend::StartDownloadingFile(std::string_view dir_name,
impl.status = DeliveryCacheProgressImpl::Status::Downloading;
impl.current_downloaded_bytes = 0;
impl.current_total_bytes = file_size;
std::memcpy(impl.current_directory.data(), dir_name.data(), std::min(dir_name.size(), 0x31ull));
std::memcpy(impl.current_file.data(), file_name.data(), std::min(file_name.size(), 0x31ull));
std::memcpy(impl.current_directory.data(), dir_name.data(),
std::min<u64>(dir_name.size(), 0x31ull));
std::memcpy(impl.current_file.data(), file_name.data(),
std::min<u64>(file_name.size(), 0x31ull));
SignalUpdate();
}
@ -68,7 +70,8 @@ void ProgressServiceBackend::CommitDirectory(std::string_view dir_name) {
impl.current_file.fill(0);
impl.current_downloaded_bytes = 0;
impl.current_total_bytes = 0;
std::memcpy(impl.current_directory.data(), dir_name.data(), std::min(dir_name.size(), 0x31ull));
std::memcpy(impl.current_directory.data(), dir_name.data(),
std::min<u64>(dir_name.size(), 0x31ull));
SignalUpdate();
}
@ -121,7 +124,7 @@ bool NullBackend::Clear(u64 title_id) {
void NullBackend::SetPassphrase(u64 title_id, const Passphrase& passphrase) {
LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase = {}", title_id,
Common::HexArrayToString(passphrase));
Common::HexToString(passphrase));
}
std::optional<std::vector<u8>> NullBackend::GetLaunchParameter(TitleIDVersion title) {

5
src/core/hle/service/bcat/backend/boxcat.cpp
View file

@ -214,8 +214,7 @@ private:
std::vector<u8> bytes(file.GetSize());
file.ReadBytes(bytes.data(), bytes.size());
const auto digest = DigestFile(bytes);
headers.insert(
{std::string("If-None-Match"), Common::HexArrayToString(digest, false)});
headers.insert({std::string("If-None-Match"), Common::HexToString(digest, false)});
}
}
@ -402,7 +401,7 @@ bool Boxcat::Clear(u64 title_id) {
void Boxcat::SetPassphrase(u64 title_id, const Passphrase& passphrase) {
LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase={}", title_id,
Common::HexArrayToString(passphrase));
Common::HexToString(passphrase));
}
std::optional<std::vector<u8>> Boxcat::GetLaunchParameter(TitleIDVersion title) {

8
src/core/hle/service/bcat/module.cpp
View file

@ -195,7 +195,7 @@ private:
const auto passphrase_raw = ctx.ReadBuffer();
LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase={}", title_id,
Common::HexVectorToString(passphrase_raw));
Common::HexToString(passphrase_raw));
if (title_id == 0) {
LOG_ERROR(Service_BCAT, "Invalid title ID!");
@ -335,7 +335,7 @@ private:
rb.Push(ERROR_NO_OPEN_ENTITY);
}
size = std::min(current_file->GetSize() - offset, size);
size = std::min<u64>(current_file->GetSize() - offset, size);
const auto buffer = current_file->ReadBytes(size, offset);
ctx.WriteBuffer(buffer);
@ -437,7 +437,7 @@ private:
}
const auto files = current_dir->GetFiles();
write_size = std::min(write_size, files.size());
write_size = std::min<u64>(write_size, files.size());
std::vector<DeliveryCacheDirectoryEntry> entries(write_size);
std::transform(
files.begin(), files.begin() + write_size, entries.begin(), [](const auto& file) {
@ -519,7 +519,7 @@ private:
LOG_DEBUG(Service_BCAT, "called, size={:016X}", size);
size = std::min(size, entries.size() - next_read_index);
size = std::min<u64>(size, entries.size() - next_read_index);
ctx.WriteBuffer(entries.data() + next_read_index, size * sizeof(DirectoryName));
next_read_index += size;