Module Name: src
Committed By: matt
Date: Thu Nov 14 17:34:02 UTC 2013
Modified Files:
src/sys/kern [matt-nb5-mips64]: subr_prf.c
src/sys/sys [matt-nb5-mips64]: device.h systm.h
Log Message:
more things for xhci
To generate a diff of this commit:
cvs rdiff -u -r1.124.4.1 -r1.124.4.1.4.1 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.112.6.1 -r1.112.6.1.4.1 src/sys/sys/device.h
cvs rdiff -u -r1.228.4.2.4.2 -r1.228.4.2.4.3 src/sys/sys/systm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.124.4.1 src/sys/kern/subr_prf.c:1.124.4.1.4.1
--- src/sys/kern/subr_prf.c:1.124.4.1 Mon Feb 2 19:47:47 2009
+++ src/sys/kern/subr_prf.c Thu Nov 14 17:34:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.124.4.1 2009/02/02 19:47:47 snj Exp $ */
+/* $NetBSD: subr_prf.c,v 1.124.4.1.4.1 2013/11/14 17:34:02 matt Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.124.4.1 2009/02/02 19:47:47 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.124.4.1.4.1 2013/11/14 17:34:02 matt Exp $");
#include "opt_ddb.h"
#include "opt_ipkdb.h"
@@ -1086,6 +1086,18 @@ vsnprintf(char *bf, size_t size, const c
} \
}
+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!
*/
Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.112.6.1 src/sys/sys/device.h:1.112.6.1.4.1
--- src/sys/sys/device.h:1.112.6.1 Sun Mar 15 19:43:48 2009
+++ src/sys/sys/device.h Thu Nov 14 17:34:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.112.6.1 2009/03/15 19:43:48 snj Exp $ */
+/* $NetBSD: device.h,v 1.112.6.1.4.1 2013/11/14 17:34:02 matt Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -167,6 +167,7 @@ struct device {
#define DVF_DRIVER_SUSPENDED 0x0010 /* device driver suspend was called */
#define DVF_BUS_SUSPENDED 0x0020 /* device bus suspend was called */
#define DVF_SELF_SUSPENDED 0x0040 /* device suspended itself */
+#define DVF_DETACH_SHUTDOWN 0x0080 /* device detaches safely at shutdown */
TAILQ_HEAD(devicelist, device);
@@ -301,12 +302,12 @@ struct cfattach __CONCAT(name,_ca) = {
#define CFATTACH_DECL(name, ddsize, matfn, attfn, detfn, actfn) \
CFATTACH_DECL2(name, ddsize, matfn, attfn, detfn, actfn, NULL, NULL)
-#define CFATTACH_DECL2_NEW(name, ddsize, matfn, attfn, detfn, actfn, \
- rescanfn, chdetfn) \
+#define CFATTACH_DECL3_NEW(name, ddsize, matfn, attfn, detfn, actfn, \
+ rescanfn, chdetfn, __flags) \
struct cfattach __CONCAT(name,_ca) = { \
.ca_name = ___STRING(name), \
.ca_devsize = ddsize, \
- .ca_flags = DVF_PRIV_ALLOC, \
+ .ca_flags = (__flags) | DVF_PRIV_ALLOC, \
.ca_match = matfn, \
.ca_attach = attfn, \
.ca_detach = detfn, \
@@ -314,9 +315,14 @@ struct cfattach __CONCAT(name,_ca) = {
.ca_rescan = rescanfn, \
.ca_childdetached = chdetfn, \
}
+#define CFATTACH_DECL2_NEW(name, ddsize, matfn, attfn, detfn, actfn, \
+ rescanfn, chdetfn) \
+ CFATTACH_DECL3_NEW(name, ddsize, matfn, attfn, detfn, actfn, \
+ rescanfn, chdetfn, 0)
-#define CFATTACH_DECL_NEW(name, ddsize, matfn, attfn, detfn, actfn) \
- CFATTACH_DECL2_NEW(name, ddsize, matfn, attfn, detfn, actfn, NULL, NULL)
+#define CFATTACH_DECL_NEW(name, ddsize, matfn, attfn, detfn, actfn) \
+ CFATTACH_DECL3_NEW(name, ddsize, matfn, attfn, detfn, actfn, \
+ NULL, NULL, 0)
/* Flags given to config_detach(), and the ca_detach function. */
#define DETACH_FORCE 0x01 /* force detachment; hardware gone */
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.228.4.2.4.2 src/sys/sys/systm.h:1.228.4.2.4.3
--- src/sys/sys/systm.h:1.228.4.2.4.2 Sat Aug 22 17:05:21 2009
+++ src/sys/sys/systm.h Thu Nov 14 17:34:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.228.4.2.4.2 2009/08/22 17:05:21 matt Exp $ */
+/* $NetBSD: systm.h,v 1.228.4.2.4.3 2013/11/14 17:34:02 matt Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@@ -185,6 +185,8 @@ void aprint_debug(const char *, ...)
__attribute__((__format__(__printf__,1,2)));
struct device;
+void device_printf(struct device *, const char *fmt, ...)
+ __attribute__((__format__(__printf__,2,3)));
void aprint_normal_dev(struct device *, const char *, ...)
__attribute__((__format__(__printf__,2,3)));
