Skip to content

Fix non working demos using AddInterServer through Disable and removal of delay in Enable.s #150

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

Merged
WDrijver merged 1 commit into from
May 12, 2026
Merged

Fix non working demos using AddInterServer through Disable and removal of delay in Enable.s #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions arch/m68k-amiga/exec/enable.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright � 1995-2010, The AROS Development Team. All rights reserved.
Copyright � 1995-2010, The AROS Development Team. All rights reserved.
$Id$

Desc: Enable() - Allow interrupts to occur after Disable().
Expand Down Expand Up @@ -72,6 +72,4 @@ AROS_SLIB_ENTRY(Enable,Exec,21):
subq.b #1,%a6@(IDNestCnt)
bge.s 0f
move.w #0xc000,0xdff09a
tst.b 0xbfe001
tst.b 0xbfe001
0: rts
10 changes: 7 additions & 3 deletions arch/m68k-amiga/timer/lowlevel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright � 1995-2018, The AROS Development Team. All rights reserved.
Copyright � 1995-2018, The AROS Development Team. All rights reserved.
$Id$

Desc: CIA timer.device
Expand Down Expand Up @@ -264,7 +264,10 @@ AROS_INTH1(cia_vbint, struct TimerBase *, TimerBase)
return 0;
inc64(&TimerBase->tb_vb_count);

Disable();
/* Disable(); */
asm volatile ("move.w #0x4000,0xdff09a\n");
/* Disable() / Enable() here interfere with demos using AddInterServer called from Disable() */
/* replaced by disabling / enabling Interrupt using INTENA */
ForeachNodeSafe(&TimerBase->tb_Lists[UNIT_VBLANK], tr, next) {
if (cmp64(&TimerBase->tb_vb_count, &tr->tr_time)) {
Remove((struct Node *)tr);
Expand All @@ -280,7 +283,8 @@ AROS_INTH1(cia_vbint, struct TimerBase *, TimerBase)
if (IsListEmpty(&TimerBase->tb_Lists[UNIT_VBLANK])) {
TimerBase->tb_vblank_on = FALSE;
}
Enable();
/* Enable(); */
asm volatile ("move.w #0xc000,0xdff09a\n");

return 0;

Expand Down