We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Fix interrupt mask for non-Atari hardware

non-atari.patch (text/plain), 2.39 KB, created by Vincent Riviere on 2017-02-05 15:00:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vincent Riviere

Created: 2017-02-05 15:00:12 UTC

Size: 2.39 KB

patch

obsolete

>From 7ca70d8d378529b73811c146aceb75be83e758ea Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Vincent=20Rivi=C3=A8re?= <vincent.riviere@freesbee.fr>
>Date: Sun, 5 Feb 2017 14:36:04 +0100
>Subject: [PATCH] Fix interrupt mask for non-Atari hardware
>
>---
> src/video/ataricommon/SDL_ikbdinterrupt.S  |  6 ++++--
> src/video/ataricommon/SDL_xbiosinterrupt.S | 14 ++++++++------
> 2 files changed, 12 insertions(+), 8 deletions(-)
>
>diff --git a/src/video/ataricommon/SDL_ikbdinterrupt.S b/src/video/ataricommon/SDL_ikbdinterrupt.S
>index 569515d..91ac1ee 100644
>--- a/src/video/ataricommon/SDL_ikbdinterrupt.S
>+++ b/src/video/ataricommon/SDL_ikbdinterrupt.S
>@@ -51,6 +51,7 @@ _SDL_AtariIkbdInstall:
> 
> 	| Disable interrupts
> 
>+	movew	sr,d1
> 	movew	#0x2700,sr
> 
> 	| Save MFP registers used for keyboard
>@@ -99,7 +100,7 @@ _SDL_AtariIkbdInstall:
> 
> 	| Reenable interrupts
> 
>-	movew	#0x2300,sr
>+	movew	d1,sr
> 
> 	| Interrupts done
> 
>@@ -123,6 +124,7 @@ _SDL_AtariIkbdUninstall:
> 
> 	| Disable interrupts
> 
>+	movew	sr,d1
> 	movew	#0x2700,sr
> 
> 	| Restore previous MFP registers
>@@ -160,7 +162,7 @@ ikbd_finbuffer:
> 
> 	| Reenable interrupts
> 
>-	movew	#0x2300,sr
>+	movew	d1,sr
> 
> 	movel	sp@+,a0
> 	rts
>diff --git a/src/video/ataricommon/SDL_xbiosinterrupt.S b/src/video/ataricommon/SDL_xbiosinterrupt.S
>index 3fc1a60..3b6fc63 100644
>--- a/src/video/ataricommon/SDL_xbiosinterrupt.S
>+++ b/src/video/ataricommon/SDL_xbiosinterrupt.S
>@@ -46,6 +46,7 @@ _SDL_AtariXbios_Install:
> 
> 	/* Stop interrupts */
> 
>+	movew	sr,d1
> 	movew	#0x2700,sr
> 
> 	/* Save old mouse vector, set our routine */
>@@ -54,8 +55,8 @@ _SDL_AtariXbios_Install:
> 	movel	sp@(8),d0
> 	beqs	no_new_mouse_vector
> #if defined(__mcoldfire__)
>-	movel	a0@(16),d1
>-	movel	d1,oldmousevector
>+	movel	a0@(16),a1
>+	movel	a1,oldmousevector
> #else
> 	movel	a0@(16),oldmousevector
> #endif
>@@ -68,8 +69,8 @@ no_new_mouse_vector:
> 	movel	sp@(12),d0
> 	beqs	no_new_joystick_vector
> #if defined(__mcoldfire__)
>-	movel	a0@(24),d1
>-	movel	d1,oldjoystickvector
>+	movel	a0@(24),a1
>+	movel	a1,oldjoystickvector
> #else
> 	movel	a0@(24),oldjoystickvector
> #endif
>@@ -78,7 +79,7 @@ no_new_joystick_vector:
> 
> 	/* Restart interrupts */
> 
>-	movew	#0x2300,sr
>+	movew	d1,sr
> 
> 	rts
> 
>@@ -89,6 +90,7 @@ _SDL_AtariXbios_Restore:
> 
> 	/* Stop interrupts */
> 
>+	movew	sr,d1
> 	movew	#0x2700,sr
> 
> 	/* Restore mouse vector */
>@@ -107,7 +109,7 @@ no_restore_joystick:
> 
> 	/* Restart interrupts */
> 
>-	movew	#0x2300,sr
>+	movew	d1,sr
> 
> 	rts
> 
>-- 
>2.8.3
>

Actions: View | Diff

Attachments on bug 3581: 2695

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.