diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1999-01-19 00:21:53 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1999-01-19 00:21:53 +0000 |
| commit | d17e4ee67dd99c4762f09a4b76efad41b6469ef5 (patch) | |
| tree | 4448427333b8351fa33ad5b0f6adc5844d7de616 /sys/isa | |
| parent | 9b3df7693a0bdc488d2c5b76cbf7e16d1ea81af8 (diff) | |
| download | src-d17e4ee67dd99c4762f09a4b76efad41b6469ef5.tar.gz src-d17e4ee67dd99c4762f09a4b76efad41b6469ef5.zip | |
Update the pccard hooks to use a module style declaration instead.
Notes
Notes:
svn path=/head/; revision=42820
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/fd.c | 14 | ||||
| -rw-r--r-- | sys/isa/sio.c | 15 |
2 files changed, 6 insertions, 23 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index c8e35a5ae07d..9972a38f5c35 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.130 1998/12/27 13:40:56 phk Exp $ + * $Id: fd.c,v 1.131 1999/01/15 09:15:27 bde Exp $ * */ @@ -275,6 +275,7 @@ static int volatile fd_debug = 0; #ifdef FDC_YE #if NCARD > 0 #include <sys/select.h> +#include <sys/module.h> #include <pccard/cardinfo.h> #include <pccard/driver.h> #include <pccard/slot.h> @@ -286,16 +287,7 @@ static int yeinit(struct pccard_devinfo *); /* init device */ static void yeunload(struct pccard_devinfo *); /* Disable driver */ static int yeintr(struct pccard_devinfo *); /* Interrupt handler */ -static struct pccard_device ye_info = { - "fdc", - yeinit, - yeunload, - yeintr, - 0, /* Attributes - presently unused */ - &bio_imask /* Interrupt mask for device */ -}; - -DATA_SET(pccarddrv_set, ye_info); +PCCARD_MODULE(fdc, yeinit, yeunload, yeintr, 0, bio_imask); /* * this is the secret PIO data port (offset from base) diff --git a/sys/isa/sio.c b/sys/isa/sio.c index db05e1863199..6a2084e6dc81 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.218 1998/11/15 18:25:17 dfr Exp $ + * $Id: sio.c,v 1.219 1998/12/13 23:12:54 steve Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.215 */ @@ -92,6 +92,7 @@ #include "card.h" #if NCARD > 0 +#include <sys/module.h> #include <pccard/cardinfo.h> #include <pccard/slot.h> #endif @@ -494,17 +495,7 @@ static int sioinit __P((struct pccard_devinfo *)); static void siounload __P((struct pccard_devinfo *)); static int card_intr __P((struct pccard_devinfo *)); -static struct pccard_device sio_info = { - driver_name, - sioinit, - siounload, - card_intr, - 0, /* Attributes - presently unused */ - &tty_imask /* Interrupt mask for device */ - /* XXX - Should this also include net_imask? */ -}; - -DATA_SET(pccarddrv_set, sio_info); +PCCARD_MODULE(sio, sioinit, siounload, card_intr, 0, tty_imask); /* * Initialize the device - called from Slot manager. |