Module Name: src
Committed By: dyoung
Date: Tue Apr 7 18:25:26 UTC 2009
Modified Files:
src/sys/dev/pci: ehci_pci.c uhci_pci.c
Log Message:
Detach ehci(4) and uhci(4) at shutdown.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/uhci_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.38 src/sys/dev/pci/ehci_pci.c:1.39
--- src/sys/dev/pci/ehci_pci.c:1.38 Mon Apr 28 20:23:54 2008
+++ src/sys/dev/pci/ehci_pci.c Tue Apr 7 18:25:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.38 2008/04/28 20:23:54 martin Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.39 2009/04/07 18:25:26 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.38 2008/04/28 20:23:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.39 2009/04/07 18:25:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -243,9 +243,9 @@
return (0);
}
-CFATTACH_DECL2_NEW(ehci_pci, sizeof(struct ehci_pci_softc),
+CFATTACH_DECL3_NEW(ehci_pci, sizeof(struct ehci_pci_softc),
ehci_pci_match, ehci_pci_attach, ehci_pci_detach, ehci_activate, NULL,
- ehci_childdet);
+ ehci_childdet, DVF_DETACH_SHUTDOWN);
#ifdef EHCI_DEBUG
static void
Index: src/sys/dev/pci/uhci_pci.c
diff -u src/sys/dev/pci/uhci_pci.c:1.44 src/sys/dev/pci/uhci_pci.c:1.45
--- src/sys/dev/pci/uhci_pci.c:1.44 Mon Apr 28 20:23:55 2008
+++ src/sys/dev/pci/uhci_pci.c Tue Apr 7 18:25:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_pci.c,v 1.44 2008/04/28 20:23:55 martin Exp $ */
+/* $NetBSD: uhci_pci.c,v 1.45 2009/04/07 18:25:26 dyoung Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.44 2008/04/28 20:23:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.45 2009/04/07 18:25:26 dyoung Exp $");
#include "ehci.h"
@@ -234,6 +234,6 @@
return uhci_resume(dv PMF_FN_CALL);
}
-CFATTACH_DECL2_NEW(uhci_pci, sizeof(struct uhci_pci_softc),
+CFATTACH_DECL3_NEW(uhci_pci, sizeof(struct uhci_pci_softc),
uhci_pci_match, uhci_pci_attach, uhci_pci_detach, uhci_activate,
- NULL, uhci_childdet);
+ NULL, uhci_childdet, DVF_DETACH_SHUTDOWN);