summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1998-04-25 04:27:54 +0000
committerkato <kato@FreeBSD.org>1998-04-25 04:27:54 +0000
commitb73332da4c8848044569e16e84b22e4130d0731e (patch)
treefd61b8439f613a1bdc10c2dba3fd39c103ef768b /sys
parent68daaf494da892e3cf83df2ad057854c8761357f (diff)
downloadFreeBSD-src-b73332da4c8848044569e16e84b22e4130d0731e.zip
FreeBSD-src-b73332da4c8848044569e16e84b22e4130d0731e.tar.gz
Sync with sys/i386/isa/wd.c revision 1.161.
Diffstat (limited to 'sys')
-rw-r--r--sys/pc98/pc98/wd.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 07a65b3..2120ebe 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
- * $Id: wd.c,v 1.48 1998/04/20 13:51:34 kato Exp $
+ * $Id: wd.c,v 1.49 1998/04/22 10:25:23 julian Exp $
*/
/* TODO:
@@ -83,6 +83,7 @@
#ifdef SLICE
#include <sys/device.h>
#include <sys/fcntl.h>
+#include <sys/sliceio.h>
#include <dev/slice/slice.h>
#else
#include <sys/devfsext.h>
@@ -1068,6 +1069,11 @@ wdstart(int ctrlr)
blknum = transbad144(dsgetbad(bp->b_dev, du->dk_slices),
blknum - ds_offset) + ds_offset;
}
+#else
+ if (du->dk_flags & DKFL_SINGLE) {
+ (void) (*du->slice->handler_up->upconf)(du->slice,
+ SLCIOCTRANSBAD, (caddr_t)&blknum, 0, 0);
+ }
#endif
wdtab[ctrlr].b_active = 1; /* mark controller active */
@@ -2622,7 +2628,7 @@ out:
static void
wderror(struct buf *bp, struct disk *du, char *mesg)
{
-#ifndef SLICE
+#ifdef SLICE
printf("wd%d: %s:\n", du->dk_lunit, mesg);
#else /* !SLICE */
if (bp == NULL)
@@ -2916,7 +2922,7 @@ SYSINIT(wddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wd_drvinit,NULL)
* be a multiple of a sector in length.
*/
static void
-wdsIOreq(void *private ,struct buf *bp)
+wdsIOreq(void *private, struct buf *bp)
{
struct disk *du = private;
int s;
OpenPOWER on IntegriCloud