Module Name: src
Committed By: jmcneill
Date: Mon Aug 29 14:47:09 UTC 2011
Modified Files:
src/sys/dev/pci: azalia.c coram.c cxdtv.c if_alc.c if_ath_pci.c
if_cas.c pci.c pci_verbose.c pwdog.c
src/sys/dev/pci/hdaudio: hdaudio.c
src/sys/external/bsd/drm/dist/bsd-core: drm_drv.c
Log Message:
have pci register itself as a module, and make PCI driver modules depend on it
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/azalia.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/coram.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/cxdtv.c \
src/sys/dev/pci/pci_verbose.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/if_alc.c src/sys/dev/pci/pwdog.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_ath_pci.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_cas.c
cvs rdiff -u -r1.141 -r1.142 src/sys/dev/pci/pci.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/hdaudio/hdaudio.c
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.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/azalia.c
diff -u src/sys/dev/pci/azalia.c:1.76 src/sys/dev/pci/azalia.c:1.77
--- src/sys/dev/pci/azalia.c:1.76 Sun Aug 28 15:40:49 2011
+++ src/sys/dev/pci/azalia.c Mon Aug 29 14:47:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.c,v 1.76 2011/08/28 15:40:49 jmcneill Exp $ */
+/* $NetBSD: azalia.c,v 1.77 2011/08/29 14:47:07 jmcneill Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.76 2011/08/28 15:40:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.77 2011/08/29 14:47:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -2406,7 +2406,7 @@
return 0;
}
-MODULE(MODULE_CLASS_DRIVER, azalia, NULL);
+MODULE(MODULE_CLASS_DRIVER, azalia, "pci");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/pci/coram.c
diff -u src/sys/dev/pci/coram.c:1.8 src/sys/dev/pci/coram.c:1.9
--- src/sys/dev/pci/coram.c:1.8 Tue Aug 9 01:42:24 2011
+++ src/sys/dev/pci/coram.c Mon Aug 29 14:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: coram.c,v 1.8 2011/08/09 01:42:24 jmcneill Exp $ */
+/* $NetBSD: coram.c,v 1.9 2011/08/29 14:47:08 jmcneill Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.8 2011/08/09 01:42:24 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.9 2011/08/29 14:47:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1100,7 +1100,7 @@
return 0;
}
-MODULE(MODULE_CLASS_DRIVER, coram, "cx24227,mt2131");
+MODULE(MODULE_CLASS_DRIVER, coram, "cx24227,mt2131,pci");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/pci/cxdtv.c
diff -u src/sys/dev/pci/cxdtv.c:1.7 src/sys/dev/pci/cxdtv.c:1.8
--- src/sys/dev/pci/cxdtv.c:1.7 Tue Aug 9 01:42:24 2011
+++ src/sys/dev/pci/cxdtv.c Mon Aug 29 14:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cxdtv.c,v 1.7 2011/08/09 01:42:24 jmcneill Exp $ */
+/* $NetBSD: cxdtv.c,v 1.8 2011/08/29 14:47:08 jmcneill Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.7 2011/08/09 01:42:24 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.8 2011/08/29 14:47:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1164,7 +1164,7 @@
delay(200000);
}
-MODULE(MODULE_CLASS_DRIVER, cxdtv, "tvpll,nxt2k,lg3303");
+MODULE(MODULE_CLASS_DRIVER, cxdtv, "tvpll,nxt2k,lg3303,pci");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/pci/pci_verbose.c
diff -u src/sys/dev/pci/pci_verbose.c:1.7 src/sys/dev/pci/pci_verbose.c:1.8
--- src/sys/dev/pci/pci_verbose.c:1.7 Sun Jul 25 14:14:25 2010
+++ src/sys/dev/pci/pci_verbose.c Mon Aug 29 14:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_verbose.c,v 1.7 2010/07/25 14:14:25 pgoyette Exp $ */
+/* $NetBSD: pci_verbose.c,v 1.8 2011/08/29 14:47:08 jmcneill Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_verbose.c,v 1.7 2010/07/25 14:14:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_verbose.c,v 1.8 2011/08/29 14:47:08 jmcneill Exp $");
#include <sys/param.h>
@@ -69,7 +69,7 @@
#ifdef _KERNEL
static int pciverbose_modcmd(modcmd_t, void *);
-MODULE(MODULE_CLASS_MISC, pciverbose, NULL);
+MODULE(MODULE_CLASS_MISC, pciverbose, "pci");
static int
pciverbose_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.4 src/sys/dev/pci/if_alc.c:1.5
--- src/sys/dev/pci/if_alc.c:1.4 Thu Jun 23 17:42:46 2011
+++ src/sys/dev/pci/if_alc.c Mon Aug 29 14:47:08 2011
@@ -2640,7 +2640,7 @@
CSR_WRITE_4(sc, ALC_MAC_CFG, rxcfg);
}
-MODULE(MODULE_CLASS_DRIVER, if_alc, NULL);
+MODULE(MODULE_CLASS_DRIVER, if_alc, "pci");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/pci/pwdog.c
diff -u src/sys/dev/pci/pwdog.c:1.4 src/sys/dev/pci/pwdog.c:1.5
--- src/sys/dev/pci/pwdog.c:1.4 Fri Aug 26 13:29:56 2011
+++ src/sys/dev/pci/pwdog.c Mon Aug 29 14:47:08 2011
@@ -1,4 +1,4 @@
-/* $$NetBSD: pwdog.c,v 1.4 2011/08/26 13:29:56 mbalmer Exp $ */
+/* $$NetBSD: pwdog.c,v 1.5 2011/08/29 14:47:08 jmcneill Exp $ */
/* $OpenBSD: pwdog.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */
/*
@@ -194,7 +194,7 @@
}
#ifdef _MODULE
-MODULE(MODULE_CLASS_DRIVER, pwdog, NULL);
+MODULE(MODULE_CLASS_DRIVER, pwdog, "pci");
#include "ioconf.c"
Index: src/sys/dev/pci/if_ath_pci.c
diff -u src/sys/dev/pci/if_ath_pci.c:1.42 src/sys/dev/pci/if_ath_pci.c:1.43
--- src/sys/dev/pci/if_ath_pci.c:1.42 Tue Jul 26 20:51:23 2011
+++ src/sys/dev/pci/if_ath_pci.c Mon Aug 29 14:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_pci.c,v 1.42 2011/07/26 20:51:23 dyoung Exp $ */
+/* $NetBSD: if_ath_pci.c,v 1.43 2011/08/29 14:47:08 jmcneill Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.42 2011/07/26 20:51:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.43 2011/08/29 14:47:08 jmcneill Exp $");
/*
* PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
@@ -278,7 +278,7 @@
return true;
}
-MODULE(MODULE_CLASS_DRIVER, if_ath_pci, "ath");
+MODULE(MODULE_CLASS_DRIVER, if_ath_pci, "ath,pci");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/pci/if_cas.c
diff -u src/sys/dev/pci/if_cas.c:1.13 src/sys/dev/pci/if_cas.c:1.14
--- src/sys/dev/pci/if_cas.c:1.13 Fri Jan 7 11:17:22 2011
+++ src/sys/dev/pci/if_cas.c Mon Aug 29 14:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.13 2011/01/07 11:17:22 jmcneill Exp $ */
+/* $NetBSD: if_cas.c,v 1.14 2011/08/29 14:47:08 jmcneill Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.13 2011/01/07 11:17:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.14 2011/08/29 14:47:08 jmcneill Exp $");
#ifndef _MODULE
#include "opt_inet.h"
@@ -2068,7 +2068,7 @@
sc->sc_tx_prod = bix;
}
-MODULE(MODULE_CLASS_DRIVER, if_cas, NULL);
+MODULE(MODULE_CLASS_DRIVER, if_cas, "pci");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/pci/pci.c
diff -u src/sys/dev/pci/pci.c:1.141 src/sys/dev/pci/pci.c:1.142
--- src/sys/dev/pci/pci.c:1.141 Wed Aug 24 20:27:35 2011
+++ src/sys/dev/pci/pci.c Mon Aug 29 14:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.c,v 1.141 2011/08/24 20:27:35 dyoung Exp $ */
+/* $NetBSD: pci.c,v 1.142 2011/08/29 14:47:08 jmcneill Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.141 2011/08/24 20:27:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.142 2011/08/29 14:47:08 jmcneill Exp $");
#include "opt_pci.h"
@@ -44,6 +44,7 @@
#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/module.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@@ -973,3 +974,13 @@
return true;
}
+
+MODULE(MODULE_CLASS_DRIVER, pci, NULL);
+
+static int
+pci_modcmd(modcmd_t cmd, void *priv)
+{
+ if (cmd == MODULE_CMD_INIT || cmd == MODULE_CMD_FINI)
+ return 0;
+ return ENOTTY;
+}
Index: src/sys/dev/pci/hdaudio/hdaudio.c
diff -u src/sys/dev/pci/hdaudio/hdaudio.c:1.13 src/sys/dev/pci/hdaudio/hdaudio.c:1.14
--- src/sys/dev/pci/hdaudio/hdaudio.c:1.13 Sat Aug 13 16:08:23 2011
+++ src/sys/dev/pci/hdaudio/hdaudio.c Mon Aug 29 14:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.13 2011/08/13 16:08:23 jakllsch Exp $ */
+/* $NetBSD: hdaudio.c,v 1.14 2011/08/29 14:47:09 jmcneill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.13 2011/08/13 16:08:23 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.14 2011/08/29 14:47:09 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1571,7 +1571,7 @@
return err;
}
-MODULE(MODULE_CLASS_DRIVER, hdaudio, NULL);
+MODULE(MODULE_CLASS_DRIVER, hdaudio, "pci");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.21 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.22
--- src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.21 Wed Aug 3 06:42:59 2011
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c Mon Aug 29 14:47:07 2011
@@ -1122,7 +1122,7 @@
#if defined(__NetBSD__)
/* Module support */
-MODULE(MODULE_CLASS_MISC, drm, NULL);
+MODULE(MODULE_CLASS_MISC, drm, "pci");
static int
drm_modcmd(modcmd_t cmd, void *arg)
