diff options
| author | yuzubot <yuzu@yuzu-emu.org> | 2019-11-26 13:01:20 +0000 |
|---|---|---|
| committer | yuzubot <yuzu@yuzu-emu.org> | 2019-11-26 13:01:20 +0000 |
| commit | 71fb3ff3cd3bca9b97f2f778c52b89aea9bea00d (patch) | |
| tree | a85c601839ab3593a76e75e3efd15461bc62bba3 /src | |
| parent | fda5853bf831f12052ba8dd23741845340ca38b1 (diff) | |
"Merge Tagged PR 2710"
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/transfer_memory.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/wait_object.cpp | 13 | ||||
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/applets.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/software_keyboard.cpp | 1 |
5 files changed, 9 insertions, 14 deletions
diff --git a/src/core/hle/kernel/transfer_memory.cpp b/src/core/hle/kernel/transfer_memory.cpp index f0e73f57b0..55029bc94c 100644 --- a/src/core/hle/kernel/transfer_memory.cpp +++ b/src/core/hle/kernel/transfer_memory.cpp @@ -23,6 +23,8 @@ std::shared_ptr<TransferMemory> TransferMemory::Create(KernelCore& kernel, VAddr transfer_memory->owner_permissions = permissions; transfer_memory->owner_process = kernel.CurrentProcess(); + transfer_memory->MapMemory(base_address, size, permissions); + return transfer_memory; } diff --git a/src/core/hle/kernel/wait_object.cpp b/src/core/hle/kernel/wait_object.cpp index 745f2c4e81..8abd7047bc 100644 --- a/src/core/hle/kernel/wait_object.cpp +++ b/src/core/hle/kernel/wait_object.cpp @@ -51,17 +51,8 @@ std::shared_ptr<Thread> WaitObject::GetHighestPriorityReadyThread() const { if (ShouldWait(thread.get())) continue; - // A thread is ready to run if it's either in ThreadStatus::WaitSynch - // and the rest of the objects it is waiting on are ready. - bool ready_to_run = true; - if (thread_status == ThreadStatus::WaitSynch) { - ready_to_run = thread->AllWaitObjectsReady(); - } - - if (ready_to_run) { - candidate = thread.get(); - candidate_priority = thread->GetPriority(); - } + candidate = thread.get(); + candidate_priority = thread->GetPriority(); } return SharedFrom(candidate); diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 95aa5d23d3..cd65f19e7c 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -857,17 +857,16 @@ private: void PopInteractiveOutData(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); - IPC::ResponseBuilder rb{ctx, 2, 0, 1}; - const auto storage = applet->GetBroker().PopInteractiveDataToGame(); if (storage == nullptr) { LOG_ERROR(Service_AM, "storage is a nullptr. There is no data in the current interactive channel"); - + IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ERR_NO_DATA_IN_CHANNEL); return; } + IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(RESULT_SUCCESS); rb.PushIpcInterface<IStorage>(std::move(*storage)); } diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/core/hle/service/am/applets/applets.cpp index 92f995f8f8..f79b7e9696 100644 --- a/src/core/hle/service/am/applets/applets.cpp +++ b/src/core/hle/service/am/applets/applets.cpp @@ -88,6 +88,7 @@ std::unique_ptr<IStorage> AppletDataBroker::PopInteractiveDataToApplet() { void AppletDataBroker::PushNormalDataFromGame(IStorage storage) { in_channel.push_back(std::make_unique<IStorage>(storage)); + pop_out_data_event.writable->Clear(); } void AppletDataBroker::PushNormalDataFromApplet(IStorage storage) { @@ -97,6 +98,7 @@ void AppletDataBroker::PushNormalDataFromApplet(IStorage storage) { void AppletDataBroker::PushInteractiveDataFromGame(IStorage storage) { in_interactive_channel.push_back(std::make_unique<IStorage>(storage)); + pop_interactive_out_data_event.writable->Clear(); } void AppletDataBroker::PushInteractiveDataFromApplet(IStorage storage) { diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp index 748559cd0a..be36e975e4 100644 --- a/src/core/hle/service/am/applets/software_keyboard.cpp +++ b/src/core/hle/service/am/applets/software_keyboard.cpp @@ -91,6 +91,7 @@ void SoftwareKeyboard::ExecuteInteractive() { if (status == INTERACTIVE_STATUS_OK) { complete = true; + broker.SignalStateChanged(); } else { std::array<char16_t, SWKBD_OUTPUT_INTERACTIVE_BUFFER_SIZE / 2 - 2> string; std::memcpy(string.data(), data.data() + 4, string.size() * 2); |