diff options
| author | christos <christos@NetBSD.org> | 2007-03-04 05:59:00 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2007-03-04 05:59:00 +0000 |
| commit | 53524e44efd7c7176da8dc8190a698b2fe184db1 (patch) | |
| tree | 68b6fb4aee85c3eb0a522cc199c3a3427938828e /sys/dev/bluetooth | |
| parent | 1b20cebad5f8d3582a41d5599641a95247721732 (diff) | |
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/dev/bluetooth')
| -rw-r--r-- | sys/dev/bluetooth/bthub.c | 6 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btkbd.c | 8 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btms.c | 8 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btsco.c | 12 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btuart.c | 8 |
5 files changed, 21 insertions, 21 deletions
diff --git a/sys/dev/bluetooth/bthub.c b/sys/dev/bluetooth/bthub.c index 909fad5024f..7e597cc5a5a 100644 --- a/sys/dev/bluetooth/bthub.c +++ b/sys/dev/bluetooth/bthub.c @@ -1,4 +1,4 @@ -/* $NetBSD: bthub.c,v 1.8 2006/11/16 01:32:48 christos Exp $ */ +/* $NetBSD: bthub.c,v 1.9 2007/03/04 06:01:45 christos Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.8 2006/11/16 01:32:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.9 2007/03/04 06:01:45 christos Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -149,7 +149,7 @@ bthub_detach(struct device *self, int flags) */ int -bthubioctl(dev_t devno, unsigned long cmd, caddr_t data, int flag, struct lwp *l) +bthubioctl(dev_t devno, unsigned long cmd, void *data, int flag, struct lwp *l) { prop_dictionary_t dict; int err; diff --git a/sys/dev/bluetooth/btkbd.c b/sys/dev/bluetooth/btkbd.c index 40f4491cd68..6bdc8d35625 100644 --- a/sys/dev/bluetooth/btkbd.c +++ b/sys/dev/bluetooth/btkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: btkbd.c,v 1.5 2006/11/16 01:32:48 christos Exp $ */ +/* $NetBSD: btkbd.c,v 1.6 2007/03/04 06:01:45 christos Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.5 2006/11/16 01:32:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.6 2007/03/04 06:01:45 christos Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -124,7 +124,7 @@ CFATTACH_DECL(btkbd, sizeof(struct btkbd_softc), /* wskbd(4) accessops */ static int btkbd_enable(void *, int); static void btkbd_set_leds(void *, int); -static int btkbd_ioctl(void *, unsigned long, caddr_t, int, struct lwp *); +static int btkbd_ioctl(void *, unsigned long, void *, int, struct lwp *); static const struct wskbd_accessops btkbd_accessops = { btkbd_enable, @@ -337,7 +337,7 @@ btkbd_set_leds(void *self, int leds) } static int -btkbd_ioctl(void *self, unsigned long cmd, caddr_t data, int flag, +btkbd_ioctl(void *self, unsigned long cmd, void *data, int flag, struct lwp *l) { struct btkbd_softc *sc = (struct btkbd_softc *)self; diff --git a/sys/dev/bluetooth/btms.c b/sys/dev/bluetooth/btms.c index 8c72c971482..d7c8923ecd8 100644 --- a/sys/dev/bluetooth/btms.c +++ b/sys/dev/bluetooth/btms.c @@ -1,4 +1,4 @@ -/* $NetBSD: btms.c,v 1.5 2006/11/16 01:32:48 christos Exp $ */ +/* $NetBSD: btms.c,v 1.6 2007/03/04 06:01:45 christos Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.5 2006/11/16 01:32:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.6 2007/03/04 06:01:45 christos Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -93,7 +93,7 @@ CFATTACH_DECL(btms, sizeof(struct btms_softc), /* wsmouse(4) accessops */ static int btms_wsmouse_enable(void *); -static int btms_wsmouse_ioctl(void *, unsigned long, caddr_t, int, struct lwp *); +static int btms_wsmouse_ioctl(void *, unsigned long, void *, int, struct lwp *); static void btms_wsmouse_disable(void *); static const struct wsmouse_accessops btms_wsmouse_accessops = { @@ -286,7 +286,7 @@ btms_wsmouse_enable(void *self) } static int -btms_wsmouse_ioctl(void *self, unsigned long cmd, caddr_t data, +btms_wsmouse_ioctl(void *self, unsigned long cmd, void *data, int flag, struct lwp *l) { /* struct btms_softc *sc = (struct btms_softc *)self; */ diff --git a/sys/dev/bluetooth/btsco.c b/sys/dev/bluetooth/btsco.c index ce7e5194103..ac5a93b8758 100644 --- a/sys/dev/bluetooth/btsco.c +++ b/sys/dev/bluetooth/btsco.c @@ -1,4 +1,4 @@ -/* $NetBSD: btsco.c,v 1.11 2006/11/16 01:32:48 christos Exp $ */ +/* $NetBSD: btsco.c,v 1.12 2007/03/04 06:01:45 christos Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.11 2006/11/16 01:32:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.12 2007/03/04 06:01:45 christos Exp $"); #include <sys/param.h> #include <sys/audioio.h> @@ -157,7 +157,7 @@ static int btsco_query_devinfo(void *, mixer_devinfo_t *); static void *btsco_allocm(void *, int, size_t, struct malloc_type *, int); static void btsco_freem(void *, void *, struct malloc_type *); static int btsco_get_props(void *); -static int btsco_dev_ioctl(void *, u_long, caddr_t, int, struct lwp *); +static int btsco_dev_ioctl(void *, u_long, void *, int, struct lwp *); static const struct audio_hw_if btsco_if = { btsco_open, /* open */ @@ -244,7 +244,7 @@ static const struct btproto btsco_sco_proto = { #define BTSCO_TIMEOUT (30 * hz) /* misc btsco functions */ -static void btsco_extfree(struct mbuf *, caddr_t, size_t, void *); +static void btsco_extfree(struct mbuf *, void *, size_t, void *); static void btsco_intr(void *); @@ -1065,7 +1065,7 @@ btsco_get_props(void *hdl) * to the device and mixer. */ static int -btsco_dev_ioctl(void *hdl, u_long cmd, caddr_t addr, int flag, +btsco_dev_ioctl(void *hdl, u_long cmd, void *addr, int flag, struct lwp *l) { struct btsco_softc *sc = hdl; @@ -1157,7 +1157,7 @@ btsco_intr(void *arg) * that we dont release it before its free. */ static void -btsco_extfree(struct mbuf *m, caddr_t addr, size_t size, +btsco_extfree(struct mbuf *m, void *addr, size_t size, void *arg) { struct btsco_softc *sc = arg; diff --git a/sys/dev/bluetooth/btuart.c b/sys/dev/bluetooth/btuart.c index bdb1a863709..2a1c5ec5aae 100644 --- a/sys/dev/bluetooth/btuart.c +++ b/sys/dev/bluetooth/btuart.c @@ -1,4 +1,4 @@ -/* $NetBSD: btuart.c,v 1.1 2007/02/20 16:53:20 kiyohara Exp $ */ +/* $NetBSD: btuart.c,v 1.2 2007/03/04 06:01:45 christos Exp $ */ /* * Copyright (c) 2006, 2007 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.1 2007/02/20 16:53:20 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.2 2007/03/04 06:01:45 christos Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -117,7 +117,7 @@ static void bth4init_input(struct hci_unit *, struct mbuf *); static int bth4open(dev_t, struct tty *); static int bth4close(struct tty *, int); -static int bth4ioctl(struct tty *, u_long, caddr_t, int, struct lwp *); +static int bth4ioctl(struct tty *, u_long, void *, int, struct lwp *); static int bth4input(int, struct tty *); static int bth4start(struct tty *); @@ -1150,7 +1150,7 @@ bth4close(struct tty *tp, int flag __unused) /* ARGSUSED */ static int -bth4ioctl(struct tty *tp, u_long cmd, caddr_t data, +bth4ioctl(struct tty *tp, u_long cmd, void *data, int flag __unused, struct lwp *l __unused) { struct btuart_softc *sc = (struct btuart_softc *)tp->t_sc; |
