Update the pccard hooks to use a module style declaration instead.

5 files changed, 15 insertions, 58 deletions

diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 0b288c308c40..90f230f5e871 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.48 1998/12/30 08:06:41 kato Exp $
+ *	$Id: fd.c,v 1.49 1999/01/16 11:40:02 kato Exp $
  *
  */
 
@@ -370,6 +370,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>
@@ -381,16 +382,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/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 104bb65115c0..97ac3ad3b384 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.74 1999/01/08 16:09:22 kato Exp $
+ *	$Id: sio.c,v 1.75 1999/01/16 11:42:16 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -180,6 +180,7 @@
 
 #include "card.h"
 #if NCARD > 0
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 #endif
@@ -864,17 +865,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.
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index 0b288c308c40..90f230f5e871 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.48 1998/12/30 08:06:41 kato Exp $
+ *	$Id: fd.c,v 1.49 1999/01/16 11:40:02 kato Exp $
  *
  */
 
@@ -370,6 +370,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>
@@ -381,16 +382,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/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index e5f7e4dea8fc..b34898e3e80e 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.56 1998/12/14 08:58:12 kato Exp $
+ *	$Id: if_ed.c,v 1.57 1998/12/31 03:23:39 kato Exp $
  */
 
 /*
@@ -241,6 +241,7 @@ static u_long	ds_crc		__P((u_char *ep));
 #endif
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 
@@ -251,17 +252,7 @@ static int	edinit		__P((struct pccard_devinfo *));
 static void	edunload	__P((struct pccard_devinfo *));
 static int	card_intr	__P((struct pccard_devinfo *));
 
-static struct pccard_device ed_info = {
-	"ed",
-	edinit,
-	edunload,
-	card_intr,
-	0,			/* Attributes - presently unused */
-	&net_imask		/* Interrupt mask for device */
-				/* XXX - Should this also include net_imask? */
-};
-
-DATA_SET(pccarddrv_set, ed_info);
+PCCARD_MODULE(ed, edinit, edunload, card_intr, 0, net_imask);
 
 /*
  *	Initialize the device - called from Slot manager.
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 104bb65115c0..97ac3ad3b384 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.74 1999/01/08 16:09:22 kato Exp $
+ *	$Id: sio.c,v 1.75 1999/01/16 11:42:16 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -180,6 +180,7 @@
 
 #include "card.h"
 #if NCARD > 0
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 #endif
@@ -864,17 +865,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.