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] riscos: Clean up SWI calls

013.patch (text/plain), 5.06 KB, created by Cameron Cawley on 2019-04-26 21:12:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cameron Cawley

Created: 2019-04-26 21:12:16 UTC

Size: 5.06 KB

patch

obsolete

># HG changeset patch
># User Cameron Cawley <ccawley2011@gmail.com>
># Date 1556296880 -3600
>#      Fri Apr 26 17:41:20 2019 +0100
># Branch SDL-1.2
># Node ID 49fe17a0e18659a0ddab38b52a2217b177fd95ee
># Parent  36124b45d01869aee7e1ab0436175595071f7ba4
>riscos: Clean up SWI calls
>
>diff -r 36124b45d018 -r 49fe17a0e186 src/joystick/riscos/SDL_sysjoystick.c
>--- a/src/joystick/riscos/SDL_sysjoystick.c	Fri Apr 26 17:34:41 2019 +0100
>+++ b/src/joystick/riscos/SDL_sysjoystick.c	Fri Apr 26 17:41:20 2019 +0100
>@@ -39,7 +39,9 @@
> 
> #include "kernel.h"
> 
>-#define JOYSTICK_READ 0x43F40
>+#ifndef Joystick_Read
>+#define Joystick_Read 0x43F40
>+#endif
> 
> struct joystick_hwdata 
> {
>@@ -58,7 +60,7 @@
> 
> 	 /* Try to read joystick 0 */
> 	regs.r[0] = 0;
>-	if (_kernel_swi(JOYSTICK_READ, &regs, &regs) == NULL)
>+	if (_kernel_swi(Joystick_Read, &regs, &regs) == NULL)
> 	{
> 		/* Switch works so assume we've got a joystick */
> 		return 1;
>@@ -112,7 +114,7 @@
> 	_kernel_swi_regs regs;
> 	regs.r[0] = joystick->index;
> 
>-	if (_kernel_swi(JOYSTICK_READ, &regs, &regs) == NULL)
>+	if (_kernel_swi(Joystick_Read, &regs, &regs) == NULL)
> 	{
> 		int newstate = regs.r[0];
> 		int oldstate = joystick->hwdata->joystate;
>diff -r 36124b45d018 -r 49fe17a0e186 src/video/riscos/SDL_riscosFullScreenVideo.c
>--- a/src/video/riscos/SDL_riscosFullScreenVideo.c	Fri Apr 26 17:34:41 2019 +0100
>+++ b/src/video/riscos/SDL_riscosFullScreenVideo.c	Fri Apr 26 17:41:20 2019 +0100
>@@ -359,16 +359,13 @@
> 
> static int FULLSCREEN_FlipHWSurface(_THIS, SDL_Surface *surface)
> {
>-   _kernel_swi_regs regs;
>-   regs.r[0] = 19;
>-
>    FULLSCREEN_SetDisplayBank(this->hidden->current_bank);
>    this->hidden->current_bank ^= 1;
>    FULLSCREEN_SetWriteBank(this->hidden->current_bank);
>    surface->pixels = this->hidden->bank[this->hidden->current_bank];
> 
>    /* Wait for Vsync */
>-   _kernel_swi(OS_Byte, &regs, &regs);
>+   _kernel_osbyte(19, 0, 0);
> 
> 	return(0);
> }
>@@ -618,41 +615,25 @@
> 
> void FULLSCREEN_SetWriteBank(int bank)
> {
>-   _kernel_swi_regs regs;
>-   regs.r[0] = 112;
>-   regs.r[1] = bank+1;
>-   _kernel_swi(OS_Byte, &regs, &regs);
>+	_kernel_osbyte(112, bank+1, 0);
> }
> 
> void FULLSCREEN_SetDisplayBank(int bank)
> {
>-   _kernel_swi_regs regs;
>-   regs.r[0] = 113;
>-   regs.r[1] = bank+1;
>-   _kernel_swi(OS_Byte, &regs, &regs);
>+	_kernel_osbyte(113, bank+1, 0);
> }
> 
> 
> /** Disable special escape key processing */
> static void FULLSCREEN_DisableEscape()
> {
>-   _kernel_swi_regs regs;
>-   regs.r[0] = 229;
>-   regs.r[1] = 1;
>-   regs.r[2] = 0;
>-   _kernel_swi(OS_Byte, &regs, &regs);
>-  
>+	_kernel_osbyte(229, 1, 0);
> }
> 
> /** Enable special escape key processing */
> static void FULLSCREEN_EnableEscape()
> {
>-   _kernel_swi_regs regs;
>-   regs.r[0] = 229;
>-   regs.r[1] = 0;
>-   regs.r[2] = 0;
>-   _kernel_swi(OS_Byte, &regs, &regs);
>-  
>+	_kernel_osbyte(229, 0, 0);
> }
> 
> /** Store caption in case this is called before we create a window */
>diff -r 36124b45d018 -r 49fe17a0e186 src/video/riscos/SDL_riscosevents.c
>--- a/src/video/riscos/SDL_riscosevents.c	Fri Apr 26 17:34:41 2019 +0100
>+++ b/src/video/riscos/SDL_riscosevents.c	Fri Apr 26 17:41:20 2019 +0100
>@@ -326,9 +326,7 @@
>                       block[3] = last_y & 0xFF;
>                       block[4] = (last_y >> 8) & 0xFF;
>                        
>-                      regs.r[0] = 21; /* OSWORD pointer stuff code */
>-                      regs.r[1] = (int)block;
>-                      _kernel_swi(OS_Word, &regs, &regs);
>+                      _kernel_osword(21, (int *)block);
>                	   }
>                 }
>              } else
>diff -r 36124b45d018 -r 49fe17a0e186 src/video/riscos/SDL_riscosmouse.c
>--- a/src/video/riscos/SDL_riscosmouse.c	Fri Apr 26 17:34:41 2019 +0100
>+++ b/src/video/riscos/SDL_riscosmouse.c	Fri Apr 26 17:41:20 2019 +0100
>@@ -242,9 +242,7 @@
> 	block[3] = osY & 0xFF;
> 	block[4] = (osY >> 8) & 0xFF;
> 
>-	regs.r[0] = 21;
>-	regs.r[1] = (int)block;
>-	_kernel_swi(OS_Word, &regs, &regs);
>+	_kernel_osword(21, (int *)block);
> 	SDL_PrivateMouseMotion(0, 0, x, y);
> }
> 
>@@ -296,9 +294,7 @@
> 
>       }
> 
>-      regs.r[0] = 21; /* OS word code */
>-      regs.r[1] = (int)block;
>-      _kernel_swi(OS_Word, &regs, &regs);
>+      _kernel_osword(21, (int *)block);
>    }
> 
>    return mode;
>@@ -317,7 +313,7 @@
>       regs.r[0] = (int)wimp_cursor_palette[colour][0];
>       regs.r[1] = 25;
>       /* Read settings with OS_ReadPalette */
>-      if (_kernel_swi(0x2f, &regs, &regs) == NULL)
>+      if (_kernel_swi(OS_ReadPalette, &regs, &regs) == NULL)
>       {
>         wimp_cursor_palette[colour][2] = (unsigned char)((regs.r[2] >> 8) & 0xFF);
>         wimp_cursor_palette[colour][3] = (unsigned char)((regs.r[2] >> 16) & 0xFF);
>diff -r 36124b45d018 -r 49fe17a0e186 src/video/riscos/SDL_riscostask.c
>--- a/src/video/riscos/SDL_riscostask.c	Fri Apr 26 17:34:41 2019 +0100
>+++ b/src/video/riscos/SDL_riscostask.c	Fri Apr 26 17:41:20 2019 +0100
>@@ -330,9 +330,7 @@
>     stored_mode = -1;
> 
>     /* Flush keyboard buffer to dump the keystrokes we've already polled */
>-    regs.r[0] = 21;
>-    regs.r[1] = 0; /* Keyboard buffer number */
>-    _kernel_swi(OS_Byte, &regs, &regs);
>+    _kernel_osbyte(21, 0, 0);
> 
>     mouseInWindow = 0;
>

Actions: View | Diff

Attachments on bug 4609: 3765

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.