From eef8ceeda01e2f623eacfb5fd6f497856aee0962 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 5 Sep 2023 23:02:08 +0200 Subject: [PATCH] early-access version 3856 --- README.md | 2 +- src/audio_core/CMakeLists.txt | 1 - src/audio_core/adsp/adsp.cpp | 2 +- src/audio_core/adsp/adsp.h | 5 +--- .../apps/audio_renderer/audio_renderer.cpp | 2 +- .../adsp/apps/audio_renderer/audio_renderer.h | 28 +++++++++---------- .../adsp/apps/audio_renderer/command_buffer.h | 2 +- .../audio_renderer/command_list_processor.cpp | 2 +- .../audio_renderer/command_list_processor.h | 2 +- src/audio_core/adsp/mailbox.h | 2 +- 10 files changed, 22 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index caf9d4c4d..c0104e3ac 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3855. +This is the source code for early-access 3856. ## Legal Notice diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index 10a1e09fa..e071b5f59 100755 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt @@ -5,7 +5,6 @@ add_library(audio_core STATIC adsp/adsp.cpp adsp/adsp.h adsp/mailbox.h - adsp/mailbox.cpp adsp/apps/audio_renderer/audio_renderer.cpp adsp/apps/audio_renderer/audio_renderer.h adsp/apps/audio_renderer/command_buffer.h diff --git a/src/audio_core/adsp/adsp.cpp b/src/audio_core/adsp/adsp.cpp index 1b1915cc6..0580990f5 100755 --- a/src/audio_core/adsp/adsp.cpp +++ b/src/audio_core/adsp/adsp.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include "audio_core/adsp/adsp.h" diff --git a/src/audio_core/adsp/adsp.h b/src/audio_core/adsp/adsp.h index 721610664..bd5bcc63b 100755 --- a/src/audio_core/adsp/adsp.h +++ b/src/audio_core/adsp/adsp.h @@ -1,11 +1,8 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include -#include - #include "audio_core/adsp/apps/audio_renderer/audio_renderer.h" #include "common/common_types.h" diff --git a/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp b/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp index db8a9f1fb..3da342ea3 100755 --- a/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp +++ b/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include diff --git a/src/audio_core/adsp/apps/audio_renderer/audio_renderer.h b/src/audio_core/adsp/apps/audio_renderer/audio_renderer.h index eb640a159..b225e10fb 100755 --- a/src/audio_core/adsp/apps/audio_renderer/audio_renderer.h +++ b/src/audio_core/adsp/apps/audio_renderer/audio_renderer.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -34,19 +34,19 @@ class Sink; namespace ADSP::AudioRenderer { enum Message : u32 { - /* 0x00 */ Invalid, - /* 0x01 */ MapUnmap_Map, - /* 0x02 */ MapUnmap_MapResponse, - /* 0x03 */ MapUnmap_Unmap, - /* 0x04 */ MapUnmap_UnmapResponse, - /* 0x05 */ MapUnmap_InvalidateCache, - /* 0x06 */ MapUnmap_InvalidateCacheResponse, - /* 0x07 */ MapUnmap_Shutdown, - /* 0x08 */ MapUnmap_ShutdownResponse, - /* 0x16 */ InitializeOK = 0x16, - /* 0x20 */ RenderResponse = 0x20, - /* 0x2A */ Render = 0x2A, - /* 0x34 */ Shutdown = 0x34, + Invalid = 0x00, + MapUnmap_Map = 0x01, + MapUnmap_MapResponse = 0x02, + MapUnmap_Unmap = 0x03, + MapUnmap_UnmapResponse = 0x04, + MapUnmap_InvalidateCache = 0x05, + MapUnmap_InvalidateCacheResponse = 0x06, + MapUnmap_Shutdown = 0x07, + MapUnmap_ShutdownResponse = 0x08, + InitializeOK = 0x16, + RenderResponse = 0x20, + Render = 0x2A, + Shutdown = 0x34, }; /** diff --git a/src/audio_core/adsp/apps/audio_renderer/command_buffer.h b/src/audio_core/adsp/apps/audio_renderer/command_buffer.h index 4b28e6867..3fd1b09dc 100755 --- a/src/audio_core/adsp/apps/audio_renderer/command_buffer.h +++ b/src/audio_core/adsp/apps/audio_renderer/command_buffer.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/audio_core/adsp/apps/audio_renderer/command_list_processor.cpp b/src/audio_core/adsp/apps/audio_renderer/command_list_processor.cpp index 7a46d1c1b..acbc9100c 100755 --- a/src/audio_core/adsp/apps/audio_renderer/command_list_processor.cpp +++ b/src/audio_core/adsp/apps/audio_renderer/command_list_processor.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include diff --git a/src/audio_core/adsp/apps/audio_renderer/command_list_processor.h b/src/audio_core/adsp/apps/audio_renderer/command_list_processor.h index 5ef5b0e5d..9d6fe1851 100755 --- a/src/audio_core/adsp/apps/audio_renderer/command_list_processor.h +++ b/src/audio_core/adsp/apps/audio_renderer/command_list_processor.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/audio_core/adsp/mailbox.h b/src/audio_core/adsp/mailbox.h index 528d65f5f..c31b73717 100755 --- a/src/audio_core/adsp/mailbox.h +++ b/src/audio_core/adsp/mailbox.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once