[Scummvm-git-logs] scummvm master -> 049ad2ed464405c79709ef12a309bc7e937a57dc
bluegr
noreply at scummvm.org
Sat Jun 27 15:36:11 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
db0dc3f001 AUDIO: Atari TOS hardware / software OPL2 / 3 (YM262 / YM3812)
049ad2ed46 AUDIO: Atari TOS hardware / software OPL2 / 3 (YM262 / YM3812)
Commit: db0dc3f0019d9e3856c968d5384b39dc8544c6ed
https://github.com/scummvm/scummvm/commit/db0dc3f0019d9e3856c968d5384b39dc8544c6ed
Author: Paweł Góralski (20125592+n0kturnal at users.noreply.github.com)
Date: 2026-06-27T18:36:05+03:00
Commit Message:
AUDIO: Atari TOS hardware / software OPL2 / 3 (YM262 / YM3812)
Bumped up nFM library version to 0.3.0. Most changes are consequence of feedback I've received for nFM library itself. Removed obsolete nf* api calls, removed function most calls with 'sc' prefix, wrapping headers into extern "C" block is not needed anymore, updated user memory allocation to a new way. Updated nFM download helper script, so nFM-0.3.0 Atari build is downloaded.
Changed paths:
audio/nfmopl.cpp
backends/platform/atari/get-nfm.sh
configure
diff --git a/audio/nfmopl.cpp b/audio/nfmopl.cpp
index 018c778dafa..99cdb9a4f0d 100644
--- a/audio/nfmopl.cpp
+++ b/audio/nfmopl.cpp
@@ -32,12 +32,8 @@
#include "audio/fmopl.h"
#include "audio/nfmopl.h"
-extern "C"
-{
#include <hwinfo.h>
-#include <sc_gmemalloc.h>
#include <nfmoplshadowregs.h>
-}
#ifndef RELEASE_BUILD
#include "common/debug.h"
@@ -64,17 +60,17 @@ namespace NfmOPL {
extern "C"
{
static mspace s_mNfmSpace = nullptr;
- static sMemoryCallbacks s_MemCallbacks;
+ static sNfUserMemoryCallbacks s_MemCallbacks;
static void *s_nfmMemoryBase = nullptr;
- static void *nfmAlloc(size_t amount, const eMemoryFlag flag, void* userData, const char* functionName, char* fileName, uint32_t lineNo) {
+ static void *nfmAlloc(size_t amount, const eNfMemoryFlag flag, void* userData, const char* functionName, char* fileName, uint32_t lineNo) {
#if NFM_ENABLE_LOGS
debug("nfmAlloc()");
#endif
return mspace_malloc(s_mNfmSpace, amount);
}
- static void *nfmAlignedAlloc(size_t alignment, size_t amount, const eMemoryFlag flag, void* userData, const int8_t* functionName, int8_t* fileName, uint32_t lineNo) {
+ static void *nfmAlignedAlloc(size_t alignment, size_t amount, const eNfMemoryFlag flag, void* userData, const char* functionName, char* fileName, uint32_t lineNo) {
#if NFM_ENABLE_LOGS
debug("nfmAlignedAlloc()");
#endif
@@ -138,7 +134,7 @@ OPL::OPL(Config::OplType type, NfmOPL::OplDevice deviceType) : _type(type), _dev
debug("NfmOPL::RealChip create");
debug("Requesting hardware info");
#endif
- Supexec(updateHardwareInfo);
+ Supexec(scOsUpdateHardwareInfo);
// defaults
_ifaceCfg.deviceType = eFmDriverType::FMD_UNDEFINED;
@@ -280,7 +276,6 @@ OPL::~OPL() {
_oplFlush = nullptr;
_oplReset = nullptr;
- (void)nfDeinit(&_iface);
(void)nfDestroyInterface(&_iface);
_incapableDevice = false;
@@ -308,8 +303,6 @@ bool OPL::init() {
}
#if NFM_ENABLE_CUSTOM_ALLOC
- // set default callbacks
- setDefaultUserMemoryCallbacks();
s_nfmMemoryBase = (void *)Mxalloc((int32_t)NFM_MSPACE_SIZE + 256, (int16_t)3);
@@ -323,14 +316,15 @@ bool OPL::init() {
return false;
}
- // install custom memory allocator callbacks
+ // install user memory allocator callbacks
s_MemCallbacks.alloc = nfmAlloc;
s_MemCallbacks.alignedAlloc = nfmAlignedAlloc;
s_MemCallbacks.release = nfmFree;
s_MemCallbacks.realloc = nfmRealloc;
s_MemCallbacks.outOfMemory = nfmOutOfMemoryCb;
- setUserMemoryCallbacks(&s_MemCallbacks);
+ nfInit(&s_MemCallbacks, NULL);
+
} else {
#if NFM_ENABLE_LOGS
debug("NfmOPL::RealChip Out of system memory!");
@@ -338,12 +332,12 @@ bool OPL::init() {
return false;
}
#else
- setDefaultUserMemoryCallbacks();
+ nfInit(NULL,NULL);
#endif
_iface = nfCreateInterface(_ifaceCfg);
if (_iface.setup != CC_UNDEFINED) {
- const int32_t retval = nfInit(&_iface, &_params);
+ const int32_t retval = nfInitialiseInterface(&_iface, &_params);
if (retval >= 0) {
_oplWrite = _iface.write;
@@ -459,7 +453,7 @@ OPL::OPL(Config::OplType type, enum NfmOPL::OplDevice deviceType): _type(type),
debug("NfmOPL::EmulatedChip create");
debug("Requesting hardware info");
#endif
- Supexec(updateHardwareInfo);
+ Supexec(scOsUpdateHardwareInfo);
// defaults
_ifaceCfg.deviceType = eFmDriverType::FMD_UNDEFINED;
@@ -533,7 +527,6 @@ OPL::~OPL() {
_oplReset = nullptr;
_generateAudioStream = nullptr;
- (void)nfDeinit(&_iface);
(void)nfDestroyInterface(&_iface);
_incapableDevice = false;
@@ -562,8 +555,6 @@ bool OPL::init() {
}
#if NFM_ENABLE_CUSTOM_ALLOC
- // set default callbacks
- setDefaultUserMemoryCallbacks();
s_nfmMemoryBase = (void *)Mxalloc((int32_t)NFM_MSPACE_SIZE + 256, (int16_t)3);
@@ -584,7 +575,8 @@ bool OPL::init() {
s_MemCallbacks.realloc = nfmRealloc;
s_MemCallbacks.outOfMemory = nfmOutOfMemoryCb;
- setUserMemoryCallbacks(&s_MemCallbacks);
+ nfInit(&s_MemCallbacks,NULL);
+
} else {
#if NFM_ENABLE_LOGS
debug("NfmOPL::EmulatedChip Out of system memory!");
@@ -592,12 +584,12 @@ bool OPL::init() {
return false;
}
#else
- setDefaultUserMemoryCallbacks();
+ nfInit(NULL,NULL);
#endif
_iface = nfCreateInterface(_ifaceCfg);
if (_iface.setup != CC_UNDEFINED) {
- const int32_t retval = nfInit(&_iface, &_params);
+ const int32_t retval = nfInitialiseInterface(&_iface, &_params);
if (retval >= 0) {
_oplWrite = _iface.write;
diff --git a/backends/platform/atari/get-nfm.sh b/backends/platform/atari/get-nfm.sh
index c4880a9bf3f..460448fb34a 100644
--- a/backends/platform/atari/get-nfm.sh
+++ b/backends/platform/atari/get-nfm.sh
@@ -4,8 +4,8 @@
# -x: Display expanded script commands
# downloads and unpacks in ./deps folder precompiled nFM library release for m68k Atari TOS / mintelf gcc stdlib
-NFM_VERSION=0.2.2
-COMMIT_SHORT_SHA=4d077f4b
+NFM_VERSION=0.3.0
+COMMIT_SHORT_SHA=ee64d5f7
curl -o ./backends/platform/atari/nfm.zip https://nokturnal.pl/downloads/atari/nokturnfm/nfmplay/builds/releases/${NFM_VERSION}/ataritos-mintelf-gcc-stdlib-m68k-${NFM_VERSION}-${COMMIT_SHORT_SHA}.zip
rm -rf ./backends/platform/atari/deps/nfm
diff --git a/configure b/configure
index 13090903c20..02c17507ca8 100755
--- a/configure
+++ b/configure
@@ -5612,16 +5612,16 @@ echocheck "nFM OPL2 / OPL3"
if test "$_nfm" = auto ; then
_nfm=no
cat > $TMPC << EOF
-extern "C"
-{
+
#include <nfmcore.h>
#include <nfmutil.h>
-}
sOplInterface gOplIf;
int main(void)
{
+ nfInit(NULL, NULL);
+
sOplInterfaceConfiguration ifCfg;
ifCfg.deviceType = FMD_NULL;
ifCfg.soundchip = CM_OPL3;
@@ -5635,11 +5635,11 @@ int main(void)
gOplIf = nfCreateInterface(ifCfg);
- const int32_t retval = nfInit(&gOplIf, ¶ms);
+ const int32_t retval = nfInitialiseInterface(&gOplIf, ¶ms);
if (retval >= 0)
{
- (void)nfDeinit(&gOplIf);
+ (void)nfDestroyInterface(&gOplIf);
return 0;
}
Commit: 049ad2ed464405c79709ef12a309bc7e937a57dc
https://github.com/scummvm/scummvm/commit/049ad2ed464405c79709ef12a309bc7e937a57dc
Author: Paweł Góralski (20125592+n0kturnal at users.noreply.github.com)
Date: 2026-06-27T18:36:05+03:00
Commit Message:
AUDIO: Atari TOS hardware / software OPL2 / 3 (YM262 / YM3812)
Hardware check is only Atari target specific
Changed paths:
audio/nfmopl.cpp
diff --git a/audio/nfmopl.cpp b/audio/nfmopl.cpp
index 99cdb9a4f0d..613ed954822 100644
--- a/audio/nfmopl.cpp
+++ b/audio/nfmopl.cpp
@@ -32,7 +32,10 @@
#include "audio/fmopl.h"
#include "audio/nfmopl.h"
+#ifdef ATARI
#include <hwinfo.h>
+#endif
+
#include <nfmoplshadowregs.h>
#ifndef RELEASE_BUILD
@@ -134,7 +137,10 @@ OPL::OPL(Config::OplType type, NfmOPL::OplDevice deviceType) : _type(type), _dev
debug("NfmOPL::RealChip create");
debug("Requesting hardware info");
#endif
+
+#ifdef ATARI
Supexec(scOsUpdateHardwareInfo);
+#endif
// defaults
_ifaceCfg.deviceType = eFmDriverType::FMD_UNDEFINED;
@@ -453,8 +459,11 @@ OPL::OPL(Config::OplType type, enum NfmOPL::OplDevice deviceType): _type(type),
debug("NfmOPL::EmulatedChip create");
debug("Requesting hardware info");
#endif
- Supexec(scOsUpdateHardwareInfo);
+#ifdef ATARI
+ Supexec(scOsUpdateHardwareInfo);
+#endif
+
// defaults
_ifaceCfg.deviceType = eFmDriverType::FMD_UNDEFINED;
_ifaceCfg.soundchip = CM_UNDEFINED;
More information about the Scummvm-git-logs
mailing list