Remove unneeded casts to fillw() since now it takes a void * argument.

This commit is contained in:
christos 1996-05-05 19:48:15 +00:00
parent db7563a62d
commit 079631f59d
1 changed files with 17 additions and 24 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: pccons.c,v 1.97 1996/05/03 19:15:00 christos Exp $ */
/* $NetBSD: pccons.c,v 1.98 1996/05/05 19:48:15 christos Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved.
@ -914,7 +914,7 @@ sput(cp, n)
else
vs.so_at = FG_YELLOW | BG_BLACK;
fillw((vs.at << 8) | ' ', (caddr_t) crtat, vs.nchr - cursorat);
fillw((vs.at << 8) | ' ', crtat, vs.nchr - cursorat);
}
while (n--) {
@ -999,7 +999,7 @@ sput(cp, n)
vs.state = VSS_EBRACE;
} else if (c == 'c') { /* Clear screen & home */
fillw((vs.at << 8) | ' ',
(caddr_t) Crtat, vs.nchr);
Crtat, vs.nchr);
crtat = Crtat;
vs.col = 0;
vs.state = 0;
@ -1090,20 +1090,18 @@ sput(cp, n)
case 0:
/* ... to end of display */
fillw((vs.at << 8) | ' ',
(caddr_t) crtat,
crtat,
Crtat + vs.nchr - crtat);
break;
case 1:
/* ... to next location */
fillw((vs.at << 8) | ' ',
(caddr_t) Crtat,
crtat - Crtat + 1);
Crtat, crtat - Crtat + 1);
break;
case 2:
/* ... whole display */
fillw((vs.at << 8) | ' ',
(caddr_t) Crtat,
vs.nchr);
Crtat, vs.nchr);
break;
}
vs.state = 0;
@ -1113,20 +1111,17 @@ sput(cp, n)
case 0:
/* ... current to EOL */
fillw((vs.at << 8) | ' ',
(caddr_t) crtat,
vs.ncol - vs.col);
crtat, vs.ncol - vs.col);
break;
case 1:
/* ... beginning to next */
fillw((vs.at << 8) | ' ',
(caddr_t) (crtat - vs.col),
vs.col + 1);
crtat - vs.col, vs.col + 1);
break;
case 2:
/* ... entire line */
fillw((vs.at << 8) | ' ',
(caddr_t) (crtat - vs.col),
vs.ncol);
crtat - vs.col, vs.ncol);
break;
}
vs.state = 0;
@ -1164,7 +1159,7 @@ sput(cp, n)
crtAt, vs.ncol * (nrow -
cx) * CHR);
fillw((vs.at << 8) | ' ',
(caddr_t) (crtAt + vs.ncol * (nrow - cx)),
crtAt + vs.ncol * (nrow - cx),
vs.ncol * cx);
vs.state = 0;
break;
@ -1180,7 +1175,7 @@ sput(cp, n)
Crtat, vs.ncol * (vs.nrow -
cx) * CHR);
fillw((vs.at << 8) | ' ',
(caddr_t) (Crtat + vs.ncol * (vs.nrow - cx)),
Crtat + vs.ncol * (vs.nrow - cx),
vs.ncol * cx);
#if 0
crtat -= vs.ncol * cx; /* XXX */
@ -1203,8 +1198,7 @@ sput(cp, n)
vs.ncol * (nrow - cx) *
CHR);
fillw((vs.at << 8) | ' ',
(caddr_t) crtAt,
vs.ncol * cx);
crtAt, vs.ncol * cx);
vs.state = 0;
break;
}
@ -1220,8 +1214,7 @@ sput(cp, n)
vs.ncol * (vs.nrow - cx) *
CHR);
fillw((vs.at << 8) | ' ',
(caddr_t) Crtat,
vs.ncol * cx);
Crtat, vs.ncol * cx);
#if 0
crtat += vs.ncol * cx; /* XXX */
#endif
@ -1287,14 +1280,14 @@ sput(cp, n)
if (!kernel) {
int s = spltty();
if (lock_state & SCROLL)
tsleep((caddr_t)&lock_state,
tsleep(&lock_state,
PUSER, "pcputc", 0);
splx(s);
}
bcopy(Crtat + vs.ncol, Crtat,
(vs.nchr - vs.ncol) * CHR);
fillw((vs.at << 8) | ' ',
(caddr_t) (Crtat + vs.nchr - vs.ncol),
Crtat + vs.nchr - vs.ncol,
vs.ncol);
crtat -= vs.ncol;
}
@ -1512,7 +1505,7 @@ top:
shift_state |= SCROLL;
lock_state ^= SCROLL;
if ((lock_state & SCROLL) == 0)
wakeup((caddr_t)&lock_state);
wakeup(&lock_state);
async_update();
break;
}
@ -1591,7 +1584,7 @@ top:
shift_state |= SCROLL;
lock_state ^= SCROLL;
if ((lock_state & SCROLL) == 0)
wakeup((caddr_t)&lock_state);
wakeup(&lock_state);
async_update();
break;
/*