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/port.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/port.c')
| -rw-r--r-- | usr.bin/doscmd/port.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/doscmd/port.c b/usr.bin/doscmd/port.c index eb2158f..9159321 100644 --- a/usr.bin/doscmd/port.c +++ b/usr.bin/doscmd/port.c @@ -246,7 +246,7 @@ insb(regcontext_t *REGS, int port) else in_handler = inb_nullport; data = (*in_handler)(port); - *(u_char *)N_GETPTR(R_ES, R_DI) = data; + *(u_char *)MAKEPTR(R_ES, R_DI) = data; debug(D_PORT, "INS on port %02x -> %02x\n", port, data); if (R_FLAGS & PSL_D) @@ -284,7 +284,7 @@ insx(regcontext_t *REGS, int port) else in_handler = inb_nullport; data = (*in_handler)(port); - *(u_char *)N_GETPTR(R_ES, R_DI) = data; + *(u_char *)MAKEPTR(R_ES, R_DI) = data; debug(D_PORT, "INS on port %02x -> %02x\n", port, data); if ((port >= MINPORT) && (port < MAXPORT)) @@ -292,7 +292,7 @@ insx(regcontext_t *REGS, int port) else in_handler = inb_nullport; data = (*in_handler)(port + 1); - ((u_char *)N_GETPTR(R_ES, R_DI))[1] = data; + ((u_char *)MAKEPTR(R_ES, R_DI))[1] = data; debug(D_PORT, "INS on port %02x -> %02x\n", port, data); if (R_FLAGS & PSL_D) @@ -347,7 +347,7 @@ outsb(regcontext_t *REGS, int port) out_handler = portsw[port].p_outb; else out_handler = outb_nullport; - value = *(u_char *)N_GETPTR(R_ES, R_DI); + value = *(u_char *)MAKEPTR(R_ES, R_DI); debug(D_PORT, "OUT on port %02x <- %02x\n", port, value); (*out_handler)(port, value); @@ -367,7 +367,7 @@ outsx(regcontext_t *REGS, int port) out_handler = portsw[port].p_outb; else out_handler = outb_nullport; - value = *(u_char *)N_GETPTR(R_ES, R_DI); + value = *(u_char *)MAKEPTR(R_ES, R_DI); debug(D_PORT, "OUT on port %02x <- %02x\n", port, value); (*out_handler)(port, value); @@ -375,7 +375,7 @@ outsx(regcontext_t *REGS, int port) out_handler = portsw[port + 1].p_outb; else out_handler = outb_nullport; - value = ((u_char *)N_GETPTR(R_ES, R_DI))[1]; + value = ((u_char *)MAKEPTR(R_ES, R_DI))[1]; debug(D_PORT, "OUT on port %02x <- %02x\n", port+1, value); (*out_handler)(port + 1, value); |
