From e23cc7090275c47f0fe6773b9769a1e7d7ab0877 Mon Sep 17 00:00:00 2001
From: rdanbrook <1869094+rdanbrook@users.noreply.github.com>
Date: Fri, 27 Aug 2021 15:31:58 -0400
Subject: [PATCH] Sync with upstream version 1.51.1
---
NstDatabase.xml | 49 ++++++
libretro/Makefile.common | 1 +
libretro/libretro.cpp | 2 +-
libretro/nstdatabase.hpp | 2 +-
source/core/NstApu.cpp | 12 +-
source/core/NstCpu.cpp | 3 +
source/core/board/NstBoard.cpp | 25 ++-
source/core/board/NstBoard.hpp | 3 +
source/core/board/NstBoardKaiser.cpp | 194 ++++++++++++++++++---
source/core/board/NstBoardKaiser.hpp | 38 ++++
source/core/board/NstBoardMmc3.hpp | 22 +--
source/core/board/NstBoardMmc6.cpp | 2 +-
source/core/board/NstBoardWaixing.hpp | 1 +
source/core/board/NstBoardWaixingFs304.cpp | 106 +++++++++++
source/core/board/NstBoardWaixingFs304.hpp | 63 +++++++
15 files changed, 476 insertions(+), 47 deletions(-)
create mode 100644 source/core/board/NstBoardWaixingFs304.cpp
create mode 100644 source/core/board/NstBoardWaixingFs304.hpp
diff --git a/NstDatabase.xml b/NstDatabase.xml
index cee76b8c..980a9962 100644
--- a/NstDatabase.xml
+++ b/NstDatabase.xml
@@ -27011,4 +27011,53 @@
-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 56b1578a..03e52310 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -263,6 +263,7 @@ SOURCES_CXX += $(CORE_DIR)/source/core/board/NstBoardUxRom.cpp
SOURCES_CXX += $(CORE_DIR)/source/core/board/NstBoardVsSystem.cpp
SOURCES_CXX += $(CORE_DIR)/source/core/board/NstBoardWaixing.cpp
SOURCES_CXX += $(CORE_DIR)/source/core/board/NstBoardWaixingFfv.cpp
+SOURCES_CXX += $(CORE_DIR)/source/core/board/NstBoardWaixingFs304.cpp
SOURCES_CXX += $(CORE_DIR)/source/core/board/NstBoardWaixingPs2.cpp
SOURCES_CXX += $(CORE_DIR)/source/core/board/NstBoardWaixingSecurity.cpp
SOURCES_CXX += $(CORE_DIR)/source/core/board/NstBoardWaixingSgz.cpp
diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
index aa3678e6..61926cb6 100644
--- a/libretro/libretro.cpp
+++ b/libretro/libretro.cpp
@@ -22,7 +22,7 @@
#include "nstdatabase.hpp"
-#define NST_VERSION "1.51.0"
+#define NST_VERSION "1.51.1"
#define MIN(a,b) ((a)<