summaryrefslogtreecommitdiff
path: root/sys/dev/sun
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2005-12-12 02:44:09 +0000
committerchristos <christos@NetBSD.org>2005-12-12 02:44:09 +0000
commit5ecdc5e2d05d45f6361e376d8aba22b69225971f (patch)
tree35f916ed029651a88d0e9a240280c876914d8a55 /sys/dev/sun
parentdac64af055a2f641a30d1fcbe0c91dacffb60231 (diff)
welcome to the new lwp world.
Diffstat (limited to 'sys/dev/sun')
-rw-r--r--sys/dev/sun/cgsix.c10
-rw-r--r--sys/dev/sun/kbd.c163
2 files changed, 52 insertions, 121 deletions
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index 167e9b0175b..f6983ac3e60 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.28 2005/12/11 12:23:56 christos Exp $ */
+/* $NetBSD: cgsix.c,v 1.29 2005/12/12 02:44:09 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.28 2005/12/11 12:23:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.29 2005/12/12 02:44:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,7 @@ struct wsscreen_descr cgsix_defaultscreen = {
WSSCREEN_WSCOLORS /* capabilities */
};
-static int cgsix_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int cgsix_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t cgsix_mmap(void *, off_t, int);
void cgsix_init_screen(struct cgsix_softc *, struct cg6_screen *,
int, long *);
@@ -939,7 +939,7 @@ cgsixioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct lwp *l)
default:
#ifdef DEBUG
log(LOG_NOTICE, "cgsixioctl(0x%lx) (%s[%d])\n", cmd,
- p->p_comm, p->p_pid);
+ l->l_proc->p_comm, l->l_proc->p_pid);
#endif
return ENOTTY;
}
@@ -1182,7 +1182,7 @@ cg6_setup_palette(struct cgsix_softc *sc)
}
int
-cgsix_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+cgsix_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
/* we'll probably need to add more stuff here */
struct cgsix_softc *sc = v;
diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c
index 8ae48459c68..f74b755e48a 100644
--- a/sys/dev/sun/kbd.c
+++ b/sys/dev/sun/kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.53 2005/12/11 12:23:56 christos Exp $ */
+/* $NetBSD: kbd.c,v 1.54 2005/12/12 02:44:09 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.53 2005/12/11 12:23:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.54 2005/12/12 02:44:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,15 +91,14 @@ const struct cdevsw kbd_cdevsw = {
};
#if NWSKBD > 0
-int wssunkbd_enable(void *, int);
-void wssunkbd_set_leds(void *, int);
-int wssunkbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
-
-void sunkbd_wskbd_cngetc(void *, u_int *, int *);
-void sunkbd_wskbd_cnpollc(void *, int);
-void sunkbd_wskbd_cnbell(void *, u_int, u_int, u_int);
-static void sunkbd_bell_off(void *v);
-void kbd_enable(struct device *); /* deferred keyboard initialization */
+static int wssunkbd_enable(void *, int);
+static void wssunkbd_set_leds(void *, int);
+static int wssunkbd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
+static void sunkbd_wskbd_cngetc(void *, u_int *, int *);
+static void sunkbd_wskbd_cnpollc(void *, int);
+static void sunkbd_wskbd_cnbell(void *, u_int, u_int, u_int);
+static void sunkbd_bell_off(void *v);
+static void kbd_enable(struct device *); /* deferred keyboard init */
const struct wskbd_accessops sunkbd_wskbd_accessops = {
wssunkbd_enable,
@@ -123,15 +122,13 @@ const struct wskbd_consops sunkbd_wskbd_consops = {
sunkbd_wskbd_cnbell,
};
-void kbd_wskbd_attach(struct kbd_softc *k, int isconsole);
+void kbd_wskbd_attach(struct kbd_softc *, int);
#endif
/* ioctl helpers */
-static int kbd_iockeymap(struct kbd_state *ks,
- u_long cmd, struct kiockeymap *kio);
+static int kbd_iockeymap(struct kbd_state *, u_long, struct kiockeymap *);
#ifdef KIOCGETKEY
-static int kbd_oldkeymap(struct kbd_state *ks,
- u_long cmd, struct okiockey *okio);
+static int kbd_oldkeymap(struct kbd_state *, u_long, struct okiockey *);
#endif
@@ -167,10 +164,7 @@ static void kbd_input_event(struct kbd_softc *, int);
* setup event channel, clear ASCII repeat stuff.
*/
int
-kbdopen(dev, flags, mode, l)
- dev_t dev;
- int flags, mode;
- struct lwp *l;
+kbdopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct kbd_softc *k;
int error, unit;
@@ -225,10 +219,7 @@ kbdopen(dev, flags, mode, l)
* unless it is supplying console input.
*/
int
-kbdclose(dev, flags, mode, l)
- dev_t dev;
- int flags, mode;
- struct lwp *l;
+kbdclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct kbd_softc *k;
@@ -247,10 +238,7 @@ kbdclose(dev, flags, mode, l)
int
-kbdread(dev, uio, flags)
- dev_t dev;
- struct uio *uio;
- int flags;
+kbdread(dev_t dev, struct uio *uio, int flags)
{
struct kbd_softc *k;
@@ -260,10 +248,7 @@ kbdread(dev, uio, flags)
int
-kbdpoll(dev, events, l)
- dev_t dev;
- int events;
- struct lwp *l;
+kbdpoll(dev_t dev, int events, struct lwp *l)
{
struct kbd_softc *k;
@@ -272,9 +257,7 @@ kbdpoll(dev, events, l)
}
int
-kbdkqfilter(dev, kn)
- dev_t dev;
- struct knote *kn;
+kbdkqfilter(dev_t dev, struct knote *kn)
{
struct kbd_softc *k;
@@ -283,12 +266,7 @@ kbdkqfilter(dev, kn)
}
int
-kbdioctl(dev, cmd, data, flag, l)
- dev_t dev;
- u_long cmd;
- caddr_t data;
- int flag;
- struct lwp *l;
+kbdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct kbd_softc *k;
struct kbd_state *ks;
@@ -385,10 +363,7 @@ kbdioctl(dev, cmd, data, flag, l)
* Get/Set keymap entry
*/
static int
-kbd_iockeymap(ks, cmd, kio)
- struct kbd_state *ks;
- u_long cmd;
- struct kiockeymap *kio;
+kbd_iockeymap(struct kbd_state *ks, u_long cmd, struct kiockeymap *kio)
{
u_short *km;
u_int station;
@@ -439,10 +414,7 @@ kbd_iockeymap(ks, cmd, kio)
* old format (compatibility)
*/
int
-kbd_oldkeymap(ks, cmd, kio)
- struct kbd_state *ks;
- u_long cmd;
- struct okiockey *kio;
+kbd_oldkeymap(struct kbd_state *ks, u_long cmd, struct okiockey *kio)
{
int error = 0;
@@ -477,9 +449,7 @@ kbd_oldkeymap(ks, cmd, kio)
****************************************************************/
void
-kbd_input(k, code)
- struct kbd_softc *k;
- int code;
+kbd_input(struct kbd_softc *k, int code)
{
if (k->k_evmode) {
/*
@@ -527,8 +497,7 @@ kbd_input(k, code)
****************************************************************/
struct cons_channel *
-kbd_cc_alloc(k)
- struct kbd_softc *k;
+kbd_cc_alloc(struct kbd_softc *k)
{
struct cons_channel *cc;
@@ -554,8 +523,7 @@ kbd_cc_alloc(k)
static int
-kbd_cc_open(cc)
- struct cons_channel *cc;
+kbd_cc_open(struct cons_channel *cc)
{
struct kbd_softc *k;
int ret;
@@ -582,8 +550,7 @@ kbd_cc_open(cc)
static int
-kbd_cc_close(cc)
- struct cons_channel *cc;
+kbd_cc_close(struct cons_channel *cc)
{
struct kbd_softc *k;
int ret;
@@ -616,9 +583,7 @@ kbd_cc_close(cc)
****************************************************************/
static void
-kbd_input_console(k, code)
- struct kbd_softc *k;
- int code;
+kbd_input_console(struct kbd_softc *k, int code)
{
struct kbd_state *ks= &k->k_state;
int keysym;
@@ -656,8 +621,7 @@ kbd_input_console(k, code)
* Called at splsoftclock().
*/
static void
-kbd_repeat(arg)
- void *arg;
+kbd_repeat(void *arg)
{
struct kbd_softc *k = (struct kbd_softc *)arg;
int s;
@@ -684,9 +648,7 @@ kbd_repeat(arg)
* (so that the caller may complain).
*/
static int
-kbd_input_keysym(k, keysym)
- struct kbd_softc *k;
- int keysym;
+kbd_input_keysym(struct kbd_softc *k, int keysym)
{
struct kbd_state *ks = &k->k_state;
int data;
@@ -749,9 +711,7 @@ kbd_input_keysym(k, keysym)
* Send string upstream.
*/
static void
-kbd_input_string(k, str)
- struct kbd_softc *k;
- char *str;
+kbd_input_string(struct kbd_softc *k, char *str)
{
while (*str) {
@@ -766,9 +726,7 @@ kbd_input_string(k, str)
* XXX: Ugly compatibility mappings.
*/
static void
-kbd_input_funckey(k, keysym)
- struct kbd_softc *k;
- int keysym;
+kbd_input_funckey(struct kbd_softc *k, int keysym)
{
int n;
char str[12];
@@ -783,8 +741,7 @@ kbd_input_funckey(k, keysym)
* Update LEDs to reflect console input state.
*/
static void
-kbd_update_leds(k)
- struct kbd_softc *k;
+kbd_update_leds(struct kbd_softc *k)
{
struct kbd_state *ks = &k->k_state;
char leds;
@@ -814,9 +771,7 @@ kbd_update_leds(k)
* If the queue is full, the keystroke is lost (sorry!).
*/
static void
-kbd_input_event(k, code)
- struct kbd_softc *k;
- int code;
+kbd_input_event(struct kbd_softc *k, int code)
{
struct firm_event *fe;
int put;
@@ -854,8 +809,7 @@ kbd_input_event(k, code)
* Initialization - called by either lower layer attach or by kdcninit.
*/
void
-kbd_xlate_init(ks)
- struct kbd_state *ks;
+kbd_xlate_init(struct kbd_state *ks)
{
struct keyboard *ktbls;
int id;
@@ -876,9 +830,7 @@ kbd_xlate_init(ks)
* Note that the "kd" driver (on sun3 and sparc64) uses this too!
*/
int
-kbd_code_to_keysym(ks, c)
- struct kbd_state *ks;
- int c;
+kbd_code_to_keysym(struct kbd_state *ks, int c)
{
u_short *km;
int keysym;
@@ -934,8 +886,7 @@ kbd_code_to_keysym(ks, c)
* Back door for rcons (fb.c)
*/
void
-kbd_bell(on)
- int on;
+kbd_bell(int on)
{
struct kbd_softc *k = kbd_cd.cd_devs[0]; /* XXX: hardcoded minor */
@@ -967,9 +918,7 @@ kbd_input_wskbd(struct kbd_softc *k, int code)
}
int
-wssunkbd_enable(v, on)
- void *v;
- int on;
+wssunkbd_enable(void *v, int on)
{
struct kbd_softc *k = v;
if (k->k_wsenabled != on) {
@@ -990,9 +939,7 @@ wssunkbd_enable(v, on)
}
void
-wssunkbd_set_leds(v, leds)
- void *v;
- int leds;
+wssunkbd_set_leds(void *v, int leds)
{
struct kbd_softc *k = v;
int l = 0;
@@ -1010,13 +957,8 @@ wssunkbd_set_leds(v, leds)
k->k_leds=l;
}
-int
-wssunkbd_ioctl(v, cmd, data, flag, p)
- void *v;
- u_long cmd;
- caddr_t data;
- int flag;
- struct proc *p;
+static int
+wssunkbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct kbd_softc *k = v;
@@ -1043,11 +985,8 @@ wssunkbd_ioctl(v, cmd, data, flag, p)
extern int prom_cngetc(dev_t);
-void
-sunkbd_wskbd_cngetc(v, type, data)
- void *v;
- u_int *type;
- int *data;
+static void
+sunkbd_wskbd_cngetc(void *v, u_int *type, int *data)
{
/* struct kbd_sun_softc *k = v; */
*data = prom_cngetc(0);
@@ -1055,24 +994,19 @@ sunkbd_wskbd_cngetc(v, type, data)
}
void
-sunkbd_wskbd_cnpollc(v, on)
- void *v;
- int on;
+sunkbd_wskbd_cnpollc(void *v, int on)
{
}
static void
-sunkbd_bell_off(v)
- void *v;
+sunkbd_bell_off(void *v)
{
struct kbd_softc *k = v;
k->k_ops->docmd(k, KBD_CMD_NOBELL, 0);
}
void
-sunkbd_wskbd_cnbell(v, pitch, period, volume)
- void *v;
- u_int pitch, period, volume;
+sunkbd_wskbd_cnbell(void *v, u_int pitch, u_int period, u_int volume)
{
struct kbd_softc *k = v;
@@ -1081,10 +1015,9 @@ sunkbd_wskbd_cnbell(v, pitch, period, volume)
}
void
-kbd_enable(dev)
- struct device *dev;
+kbd_enable(struct device *dev)
{
- struct kbd_softc *k=(struct kbd_softc *)dev;
+ struct kbd_softc *k = (struct kbd_softc *)(void *)dev;
struct wskbddev_attach_args a;
if (k->k_isconsole)
@@ -1112,9 +1045,7 @@ kbd_enable(dev)
}
void
-kbd_wskbd_attach(k, isconsole)
- struct kbd_softc *k;
- int isconsole;
+kbd_wskbd_attach(struct kbd_softc *k, int isconsole)
{
k->k_isconsole=isconsole;