diff options
Diffstat (limited to 'sys/i386/isa/aic6360.c')
| -rw-r--r-- | sys/i386/isa/aic6360.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c index e0f946d3d993a..2b28abcebcd56 100644 --- a/sys/i386/isa/aic6360.c +++ b/sys/i386/isa/aic6360.c @@ -32,7 +32,7 @@ */ /* - * $Id: aic6360.c,v 1.42 1998/10/22 05:58:38 bde Exp $ + * $Id: aic6360.c,v 1.40 1998/04/15 17:45:12 bde Exp $ * * Acknowledgements: Many of the algorithms used in this driver are * inspired by the work of Julian Elischer (julian@tfs.com) and @@ -663,7 +663,6 @@ static int aic_find __P((struct aic_data *)); static void aic_done __P((struct acb *)); static void aic_dataout __P((struct aic_data *aic)); static void aic_datain __P((struct aic_data *aic)); -static ointhand2_t aicintr; static int32_t aic_scsi_cmd __P((struct scsi_xfer *)); static int aic_poll __P((struct aic_data *aic, struct acb *)); void aic_add_timeout __P((struct acb *, int)); @@ -715,7 +714,6 @@ static struct scsi_device aic_dev = { #include "card.h" #if NCARD > 0 #include <sys/select.h> -#include <sys/module.h> #include <pccard/cardinfo.h> #include <pccard/slot.h> @@ -723,7 +721,16 @@ static int aic_card_intr __P((struct pccard_devinfo *)); static int aicinit __P((struct pccard_devinfo *)); static void aicunload __P((struct pccard_devinfo *)); -PCCARD_MODULE(aic, aicinit, aicunload, aic_card_intr, 0, bio_imask); +static struct pccard_device aic_info = { + "aic", + aicinit, + aicunload, + aic_card_intr, + 0, /* Attributes - presently unused */ + &bio_imask +}; + +DATA_SET(pccarddrv_set, aic_info); /* * Initialize the device - called from Slot manager. @@ -960,7 +967,6 @@ aicattach(dev) struct scsibus_data *scbus; AIC_TRACE(("aicattach\n")); - dev->id_ointr = aicintr; aic->state = 0; aic_scsi_reset(aic); aic_init(aic); /* Init chip and driver */ @@ -2129,7 +2135,7 @@ aic_datain(aic) * 2) doesn't support synchronous transfers properly (yet) */ -static void +void aicintr(int unit) { struct aic_data *aic = aicdata[unit]; |