Skip to content
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

Expose warp mode control to Amiga side via UAE traps #7

Merged
merged 3 commits into from
Jan 3, 2025
Merged

Expose warp mode control to Amiga side via UAE traps #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab8f198
Make warp mode controllable by Amiga code.
cahirwpz Jan 2, 2025
5eb346b
Correctly set warp mode via FS-UAE function.
cahirwpz Jan 3, 2025
0b1b0da
Remove noisy output on warp enable / disable.
cahirwpz Jan 3, 2025
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
44 changes: 44 additions & 0 deletions patches/fs-uae/uaelib-warpmode.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
Index: demoscene-toolchain/submodules/fs-uae/src/uaelib.cpp
===================================================================
--- demoscene-toolchain.orig/submodules/fs-uae/src/uaelib.cpp
+++ demoscene-toolchain/submodules/fs-uae/src/uaelib.cpp
@@ -27,6 +27,7 @@
#include "gensound.h"
#include "picasso96.h"
#include "filesys.h"
+#include "fsemu-control.h"

/*
* Returns UAE Version
@@ -329,6 +330,11 @@ static uae_u32 emulib_Minimize (void)
return 0; // OSDEP_minimize_uae();
}

+static uae_u32 emulib_WarpMode(uae_u32 mode) {
+ fsemu_control_set_warp(mode ? 1 : 0);
+ return 1;
+}
+
static int native_dos_op(TrapContext *ctx, uae_u32 mode, uae_u32 p1, uae_u32 p2, uae_u32 p3)
{
TCHAR tmp[MAX_DPATH];
@@ -373,6 +379,7 @@ static uae_u32 uaelib_demux_common(TrapC
case 15: return emulib_Debug();

case 40: return emulib_Log(ARG1);
+ case 41: return emulib_WarpMode(ARG1);

case 68: return emulib_Minimize();
case 69: return emulib_ExecuteNativeCode();
Index: demoscene-toolchain/submodules/fs-uae/fsemu/src/fsemu-frame.c
===================================================================
--- demoscene-toolchain.orig/submodules/fs-uae/fsemu/src/fsemu-frame.c
+++ demoscene-toolchain/submodules/fs-uae/fsemu/src/fsemu-frame.c
@@ -1014,7 +1014,6 @@ static void fsemu_frame_start_handle_com
fsemu_action_t action;
fsemu_action_state_t state;
while (fsemu_input_next_command(&action, &state)) {
- printf(" ----- fsemu frame command %04x %04x\n", action, state);
fsemu_frame_start_handle_command(action, state);
}
}
3 changes: 2 additions & 1 deletion patches/series
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ld-extra-chip-sections.patch
gcc-2.95.3-amigahunk-fix.patch
gcc-2.95.3-bss-section.patch
gdb-line-addr-fix.patch
fs-uae/break-on-illegal.diff
fs-uae/break-on-sigint.diff
fs-uae/break-at-start.diff
Expand All @@ -12,4 +13,4 @@ fs-uae/uaelib-log.diff
fs-uae/data-path-macos.diff
fs-uae/silence-logs.diff
fs-uae/debug-msg-fix.diff
gdb-line-addr-fix.patch
fs-uae/uaelib-warpmode.diff
Loading