github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-11 23:43:19 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/bitblt.h
View File

@ -50,9 +50,9 @@ extern int DisplayRasterWidth;
#ifdef DOS
#define HideCursor { (currentdsp->mouse_invisible)(currentdsp, IOPage68K); }
#define ShowCursor { (currentdsp->mouse_visible)(IOPage68K->dlmousex, \
IOPage68K->dlmousey); }
#define HideCursor { (currentdsp->mouse_invisible)(currentdsp, IOPage); }
#define ShowCursor { (currentdsp->mouse_visible)(IOPage->dlmousex, \
IOPage->dlmousey); }
#else
extern DLword *EmCursorX68K,*EmCursorY68K;

4
inc/devif.h
View File

@ -88,7 +88,7 @@ typedef struct
/* M o u s e I n t e r f a c e */
/* */
/* Definition of the mouse. Note that the mouse is also */
/* dependent on the IOPage68K */
/* dependent on the IOPage */
/**************************************************************/
typedef struct
{
@ -141,7 +141,7 @@ typedef MouseInterfaceRec *MouseInterface;
/* K b d I n t e r f a c e */
/* */
/* Definition of the keyboard. Note that the keyboard is also */
/* dependent on the IOPage68K */
/* dependent on the IOPage */
/**************************************************************/
typedef struct
{

3
src/bbtsub.c
View File

@ -50,7 +50,6 @@
#include "return.h"
#include "cell.h"
#include "gcdata.h"
#include "iopage.h"
#include "bbtsubdefs.h"
#include "car-cdrdefs.h"
@ -61,8 +60,6 @@
#include "llstkdefs.h"
#include "returndefs.h"
extern IOPAGE *IOPage68K;
#include "bb.h"
#include "bitblt.h"
#include "pilotbbt.h"

6
src/bitblt.c
View File

@ -38,9 +38,7 @@ extern int kbd_for_makeinit;
#ifdef DOS
#include "devif.h"
#include "iopage.h"
extern DspInterface currentdsp;
extern IOPAGE *IOPage68K;
#endif
extern int LispWindowFd;
@ -118,7 +116,7 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl, LispPTR tos)
curr_gray_line = ((TEXTUREBBT *)pbt)->pbtgrayoffset;
#if DOS
if (displayflg) (currentdsp->mouse_invisible)(currentdsp, IOPage68K);
if (displayflg) (currentdsp->mouse_invisible)(currentdsp, IOPage);
;
#endif /* SUNDISPLAY / DOS */
@ -126,7 +124,7 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl, LispPTR tos)
#if DOS
flush_display_lineregion(dx, dstbase, w, h);
if (displayflg) (currentdsp->mouse_visible)(IOPage68K->dlmousex, IOPage68K->dlmousey);
if (displayflg) (currentdsp->mouse_visible)(IOPage->dlmousex, IOPage->dlmousey);
#endif /* SUNDISPLAY / DOS */
#ifdef XWINDOW

35
src/doskbd.c
View File

@ -22,7 +22,9 @@
#include <stk.h>
#include <conio.h>
#include "iopage.h"
#include "lispemul.h"
#include "lspglob.h"
#include "keyboard.h"
#include "keysym.h"
#include "devif.h"
@ -31,7 +33,6 @@ int nokbdflag = FALSE;
extern int eurokbd;
extern KbdInterface currentkbd;
extern MouseInterface currentmouse;
extern IOPAGE *IOPage68K;
extern IFPAGE *InterfacePage;
extern int KBDEventFlg;
@ -179,11 +180,11 @@ handle:
if (keycode != 0xff) {
if (keycode < 64) {
PUTBASEBIT68K(&(IOPage68K->dlkbdad0), keycode, (currentkbd->lastbyte >> 7) & 1);
PUTBASEBIT68K(&(IOPage->dlkbdad0), keycode, (currentkbd->lastbyte >> 7) & 1);
} else if (keycode >= 80) {
PUTBASEBIT68K(&(IOPage68K->dlkbdad0), keycode - 16, (currentkbd->lastbyte >> 7) & 1);
PUTBASEBIT68K(&(IOPage->dlkbdad0), keycode - 16, (currentkbd->lastbyte >> 7) & 1);
} else {
PUTBASEBIT68K(&(IOPage68K->dlutilin), (keycode & 0xf), (currentkbd->lastbyte >> 7) & 1);
PUTBASEBIT68K(&(IOPage->dlutilin), (keycode & 0xf), (currentkbd->lastbyte >> 7) & 1);
PUTBASEBIT68K(&(InterfacePage->fakemousebits), (keycode & 0xf),
(currentkbd->lastbyte >> 7) & 1);
}
@ -191,8 +192,8 @@ handle:
/* In DOS we can't enter uraid inside an exception handler. */
/* Uraid may touch a swapped out address and that dumps Medley */
if (((IOPage68K->dlkbdad2 & 2113) == 0) || /* Ctrl-shift-NEXT */
((IOPage68K->dlkbdad2 & 2114) == 0)) { /* Ctrl-shift-DEL */
if (((IOPage->dlkbdad2 & 2113) == 0) || /* Ctrl-shift-NEXT */
((IOPage->dlkbdad2 & 2114) == 0)) { /* Ctrl-shift-DEL */
currentkbd->URaid = TRUE; /* Tell the dispatch loop about it. */
return;
}
@ -203,13 +204,13 @@ handle:
if (r != w) {
kbevent = (KBEVENT *)((DLword *)CTopKeyevent + w);
/* Copy the Hardware bits. */
kbevent->W0 = IOPage68K->dlkbdad0;
kbevent->W1 = IOPage68K->dlkbdad1;
kbevent->W2 = IOPage68K->dlkbdad2;
kbevent->W3 = IOPage68K->dlkbdad3;
kbevent->W4 = IOPage68K->dlkbdad4;
kbevent->W5 = IOPage68K->dlkbdad5;
kbevent->WU = IOPage68K->dlutilin;
kbevent->W0 = IOPage->dlkbdad0;
kbevent->W1 = IOPage->dlkbdad1;
kbevent->W2 = IOPage->dlkbdad2;
kbevent->W3 = IOPage->dlkbdad3;
kbevent->W4 = IOPage->dlkbdad4;
kbevent->W5 = IOPage->dlkbdad5;
kbevent->WU = IOPage->dlutilin;
/* If queue was empty, update the read pointer */
if (r == 0) CTopKeyevent->ring.vectorindex.read = w;
@ -249,8 +250,8 @@ void ExitDosKbd(KbdInterface kbd)
_dpmi_unlockregion((void *)kbd, sizeof(*kbd));
_dpmi_unlockregion((void *)&InterfacePage, sizeof(InterfacePage));
_dpmi_unlockregion((void *)InterfacePage, sizeof(IFPAGE));
_dpmi_unlockregion((void *)&IOPage68K, sizeof(IOPage68K));
_dpmi_unlockregion((void *)IOPage68K, sizeof(IOPAGE));
_dpmi_unlockregion((void *)&IOPage, sizeof(IOPage));
_dpmi_unlockregion((void *)IOPage, sizeof(IOPAGE));
_dpmi_unlockregion((void *)&CTopKeyevent, sizeof(CTopKeyevent));
_dpmi_unlockregion((void *)CTopKeyevent, sizeof(*CTopKeyevent));
@ -293,8 +294,8 @@ void EnterDosKbd(KbdInterface kbd)
_dpmi_lockregion((void *)kbd, sizeof(*kbd));
_dpmi_lockregion((void *)&InterfacePage, sizeof(InterfacePage));
_dpmi_lockregion((void *)InterfacePage, sizeof(IFPAGE));
_dpmi_lockregion((void *)&IOPage68K, sizeof(IOPage68K));
_dpmi_lockregion((void *)IOPage68K, sizeof(IOPAGE));
_dpmi_lockregion((void *)&IOPage, sizeof(IOPage));
_dpmi_lockregion((void *)IOPage, sizeof(IOPAGE));
_dpmi_lockregion((void *)&MachineState, sizeof(MachineState));
_dpmi_lockregion((void *)&CTopKeyevent, sizeof(CTopKeyevent));

41
src/dosmouse.c
View File

@ -16,6 +16,7 @@
#include <dos.h> /* Defines REGS & other structs */
#include "lispemul.h"
#include "lspglob.h"
#include "display.h"
#include "bb.h"
@ -23,9 +24,9 @@
#include "devif.h"
#include "keyboard.h"
#include "ifpage.h"
#include "iopage.h"
extern int eurokbd;
extern IOPAGE *IOPage68K;
extern MISCSTATS *MiscStats;
extern IFPAGE *InterfacePage;
extern int KBDEventFlg;
@ -81,8 +82,8 @@ void EnterDosMouse(MouseInterface mouse, DspInterface dsp)
if (mouse->Button.TwoButtonP) { _dpmi_lockregion((void *)&ButtonTimer, 4096); }
/* Lock the structures used, both pointers to 'em & the whole structure. */
_dpmi_lockregion((void *)&IOPage68K, sizeof(IOPage68K));
_dpmi_lockregion((void *)IOPage68K, sizeof(IOPAGE));
_dpmi_lockregion((void *)&IOPage, sizeof(IOPage));
_dpmi_lockregion((void *)IOPage, sizeof(IOPAGE));
_dpmi_lockregion((void *)&InterfacePage, sizeof(InterfacePage));
_dpmi_lockregion((void *)InterfacePage, sizeof(IFPAGE));
_dpmi_lockregion((void *)&MiscStats, sizeof(MiscStats));
@ -155,7 +156,7 @@ void ExitDosMouse(MouseInterface mouse)
_dpmi_unlockregion((void *)&MouseButtonSignal, 4096);
/* Unlock the structures used. */
_dpmi_unlockregion((void *)&IOPage68K, sizeof(IOPage68K));
_dpmi_unlockregion((void *)&IOPage, sizeof(IOPage));
_dpmi_unlockregion((void *)&InterfacePage, sizeof(InterfacePage));
_dpmi_unlockregion((void *)&MiscStats, sizeof(MiscStats));
@ -242,14 +243,14 @@ set_DOSmouseposition(DspInterface dsp, int x, int y)
#endif /* NEVER */
/* Actually move the cursor image */
IOPage68K->dlmousex = x;
IOPage68K->dlmousey = y;
IOPage->dlmousex = x;
IOPage->dlmousey = y;
/* *(currentmouse->timestamp) = MiscStats->secondstmp; */
(currentdsp->mouse_invisible)(currentdsp, IOPage68K);
currentmouse->Cursor.New.x = IOPage68K->dlcursorx = x;
currentmouse->Cursor.New.y = IOPage68K->dlcursory = y;
(currentdsp->mouse_invisible)(currentdsp, IOPage);
currentmouse->Cursor.New.x = IOPage->dlcursorx = x;
currentmouse->Cursor.New.y = IOPage->dlcursory = y;
(currentdsp->mouse_visible)(x, y);
dsp->device.locked--;
@ -262,7 +263,7 @@ void docopy(int newx, int newy)
static int sx, dx, w = 16, h = 16, srcbpl, dstbpl, backwardflg = 0;
static int src_comp = 0, op = 0, gray = 0, num_gray = 0, curr_gray_line = 0;
srcbase = IOPage68K->dlcursorbitmap;
srcbase = IOPage->dlcursorbitmap;
dstbase = DisplayRegion68k + (newy * currentdsp->Display.width / 16);
sx = 0;
dx = newx;
@ -378,9 +379,9 @@ void MouseButtonSignal(MouseInterface mouse)
/* In the mouse device TRUE means button pressed */
/* In the IOPage 0 means button pressed */
/* Hence the ! in the lines below. */
PUTBASEBIT68K(&(IOPage68K->dlutilin), MOUSE_LEFT, !mouse->Button.Left);
PUTBASEBIT68K(&(IOPage68K->dlutilin), MOUSE_MIDDLE, !mouse->Button.Middle);
PUTBASEBIT68K(&(IOPage68K->dlutilin), MOUSE_RIGHT, !mouse->Button.Right);
PUTBASEBIT68K(&(IOPage->dlutilin), MOUSE_LEFT, !mouse->Button.Left);
PUTBASEBIT68K(&(IOPage->dlutilin), MOUSE_MIDDLE, !mouse->Button.Middle);
PUTBASEBIT68K(&(IOPage->dlutilin), MOUSE_RIGHT, !mouse->Button.Right);
r = CTopKeyevent->ring.vectorindex.read;
w = CTopKeyevent->ring.vectorindex.write;
@ -389,13 +390,13 @@ void MouseButtonSignal(MouseInterface mouse)
kbevent = (KBEVENT *)((DLword *)CTopKeyevent + w);
/* Copy the Hardware bits. */
kbevent->W0 = IOPage68K->dlkbdad0;
kbevent->W1 = IOPage68K->dlkbdad1;
kbevent->W2 = IOPage68K->dlkbdad2;
kbevent->W3 = IOPage68K->dlkbdad3;
kbevent->W4 = IOPage68K->dlkbdad4;
kbevent->W5 = IOPage68K->dlkbdad5;
kbevent->WU = IOPage68K->dlutilin;
kbevent->W0 = IOPage->dlkbdad0;
kbevent->W1 = IOPage->dlkbdad1;
kbevent->W2 = IOPage->dlkbdad2;
kbevent->W3 = IOPage->dlkbdad3;
kbevent->W4 = IOPage->dlkbdad4;
kbevent->W5 = IOPage->dlkbdad5;
kbevent->WU = IOPage->dlutilin;
/* If queue was empty, update the read pointer */
if (r == 0) CTopKeyevent->ring.vectorindex.read = w;

1
src/ether_nethub.c
View File

@ -33,7 +33,6 @@
#include "dbprint.h"
#include "etherdefs.h"
#include "ifpage.h"
#include "iopage.h"
#include "byteswapdefs.h"
#include "dbprint.h"
#include "timerdefs.h"

1
src/ether_sunos.c
View File

@ -75,7 +75,6 @@
#include "dbprint.h"
#include "etherdefs.h"
#include "ifpage.h"
#include "iopage.h"
#if defined(USE_DLPI)
#define NIOCSETF PFIOCSETF

30
src/initkbd.c
View File

@ -49,7 +49,6 @@
#include "address.h"
#include "devconf.h"
#include "iopage.h"
#include "ifpage.h"
#include "keyboard.h"
@ -78,8 +77,6 @@ FILE *KBlog;
extern fd_set LispReadFds;
IOPAGE *IOPage68K;
DLword *EmMouseX68K;
DLword *EmMouseY68K;
DLword *EmCursorX68K;
@ -238,22 +235,21 @@ void device_before_exit(void) {
/* ----------------------------------------------------------------*/
void set_kbd_iopointers(void) {
IOPage68K = (IOPAGE *)IOPage;
EmMouseX68K = (DLword *)&(IOPage68K->dlmousex);
EmMouseY68K = (DLword *)&(IOPage68K->dlmousey);
EmCursorX68K = (DLword *)&(IOPage68K->dlcursorx);
EmCursorY68K = (DLword *)&(IOPage68K->dlcursory);
EmRealUtilin68K = (DLword *)&(IOPage68K->dlutilin);
EmMouseX68K = (DLword *)&(IOPage->dlmousex);
EmMouseY68K = (DLword *)&(IOPage->dlmousey);
EmCursorX68K = (DLword *)&(IOPage->dlcursorx);
EmCursorY68K = (DLword *)&(IOPage->dlcursory);
EmRealUtilin68K = (DLword *)&(IOPage->dlutilin);
/* EmUtilin68K is for KEYDOWNP1 macro or etc. */
EmUtilin68K = (DLword *)&(InterfacePage->fakemousebits);
EmKbdAd068K = (DLword *)&(IOPage68K->dlkbdad0);
EmKbdAd168K = (DLword *)&(IOPage68K->dlkbdad1);
EmKbdAd268K = (DLword *)&(IOPage68K->dlkbdad2);
EmKbdAd368K = (DLword *)&(IOPage68K->dlkbdad3);
EmKbdAd468K = (DLword *)&(IOPage68K->dlkbdad4);
EmKbdAd568K = (DLword *)&(IOPage68K->dlkbdad5);
EmDispInterrupt68K = (DLword *)&(IOPage68K->dldispinterrupt);
EmCursorBitMap68K = (DLword *)(IOPage68K->dlcursorbitmap);
EmKbdAd068K = (DLword *)&(IOPage->dlkbdad0);
EmKbdAd168K = (DLword *)&(IOPage->dlkbdad1);
EmKbdAd268K = (DLword *)&(IOPage->dlkbdad2);
EmKbdAd368K = (DLword *)&(IOPage->dlkbdad3);
EmKbdAd468K = (DLword *)&(IOPage->dlkbdad4);
EmKbdAd568K = (DLword *)&(IOPage->dlkbdad5);
EmDispInterrupt68K = (DLword *)&(IOPage->dldispinterrupt);
EmCursorBitMap68K = (DLword *)(IOPage->dlcursorbitmap);
*EmRealUtilin68K = KB_ALLUP;
*EmKbdAd068K = KB_ALLUP;

4
src/keyevent.c
View File

@ -49,7 +49,6 @@ void Mouse_hndlr(void); /* Fields mouse events from driver */
#include "display.h"
#include "lsptypes.h"
#include "iopage.h"
#include "ifpage.h"
#include "miscstat.h"
@ -69,7 +68,6 @@ void Mouse_hndlr(void); /* Fields mouse events from driver */
#if (defined(DOS) || defined(XWINDOW))
#include "devif.h"
extern DspInterface currentdsp;
extern IOPAGE *IOPage68K;
#endif /* DOS */
/* for contextsw */
@ -375,7 +373,7 @@ void taking_mouse_down(void) {
static int src_comp = 0, op = 0, gray = 0, num_gray = 0, curr_gray_line = 0;
#ifdef DOS
(currentdsp->mouse_invisible)(currentdsp, IOPage68K);
(currentdsp->mouse_invisible)(currentdsp, IOPage);
#else
if (!DisplayInitialized) return;

1
src/vesainit.c
View File

@ -28,6 +28,7 @@
#include "dbprint.h"
#include "dspifdefs.h"
#include "lspglob.h"
#include "lispemul.h"
#include "devif.h"
#include "iopage.h"

1
src/vgainit.c
View File

@ -13,6 +13,7 @@
#include <stdio.h>
#include <graph.h>
#include "iopage.h"
#include "lispemul.h"
#include "devif.h"

5
src/vmemsave.c
View File

@ -74,7 +74,6 @@ extern struct pixrect *CursorBitMap, *InvisibleCursorBitMap;
extern struct cursor CurrentCursor, InvisibleCursor;
extern IFPAGE *InterfacePage;
#ifdef DOS
extern IOPAGE *IOPage68K;
extern DspInterface currentdsp;
#endif /* DOS */
@ -328,7 +327,7 @@ LispPTR vmem_save(char *sysout_file_name)
/* For DOS, must also take the mouse cursor away (it's */
/* written into the display-region bitmap). */
currentdsp->device.locked++;
(currentdsp->mouse_invisible)(currentdsp, IOPage68K);
(currentdsp->mouse_invisible)(currentdsp, IOPage);
#endif /* SUNDISPLAY || DOS */
/* set FPTOVP */
@ -497,7 +496,7 @@ LispPTR vmem_save(char *sysout_file_name)
/* restore cursor image to screen */
#ifdef DOS
/* Must also put the mouse back. */
(currentdsp->mouse_visible)(IOPage68K->dlmousex, IOPage68K->dlmousey);
(currentdsp->mouse_visible)(IOPage->dlmousex, IOPage->dlmousey);
currentdsp->device.locked--;
#endif /* SUNDISPLAY */

8
src/xc.c
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);

4
src/xcursor.c
View File

@ -19,13 +19,11 @@
#include "dbprint.h" // for TPRINT
#include "devif.h" // for (anonymous), DspInterface, DefineCursor
#include "display.h" // for CURSORHEIGHT
#include "iopage.h" // for IOPAGE
#include "lispemul.h" // for DLword
#include "lspglob.h" // for IOPage
#include "xcursordefs.h" // for Init_XCursor, Set_XCursor, init_Xcursor
#include "xdefs.h" // for XLOCK, XUNLOCK
extern IOPAGE *IOPage;
XColor cursor_fore_xcsd, cursor_back_xcsd, xced;
extern Colormap Colors;