cleanup const/volatile/shadowing
This commit is contained in:
parent
5fb18b1aa9
commit
8d53551666
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: z8530tty.c,v 1.21 2003/12/04 13:05:16 keihan Exp $ */
|
/* $NetBSD: z8530tty.c,v 1.22 2005/06/03 21:38:05 matt Exp $ */
|
||||||
|
|
||||||
/*-
|
/*-
|
||||||
* Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
|
* Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
|
||||||
|
@ -137,7 +137,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.21 2003/12/04 13:05:16 keihan Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.22 2005/06/03 21:38:05 matt Exp $");
|
||||||
|
|
||||||
#include "opt_kgdb.h"
|
#include "opt_kgdb.h"
|
||||||
|
|
||||||
|
@ -1398,7 +1398,7 @@ zstty_rxsoft(zst, tp)
|
||||||
struct tty *tp;
|
struct tty *tp;
|
||||||
{
|
{
|
||||||
struct zs_chanstate *cs = zst->zst_cs;
|
struct zs_chanstate *cs = zst->zst_cs;
|
||||||
int (*rint) __P((int c, struct tty *tp)) = tp->t_linesw->l_rint;
|
int (*rint)(int, struct tty *) = tp->t_linesw->l_rint;
|
||||||
u_char *get, *end;
|
u_char *get, *end;
|
||||||
u_int cc, scc;
|
u_int cc, scc;
|
||||||
u_char rr1;
|
u_char rr1;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: zs.c,v 1.32 2005/01/24 21:39:15 matt Exp $ */
|
/* $NetBSD: zs.c,v 1.33 2005/06/03 21:38:05 matt Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1996, 1998 Bill Studenmund
|
* Copyright (c) 1996, 1998 Bill Studenmund
|
||||||
|
@ -54,7 +54,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.32 2005/01/24 21:39:15 matt Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.33 2005/06/03 21:38:05 matt Exp $");
|
||||||
|
|
||||||
#include "opt_ddb.h"
|
#include "opt_ddb.h"
|
||||||
#include "opt_kgdb.h"
|
#include "opt_kgdb.h"
|
||||||
|
@ -971,7 +971,7 @@ zscngetc(dev_t dev)
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
if (zc) {
|
if (zc) {
|
||||||
c = zs_getc((void *)zc);
|
c = zs_getc(__UNVOLATILE(zc));
|
||||||
} else {
|
} else {
|
||||||
char ch = 0;
|
char ch = 0;
|
||||||
OF_read(stdin, &ch, 1);
|
OF_read(stdin, &ch, 1);
|
||||||
|
@ -989,7 +989,7 @@ zscnputc(dev_t dev, int c)
|
||||||
volatile struct zschan *zc = zs_conschan;
|
volatile struct zschan *zc = zs_conschan;
|
||||||
|
|
||||||
if (zc) {
|
if (zc) {
|
||||||
zs_putc((void *)zc, c);
|
zs_putc(__UNVOLATILE(zc), c);
|
||||||
} else {
|
} else {
|
||||||
char ch = c;
|
char ch = c;
|
||||||
OF_write(stdout, &ch, 1);
|
OF_write(stdout, &ch, 1);
|
||||||
|
|
Loading…
Reference in New Issue