diff options
| author | ad <ad@NetBSD.org> | 2008-11-12 12:35:50 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2008-11-12 12:35:50 +0000 |
| commit | 0efea177e37295fed654875d875160c47500d6bd (patch) | |
| tree | 9d0589344a5d07b9a511a2e81ebbd701744d03b5 /sys/dev/pci | |
| parent | 0f81d3e0a26c2833cd085c472a4a77c325486b75 (diff) | |
Remove LKMs and switch to the module framework, pass 1.
Proposed on tech-kern@.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_lmc.c | 12 | ||||
| -rw-r--r-- | sys/dev/pci/if_lmc.h | 7 | ||||
| -rw-r--r-- | sys/dev/pci/n8/common/config.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/n8/nsp.c | 7 |
4 files changed, 12 insertions, 19 deletions
diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c index b6a9ce9f418..35779b854b1 100644 --- a/sys/dev/pci/if_lmc.c +++ b/sys/dev/pci/if_lmc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_lmc.c,v 1.44 2008/11/07 00:20:07 dyoung Exp $ */ +/* $NetBSD: if_lmc.c,v 1.45 2008/11/12 12:36:12 ad Exp $ */ /*- * Copyright (c) 2002-2006 David Boggs. <boggs@boggs.palo-alto.ca.us> @@ -142,7 +142,7 @@ #if defined(__NetBSD__) # include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.44 2008/11/07 00:20:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.45 2008/11/12 12:36:12 ad Exp $"); # include <sys/param.h> /* OS version */ /* -DLKM is passed on the compiler command line */ # include "opt_inet.h" /* INET6, INET */ @@ -161,7 +161,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.44 2008/11/07 00:20:07 dyoung Exp $"); # # include <sys/systm.h> # include <sys/kernel.h> -# include <sys/lkm.h> +# include <sys/module.h> # include <sys/mbuf.h> # include <sys/socket.h> # include <sys/sockio.h> @@ -216,7 +216,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.44 2008/11/07 00:20:07 dyoung Exp $"); # include <sys/kernel.h> # include <sys/conf.h> # include <sys/exec.h> -# include <sys/lkm.h> +# include <sys/module.h> # include <sys/mbuf.h> # include <sys/socket.h> # include <sys/sockio.h> @@ -7372,7 +7372,7 @@ struct cfattach lmc_ca = .ca_activate = NULL, }; -# if defined(LKM) +# if defined(_MODULE) struct cfdriver lmc_cd = { @@ -7479,7 +7479,7 @@ int if_lmc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver) return error; } -# endif /* LKM */ +# endif /* _MODULE */ #endif /* __OpenBSD__ */ diff --git a/sys/dev/pci/if_lmc.h b/sys/dev/pci/if_lmc.h index 4abb0d055d7..f2afe37df80 100644 --- a/sys/dev/pci/if_lmc.h +++ b/sys/dev/pci/if_lmc.h @@ -1,5 +1,5 @@ /*- - * $NetBSD: if_lmc.h,v 1.14 2008/09/08 23:36:54 gmcgarry Exp $ + * $NetBSD: if_lmc.h,v 1.15 2008/11/12 12:36:12 ad Exp $ * * Copyright (c) 2002-2006 David Boggs. (boggs@boggs.palo-alto.ca.us) * All rights reserved. @@ -1680,18 +1680,13 @@ static void fbsd_dmamap_load(void *, bus_dma_segment_t *, int, int); static int nbsd_match(struct device *, struct cfdata *, void *); static void nbsd_attach(struct device *, struct device *, void *); static int nbsd_detach(struct device *, int); -# if defined(LKM) -int if_lmc_lkmentry(struct lkm_table *, int, int); -# endif #endif /* __NetBSD__ */ #if defined(__OpenBSD__) static int obsd_match(struct device *, void *, void *); static void obsd_attach(struct device *, struct device *, void *); static int obsd_detach(struct device *, int); -# if defined(LKM) int if_lmc_lkmentry(struct lkm_table *, int, int); -# endif #endif /* __OpenBSD__ */ #if defined(__bsdi__) diff --git a/sys/dev/pci/n8/common/config.c b/sys/dev/pci/n8/common/config.c index 294eb9f3657..b506f8e5bcf 100644 --- a/sys/dev/pci/n8/common/config.c +++ b/sys/dev/pci/n8/common/config.c @@ -32,7 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -static char const n8_id[] = "$Id: config.c,v 1.1 2008/10/30 12:02:14 darran Exp $"; +static char const n8_id[] = "$Id: config.c,v 1.2 2008/11/12 12:36:16 ad Exp $"; /*****************************************************************************/ /** @file config.c * @brief NSP2000 Device Driver Configuration Manager. @@ -172,8 +172,7 @@ static char const n8_id[] = "$Id: config.c,v 1.1 2008/10/30 12:02:14 darran Exp #include <sys/mbuf.h> #include <sys/device.h> #include <sys/queue.h> - -#include <sys/lkm.h> +#include <sys/module.h> #include <sys/bus.h> #include <uvm/uvm_extern.h> diff --git a/sys/dev/pci/n8/nsp.c b/sys/dev/pci/n8/nsp.c index a0a9032440d..f0a7d4b5e16 100644 --- a/sys/dev/pci/n8/nsp.c +++ b/sys/dev/pci/n8/nsp.c @@ -77,8 +77,7 @@ #include <sys/mbuf.h> #include <sys/device.h> #include <sys/queue.h> - -#include <sys/lkm.h> +#include <sys/module.h> #include <sys/bus.h> #include <uvm/uvm_extern.h> @@ -111,7 +110,7 @@ static void nsp_attach(struct device *parent, struct device *self, void *aux); static int nsp_detach(device_t dev, int flags); -#ifdef _LKM +#ifdef _MODULE CFATTACH_DECL(nsp2000, sizeof(struct nsp_softc), nsp_probe, nsp_attach, nsp_detach, NULL); int nsp2000_lkmentry(struct lkm_table *lkmtp, int cmd, int ver); @@ -149,7 +148,7 @@ nsp2000_lkmentry(struct lkm_table *lkmtp, int cmd, int ver) LKM_DISPATCH(lkmtp, cmd, NULL, lkm_nofunc, lkm_nofunc, lkm_nofunc); } -#else /* _LKM */ +#else /* _MODULE */ CFATTACH_DECL(nsp, sizeof(struct nsp_softc), nsp_probe, nsp_attach, nsp_detach, NULL); #endif |
