d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New style functions, kill register keyword.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2004-06-21 12:28:56 +00:00
parent 3ec73cf100
commit 55dbc267cb
1 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
sys/kern/tty_compat.c
View File

@ -82,9 +82,7 @@ static int compatspcodes[] = {
}; };
static int static int
ttcompatspeedtab(speed, table) ttcompatspeedtab(int speed, struct speedtab *table)
int speed;
register struct speedtab *table;
{ {
if (speed == 0) if (speed == 0)
return (0); /* hangup */ return (0); /* hangup */
@ -95,16 +93,12 @@ ttcompatspeedtab(speed, table)
} }
int int
ttsetcompat(tp, com, data, term) ttsetcompat(struct tty *tp, u_long *com, caddr_t data, struct termios *term)
register struct tty *tp;
u_long *com;
caddr_t data;
struct termios *term;
{ {
switch (*com) { switch (*com) {
case TIOCSETP: case TIOCSETP:
case TIOCSETN: { case TIOCSETN: {
register struct sgttyb *sg = (struct sgttyb *)data; struct sgttyb *sg = (struct sgttyb *)data;
int speed; int speed;
if ((speed = sg->sg_ispeed) > MAX_SPEED || speed < 0) if ((speed = sg->sg_ispeed) > MAX_SPEED || speed < 0)
@ -128,7 +122,7 @@ ttsetcompat(tp, com, data, term)
} }
case TIOCSETC: { case TIOCSETC: {
struct tchars *tc = (struct tchars *)data; struct tchars *tc = (struct tchars *)data;
register cc_t *cc; cc_t *cc;
cc = term->c_cc; cc = term->c_cc;
cc[VINTR] = tc->t_intrc; cc[VINTR] = tc->t_intrc;
@ -144,7 +138,7 @@ ttsetcompat(tp, com, data, term)
} }
case TIOCSLTC: { case TIOCSLTC: {
struct ltchars *ltc = (struct ltchars *)data; struct ltchars *ltc = (struct ltchars *)data;
register cc_t *cc; cc_t *cc;
cc = term->c_cc; cc = term->c_cc;
cc[VSUSP] = ltc->t_suspc; cc[VSUSP] = ltc->t_suspc;
@ -178,11 +172,7 @@ ttsetcompat(tp, com, data, term)
/*ARGSUSED*/ /*ARGSUSED*/
int int
ttcompat(tp, com, data, flag) ttcompat(struct tty *tp, u_long com, caddr_t data, int flag)
register struct tty *tp;
u_long com;
caddr_t data;
int flag;
{ {
switch (com) { switch (com) {
case TIOCSETP: case TIOCSETP:
@ -201,8 +191,8 @@ ttcompat(tp, com, data, flag)
return ttioctl(tp, com, &term, flag); return ttioctl(tp, com, &term, flag);
} }
case TIOCGETP: { case TIOCGETP: {
register struct sgttyb *sg = (struct sgttyb *)data; struct sgttyb *sg = (struct sgttyb *)data;
register cc_t *cc = tp->t_cc; cc_t *cc = tp->t_cc;
sg->sg_ospeed = ttcompatspeedtab(tp->t_ospeed, compatspeeds); sg->sg_ospeed = ttcompatspeedtab(tp->t_ospeed, compatspeeds);
if (tp->t_ispeed == 0) if (tp->t_ispeed == 0)
@ -216,7 +206,7 @@ ttcompat(tp, com, data, flag)
} }
case TIOCGETC: { case TIOCGETC: {
struct tchars *tc = (struct tchars *)data; struct tchars *tc = (struct tchars *)data;
register cc_t *cc = tp->t_cc; cc_t *cc = tp->t_cc;
tc->t_intrc = cc[VINTR]; tc->t_intrc = cc[VINTR];
tc->t_quitc = cc[VQUIT]; tc->t_quitc = cc[VQUIT];
@ -228,7 +218,7 @@ ttcompat(tp, com, data, flag)
} }
case TIOCGLTC: { case TIOCGLTC: {
struct ltchars *ltc = (struct ltchars *)data; struct ltchars *ltc = (struct ltchars *)data;
register cc_t *cc = tp->t_cc; cc_t *cc = tp->t_cc;
ltc->t_suspc = cc[VSUSP]; ltc->t_suspc = cc[VSUSP];
ltc->t_dsuspc = cc[VDSUSP]; ltc->t_dsuspc = cc[VDSUSP];
@ -269,14 +259,13 @@ ttcompat(tp, com, data, flag)
} }
static int static int
ttcompatgetflags(tp) ttcompatgetflags(struct tty *tp)
register struct tty *tp;
{ {
register tcflag_t iflag = tp->t_iflag; tcflag_t iflag = tp->t_iflag;
register tcflag_t lflag = tp->t_lflag; tcflag_t lflag = tp->t_lflag;
register tcflag_t oflag = tp->t_oflag; tcflag_t oflag = tp->t_oflag;
register tcflag_t cflag = tp->t_cflag; tcflag_t cflag = tp->t_cflag;
register int flags = 0; int flags = 0;
if (iflag&IXOFF) if (iflag&IXOFF)
flags |= TANDEM; flags |= TANDEM;
@ -330,15 +319,13 @@ ttcompatgetflags(tp)
} }
static void static void
ttcompatsetflags(tp, t) ttcompatsetflags(struct tty *tp, struct termios *t)
register struct tty *tp;
register struct termios *t;
{ {
register int flags = tp->t_flags; int flags = tp->t_flags;
register tcflag_t iflag = t->c_iflag; tcflag_t iflag = t->c_iflag;
register tcflag_t oflag = t->c_oflag; tcflag_t oflag = t->c_oflag;
register tcflag_t lflag = t->c_lflag; tcflag_t lflag = t->c_lflag;
register tcflag_t cflag = t->c_cflag; tcflag_t cflag = t->c_cflag;
if (flags & RAW) { if (flags & RAW) {
iflag = IGNBRK; iflag = IGNBRK;
@ -409,15 +396,13 @@ ttcompatsetflags(tp, t)
} }
static void static void
ttcompatsetlflags(tp, t) ttcompatsetlflags(struct tty *tp, struct termios *t)
register struct tty *tp;
register struct termios *t;
{ {
register int flags = tp->t_flags; int flags = tp->t_flags;
register tcflag_t iflag = t->c_iflag; tcflag_t iflag = t->c_iflag;
register tcflag_t oflag = t->c_oflag; tcflag_t oflag = t->c_oflag;
register tcflag_t lflag = t->c_lflag; tcflag_t lflag = t->c_lflag;
register tcflag_t cflag = t->c_cflag; tcflag_t cflag = t->c_cflag;
iflag &= ~(PARMRK|IGNPAR|IGNCR|INLCR); iflag &= ~(PARMRK|IGNPAR|IGNCR|INLCR);
if (flags&CRTERA) if (flags&CRTERA)