 @@ -1,14 +1,14 @@
-/*	$NetBSD: ath_netbsd.c,v 1.17 2009/10/19 23:19:39 rmind Exp $ */
+/*	$NetBSD: ath_netbsd.c,v 1.18 2011/01/21 17:46:19 dyoung Exp $ */
 /*-
  * Copyright (c) 2003, 2004 David Young
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.17 2009/10/19 23:19:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.18 2011/01/21 17:46:19 dyoung Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/callout.h>
 @@ -47,38 +47,26 @@ __KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/if_ether.h>
 #include <net/if_llc.h>
 #include <net80211/ieee80211_netbsd.h>
 #include <net80211/ieee80211_var.h>
 #include <dev/ic/ath_netbsd.h>
 #include <dev/ic/athvar.h>
 void
 device_printf(device_t dev, const char *fmt, ...)
 	va_list ap;
 	va_start(ap, fmt);
 	printf("%s: ", device_xname(dev));
 	vprintf(fmt, ap);
 	va_end(ap);
 	return;
 /*
  * Setup sysctl(3) MIB, hw.ath.*.
+ *
  * TBD condition CTLFLAG_PERMANENT on being a module or not
  */
 SYSCTL_SETUP(sysctl_ath, "sysctl ath subtree setup")
+{
 	int rc;
 	const struct sysctlnode *cnode, *rnode;
 	if ((rnode = ath_sysctl_treetop(clog)) == NULL)
 		return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ath_netbsd.h,v 1.10 2010/03/19 01:31:11 dyoung Exp $ */
+/*	$NetBSD: ath_netbsd.h,v 1.11 2011/01/21 17:46:19 dyoung Exp $ */
 /*-
  * Copyright (c) 2003, 2004 David Young
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -109,19 +109,17 @@ typedef struct ath_lock ath_txbuf_lock_t
 	sysctl_createv(log, 0, &rnode, &cnode, CTLFLAG_PERMANENT|(__rw),\
 	    CTLTYPE_INT, #__name, SYSCTL_DESCR(__descr), NULL, 0,	\
 	    __PFX(&__pfx, __name), 0, CTL_CREATE, CTL_EOL)
 #define	SYSCTL_INT(__rw, __name, __descr)				\
 	SYSCTL_PFX_INT(sc->sc_, __rw, __name, __descr)
 #define	SYSCTL_GLOBAL_INT(__rw, __name, __descr, __var)			\
 	sysctl_createv(clog, 0, &rnode, &cnode,				\
 	    CTLFLAG_PERMANENT|(__rw), CTLTYPE_INT, __name,		\
 	    SYSCTL_DESCR(__descr), NULL, 0, &ath_##__var, 0, CTL_CREATE,\
 	    CTL_EOL)
 extern void device_printf(device_t, const char *fmt, ...)
     __attribute__((__format__(__printf__,2,3)));
 const struct sysctlnode *ath_sysctl_treetop(struct sysctllog **);
 const struct sysctlnode *ath_sysctl_instance(const char *, struct sysctllog **);
 #endif /* _ATH_NETBSD_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_prf.c,v 1.138 2010/01/26 12:59:50 he Exp $	*/
+/*	$NetBSD: subr_prf.c,v 1.139 2011/01/21 17:46:19 dyoung Exp $	*/
 /*-
  * Copyright (c) 1986, 1988, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,27 +27,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)subr_prf.c	8.4 (Berkeley) 5/4/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.138 2010/01/26 12:59:50 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.139 2011/01/21 17:46:19 dyoung Exp $");
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_kgdb.h"
 #include "opt_dump.h"
 #include <sys/param.h>
 #include <sys/stdint.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/msgbuf.h>
 @@ -1128,26 +1128,38 @@ vsnprintf(char *bf, size_t size, const c
 #define KPRINTF_PUTCHAR(C) {						\
 	if (oflags == TOBUFONLY) {					\
 		if ((vp != NULL) && (sbuf == tailp)) {			\
 			ret += 1;		/* indicate error */	\
 			goto overflow;					\
 		}							\
 		*sbuf++ = (C);						\
 	} else {							\
 		putchar((C), oflags, (struct tty *)vp);			\
 	}								\
+}
 void
 device_printf(device_t dev, const char *fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
 	printf("%s: ", device_xname(dev));
 	vprintf(fmt, ap);
 	va_end(ap);
 	return;
+}
 /*
  * Guts of kernel printf.  Note, we already expect to be in a mutex!
  */
 int
 kprintf(const char *fmt0, int oflags, void *vp, char *sbuf, va_list ap)
+{
 	const char *fmt;	/* format string */
 	int ch;			/* character from fmt */
 	int n;			/* handy integer (short term usage) */
 	char *cp;		/* handy char pointer (short term usage) */
 	int flags;		/* flags as above */
 	int ret;		/* return value accumulator */
 	int width;		/* width from format (%8d), or 0 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: systm.h,v 1.245 2010/12/30 16:49:25 pooka Exp $	*/
+/*	$NetBSD: systm.h,v 1.246 2011/01/21 17:46:19 dyoung Exp $	*/
 /*-
  * Copyright (c) 1982, 1988, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -38,30 +38,30 @@
 #ifndef _SYS_SYSTM_H_
 #define _SYS_SYSTM_H_
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #endif
 #include <machine/endian.h>
 #ifdef _KERNEL
 #include <sys/types.h>
 #include <sys/device_if.h>
 #endif
 struct clockframe;
 struct device;
 struct lwp;
 struct proc;
 struct timeval;
 struct tty;
 struct uio;
 struct vnode;
 struct vmspace;
 struct vm_map;
 extern const char *panicstr;	/* panic message */
 extern int doing_shutdown;	/* shutting down */
 extern const char copyright[];	/* system copyright */
 @@ -79,27 +79,27 @@ extern int autoniceval;         /* proc
 extern int selwait;		/* select timeout address */
 extern int maxmem;		/* max memory per process */
 extern int physmem;		/* physical memory */
 extern dev_t dumpdev;		/* dump device */
 extern dev_t dumpcdev;		/* dump device (character equivalent) */
 extern long dumplo;		/* offset into dumpdev */
 extern int dumpsize;		/* size of dump in pages */
 extern const char *dumpspec;	/* how dump device was specified */
 extern dev_t rootdev;		/* root device */
 extern struct vnode *rootvp;	/* vnode equivalent to above */
-extern struct device *root_device; /* device equivalent to above */
+extern device_t root_device; /* device equivalent to above */
 extern const char *rootspec;	/* how root device was specified */
 extern int ncpu;		/* number of CPUs configured */
 extern int ncpuonline;		/* number of CPUs online */
 #if defined(_KERNEL)
 extern bool mp_online;		/* secondary processors are started */
 #endif /* defined(_KERNEL) */
 extern const char hexdigits[];	/* "0123456789abcdef" in subr_prf.c */
 extern const char HEXDIGITS[];	/* "0123456789ABCDEF" in subr_prf.c */
 /*
  * These represent the swap pseudo-device (`sw').  This device
 @@ -177,37 +177,38 @@ int	sys_nosys(struct lwp *, const void *
 int	sys_nomodule(struct lwp *, const void *, register_t *);
 void	aprint_normal(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	aprint_error(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	aprint_naive(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	aprint_verbose(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	aprint_debug(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
-struct device;
+void device_printf(device_t, const char *fmt, ...)
     __attribute__((__format__(__printf__,2,3)));
-void	aprint_normal_dev(struct device *, const char *, ...)
+void	aprint_normal_dev(device_t, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
-void	aprint_error_dev(struct device *, const char *, ...)
+void	aprint_error_dev(device_t, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
-void	aprint_naive_dev(struct device *, const char *, ...)
+void	aprint_naive_dev(device_t, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
-void	aprint_verbose_dev(struct device *, const char *, ...)
+void	aprint_verbose_dev(device_t, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
-void	aprint_debug_dev(struct device *, const char *, ...)
+void	aprint_debug_dev(device_t, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 struct ifnet;
 void	aprint_normal_ifnet(struct ifnet *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_error_ifnet(struct ifnet *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_naive_ifnet(struct ifnet *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_verbose_ifnet(struct ifnet *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_debug_ifnet(struct ifnet *, const char *, ...)
 @@ -357,30 +358,30 @@ void	dopowerhooks(int);
 	"softresume",	/* 3 */ \
 	"softsuspend",	/* 4 */ \
 	"softstandby"	/* 5 */
 /*
  * Mountroot hooks (and mountroot declaration).  Device drivers establish
  * these to be executed just before (*mountroot)() if the passed device is
  * selected as the root device.
  */
 #define	ROOT_FSTYPE_ANY	"?"
 extern const char *rootfstype;
-void	*mountroothook_establish(void (*)(struct device *), struct device *);
+void	*mountroothook_establish(void (*)(device_t), device_t);
 void	mountroothook_disestablish(void *);
 void	mountroothook_destroy(void);
-void	domountroothook(struct device *);
+void	domountroothook(device_t);
 /*
  * Exec hooks. Subsystems may want to do cleanup when a process
  * execs.
  */
 void	*exechook_establish(void (*)(struct proc *, void *), void *);
 void	exechook_disestablish(void *);
 void	doexechooks(struct proc *);
 /*
  * Exit hooks. Subsystems may want to do cleanup when a process exits.
  */
 void	*exithook_establish(void (*)(struct proc *, void *), void *);