Skip to content

fix ymfm register writes, use linear OPL3 output resampling #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wbcbz7 wants to merge 5 commits into
base: HID_CDROM_OPL_DEV
Choose a base branch
from
Open

fix ymfm register writes, use linear OPL3 output resampling #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec64d16
fix ymfm register writes, use linear OPL3 output resampling
wbcbz7 Mar 11, 2026
e0996a1
add DOSBox OPL3 core
wbcbz7 Mar 13, 2026
9f4b0b4
fix missing stereo
wbcbz7 Mar 13, 2026
4815c13
fix OPL3 register output dispatch
wbcbz7 Mar 17, 2026
6a343b3
resampler: resolve python path
wbcbz7 Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions sw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,14 @@ function(config_target TARGET_NAME MULTIFW)
OPL_CMD_BUFFER=1
)
target_link_libraries(${TARGET_NAME} opl_ymfm)
elseif(USE_DBOPL_OPL)
# DOSBox OPL emulation
target_compile_definitions(${TARGET_NAME} PRIVATE
SOUND_OPL=1
USE_DBOPL_OPL=1
OPL_CMD_BUFFER=1
)
target_link_libraries(${TARGET_NAME} opl_dbopl)
else()
# Default: emu8950 (OPL2, assembly-optimized for RP2040)
target_compile_definitions(${TARGET_NAME} PRIVATE
Expand Down Expand Up @@ -327,6 +335,35 @@ function(build_sb_ymf262 TARGET_NAME MULTIFW)
pico_generate_pio_header(${TARGET_NAME} ${CMAKE_CURRENT_LIST_DIR}/isa/isa_dma.pio)
endfunction()

################################################################################
# Build SB firmware — DOSBox OPL3 core
function(build_sb_dbopl3 TARGET_NAME MULTIFW)
set(USE_DBOPL_OPL TRUE)
set(USB_JOYSTICK TRUE)
set(SOUND_MPU FALSE)
set(SOUND_OPL TRUE)
set(CDROM TRUE)
config_target(${TARGET_NAME} ${MULTIFW})
pico_set_program_name(${TARGET_NAME} "picogus-sb-dbopl3")
target_sources(${TARGET_NAME} PRIVATE
audio/volctrl.cpp
sbdsp/sbdsp.cpp
sbplay.cpp
isa/isa_dma.c
audio/audio_fifo.c
audio/audio_i2s_minimal.c
)
target_compile_definitions(${TARGET_NAME} PRIVATE
SOUND_SB=1
SOUND_DSP=1
SB_BUFFERLESS=1
SB_BUFFERLESS_NG=1
USE_CD_AUDIO_FIFO=1
)
target_link_libraries(${TARGET_NAME} resampler)
pico_generate_pio_header(${TARGET_NAME} ${CMAKE_CURRENT_LIST_DIR}/isa/isa_dma.pio)
endfunction()

################################################################################
# Build AdLib firmware
function(build_adlib TARGET_NAME MULTIFW)
Expand Down Expand Up @@ -362,6 +399,24 @@ function(build_adlib_ymf262 TARGET_NAME MULTIFW)
target_link_libraries(${TARGET_NAME} resampler)
endfunction()

################################################################################
# Build AdLib firmware — DOSBox OPL3 core
function(build_adlib_dbopl3 TARGET_NAME MULTIFW)
set(USE_DBOPL3_OPL TRUE)
set(USB_JOYSTICK TRUE)
set(USB_MOUSE TRUE)
set(SOUND_MPU TRUE)
set(SOUND_OPL TRUE)
config_target(${TARGET_NAME} ${MULTIFW})
pico_set_program_name(${TARGET_NAME} "picogus-adlib-dbopl3")
target_sources(${TARGET_NAME} PRIVATE
audio/volctrl.cpp
sbplay.cpp
audio/audio_i2s_minimal.c
)
target_link_libraries(${TARGET_NAME} resampler)
endfunction()

################################################################################
# Build AdLib firmware — ymfm OPL2 (ym3812) variant
function(build_adlib_ym3812 TARGET_NAME MULTIFW)
Expand Down Expand Up @@ -493,6 +548,7 @@ if(PROJECT_TYPE STREQUAL "MULTIFW")
# set(MULTIFW_OPL_VARIANT "emu8950") # original emu8950 — OPL2, assembly-optimized
# set(MULTIFW_OPL_VARIANT "ym3812") # ymfm ym3812 — OPL2, ymfm quality
set(MULTIFW_OPL_VARIANT "ymf262") # ymfm ymf262 — OPL3, true stereo
#set(MULTIFW_OPL_VARIANT "dbopl") # DOSBox OPL — OPL3, true stereo
# ---------------------------------------------------------------------------

if(MULTIFW_OPL_VARIANT STREQUAL "ymf262")
Expand Down Expand Up @@ -627,6 +683,9 @@ elseif(PROJECT_TYPE STREQUAL "SB_YMF262")
elseif(PROJECT_TYPE STREQUAL "SB_YM3812")
set(FW_TARGET pg-sb-ym3812)
build_sb_ym3812(pg-sb-ym3812 FALSE)
elseif(PROJECT_TYPE STREQUAL "SB_DBOPL3")
set(FW_TARGET pg-sb-dbopl3)
build_sb_dbopl3(pg-sb-dbopl3 FALSE)
elseif(PROJECT_TYPE STREQUAL "ADLIB")
set(FW_TARGET pg-adlib)
build_adlib(pg-adlib FALSE)
Expand All @@ -639,6 +698,9 @@ elseif(PROJECT_TYPE STREQUAL "ADLIB_YMF262")
elseif(PROJECT_TYPE STREQUAL "ADLIB_YM3812")
set(FW_TARGET pg-adlib-ym3812)
build_adlib_ym3812(pg-adlib-ym3812 FALSE)
elseif(PROJECT_TYPE STREQUAL "ADLIB_DBOPL3")
set(FW_TARGET pg-adlib-dbopl3)
build_adlib_dbopl3(pg-adlib-dbopl3 FALSE)
elseif(PROJECT_TYPE STREQUAL "MPU")
set(FW_TARGET pg-mpu)
build_mpu(pg-mpu FALSE)
Expand Down
13 changes: 13 additions & 0 deletions sw/opl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,16 @@ target_include_directories(opl_ym3812 INTERFACE
target_compile_definitions(opl_ym3812 INTERFACE USE_YMF3812=1)
target_compile_options(opl_ym3812 INTERFACE -O3 -Wno-stringop-overflow)
target_link_libraries(opl_ym3812 INTERFACE pico_audio_i2s hardware_gpio hardware_timer)

# DOSBox OPL3 backend
add_library(opl_dbopl INTERFACE)
target_sources(opl_dbopl INTERFACE
${CMAKE_CURRENT_LIST_DIR}/opl_dbopl.cpp
${CMAKE_CURRENT_LIST_DIR}/dbopl/dbopl.cpp
)
target_include_directories(opl_dbopl INTERFACE
${CMAKE_CURRENT_LIST_DIR}
${CMAKE_CURRENT_LIST_DIR}/dbopl
)
target_compile_options(opl_dbopl INTERFACE -O3 -Wno-stringop-overflow)
target_link_libraries(opl_dbopl INTERFACE pico_audio_i2s hardware_gpio hardware_timer)
Loading