summaryrefslogtreecommitdiff
path: root/sys/dev/wscons
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2005-05-29 21:56:35 +0000
committerchristos <christos@NetBSD.org>2005-05-29 21:56:35 +0000
commitf90bcf3a23dec41fc4bbe6ca8ef9db1b4e71cdc2 (patch)
treeb8be5dd4ad68935e16e3369547d5c6f313911165 /sys/dev/wscons
parentc107ef9edcaf669743f05d8c3e004b1dbde3a33d (diff)
- sprinkle const.
- avoid variable shadowing.
Diffstat (limited to 'sys/dev/wscons')
-rw-r--r--sys/dev/wscons/wsdisplay.c28
-rw-r--r--sys/dev/wscons/wsdisplayvar.h4
-rw-r--r--sys/dev/wscons/wsemul_dumb.c8
-rw-r--r--sys/dev/wscons/wsemul_vt100_keys.c12
-rw-r--r--sys/dev/wscons/wsemul_vt100_subr.c10
-rw-r--r--sys/dev/wscons/wsemul_vt100var.h4
-rw-r--r--sys/dev/wscons/wsemulvar.h4
-rw-r--r--sys/dev/wscons/wskbd.c18
8 files changed, 44 insertions, 44 deletions
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 6abbe2fbcc8..4f795f62c7e 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.83 2005/05/29 21:56:35 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.83 2005/05/29 21:56:35 christos Exp $");
#include "opt_wsdisplay_border.h"
#include "opt_wsdisplay_compat.h"
@@ -1223,7 +1223,7 @@ wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
{
int error;
char *type, typebuf[16], *emul, emulbuf[16];
- void *buf;
+ void *tbuf;
u_int fontsz;
#if defined(COMPAT_14) && NWSKBD > 0
struct wsmux_device wsmuxdata;
@@ -1274,16 +1274,16 @@ wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
if (fontsz > WSDISPLAY_MAXFONTSZ)
return (EINVAL);
- buf = malloc(fontsz, M_DEVBUF, M_WAITOK);
- error = copyin(d->data, buf, fontsz);
+ tbuf = malloc(fontsz, M_DEVBUF, M_WAITOK);
+ error = copyin(d->data, tbuf, fontsz);
if (error) {
- free(buf, M_DEVBUF);
+ free(tbuf, M_DEVBUF);
return (error);
}
- d->data = buf;
+ d->data = tbuf;
error =
(*sc->sc_accessops->load_font)(sc->sc_accesscookie, 0, d);
- free(buf, M_DEVBUF);
+ free(tbuf, M_DEVBUF);
#undef d
return (error);
@@ -1398,7 +1398,7 @@ wsdisplaystart(struct tty *tp)
struct wsdisplay_softc *sc;
struct wsscreen *scr;
int s, n;
- u_char *buf;
+ u_char *tbuf;
s = spltty();
if (tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP)) {
@@ -1429,22 +1429,22 @@ wsdisplaystart(struct tty *tp)
*/
n = ndqb(&tp->t_outq, 0);
- buf = tp->t_outq.c_cf;
+ tbuf = tp->t_outq.c_cf;
if (!(scr->scr_flags & SCR_GRAPHICS)) {
KASSERT(WSSCREEN_HAS_EMULATOR(scr));
(*scr->scr_dconf->wsemul->output)(scr->scr_dconf->wsemulcookie,
- buf, n, 0);
+ tbuf, n, 0);
}
ndflush(&tp->t_outq, n);
if ((n = ndqb(&tp->t_outq, 0)) > 0) {
- buf = tp->t_outq.c_cf;
+ tbuf = tp->t_outq.c_cf;
if (!(scr->scr_flags & SCR_GRAPHICS)) {
KASSERT(WSSCREEN_HAS_EMULATOR(scr));
(*scr->scr_dconf->wsemul->output)
- (scr->scr_dconf->wsemulcookie, buf, n, 0);
+ (scr->scr_dconf->wsemulcookie, tbuf, n, 0);
}
ndflush(&tp->t_outq, n);
}
@@ -1535,7 +1535,7 @@ wsdisplay_kbdinput(struct device *dev, keysym_t ks)
{
struct wsdisplay_softc *sc = (struct wsdisplay_softc *)dev;
struct wsscreen *scr;
- char *dp;
+ const char *dp;
int count;
struct tty *tp;
diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h
index 0fefbb58051..8445017aaa5 100644
--- a/sys/dev/wscons/wsdisplayvar.h
+++ b/sys/dev/wscons/wsdisplayvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplayvar.h,v 1.32 2005/05/23 09:44:57 martin Exp $ */
+/* $NetBSD: wsdisplayvar.h,v 1.33 2005/05/29 21:56:35 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -85,7 +85,7 @@ struct wsdisplay_emulops {
};
struct wsscreen_descr {
- char *name;
+ const char *name;
int ncols, nrows;
const struct wsdisplay_emulops *textops;
int fontwidth, fontheight;
diff --git a/sys/dev/wscons/wsemul_dumb.c b/sys/dev/wscons/wsemul_dumb.c
index c19db913a7c..88cb6b231bc 100644
--- a/sys/dev/wscons/wsemul_dumb.c
+++ b/sys/dev/wscons/wsemul_dumb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_dumb.c,v 1.9 2005/02/27 00:27:52 perry Exp $ */
+/* $NetBSD: wsemul_dumb.c,v 1.10 2005/05/29 21:56:35 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_dumb.c,v 1.9 2005/02/27 00:27:52 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_dumb.c,v 1.10 2005/05/29 21:56:35 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ void *wsemul_dumb_cnattach(const struct wsscreen_descr *, void *,
void *wsemul_dumb_attach(int console, const struct wsscreen_descr *,
void *, int, int, void *, long);
void wsemul_dumb_output(void *cookie, const u_char *data, u_int count, int);
-int wsemul_dumb_translate(void *cookie, keysym_t, char **);
+int wsemul_dumb_translate(void *cookie, keysym_t, const char **);
void wsemul_dumb_detach(void *cookie, u_int *crowp, u_int *ccolp);
void wsemul_dumb_resetop(void *, enum wsemul_resetops);
@@ -198,7 +198,7 @@ wsemul_dumb_output(void *cookie, const u_char *data, u_int count,
}
int
-wsemul_dumb_translate(void *cookie, keysym_t in, char **out)
+wsemul_dumb_translate(void *cookie, keysym_t in, const char **out)
{
return (0);
}
diff --git a/sys/dev/wscons/wsemul_vt100_keys.c b/sys/dev/wscons/wsemul_vt100_keys.c
index 3d13a7d3b7a..4dc07ffd0f0 100644
--- a/sys/dev/wscons/wsemul_vt100_keys.c
+++ b/sys/dev/wscons/wsemul_vt100_keys.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100_keys.c,v 1.7 2004/07/28 12:34:05 jmmv Exp $ */
+/* $NetBSD: wsemul_vt100_keys.c,v 1.8 2005/05/29 21:56:35 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_keys.c,v 1.7 2004/07/28 12:34:05 jmmv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_keys.c,v 1.8 2005/05/29 21:56:35 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_keys.c,v 1.7 2004/07/28 12:34:05 jmmv E
#include <dev/wscons/wsksymdef.h>
#include <dev/wscons/wsemul_vt100var.h>
-static char *vt100_fkeys[] = {
+static const char *vt100_fkeys[] = {
"\033[11~", /* F1 */
"\033[12~",
"\033[13~", /* F1-F5 normally don't send codes */
@@ -61,14 +61,14 @@ static char *vt100_fkeys[] = {
"\033[34~", /* F20 */
};
-static char *vt100_pfkeys[] = {
+static const char *vt100_pfkeys[] = {
"\033OP", /* PF1 */
"\033OQ",
"\033OR",
"\033OS", /* PF4 */
};
-static char *vt100_numpad[] = {
+static const char *vt100_numpad[] = {
"\033Op", /* KP 0 */
"\033Oq", /* KP 1 */
"\033Or", /* KP 2 */
@@ -82,7 +82,7 @@ static char *vt100_numpad[] = {
};
int
-wsemul_vt100_translate(void *cookie, keysym_t in, char **out)
+wsemul_vt100_translate(void *cookie, keysym_t in, const char **out)
{
struct wsemul_vt100_emuldata *edp = cookie;
static char c;
diff --git a/sys/dev/wscons/wsemul_vt100_subr.c b/sys/dev/wscons/wsemul_vt100_subr.c
index 71eeea3c610..272c6cf3b55 100644
--- a/sys/dev/wscons/wsemul_vt100_subr.c
+++ b/sys/dev/wscons/wsemul_vt100_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100_subr.c,v 1.17 2004/07/28 12:34:05 jmmv Exp $ */
+/* $NetBSD: wsemul_vt100_subr.c,v 1.18 2005/05/29 21:56:35 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_subr.c,v 1.17 2004/07/28 12:34:05 jmmv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_subr.c,v 1.18 2005/05/29 21:56:35 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -325,16 +325,16 @@ wsemul_vt100_handle_csi(struct wsemul_vt100_emuldata *edp, u_char c)
break;
case 2: /* tab stop report */
{
- int i, n, ps = 0;
+ int i, j, ps = 0;
char buf[20];
KASSERT(edp->tabs != 0);
wsdisplay_emulinput(edp->cbcookie, "\033P2$u", 5);
for (i = 0; i < edp->ncols; i++)
if (edp->tabs[i]) {
- n = snprintf(buf, sizeof(buf), "%s%d",
+ j = snprintf(buf, sizeof(buf), "%s%d",
(ps ? "/" : ""), i + 1);
wsdisplay_emulinput(edp->cbcookie,
- buf, n);
+ buf, j);
ps = 1;
}
}
diff --git a/sys/dev/wscons/wsemul_vt100var.h b/sys/dev/wscons/wsemul_vt100var.h
index 08e8be573c3..1529ef6fd36 100644
--- a/sys/dev/wscons/wsemul_vt100var.h
+++ b/sys/dev/wscons/wsemul_vt100var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100var.h,v 1.9 2004/07/28 12:34:05 jmmv Exp $ */
+/* $NetBSD: wsemul_vt100var.h,v 1.10 2005/05/29 21:56:35 christos Exp $ */
/*
* Copyright (c) 1998
@@ -135,7 +135,7 @@ void wsemul_vt100_el(struct wsemul_vt100_emuldata *, int);
void wsemul_vt100_handle_csi(struct wsemul_vt100_emuldata *, u_char);
void wsemul_vt100_handle_dcs(struct wsemul_vt100_emuldata *);
-int wsemul_vt100_translate(void *cookie, keysym_t, char **);
+int wsemul_vt100_translate(void *cookie, keysym_t, const char **);
void vt100_initchartables(struct wsemul_vt100_emuldata *);
void vt100_setnrc(struct wsemul_vt100_emuldata *, int);
diff --git a/sys/dev/wscons/wsemulvar.h b/sys/dev/wscons/wsemulvar.h
index cac8aa801de..77290dbde14 100644
--- a/sys/dev/wscons/wsemulvar.h
+++ b/sys/dev/wscons/wsemulvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemulvar.h,v 1.10 2005/02/27 00:27:52 perry Exp $ */
+/* $NetBSD: wsemulvar.h,v 1.11 2005/05/29 21:56:35 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -47,7 +47,7 @@ struct wsemul_ops {
void *(*attach)(int console, const struct wsscreen_descr *, void *,
int, int, void *, long);
void (*output)(void *cookie, const u_char *data, u_int count, int);
- int (*translate)(void *, keysym_t, char **);
+ int (*translate)(void *, keysym_t, const char **);
void (*detach)(void *cookie, u_int *crow, u_int *ccol);
void (*reset)(void *, enum wsemul_resetops);
void (*getmsgattrs)(void *, struct wsdisplay_msgattrs *);
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index 9c352276d4a..7baf3b61861 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.81 2005/05/08 17:16:34 he Exp $ */
+/* $NetBSD: wskbd.c,v 1.82 2005/05/29 21:56:35 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.81 2005/05/08 17:16:34 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.82 2005/05/29 21:56:35 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -702,7 +702,7 @@ wskbd_deliver_event(struct wskbd_softc *sc, u_int type, int value)
#ifdef WSDISPLAY_COMPAT_RAWKBD
void
-wskbd_rawinput(struct device *dev, u_char *buf, int len)
+wskbd_rawinput(struct device *dev, u_char *tbuf, int len)
{
#if NWSDISPLAY > 0
struct wskbd_softc *sc = (struct wskbd_softc *)dev;
@@ -710,7 +710,7 @@ wskbd_rawinput(struct device *dev, u_char *buf, int len)
if (sc->sc_base.me_dispdv != NULL)
for (i = 0; i < len; i++)
- wsdisplay_kbdinput(sc->sc_base.me_dispdv, buf[i]);
+ wsdisplay_kbdinput(sc->sc_base.me_dispdv, tbuf[i]);
/* this is KS_GROUP_Ascii */
#endif
}
@@ -981,7 +981,7 @@ wskbd_displayioctl(struct device *dev, u_long cmd, caddr_t data, int flag,
struct wskbd_map_data *umdp;
struct wskbd_mapdata md;
kbd_t enc;
- void *buf;
+ void *tbuf;
int len, error;
switch (cmd) {
@@ -1112,18 +1112,18 @@ getkeyrepeat:
return (EINVAL);
len = umdp->maplen*sizeof(struct wscons_keymap);
- buf = malloc(len, M_TEMP, M_WAITOK);
- error = copyin(umdp->map, buf, len);
+ tbuf = malloc(len, M_TEMP, M_WAITOK);
+ error = copyin(umdp->map, tbuf, len);
if (error == 0) {
wskbd_init_keymap(umdp->maplen,
&sc->sc_map, &sc->sc_maplen);
- memcpy(sc->sc_map, buf, len);
+ memcpy(sc->sc_map, tbuf, len);
/* drop the variant bits handled by the map */
sc->sc_layout = KB_USER |
(KB_VARIANT(sc->sc_layout) & KB_HANDLEDBYWSKBD);
wskbd_update_layout(sc->id, sc->sc_layout);
}
- free(buf, M_TEMP);
+ free(tbuf, M_TEMP);
return(error);
case WSKBDIO_GETMAP: