diff options
| author | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2001-05-06 05:49:11 +0000 |
|---|---|---|
| committer | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2001-05-06 05:49:11 +0000 |
| commit | df552828128e1155af3f2ef4913f842bfd9b585f (patch) | |
| tree | 489249e81fa1f310bfc928e94096ce5d5e58325c /sys/pc98 | |
| parent | c546d2f1a9dab35d378e7402df50626c00b385d1 (diff) | |
| download | src-df552828128e1155af3f2ef4913f842bfd9b585f.tar.gz src-df552828128e1155af3f2ef4913f842bfd9b585f.zip | |
Merged from sys/isa/fd.c revision 1.193.
Notes
Notes:
svn path=/head/; revision=76303
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/fdc.c | 10 | ||||
| -rw-r--r-- | sys/pc98/pc98/fd.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index c02e7fc9699f..74db22485ad8 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -56,13 +56,13 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/bio.h> #include <sys/bus.h> #include <sys/conf.h> -#include <sys/devicestat.h> #include <sys/disklabel.h> +#include <sys/devicestat.h> #include <sys/fcntl.h> -#include <sys/kernel.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/module.h> @@ -1055,7 +1055,8 @@ fdc_attach(device_t dev) return error; } error = BUS_SETUP_INTR(device_get_parent(dev), dev, fdc->res_irq, - INTR_TYPE_BIO, fdc_intr, fdc, &fdc->fdc_intr); + INTR_TYPE_BIO | INTR_ENTROPY, fdc_intr, fdc, + &fdc->fdc_intr); if (error) { device_printf(dev, "cannot setup interrupt\n"); return error; @@ -2664,8 +2665,7 @@ retrier(struct fdc_data *fdc) /* Trick diskerr */ bp->bio_dev = makedev(major(bp->bio_dev), (FDUNIT(minor(bp->bio_dev))<<3)|RAW_PART); - diskerr(bp, "hard error", - fdc->fd->skip / DEV_BSIZE, + diskerr(bp, "hard error", fdc->fd->skip / DEV_BSIZE, (struct disklabel *)NULL); bp->bio_dev = sav_bio_dev; if (fdc->flags & FDC_STAT_VALID) diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c index c02e7fc9699f..74db22485ad8 100644 --- a/sys/pc98/pc98/fd.c +++ b/sys/pc98/pc98/fd.c @@ -56,13 +56,13 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/bio.h> #include <sys/bus.h> #include <sys/conf.h> -#include <sys/devicestat.h> #include <sys/disklabel.h> +#include <sys/devicestat.h> #include <sys/fcntl.h> -#include <sys/kernel.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/module.h> @@ -1055,7 +1055,8 @@ fdc_attach(device_t dev) return error; } error = BUS_SETUP_INTR(device_get_parent(dev), dev, fdc->res_irq, - INTR_TYPE_BIO, fdc_intr, fdc, &fdc->fdc_intr); + INTR_TYPE_BIO | INTR_ENTROPY, fdc_intr, fdc, + &fdc->fdc_intr); if (error) { device_printf(dev, "cannot setup interrupt\n"); return error; @@ -2664,8 +2665,7 @@ retrier(struct fdc_data *fdc) /* Trick diskerr */ bp->bio_dev = makedev(major(bp->bio_dev), (FDUNIT(minor(bp->bio_dev))<<3)|RAW_PART); - diskerr(bp, "hard error", - fdc->fd->skip / DEV_BSIZE, + diskerr(bp, "hard error", fdc->fd->skip / DEV_BSIZE, (struct disklabel *)NULL); bp->bio_dev = sav_bio_dev; if (fdc->flags & FDC_STAT_VALID) |