diff options
| author | marcel <marcel@FreeBSD.org> | 1999-09-29 20:09:19 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 1999-09-29 20:09:19 +0000 |
| commit | d4e70391772e9b3fa25d96b93d50278ea1c125ef (patch) | |
| tree | 8397c40eb0fbcd1e79470ce8389a29cbebc02ca6 /usr.bin/doscmd/mouse.c | |
| parent | 073b941095e3deeaae66ec3452643c4db25deb08 (diff) | |
| download | FreeBSD-src-d4e70391772e9b3fa25d96b93d50278ea1c125ef.zip FreeBSD-src-d4e70391772e9b3fa25d96b93d50278ea1c125ef.tar.gz | |
Unbreak doscmd after the sigset_t change:
doscmd heavily depends on struct sigcontext which luckily is mostly passed
between functions as usion regcontext_t. By redefining union regcontext_t in
terms of mcontext_t almost all bases are covered.
It also seems to me that doscmd was in a transitional state. The redundant
definitions made it difficult to get a clear overview and could easily cause
oversight. To make sure my changes were ok, I went as far as to complete the
transition. It was not exactly necessary, but I expect to have to come back
here some more ("whistle" if I'm wrong :-).
Diffstat (limited to 'usr.bin/doscmd/mouse.c')
| -rw-r--r-- | usr.bin/doscmd/mouse.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/doscmd/mouse.c b/usr.bin/doscmd/mouse.c index c9a0774..93416b8 100644 --- a/usr.bin/doscmd/mouse.c +++ b/usr.bin/doscmd/mouse.c @@ -151,7 +151,7 @@ int33(regcontext_t *REGS) case 0x0c: /* Set event handler */ mouse_status.mask = R_CX; - mouse_status.handler = N_GETVEC(R_ES, R_DX); + mouse_status.handler = MAKEVEC(R_ES, R_DX); break; case 0x0d: /* Enable light pen */ @@ -177,9 +177,9 @@ int33(regcontext_t *REGS) vec = mouse_status.handler; mouse_status.mask = R_CX; - mouse_status.handler = GETVEC(R_ES, R_DX); + mouse_status.handler = MAKEVEC(R_ES, R_DX); R_CX = mask; - N_PUTVEC(R_ES, R_DX, vec); + PUTVEC(R_ES, R_DX, vec); break; case 0x15: /* Determine mouse status buffer size */ @@ -187,12 +187,12 @@ int33(regcontext_t *REGS) break; case 0x16: /* Store mouse buffer */ - memcpy((char *)N_GETPTR(R_ES, R_DX), &mouse_status, + memcpy((char *)MAKEPTR(R_ES, R_DX), &mouse_status, sizeof(mouse_status)); break; case 0x17: /* Restore mouse buffer */ - memcpy(&mouse_status, (char *)N_GETPTR(R_ES, R_DX), + memcpy(&mouse_status, (char *)MAKEPTR(R_ES, R_DX), sizeof(mouse_status)); break; @@ -209,7 +209,7 @@ int33(regcontext_t *REGS) break; } mouse_status.altmask[i] = R_CX; - mouse_status.althandler[i] = N_GETVEC(R_ES, R_DX); + mouse_status.althandler[i] = MAKEVEC(R_ES, R_DX); break; case 0x19: /* Determine address of alternate event handler */ @@ -222,7 +222,7 @@ int33(regcontext_t *REGS) vec = mouse_status.althandler[2]; else R_CX = 0; - N_PUTVEC(R_ES, R_DX, vec); + PUTVEC(R_ES, R_DX, vec); break; case 0x1a: /* set mouse sensitivity */ @@ -247,7 +247,7 @@ int33(regcontext_t *REGS) case 0x1f: /* Disable mouse driver */ if (mouse_status.installed) { - N_PUTVEC(R_ES, R_DX, mouse_status.handler); + PUTVEC(R_ES, R_DX, mouse_status.handler); mouse_status.installed = 0; } else { R_AX = 0xffff; |
