Merge remote-tracking branch 'origin/fix/nx2-audio-rev16' into test/linux-all-prs

2 files changed, 5 insertions, 1 deletions

diff --git a/src/audio_core/audio_render_manager.cpp b/src/audio_core/audio_render_manager.cpp
index 8c4e74c4be..8083b92287 100644
--- a/src/audio_core/audio_render_manager.cpp
+++ b/src/audio_core/audio_render_manager.cpp
@@ -33,6 +33,8 @@ SystemManager& Manager::GetSystemManager() {
 Result Manager::GetWorkBufferSize(const AudioRendererParameterInternal& params,
                                   u64& out_count) const {
     if (!CheckValidRevision(params.revision)) {
+        LOG_ERROR(Service_Audio, "Audio renderer revision {:#x} ({}) is newer than {}",
+                  params.revision, GetRevisionNum(params.revision), MaxAcceptedRevision);
         return Service::Audio::ResultInvalidRevision;
     }
 
diff --git a/src/audio_core/common/feature_support.h b/src/audio_core/common/feature_support.h
index 4585be45ef..1a6bfef527 100644
--- a/src/audio_core/common/feature_support.h
+++ b/src/audio_core/common/feature_support.h
@@ -17,6 +17,8 @@
 
 namespace AudioCore {
 constexpr u32 CurrentRevision = 15;
+/// Newest revision accepted: Switch 2 SDKs ask for 16 ("REv@"), run with revision 15's features.
+constexpr u32 MaxAcceptedRevision = 16;
 
 enum class SupportTags {
     CommandProcessingTimeEstimatorVersion4,
@@ -112,7 +114,7 @@ constexpr bool CheckFeatureSupported(SupportTags tag, u32 user_revision) {
 }
 
 constexpr bool CheckValidRevision(u32 user_revision) {
-    return GetRevisionNum(user_revision) <= CurrentRevision;
+    return GetRevisionNum(user_revision) <= MaxAcceptedRevision;
 };
 
 } // namespace AudioCore