From a32bcf44c42c199c510716b6adb8df00c7ccc632 Mon Sep 17 00:00:00 2001 From: mason Date: Fri, 7 Apr 2023 13:15:36 +0000 Subject: [PATCH] S922X updates, enable .WAD for dolphin --- .../flycast-sa/config/S922X/emu.cfg | 95 +++++++++++++++++++ .../S922X/mappings/SDL_GO-Ultra Gamepad.cfg | 30 ++++++ .../standalone/flycast-sa/package.mk | 2 +- .../config/common/es_systems.cfg | 2 +- .../config/device/RK3566/es_systems.cfg | 2 +- .../config/device/RK3588/es_systems.cfg | 2 +- .../config/device/S922X/es_systems.cfg | 2 +- packages/ui/emulationstation/package.mk | 6 -- packages/virtual/emulators/package.mk | 2 +- projects/Amlogic/packages/linux/package.mk | 2 +- 10 files changed, 132 insertions(+), 13 deletions(-) create mode 100644 packages/emulators/standalone/flycast-sa/config/S922X/mappings/SDL_GO-Ultra Gamepad.cfg diff --git a/packages/emulators/standalone/flycast-sa/config/S922X/emu.cfg b/packages/emulators/standalone/flycast-sa/config/S922X/emu.cfg index 9a0a75ce2..9abc9834d 100644 --- a/packages/emulators/standalone/flycast-sa/config/S922X/emu.cfg +++ b/packages/emulators/standalone/flycast-sa/config/S922X/emu.cfg @@ -1,3 +1,78 @@ +[audio] +backend = auto + +[config] +BoxartDisplayMode = yes +Debug.GDBEnabled = no +Debug.GDBPort = 3263 +Debug.GDBWaitForConnection = no +Debug.SerialConsoleEnabled = no +Debug.SerialPTY = no +Dreamcast.AutoLoadState = no +Dreamcast.AutoSaveState = no +Dreamcast.Broadcast = 0 +Dreamcast.Cable = 3 +Dreamcast.ContentPath = +Dreamcast.ForceWindowsCE = no +Dreamcast.FullMMU = no +Dreamcast.HideLegacyNaomiRoms = yes +Dreamcast.Language = 1 +Dreamcast.Region = 1 +Dreamcast.SavestateSlot = 0 +Dynarec.Enabled = yes +Dynarec.idleskip = yes +FastGDRomLoad = no +FetchBoxart = yes +ForceFreePlay = yes +LuaFileName = flycast.lua +Profiler.DrawGUI = no +Profiler.Enabled = no +Profiler.FrameWarningTime = 0.018182 +Profiler.OutputTTY = no +UploadCrashLogs = yes +UseReios = no +aica.AutoLatency = no +aica.BufferSize = 2822 +aica.DSPEnabled = no +aica.Volume = 100 +pvr.AutoSkipFrame = 0 +pvr.MaxThreads = 3 +pvr.rend = 4 +rend.AnisotropicFiltering = 1 +rend.CrossHairColor1 = 0 +rend.CrossHairColor2 = 0 +rend.CrossHairColor3 = 0 +rend.CrossHairColor4 = 0 +rend.CustomTextures = no +rend.DelayFrameSwapping = yes +rend.DumpTextures = no +rend.DupeFrames = no +rend.EmulateFramebuffer = no +rend.ExtraDepthScale = 1.000000 +rend.FloatVMUs = no +rend.Fog = yes +rend.MaxFilteredTextureSize = 256 +rend.ModifierVolumes = yes +rend.NativeDepthInterpolation = no +rend.PerPixelLayers = 32 +rend.PerStripSorting = no +rend.PixelBufferSize = 536870912 +rend.RenderToTextureBuffer = no +rend.Resolution = 480 +rend.Rotate90 = no +rend.ScreenStretching = 100 +rend.ShowFPS = no +rend.SuperWideScreen = no +rend.TextureFiltering = 0 +rend.TextureUpscale = 1 +rend.ThreadedRendering = yes +rend.TranslucentPolygonDepthMask = no +rend.UseMipmaps = yes +rend.WideScreen = no +rend.WidescreenGameHacks = no +rend.vsync = yes +ta.skip = 0 + [input] MouseSensitivity = 100 VirtualGamepadVibration = 20 @@ -18,6 +93,26 @@ maple_sdl_joystick_1 = 1 maple_sdl_keyboard = 0 maple_sdl_mouse = 0 +[network] +ActAsServer = no +DNS = 46.101.91.123 +EmulateBBA = no +Enable = no +EnableUPnP = yes +GGPO = no +GGPOAnalogAxes = 0 +GGPOChat = yes +GGPOChatTimeout = 10 +GGPOChatTimeoutToggle = yes +GGPODelay = 0 +LocalPort = 37391 +NetworkOutput = no +Stats = yes +server = + +[validate] +OpenGlChecks = no + [window] fullscreen = yes height = 480 diff --git a/packages/emulators/standalone/flycast-sa/config/S922X/mappings/SDL_GO-Ultra Gamepad.cfg b/packages/emulators/standalone/flycast-sa/config/S922X/mappings/SDL_GO-Ultra Gamepad.cfg new file mode 100644 index 000000000..e3edf331a --- /dev/null +++ b/packages/emulators/standalone/flycast-sa/config/S922X/mappings/SDL_GO-Ultra Gamepad.cfg @@ -0,0 +1,30 @@ +[analog] +bind0 = 0-:btn_analog_left +bind1 = 0+:btn_analog_right +bind2 = 1-:btn_analog_up +bind3 = 1+:btn_analog_down +bind4 = 2-:axis2_left +bind5 = 2+:axis2_right +bind6 = 3-:axis2_up +bind7 = 3+:axis2_down + +[digital] +bind0 = 0:btn_a +bind1 = 1:btn_b +bind10 = 12:btn_menu +bind11 = 13:btn_dpad2_up +bind12 = 17:btn_start +bind2 = 2:btn_x +bind3 = 3:btn_y +bind4 = 4:btn_trigger_left +bind5 = 5:btn_trigger_right +bind6 = 8:btn_dpad1_up +bind7 = 9:btn_dpad1_down +bind8 = 10:btn_dpad1_left +bind9 = 11:btn_dpad1_right + +[emulator] +dead_zone = 10 +mapping_name = GO-Ultra Gamepad +rumble_power = 100 +version = 3 diff --git a/packages/emulators/standalone/flycast-sa/package.mk b/packages/emulators/standalone/flycast-sa/package.mk index 2933621ab..0978c5b98 100644 --- a/packages/emulators/standalone/flycast-sa/package.mk +++ b/packages/emulators/standalone/flycast-sa/package.mk @@ -45,7 +45,7 @@ makeinstall_target() { mkdir -p ${INSTALL}/usr/config/flycast cp ${PKG_BUILD}/.${TARGET_NAME}/flycast ${INSTALL}/usr/bin/flycast cp ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin - cp ${PKG_DIR}/config/${DEVICE}/* ${INSTALL}/usr/config/flycast + cp -r ${PKG_DIR}/config/${DEVICE}/* ${INSTALL}/usr/config/flycast chmod +x ${INSTALL}/usr/bin/start_flycastsa.sh } diff --git a/packages/ui/emulationstation/config/common/es_systems.cfg b/packages/ui/emulationstation/config/common/es_systems.cfg index 44267b1a8..22f0407fc 100644 --- a/packages/ui/emulationstation/config/common/es_systems.cfg +++ b/packages/ui/emulationstation/config/common/es_systems.cfg @@ -827,7 +827,7 @@ 2006 console /storage/roms/wii - .gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL + .gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL .wad .WAD /usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers="%CONTROLLERSCONFIG%" wii wii diff --git a/packages/ui/emulationstation/config/device/RK3566/es_systems.cfg b/packages/ui/emulationstation/config/device/RK3566/es_systems.cfg index ac9fe7586..dc80b8885 100644 --- a/packages/ui/emulationstation/config/device/RK3566/es_systems.cfg +++ b/packages/ui/emulationstation/config/device/RK3566/es_systems.cfg @@ -795,7 +795,7 @@ 2006 console /storage/roms/wii - .gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL + .gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL .wad .WAD /usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers="%CONTROLLERSCONFIG%" wii wii diff --git a/packages/ui/emulationstation/config/device/RK3588/es_systems.cfg b/packages/ui/emulationstation/config/device/RK3588/es_systems.cfg index 5d313378c..e42766406 100644 --- a/packages/ui/emulationstation/config/device/RK3588/es_systems.cfg +++ b/packages/ui/emulationstation/config/device/RK3588/es_systems.cfg @@ -795,7 +795,7 @@ 2006 console /storage/roms/wii - .gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL + .gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL .wad .WAD /usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers="%CONTROLLERSCONFIG%" wii wii diff --git a/packages/ui/emulationstation/config/device/S922X/es_systems.cfg b/packages/ui/emulationstation/config/device/S922X/es_systems.cfg index 5b3ad4ec7..d241d0982 100644 --- a/packages/ui/emulationstation/config/device/S922X/es_systems.cfg +++ b/packages/ui/emulationstation/config/device/S922X/es_systems.cfg @@ -798,7 +798,7 @@ 2006 console /storage/roms/wii - .gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL + .gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL .wad .WAD /usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers="%CONTROLLERSCONFIG%" wii wii diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk index 1dd4da712..cb6d1926c 100644 --- a/packages/ui/emulationstation/package.mk +++ b/packages/ui/emulationstation/package.mk @@ -101,12 +101,6 @@ makeinstall_target() { cp ${PKG_BUILD}/start_es.sh ${INSTALL}/usr/bin chmod 0755 ${INSTALL}/usr/bin/start_es.sh - case ${DEVICE} in - S922X) - sed -i '/^emulationstation --log-path \/var\/log/c\emulationstation --ignore-gamelist --log-path \/var\/log' ${INSTALL}/usr/bin/start_es.sh - ;; - esac - mkdir -p ${INSTALL}/usr/lib/${PKG_PYTHON_VERSION} cp -rf ${PKG_DIR}/bluez/* ${INSTALL}/usr/lib/${PKG_PYTHON_VERSION} diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index 222403b77..2042f8a6d 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -49,7 +49,7 @@ case "${DEVICE}" in S922X) [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr pcsx_rearmed-lr" PKG_EMUS+=" aethersx2-sa dolphin-sa duckstation-sa mupen64plus-sa yabasanshiro-sa box64" - LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr dolphin-lr yabasanshiro-sa" + LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr flycast-lr dolphin-lr yabasanshiro-sa" esac PKG_DEPENDS_TARGET+=" ${PKG_EMUS} ${EMUS_32BIT} ${PKG_RETROARCH} ${LIBRETRO_CORES}" diff --git a/projects/Amlogic/packages/linux/package.mk b/projects/Amlogic/packages/linux/package.mk index 660f1bbf4..2f203a1c1 100644 --- a/projects/Amlogic/packages/linux/package.mk +++ b/projects/Amlogic/packages/linux/package.mk @@ -19,7 +19,7 @@ PKG_PATCH_DIRS+="${DEVICE}" case ${DEVICE} in S922X) - PKG_VERSION="6.1.22" + PKG_VERSION="6.1.23" PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" ;; esac