Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev welcome to the new lwp world.
details: https://anonhg.NetBSD.org/src/rev/8081c21898f9
branches: trunk
changeset: 586267:8081c21898f9
user: christos <christos%NetBSD.org@localhost>
date: Mon Dec 12 02:44:09 2005 +0000
description:
welcome to the new lwp world.
diffstat:
sys/dev/pci/machfb.c | 6 +-
sys/dev/sun/cgsix.c | 10 +-
sys/dev/sun/kbd.c | 163 ++++++++++++++------------------------------------
3 files changed, 55 insertions(+), 124 deletions(-)
diffs (truncated from 481 to 300 lines):
diff -r 9c6912712792 -r 8081c21898f9 sys/dev/pci/machfb.c
--- a/sys/dev/pci/machfb.c Mon Dec 12 01:18:29 2005 +0000
+++ b/sys/dev/pci/machfb.c Mon Dec 12 02:44:09 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.36 2005/12/11 12:22:50 christos Exp $ */
+/* $NetBSD: machfb.c,v 1.37 2005/12/12 02:44:09 christos Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
- "$NetBSD: machfb.c,v 1.36 2005/12/11 12:22:50 christos Exp $");
+ "$NetBSD: machfb.c,v 1.37 2005/12/12 02:44:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1625,7 +1625,7 @@
case PCI_IOC_CFGREAD:
case PCI_IOC_CFGWRITE:
return (pci_devioctl(sc->sc_pc, sc->sc_pcitag,
- cmd, data, flag, p));
+ cmd, data, flag, l));
case WSDISPLAYIO_SMODE:
{
diff -r 9c6912712792 -r 8081c21898f9 sys/dev/sun/cgsix.c
--- a/sys/dev/sun/cgsix.c Mon Dec 12 01:18:29 2005 +0000
+++ b/sys/dev/sun/cgsix.c Mon Dec 12 02:44:09 2005 +0000
@@ -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 @@
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 @@
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 @@
}
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 -r 9c6912712792 -r 8081c21898f9 sys/dev/sun/kbd.c
--- a/sys/dev/sun/kbd.c Mon Dec 12 01:18:29 2005 +0000
+++ b/sys/dev/sun/kbd.c Mon Dec 12 02:44:09 2005 +0000
@@ -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 @@
};
#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 @@
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 @@
* 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 @@
* 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 @@
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 @@
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 @@
}
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 @@
}
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 @@
* 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 @@
* 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 @@
****************************************************************/
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 @@
****************************************************************/
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 @@
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 @@
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 @@
****************************************************************/
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 @@
* 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 @@
* (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)
Home |
Main Index |
Thread Index |
Old Index