1
0
mirror of https://github.com/Interlisp/maiko.git synced 2026-04-25 03:55:16 +00:00

Clean up usage of the native address of the I/O page and its struct typedef

The global variable holding the native address of the I/O page is spelled "IOPage"
The global variable "IOPage" is declared extern by "lspglob.h"
The structure pointed to by IOPage is named IOPAGE and is defined in "iopage.h"
If there is no direct reference to the IOPAGE struct do not include "iopage.h"
This commit is contained in:
Nick Briggs
2022-12-24 15:17:49 -08:00
parent 602fff2c2f
commit 1c6277d313
15 changed files with 68 additions and 82 deletions

View File

@@ -99,8 +99,6 @@
#include "z2defs.h"
#ifdef DOS
#include "iopage.h"
extern IOPAGE *IOPage68K;
#include "devif.h"
extern KbdInterface currentkbd;
extern DspInterface currentdsp;
@@ -1181,7 +1179,7 @@ check_interrupt:
currentdsp->device.locked++;
/* Remove the mouse from the old place on the screen */
(currentdsp->mouse_invisible)(currentdsp, IOPage68K);
(currentdsp->mouse_invisible)(currentdsp, IOPage);
/* Find the new delta */
regs.w.eax = 0x000B; /* Function 0xB = get delta mickeys */
@@ -1199,8 +1197,8 @@ check_interrupt:
else if (currentmouse->Cursor.New.y > (currentdsp->Display.height - 1))
currentmouse->Cursor.New.y = currentdsp->Display.height - 1;
IOPage68K->dlmousex = IOPage68K->dlcursorx = currentmouse->Cursor.New.x;
IOPage68K->dlmousey = IOPage68K->dlcursory = currentmouse->Cursor.New.y;
IOPage->dlmousex = IOPage->dlcursorx = currentmouse->Cursor.New.x;
IOPage->dlmousey = IOPage->dlcursory = currentmouse->Cursor.New.y;
/* Paint the mouse back up on the screen on the new place */
(currentdsp->mouse_visible)(currentmouse->Cursor.New.x, currentmouse->Cursor.New.y);