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/usb | |
| parent | 1b20cebad5f8d3582a41d5599641a95247721732 (diff) | |
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/dev/usb')
38 files changed, 144 insertions, 143 deletions
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index c461a80cb7b..4a20aa231e9 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_atu.c,v 1.24 2006/12/25 18:39:48 wiz Exp $ */ +/* $NetBSD: if_atu.c,v 1.25 2007/03/04 06:02:47 christos Exp $ */ /* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */ /* * Copyright (c) 2003, 2004 @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.24 2006/12/25 18:39:48 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.25 2007/03/04 06:02:47 christos Exp $"); #include "bpfilter.h" @@ -175,7 +175,7 @@ int atu_newbuf(struct atu_softc *, struct atu_chain *, struct mbuf *); void atu_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); void atu_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); void atu_start(struct ifnet *); -int atu_ioctl(struct ifnet *, u_long, caddr_t); +int atu_ioctl(struct ifnet *, u_long, void *); int atu_init(struct ifnet *); void atu_stop(struct ifnet *, int); void atu_watchdog(struct ifnet *); @@ -2087,7 +2087,7 @@ atu_debug_print(struct atu_softc *sc) #endif /* ATU_DEBUG */ int -atu_ioctl(struct ifnet *ifp, u_long command, caddr_t data) +atu_ioctl(struct ifnet *ifp, u_long command, void *data) { struct atu_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 5e552259f23..617ce60fa7f 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_aue.c,v 1.99 2006/11/16 01:33:26 christos Exp $ */ +/* $NetBSD: if_aue.c,v 1.100 2007/03/04 06:02:47 christos Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.99 2006/11/16 01:33:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.100 2007/03/04 06:02:47 christos Exp $"); #if defined(__NetBSD__) #include "opt_inet.h" @@ -249,7 +249,7 @@ Static void aue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void aue_tick(void *); Static void aue_tick_task(void *); Static void aue_start(struct ifnet *); -Static int aue_ioctl(struct ifnet *, u_long, caddr_t); +Static int aue_ioctl(struct ifnet *, u_long, void *); Static void aue_init(void *); Static void aue_stop(struct aue_softc *); Static void aue_watchdog(struct ifnet *); @@ -267,7 +267,7 @@ Static void aue_lock_mii(struct aue_softc *); Static void aue_unlock_mii(struct aue_softc *); Static void aue_setmulti(struct aue_softc *); -Static u_int32_t aue_crc(caddr_t); +Static u_int32_t aue_crc(void *); Static void aue_reset(struct aue_softc *); Static int aue_csr_read_1(struct aue_softc *, int); @@ -580,9 +580,10 @@ aue_miibus_statchg(device_ptr_t dev) #define AUE_BITS 6 Static u_int32_t -aue_crc(caddr_t addr) +aue_crc(void *addrv) { u_int32_t idx, bit, data, crc; + char *addr = addrv; /* Compute CRC for the address value. */ crc = 0xFFFFFFFF; /* initial value */ @@ -1556,7 +1557,7 @@ aue_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) } Static int -aue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) +aue_ioctl(struct ifnet *ifp, u_long command, void *data) { struct aue_softc *sc = ifp->if_softc; struct ifaddr *ifa = (struct ifaddr *)data; diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index 7d7101497cb..b272b276ed2 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_axe.c,v 1.17 2006/11/16 01:33:26 christos Exp $ */ +/* $NetBSD: if_axe.c,v 1.18 2007/03/04 06:02:48 christos Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.17 2006/11/16 01:33:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.18 2007/03/04 06:02:48 christos Exp $"); #if defined(__NetBSD__) #include "opt_inet.h" @@ -178,7 +178,7 @@ Static void axe_tick_task(void *); Static void axe_rxstart(struct ifnet *); #endif Static void axe_start(struct ifnet *); -Static int axe_ioctl(struct ifnet *, u_long, caddr_t); +Static int axe_ioctl(struct ifnet *, u_long, void *); Static void axe_init(void *); Static void axe_stop(struct axe_softc *); Static void axe_watchdog(struct ifnet *); @@ -1175,7 +1175,7 @@ axe_init(void *xsc) } Static int -axe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) +axe_ioctl(struct ifnet *ifp, u_long cmd, void *data) { struct axe_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index 7757568e2cd..45b3bd3b68a 100644 --- a/sys/dev/usb/if_cdce.c +++ b/sys/dev/usb/if_cdce.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cdce.c,v 1.12 2006/11/16 01:33:26 christos Exp $ */ +/* $NetBSD: if_cdce.c,v 1.13 2007/03/04 06:02:48 christos Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.12 2006/11/16 01:33:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.13 2007/03/04 06:02:48 christos Exp $"); #include "bpfilter.h" #include <sys/param.h> @@ -108,7 +108,7 @@ Static int cdce_encap(struct cdce_softc *, struct mbuf *, int); Static void cdce_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void cdce_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void cdce_start(struct ifnet *); -Static int cdce_ioctl(struct ifnet *, u_long, caddr_t); +Static int cdce_ioctl(struct ifnet *, u_long, void *); Static void cdce_init(void *); Static void cdce_watchdog(struct ifnet *); Static void cdce_stop(struct cdce_softc *); @@ -444,7 +444,7 @@ cdce_stop(struct cdce_softc *sc) } Static int -cdce_ioctl(struct ifnet *ifp, u_long command, caddr_t data) +cdce_ioctl(struct ifnet *ifp, u_long command, void *data) { struct cdce_softc *sc = ifp->if_softc; struct ifaddr *ifa = (struct ifaddr *)data; diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 17349c6f6ff..3de71123f40 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cue.c,v 1.48 2006/11/16 01:33:26 christos Exp $ */ +/* $NetBSD: if_cue.c,v 1.49 2007/03/04 06:02:48 christos Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.48 2006/11/16 01:33:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.49 2007/03/04 06:02:48 christos Exp $"); #if defined(__NetBSD__) #include "opt_inet.h" @@ -152,7 +152,7 @@ Static void cue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void cue_tick(void *); Static void cue_tick_task(void *); Static void cue_start(struct ifnet *); -Static int cue_ioctl(struct ifnet *, u_long, caddr_t); +Static int cue_ioctl(struct ifnet *, u_long, void *); Static void cue_init(void *); Static void cue_stop(struct cue_softc *); Static void cue_watchdog(struct ifnet *); @@ -1155,7 +1155,7 @@ cue_open_pipes(struct cue_softc *sc) } Static int -cue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) +cue_ioctl(struct ifnet *ifp, u_long command, void *data) { struct cue_softc *sc = ifp->if_softc; struct ifaddr *ifa = (struct ifaddr *)data; diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index a46e021f672..c614de905bb 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_kue.c,v 1.58 2006/11/16 01:33:26 christos Exp $ */ +/* $NetBSD: if_kue.c,v 1.59 2007/03/04 06:02:48 christos Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.58 2006/11/16 01:33:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.59 2007/03/04 06:02:48 christos Exp $"); #if defined(__NetBSD__) #include "opt_inet.h" @@ -189,7 +189,7 @@ Static int kue_open_pipes(struct kue_softc *); Static void kue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void kue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void kue_start(struct ifnet *); -Static int kue_ioctl(struct ifnet *, u_long, caddr_t); +Static int kue_ioctl(struct ifnet *, u_long, void *); Static void kue_init(void *); Static void kue_stop(struct kue_softc *); Static void kue_watchdog(struct ifnet *); @@ -1058,7 +1058,7 @@ kue_open_pipes(struct kue_softc *sc) } Static int -kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data) +kue_ioctl(struct ifnet *ifp, u_long command, void *data) { struct kue_softc *sc = ifp->if_softc; struct ifaddr *ifa = (struct ifaddr *)data; diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index 403ad10564d..5eb0d9a973a 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */ -/* $NetBSD: if_rum.c,v 1.6 2007/02/26 21:35:44 wiz Exp $ */ +/* $NetBSD: if_rum.c,v 1.7 2007/03/04 06:02:48 christos Exp $ */ /*- * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr> @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.6 2007/02/26 21:35:44 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.7 2007/03/04 06:02:48 christos Exp $"); #include "bpfilter.h" @@ -146,7 +146,7 @@ Static int rum_tx_data(struct rum_softc *, struct mbuf *, struct ieee80211_node *); Static void rum_start(struct ifnet *); Static void rum_watchdog(struct ifnet *); -Static int rum_ioctl(struct ifnet *, u_long, caddr_t); +Static int rum_ioctl(struct ifnet *, u_long, void *); Static void rum_eeprom_read(struct rum_softc *, uint16_t, void *, int); Static uint32_t rum_read(struct rum_softc *, uint16_t); @@ -860,7 +860,7 @@ rum_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) /* finalize mbuf */ m->m_pkthdr.rcvif = ifp; - m->m_data = (caddr_t)(desc + 1); + m->m_data = (void *)(desc + 1); m->m_pkthdr.len = m->m_len = (le32toh(desc->flags) >> 16) & 0xfff; s = splnet(); @@ -1332,7 +1332,7 @@ rum_watchdog(struct ifnet *ifp) } Static int -rum_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) +rum_ioctl(struct ifnet *ifp, u_long cmd, void *data) { struct rum_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; diff --git a/sys/dev/usb/if_rumvar.h b/sys/dev/usb/if_rumvar.h index bc59e8fe053..608ef5d01e0 100644 --- a/sys/dev/usb/if_rumvar.h +++ b/sys/dev/usb/if_rumvar.h @@ -134,7 +134,7 @@ struct rum_softc { uint8_t bbp17; #if NBPFILTER > 0 - caddr_t sc_drvbpf; + void * sc_drvbpf; union { struct rum_rx_radiotap_header th; diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index 9032fe3da11..9ec4979c294 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_udav.c,v 1.15 2006/12/01 20:56:42 drochner Exp $ */ +/* $NetBSD: if_udav.c,v 1.16 2007/03/04 06:02:48 christos Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* * Copyright (c) 2003 @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.15 2006/12/01 20:56:42 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.16 2007/03/04 06:02:48 christos Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -102,7 +102,7 @@ Static void udav_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void udav_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void udav_tick(void *); Static void udav_tick_task(void *); -Static int udav_ioctl(struct ifnet *, u_long, caddr_t); +Static int udav_ioctl(struct ifnet *, u_long, void *); Static void udav_stop_task(struct udav_softc *); Static void udav_stop(struct ifnet *, int); Static void udav_watchdog(struct ifnet *); @@ -1209,7 +1209,7 @@ Static void udav_intr() #endif Static int -udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) +udav_ioctl(struct ifnet *ifp, u_long cmd, void *data) { struct udav_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 917651dc4cc..583d96aa2a9 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_upl.c,v 1.27 2007/02/17 22:34:07 dyoung Exp $ */ +/* $NetBSD: if_upl.c,v 1.28 2007/03/04 06:02:48 christos Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.27 2007/02/17 22:34:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.28 2007/03/04 06:02:48 christos Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -198,7 +198,7 @@ Static void upl_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void upl_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void upl_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void upl_start(struct ifnet *); -Static int upl_ioctl(struct ifnet *, u_long, caddr_t); +Static int upl_ioctl(struct ifnet *, u_long, void *); Static void upl_init(void *); Static void upl_stop(struct upl_softc *); Static void upl_watchdog(struct ifnet *); @@ -852,7 +852,7 @@ upl_intr(usbd_xfer_handle xfer, usbd_private_handle priv, } Static int -upl_ioctl(struct ifnet *ifp, u_long command, caddr_t data) +upl_ioctl(struct ifnet *ifp, u_long command, void *data) { struct upl_softc *sc = ifp->if_softc; struct ifaddr *ifa = (struct ifaddr *)data; diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c index cf3e44924dc..0b1991b9d7b 100644 --- a/sys/dev/usb/if_ural.c +++ b/sys/dev/usb/if_ural.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ural.c,v 1.18 2006/11/16 01:33:26 christos Exp $ */ +/* $NetBSD: if_ural.c,v 1.19 2007/03/04 06:02:48 christos Exp $ */ /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */ /*- @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.18 2006/11/16 01:33:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.19 2007/03/04 06:02:48 christos Exp $"); #include "bpfilter.h" @@ -139,7 +139,7 @@ Static int ural_tx_data(struct ural_softc *, struct mbuf *, Static void ural_start(struct ifnet *); Static void ural_watchdog(struct ifnet *); Static int ural_reset(struct ifnet *); -Static int ural_ioctl(struct ifnet *, u_long, caddr_t); +Static int ural_ioctl(struct ifnet *, u_long, void *); Static void ural_set_testmode(struct ural_softc *); Static void ural_eeprom_read(struct ural_softc *, uint16_t, void *, int); @@ -1487,7 +1487,7 @@ ural_reset(struct ifnet *ifp) } Static int -ural_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) +ural_ioctl(struct ifnet *ifp, u_long cmd, void *data) { struct ural_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; diff --git a/sys/dev/usb/if_uralvar.h b/sys/dev/usb/if_uralvar.h index b267e5de8a3..d6fe2bd9925 100644 --- a/sys/dev/usb/if_uralvar.h +++ b/sys/dev/usb/if_uralvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_uralvar.h,v 1.6 2006/10/31 21:53:41 joerg Exp $ */ +/* $NetBSD: if_uralvar.h,v 1.7 2007/03/04 06:02:48 christos Exp $ */ /* $OpenBSD: if_ralvar.h,v 1.2 2005/05/13 18:42:50 damien Exp $ */ /*- @@ -125,7 +125,7 @@ struct ural_softc { int nb_ant; #if NBPFILTER > 0 - caddr_t sc_drvbpf; + void * sc_drvbpf; union { struct ural_rx_radiotap_header th; diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index 40ea96b4a7c..557a4c860a8 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_url.c,v 1.24 2006/12/01 20:56:42 drochner Exp $ */ +/* $NetBSD: if_url.c,v 1.25 2007/03/04 06:02:48 christos Exp $ */ /* * Copyright (c) 2001, 2002 * Shingo WATANABE <nabe@nabechan.org>. All rights reserved. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.24 2006/12/01 20:56:42 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.25 2007/03/04 06:02:48 christos Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -102,7 +102,7 @@ Static void url_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void url_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status); Static void url_tick(void *); Static void url_tick_task(void *); -Static int url_ioctl(struct ifnet *, u_long, caddr_t); +Static int url_ioctl(struct ifnet *, u_long, void *); Static void url_stop_task(struct url_softc *); Static void url_stop(struct ifnet *, int); Static void url_watchdog(struct ifnet *); @@ -1094,7 +1094,7 @@ Static void url_intr() #endif Static int -url_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) +url_ioctl(struct ifnet *ifp, u_long cmd, void *data) { struct url_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index e174042a041..a4e3e658852 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $NetBSD: ucom.c,v 1.69 2006/11/16 01:33:26 christos Exp $ */ +/* $NetBSD: ucom.c,v 1.70 2007/03/04 06:02:48 christos Exp $ */ /* * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.69 2006/11/16 01:33:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.70 2007/03/04 06:02:48 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -155,7 +155,7 @@ Static void ucom_hwiflow(struct ucom_softc *); Static int ucomparam(struct tty *, struct termios *); Static void ucomstart(struct tty *); Static void ucom_shutdown(struct ucom_softc *); -Static int ucom_do_ioctl(struct ucom_softc *, u_long, caddr_t, +Static int ucom_do_ioctl(struct ucom_softc *, u_long, void *, int, struct lwp *); Static void ucom_dtr(struct ucom_softc *, int); Static void ucom_rts(struct ucom_softc *, int); @@ -588,7 +588,7 @@ ucomtty(dev_t dev) } int -ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l) +ucomioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) { struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)]; int error; @@ -601,7 +601,7 @@ ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l) } Static int -ucom_do_ioctl(struct ucom_softc *sc, u_long cmd, caddr_t data, +ucom_do_ioctl(struct ucom_softc *sc, u_long cmd, void *data, int flag, struct lwp *l) { struct tty *tp = sc->sc_tty; diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h index efbd6ed0c0f..82e2c6a92d5 100644 --- a/sys/dev/usb/ucomvar.h +++ b/sys/dev/usb/ucomvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ucomvar.h,v 1.14 2006/03/05 17:33:33 christos Exp $ */ +/* $NetBSD: ucomvar.h,v 1.15 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -51,7 +51,7 @@ struct ucom_methods { #define UCOM_SET_BREAK 3 int (*ucom_param)(void *sc, int portno, struct termios *); int (*ucom_ioctl)(void *sc, int portno, u_long cmd, - caddr_t data, int flag, usb_proc_ptr p); + void *data, int flag, usb_proc_ptr p); int (*ucom_open)(void *sc, int portno); void (*ucom_close)(void *sc, int portno); void (*ucom_read)(void *sc, int portno, u_char **ptr, u_int32_t *count); diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c index ac9d43d6124..d2a838a8d74 100644 --- a/sys/dev/usb/ucycom.c +++ b/sys/dev/usb/ucycom.c @@ -1,4 +1,4 @@ -/* $NetBSD: ucycom.c,v 1.16 2006/11/16 01:33:26 christos Exp $ */ +/* $NetBSD: ucycom.c,v 1.17 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: ucycom.c,v 1.16 2006/11/16 01:33:26 christos Exp $"); +__RCSID("$NetBSD: ucycom.c,v 1.17 2007/03/04 06:02:49 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -723,7 +723,7 @@ ucycomtty(dev_t dev) } int -ucycomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l) +ucycomioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) { struct ucycom_softc *sc = ucycom_cd.cd_devs[UCYCOMUNIT(dev)]; struct tty *tp = sc->sc_tty; diff --git a/sys/dev/usb/uep.c b/sys/dev/usb/uep.c index fc161785287..fc3d229d14b 100644 --- a/sys/dev/usb/uep.c +++ b/sys/dev/usb/uep.c @@ -1,4 +1,4 @@ -/* $NetBSD: uep.c,v 1.7 2006/11/12 19:00:43 plunky Exp $ */ +/* $NetBSD: uep.c,v 1.8 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.7 2006/11/12 19:00:43 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.8 2007/03/04 06:02:49 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -97,7 +97,7 @@ Static void uep_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); Static int uep_enable(void *); Static void uep_disable(void *); -Static int uep_ioctl(void *, u_long, caddr_t, int, struct lwp *); +Static int uep_ioctl(void *, u_long, void *, int, struct lwp *); const struct wsmouse_accessops uep_accessops = { uep_enable, @@ -215,7 +215,7 @@ USB_ATTACH(uep) tpcalib_init(&sc->sc_tpcalib); tpcalib_ioctl(&sc->sc_tpcalib, WSMOUSEIO_SCALIBCOORDS, - (caddr_t)&default_calib, 0, 0); + (void *)&default_calib, 0, 0); USB_ATTACH_SUCCESS_RETURN; } @@ -322,7 +322,7 @@ uep_disable(void *v) } Static int -uep_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l) +uep_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l) { struct uep_softc *sc = v; struct wsmouse_id *id; diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index 1a1d5970a87..15fabc30bf2 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $NetBSD: ugen.c,v 1.91 2007/02/26 13:28:56 drochner Exp $ */ +/* $NetBSD: ugen.c,v 1.92 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.91 2007/02/26 13:28:56 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.92 2007/03/04 06:02:49 christos Exp $"); #include "opt_ugen_bulk_ra_wb.h" #include "opt_compat_netbsd.h" @@ -199,7 +199,7 @@ Static void ugen_bulkwb_intr(usbd_xfer_handle xfer, usbd_private_handle addr, Static int ugen_do_read(struct ugen_softc *, int, struct uio *, int); Static int ugen_do_write(struct ugen_softc *, int, struct uio *, int); Static int ugen_do_ioctl(struct ugen_softc *, int, u_long, - caddr_t, int, struct lwp *); + void *, int, struct lwp *); Static int ugen_set_config(struct ugen_softc *sc, int configno); Static usb_config_descriptor_t *ugen_get_cdesc(struct ugen_softc *sc, int index, int *lenp); @@ -1383,7 +1383,7 @@ ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx) Static int ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd, - caddr_t addr, int flag, struct lwp *l) + void *addr, int flag, struct lwp *l) { struct ugen_endpoint *sce; usbd_status err; @@ -1721,7 +1721,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd, cdesc = ugen_get_cdesc(sc, fd->ufd_config_index, &len); if (len > fd->ufd_size) len = fd->ufd_size; - iov.iov_base = (caddr_t)fd->ufd_data; + iov.iov_base = (void *)fd->ufd_data; iov.iov_len = len; uio.uio_iov = &iov; uio.uio_iovcnt = 1; @@ -1766,7 +1766,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd, if (len < 0 || len > 32767) return (EINVAL); if (len != 0) { - iov.iov_base = (caddr_t)ur->ucr_data; + iov.iov_base = (void *)ur->ucr_data; iov.iov_len = len; uio.uio_iov = &iov; uio.uio_iovcnt = 1; @@ -1820,7 +1820,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd, } int -ugenioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l) +ugenioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l) { int endpt = UGENENDPOINT(dev); struct ugen_softc *sc; diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 8f186d13695..2cc257e3148 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhid.c,v 1.75 2007/02/26 13:28:56 drochner Exp $ */ +/* $NetBSD: uhid.c,v 1.76 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.75 2007/02/26 13:28:56 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.76 2007/03/04 06:02:49 christos Exp $"); #include "opt_compat_netbsd.h" @@ -122,7 +122,7 @@ Static void uhid_intr(struct uhidev *, void *, u_int len); Static int uhid_do_read(struct uhid_softc *, struct uio *uio, int); Static int uhid_do_write(struct uhid_softc *, struct uio *uio, int); -Static int uhid_do_ioctl(struct uhid_softc*, u_long, caddr_t, int, struct lwp *); +Static int uhid_do_ioctl(struct uhid_softc*, u_long, void *, int, struct lwp *); USB_DECLARE_DRIVER(uhid); @@ -421,7 +421,7 @@ uhidwrite(dev_t dev, struct uio *uio, int flag) } int -uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr, +uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, void *addr, int flag, struct lwp *l) { struct usb_ctl_report_desc *rd; @@ -566,7 +566,7 @@ uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr, } int -uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l) +uhidioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l) { struct uhid_softc *sc; int error; diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index 26f5d7d5fc5..77456e09044 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ukbd.c,v 1.94 2006/11/16 01:33:27 christos Exp $ */ +/* $NetBSD: ukbd.c,v 1.95 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.94 2006/11/16 01:33:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.95 2007/03/04 06:02:49 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -250,7 +250,7 @@ Static int ukbd_enable(void *, int); Static void ukbd_set_leds(void *, int); #if defined(__NetBSD__) -Static int ukbd_ioctl(void *, u_long, caddr_t, int, struct lwp *); +Static int ukbd_ioctl(void *, u_long, void *, int, struct lwp *); #if defined(WSDISPLAY_COMPAT_RAWKBD) && defined(UKBD_REPEAT) Static void ukbd_rawrepeat(void *v); #endif @@ -697,7 +697,7 @@ ukbd_rawrepeat(void *v) #endif /* defined(WSDISPLAY_COMPAT_RAWKBD) && defined(UKBD_REPEAT) */ int -ukbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, +ukbd_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l) { struct ukbd_softc *sc = v; diff --git a/sys/dev/usb/ukyopon.c b/sys/dev/usb/ukyopon.c index a07528698dd..491444c7a39 100644 --- a/sys/dev/usb/ukyopon.c +++ b/sys/dev/usb/ukyopon.c @@ -1,4 +1,4 @@ -/* $NetBSD: ukyopon.c,v 1.5 2007/01/29 01:52:45 hubertf Exp $ */ +/* $NetBSD: ukyopon.c,v 1.6 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 1998, 2005 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.5 2007/01/29 01:52:45 hubertf Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.6 2007/03/04 06:02:49 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,7 +90,7 @@ struct ukyopon_softc { #define UKYOPON_DATA_IFACE_INDEX 3 Static void ukyopon_get_status(void *, int, u_char *, u_char *); -Static int ukyopon_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr); +Static int ukyopon_ioctl(void *, int, u_long, void *, int, usb_proc_ptr); Static struct ucom_methods ukyopon_methods = { ukyopon_get_status, @@ -160,7 +160,7 @@ ukyopon_get_status(void *addr, int portno, u_char *lsr, u_char *msr) } Static int -ukyopon_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag, +ukyopon_ioctl(void *addr, int portno, u_long cmd, void *data, int flag, usb_proc_ptr p) { struct ukyopon_softc *sc = addr; diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 52d7dd4e000..ff2c28b0c27 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ulpt.c,v 1.76 2006/11/16 01:33:27 christos Exp $ */ +/* $NetBSD: ulpt.c,v 1.77 2007/03/04 06:02:49 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */ /* @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.76 2006/11/16 01:33:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.77 2007/03/04 06:02:49 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -544,7 +544,7 @@ ulptopen(dev_t dev, int flag, int mode, struct lwp *l) } /* wait 1/4 second, give up if we get a signal */ - error = tsleep((caddr_t)sc, LPTPRI | PCATCH, "ulptop", STEP); + error = tsleep((void *)sc, LPTPRI | PCATCH, "ulptop", STEP); if (error != EWOULDBLOCK) { sc->sc_state = 0; goto done; @@ -833,7 +833,7 @@ ulpt_tick(void *xsc) } int -ulptioctl(dev_t dev, u_long cmd, caddr_t data, +ulptioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) { return ENODEV; diff --git a/sys/dev/usb/umass_scsipi.c b/sys/dev/usb/umass_scsipi.c index 8c6e013e980..8058b6d1bbf 100644 --- a/sys/dev/usb/umass_scsipi.c +++ b/sys/dev/usb/umass_scsipi.c @@ -1,4 +1,4 @@ -/* $NetBSD: umass_scsipi.c,v 1.29 2006/11/16 01:33:27 christos Exp $ */ +/* $NetBSD: umass_scsipi.c,v 1.30 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 2001, 2003 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.29 2006/11/16 01:33:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.30 2007/03/04 06:02:49 christos Exp $"); #include "atapibus.h" #include "scsibus.h" @@ -97,7 +97,7 @@ Static void umass_scsipi_request(struct scsipi_channel *, scsipi_adapter_req_t, void *); Static void umass_scsipi_minphys(struct buf *bp); Static int umass_scsipi_ioctl(struct scsipi_channel *, u_long, - caddr_t, int, usb_proc_ptr ); + void *, int, usb_proc_ptr ); Static int umass_scsipi_getgeom(struct scsipi_periph *periph, struct disk_parms *, u_long sectors); @@ -345,7 +345,7 @@ umass_scsipi_minphys(struct buf *bp) int umass_scsipi_ioctl(struct scsipi_channel *chan, u_long cmd, - caddr_t arg, int flag, usb_proc_ptr p) + void *arg, int flag, usb_proc_ptr p) { /*struct umass_softc *sc = link->adapter_softc;*/ /*struct umass_scsipi_softc *scbus = sc->bus;*/ diff --git a/sys/dev/usb/umidireg.h b/sys/dev/usb/umidireg.h index f2b69fa55b7..f4ac3465750 100644 --- a/sys/dev/usb/umidireg.h +++ b/sys/dev/usb/umidireg.h @@ -1,4 +1,4 @@ -/* $NetBSD: umidireg.h,v 1.5 2007/02/26 13:14:11 drochner Exp $ */ +/* $NetBSD: umidireg.h,v 1.6 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -79,7 +79,7 @@ typedef struct { #define TO_D(p) ((usb_descriptor_t *)(p)) -#define NEXT_D(desc) TO_D((caddr_t)(desc)+(desc)->bLength) +#define NEXT_D(desc) TO_D((char *)(desc)+(desc)->bLength) #define TO_IFD(desc) ((usb_interface_descriptor_t *)(desc)) #define TO_CSIFD(desc) ((umidi_cs_interface_descriptor_t *)(desc)) #define TO_EPD(desc) ((usb_endpoint_descriptor_t *)(desc)) diff --git a/sys/dev/usb/umodem_common.c b/sys/dev/usb/umodem_common.c index b8adf046ffd..3baa11dbdb1 100644 --- a/sys/dev/usb/umodem_common.c +++ b/sys/dev/usb/umodem_common.c @@ -1,4 +1,4 @@ -/* $NetBSD: umodem_common.c,v 1.10 2007/01/29 01:52:45 hubertf Exp $ */ +/* $NetBSD: umodem_common.c,v 1.11 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.10 2007/01/29 01:52:45 hubertf Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.11 2007/03/04 06:02:49 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -467,7 +467,7 @@ umodem_param(void *addr, int portno, struct termios *t) } int -umodem_ioctl(void *addr, int portno, u_long cmd, caddr_t data, +umodem_ioctl(void *addr, int portno, u_long cmd, void *data, int flag, usb_proc_ptr p) { struct umodem_softc *sc = addr; diff --git a/sys/dev/usb/umodemvar.h b/sys/dev/usb/umodemvar.h index 21ada9badd6..39d86aea901 100644 --- a/sys/dev/usb/umodemvar.h +++ b/sys/dev/usb/umodemvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: umodemvar.h,v 1.3 2005/12/11 12:24:01 christos Exp $ */ +/* $NetBSD: umodemvar.h,v 1.4 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -77,7 +77,7 @@ int umodem_get_caps(usbd_device_handle, int *, int *, void umodem_get_status(void *, int portno, u_char *lsr, u_char *msr); void umodem_set(void *, int, int, int); int umodem_param(void *, int, struct termios *); -int umodem_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr); +int umodem_ioctl(void *, int, u_long, void *, int, usb_proc_ptr); int umodem_open(void *, int portno); void umodem_close(void *, int portno); int umodem_common_activate(struct umodem_softc *, enum devact); diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index dc3ec87deb4..22270d5661d 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -1,4 +1,4 @@ -/* $NetBSD: ums.c,v 1.67 2006/11/16 01:33:27 christos Exp $ */ +/* $NetBSD: ums.c,v 1.68 2007/03/04 06:02:49 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.67 2006/11/16 01:33:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.68 2007/03/04 06:02:49 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -118,7 +118,7 @@ Static void ums_intr(struct uhidev *addr, void *ibuf, u_int len); Static int ums_enable(void *); Static void ums_disable(void *); -Static int ums_ioctl(void *, u_long, caddr_t, int, struct lwp * ); +Static int ums_ioctl(void *, u_long, void *, int, struct lwp * ); const struct wsmouse_accessops ums_accessops = { ums_enable, @@ -379,7 +379,7 @@ ums_disable(void *v) } Static int -ums_ioctl(void *v, u_long cmd, caddr_t data, int flag, +ums_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp * p) { diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index dcef21c4d44..a1adaffc13c 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: uplcom.c,v 1.52 2007/01/31 10:11:50 msaitoh Exp $ */ +/* $NetBSD: uplcom.c,v 1.53 2007/03/04 06:02:50 christos Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.52 2007/01/31 10:11:50 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.53 2007/03/04 06:02:50 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -135,7 +135,7 @@ Static void uplcom_break(struct uplcom_softc *, int); Static void uplcom_set_line_state(struct uplcom_softc *); Static void uplcom_get_status(void *, int portno, u_char *lsr, u_char *msr); #if TODO -Static int uplcom_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr ); +Static int uplcom_ioctl(void *, int, u_long, void *, int, usb_proc_ptr ); #endif Static int uplcom_param(void *, int, struct termios *); Static int uplcom_open(void *, int); @@ -826,7 +826,7 @@ uplcom_get_status(void *addr, int portno, u_char *lsr, u_char *msr) #if TODO int -uplcom_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag, +uplcom_ioctl(void *addr, int portno, u_long cmd, void *data, int flag, usb_proc_ptr p) { struct uplcom_softc *sc = addr; diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c index 0c5cde24a7b..36a760e6c1f 100644 --- a/sys/dev/usb/urio.c +++ b/sys/dev/usb/urio.c @@ -1,4 +1,4 @@ -/* $NetBSD: urio.c,v 1.26 2006/11/16 01:33:27 christos Exp $ */ +/* $NetBSD: urio.c,v 1.27 2007/03/04 06:02:50 christos Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.26 2006/11/16 01:33:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.27 2007/03/04 06:02:50 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -488,7 +488,7 @@ uriowrite(dev_t dev, struct uio *uio, int flag) int -urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l) +urioioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l) { struct urio_softc * sc; int unit = URIOUNIT(dev); @@ -543,7 +543,7 @@ urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l) if (len < 0 || len > 32767) return (EINVAL); if (len != 0) { - iov.iov_base = (caddr_t)rcmd->buffer; + iov.iov_base = (void *)rcmd->buffer; iov.iov_len = len; uio.uio_iov = &iov; uio.uio_iovcnt = 1; diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index ac25282721d..2888d981222 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $NetBSD: usb.c,v 1.95 2007/02/26 13:38:09 drochner Exp $ */ +/* $NetBSD: usb.c,v 1.96 2007/03/04 06:02:50 christos Exp $ */ /* * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.95 2007/02/26 13:38:09 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.96 2007/03/04 06:02:50 christos Exp $"); #include "opt_compat_netbsd.h" @@ -531,7 +531,7 @@ usbclose(dev_t dev, int flag, int mode, } int -usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, struct lwp *l) +usbioctl(dev_t devt, u_long cmd, void *data, int flag, struct lwp *l) { struct usb_softc *sc; int unit = minor(devt); @@ -594,7 +594,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, struct lwp *l) sc->sc_bus->devices[addr] == 0) return (EINVAL); if (len != 0) { - iov.iov_base = (caddr_t)ur->ucr_data; + iov.iov_base = (void *)ur->ucr_data; iov.iov_len = len; uio.uio_iov = &iov; uio.uio_iovcnt = 1; diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c index 36b3176d098..5ed2fb469df 100644 --- a/sys/dev/usb/usb_mem.c +++ b/sys/dev/usb/usb_mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: usb_mem.c,v 1.31 2006/11/16 01:33:27 christos Exp $ */ +/* $NetBSD: usb_mem.c,v 1.32 2007/03/04 06:02:50 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.31 2006/11/16 01:33:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.32 2007/03/04 06:02:50 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -258,7 +258,7 @@ usb_allocmem(usbd_bus_handle bus, size_t size, size_t align, usb_dma_t *p) } b->flags = 0; for (i = 0; i < USB_MEM_BLOCK; i += USB_MEM_SMALL) { - f = (struct usb_frag_dma *)(b->kaddr + i); + f = (struct usb_frag_dma *)((char *)b->kaddr + i); f->block = b; f->offs = i; LIST_INSERT_HEAD(&usb_frag_freelist, f, next); diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h index 7ccd18bc15e..db1f0ad2743 100644 --- a/sys/dev/usb/usb_mem.h +++ b/sys/dev/usb/usb_mem.h @@ -1,4 +1,4 @@ -/* $NetBSD: usb_mem.h,v 1.23 2005/12/11 12:24:01 christos Exp $ */ +/* $NetBSD: usb_mem.h,v 1.24 2007/03/04 06:02:50 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.9 1999/11/17 22:33:47 n_hibma Exp $ */ /* @@ -42,7 +42,7 @@ typedef struct usb_dma_block { bus_dma_tag_t tag; bus_dmamap_t map; - caddr_t kaddr; + void *kaddr; bus_dma_segment_t segs[1]; int nsegs; size_t size; @@ -55,7 +55,7 @@ typedef struct usb_dma_block { #define DMAADDR(dma, o) ((dma)->block->map->dm_segs[0].ds_addr + (dma)->offs + (o)) #define KERNADDR(dma, o) \ - ((void *)((char *)((dma)->block->kaddr + (dma)->offs) + (o))) + ((void *)((char *)(dma)->block->kaddr + (dma)->offs + (o))) usbd_status usb_allocmem(usbd_bus_handle,size_t,size_t, usb_dma_t *); void usb_freemem(usbd_bus_handle, usb_dma_t *); @@ -66,7 +66,7 @@ struct extent; struct usb_dma_reserve { bus_dma_tag_t dtag; bus_dmamap_t map; - caddr_t vaddr; + void *vaddr; bus_addr_t paddr; size_t size; struct extent *extent; diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 8e6c47b6ece..387a6be417e 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -1,5 +1,5 @@ /* $OpenBSD: usb_port.h,v 1.18 2000/09/06 22:42:10 rahnds Exp $ */ -/* $NetBSD: usb_port.h,v 1.73 2006/11/16 01:33:27 christos Exp $ */ +/* $NetBSD: usb_port.h,v 1.74 2007/03/04 06:02:50 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */ /* @@ -418,7 +418,7 @@ MALLOC_DECLARE(M_USBHC); #define USBDEVPTRNAME(bdev) device_get_nameunit(bdev) #define USBGETSOFTC(bdev) (device_get_softc(bdev)) -#define DECLARE_USB_DMA_T typedef void * usb_dma_t +#define DECLARE_USB_DMA_T typedef void *usb_dma_t typedef struct proc *usb_proc_ptr; diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c index 0559d394362..317d96f0644 100644 --- a/sys/dev/usb/usbdi_util.c +++ b/sys/dev/usb/usbdi_util.c @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi_util.c,v 1.48 2007/02/26 13:50:06 drochner Exp $ */ +/* $NetBSD: usbdi_util.c,v 1.49 2007/03/04 06:02:50 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.48 2007/02/26 13:50:06 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.49 2007/03/04 06:02:50 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -450,7 +450,7 @@ usbd_bulk_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe, splx(s); return (err); } - error = tsleep((caddr_t)xfer, PZERO | PCATCH, lbl, 0); + error = tsleep((void *)xfer, PZERO | PCATCH, lbl, 0); splx(s); if (error) { DPRINTF(("usbd_bulk_transfer: tsleep=%d\n", error)); diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index ec3fd79704b..9cc7e5f4912 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $NetBSD: uscanner.c,v 1.54 2006/11/16 01:33:27 christos Exp $ */ +/* $NetBSD: uscanner.c,v 1.55 2007/03/04 06:02:50 christos Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.54 2006/11/16 01:33:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.55 2007/03/04 06:02:50 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -769,7 +769,7 @@ uscannerkqfilter(dev_t dev, struct knote *kn) } int -uscannerioctl(dev_t dev, u_long cmd, caddr_t addr, +uscannerioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l) { return (EINVAL); diff --git a/sys/dev/usb/ustir.c b/sys/dev/usb/ustir.c index eedd8d38119..fe69920ec95 100644 --- a/sys/dev/usb/ustir.c +++ b/sys/dev/usb/ustir.c @@ -1,4 +1,4 @@ -/* $NetBSD: ustir.c,v 1.17 2006/11/16 01:33:27 christos Exp $ */ +/* $NetBSD: ustir.c,v 1.18 2007/03/04 06:02:50 christos Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.17 2006/11/16 01:33:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.18 2007/03/04 06:02:50 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -220,7 +220,7 @@ Static int ustir_poll(void *h, int events, struct lwp *l); Static int ustir_kqfilter(void *h, struct knote *kn); #ifdef USTIR_DEBUG_IOCTLS -Static int ustir_ioctl(void *h, u_long cmd, caddr_t addr, int flag, struct lwp *l); +Static int ustir_ioctl(void *h, u_long cmd, void *addr, int flag, struct lwp *l); #endif Static struct irframe_methods const ustir_methods = { @@ -1296,7 +1296,7 @@ ustir_kqfilter(void *h, struct knote *kn) } #ifdef USTIR_DEBUG_IOCTLS -Static int ustir_ioctl(void *h, u_long cmd, caddr_t addr, int flag, struct lwp *l) +Static int ustir_ioctl(void *h, u_long cmd, void *addr, int flag, struct lwp *l) { struct ustir_softc *sc = h; int error; diff --git a/sys/dev/usb/utoppy.c b/sys/dev/usb/utoppy.c index e22e52dcf66..1ca14a123d0 100644 --- a/sys/dev/usb/utoppy.c +++ b/sys/dev/usb/utoppy.c @@ -1,4 +1,4 @@ -/* $NetBSD: utoppy.c,v 1.8 2006/11/16 01:33:27 christos Exp $ */ +/* $NetBSD: utoppy.c,v 1.9 2007/03/04 06:02:50 christos Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.8 2006/11/16 01:33:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.9 2007/03/04 06:02:50 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -535,7 +535,7 @@ utoppy_bulk_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe, splx(s); return (err); } - error = tsleep((caddr_t)xfer, PZERO, lbl, 0); + error = tsleep((void *)xfer, PZERO, lbl, 0); splx(s); if (error) { usbd_abort_pipe(pipe); @@ -1658,7 +1658,7 @@ utoppywrite(dev_t dev, struct uio *uio, int flags) } int -utoppyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, +utoppyioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) { struct utoppy_softc *sc; diff --git a/sys/dev/usb/xboxcontroller.c b/sys/dev/usb/xboxcontroller.c index 4bf83f2b2ce..ffce1127540 100644 --- a/sys/dev/usb/xboxcontroller.c +++ b/sys/dev/usb/xboxcontroller.c @@ -1,4 +1,4 @@ -/* $NetBSD: xboxcontroller.c,v 1.3 2007/01/07 19:08:05 jmcneill Exp $ */ +/* $NetBSD: xboxcontroller.c,v 1.4 2007/03/04 06:02:50 christos Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca> @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xboxcontroller.c,v 1.3 2007/01/07 19:08:05 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xboxcontroller.c,v 1.4 2007/03/04 06:02:50 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,7 +74,7 @@ static void xboxcontroller_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); static int xboxcontroller_wsmouse_enable(void *); -static int xboxcontroller_wsmouse_ioctl(void *, u_long, caddr_t, int, +static int xboxcontroller_wsmouse_ioctl(void *, u_long, void *, int, struct lwp *); static void xboxcontroller_wsmouse_disable(void *); @@ -319,7 +319,7 @@ xboxcontroller_wsmouse_disable(void *opaque) } static int -xboxcontroller_wsmouse_ioctl(void *opaque, u_long cmd, caddr_t data, int flag, +xboxcontroller_wsmouse_ioctl(void *opaque, u_long cmd, void *data, int flag, struct lwp *l) { |
