Wed Jan 18 00:11:43 2012 UTC ()
Improve module dependencies, clean up old #if 0 code.


(jakllsch)
diff -r1.2 -r1.3 src/sys/dev/isa/lm_isa_common.c
cvs diff -r1.2 -r1.3 src/sys/dev/isa/lm_isa_common.c (expand / switch to unified diff)

--- src/sys/dev/isa/lm_isa_common.c 2012/01/17 17:17:15 1.2
+++ src/sys/dev/isa/lm_isa_common.c 2012/01/18 00:11:43 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: lm_isa_common.c,v 1.2 2012/01/17 17:17:15 jakllsch Exp $ */ 1/* $NetBSD: lm_isa_common.c,v 1.3 2012/01/18 00:11:43 jakllsch Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2000 The NetBSD Foundation, Inc. 4 * Copyright (c) 2000 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Bill Squier. 8 * by Bill Squier.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: lm_isa_common.c,v 1.2 2012/01/17 17:17:15 jakllsch Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: lm_isa_common.c,v 1.3 2012/01/18 00:11:43 jakllsch Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37#include <sys/kernel.h> 37#include <sys/kernel.h>
38#include <sys/device.h> 38#include <sys/device.h>
39#include <sys/module.h> 39#include <sys/module.h>
40#include <sys/conf.h> 40#include <sys/conf.h>
41 41
42#include <sys/bus.h> 42#include <sys/bus.h>
43 43
44#include <dev/isa/isareg.h> 44#include <dev/isa/isareg.h>
45#include <dev/isa/isavar.h> 45#include <dev/isa/isavar.h>
46 46
@@ -49,34 +49,26 @@ __KERNEL_RCSID(0, "$NetBSD: lm_isa_commo @@ -49,34 +49,26 @@ __KERNEL_RCSID(0, "$NetBSD: lm_isa_commo
49int lm_isa_match(device_t, cfdata_t, void *); 49int lm_isa_match(device_t, cfdata_t, void *);
50void lm_isa_attach(device_t, device_t, void *); 50void lm_isa_attach(device_t, device_t, void *);
51int lm_isa_detach(device_t, int); 51int lm_isa_detach(device_t, int);
52 52
53static uint8_t lm_isa_readreg(struct lm_softc *, int); 53static uint8_t lm_isa_readreg(struct lm_softc *, int);
54static void lm_isa_writereg(struct lm_softc *, int, int); 54static void lm_isa_writereg(struct lm_softc *, int, int);
55 55
56struct lm_isa_softc { 56struct lm_isa_softc {
57 struct lm_softc lmsc; 57 struct lm_softc lmsc;
58 bus_space_tag_t lm_iot; 58 bus_space_tag_t lm_iot;
59 bus_space_handle_t lm_ioh; 59 bus_space_handle_t lm_ioh;
60}; 60};
61 61
62#if 0 
63CFATTACH_DECL_NEW(lm_isa, sizeof(struct lm_isa_softc), 
64 lm_isa_match, lm_isa_attach, lm_isa_detach, NULL); 
65 
66CFATTACH_DECL_NEW(lm_wbsio, sizeof(struct lm_isa_softc), 
67 lm_isa_match, lm_isa_attach, lm_isa_detach, NULL); 
68#endif 
69 
70int 62int
71lm_isa_match(device_t parent, cfdata_t match, void *aux) 63lm_isa_match(device_t parent, cfdata_t match, void *aux)
72{ 64{
73 bus_space_handle_t ioh; 65 bus_space_handle_t ioh;
74 struct isa_attach_args *ia = aux; 66 struct isa_attach_args *ia = aux;
75 struct lm_isa_softc sc; 67 struct lm_isa_softc sc;
76 int rv; 68 int rv;
77 69
78 /* Must supply an address */ 70 /* Must supply an address */
79 if (ia->ia_nio < 1) 71 if (ia->ia_nio < 1)
80 return 0; 72 return 0;
81 73
82 if (ISA_DIRECT_CONFIG(ia)) 74 if (ISA_DIRECT_CONFIG(ia))
@@ -151,22 +143,22 @@ lm_isa_readreg(struct lm_softc *lmsc, in @@ -151,22 +143,22 @@ lm_isa_readreg(struct lm_softc *lmsc, in
151 bus_space_write_1(sc->lm_iot, sc->lm_ioh, LMC_ADDR, reg); 143 bus_space_write_1(sc->lm_iot, sc->lm_ioh, LMC_ADDR, reg);
152 return bus_space_read_1(sc->lm_iot, sc->lm_ioh, LMC_DATA); 144 return bus_space_read_1(sc->lm_iot, sc->lm_ioh, LMC_DATA);
153} 145}
154 146
155static void 147static void
156lm_isa_writereg(struct lm_softc *lmsc, int reg, int val) 148lm_isa_writereg(struct lm_softc *lmsc, int reg, int val)
157{ 149{
158 struct lm_isa_softc *sc = (struct lm_isa_softc *)lmsc; 150 struct lm_isa_softc *sc = (struct lm_isa_softc *)lmsc;
159 151
160 bus_space_write_1(sc->lm_iot, sc->lm_ioh, LMC_ADDR, reg); 152 bus_space_write_1(sc->lm_iot, sc->lm_ioh, LMC_ADDR, reg);
161 bus_space_write_1(sc->lm_iot, sc->lm_ioh, LMC_DATA, val); 153 bus_space_write_1(sc->lm_iot, sc->lm_ioh, LMC_DATA, val);
162} 154}
163 155
164MODULE(MODULE_CLASS_DRIVER, lm_isa_common, NULL); 156MODULE(MODULE_CLASS_DRIVER, lm_isa_common, "lm");
165 157
166static int 158static int
167lm_isa_common_modcmd(modcmd_t cmd, void *priv) 159lm_isa_common_modcmd(modcmd_t cmd, void *priv)
168{ 160{
169 if ((cmd == MODULE_CMD_INIT) || (cmd == MODULE_CMD_FINI)) 161 if ((cmd == MODULE_CMD_INIT) || (cmd == MODULE_CMD_FINI))
170 return 0; 162 return 0;
171 return ENOTTY; 163 return ENOTTY;
172} 164}