changes to make function

SCCS-vsn: sys/i386/isa/wd.c 5.3

diff --git a/usr/src/sys/i386/isa/wd.c b/usr/src/sys/i386/isa/wd.c
index d1fbac7..a4d1af8 100644 (file)
--- a/usr/src/sys/i386/isa/wd.c
+++ b/usr/src/sys/i386/isa/wd.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.386.c%
  *
  *
  * %sccs.include.386.c%
  *

- *     @(#)wd.c        5.2 (Berkeley) %G%
+ *     @(#)wd.c        5.3 (Berkeley) %G%

  */
 
 #include "wd.h"
  */
 
 #include "wd.h"


@@ -412,7 +412,7 @@ wdintr()
                return;
        }
 
                return;
        }
 

-#ifdef WDDEBUGx
+#ifdef WDDEBUG

        dprintf(DDSK,"I ");
 #endif
        dp = wdtab.b_actf;
        dprintf(DDSK,"I ");
 #endif
        dp = wdtab.b_actf;


@@ -532,7 +532,6 @@ wdopen(dev, flags)
        int i, error = 0;
 
        unit = WDUNIT(dev);
        int i, error = 0;
 
        unit = WDUNIT(dev);

-/*dprintf(DDSK,"wdopen %x\n",unit);*/

        if (unit >= NWD) return (ENXIO) ;
        du = &wddrives[unit];
        if (du->dk_open){
        if (unit >= NWD) return (ENXIO) ;
        du = &wddrives[unit];
        if (du->dk_open){


@@ -560,7 +559,7 @@ wdopen(dev, flags)
         * during first read operation.
         */
        bp = geteblk(512);
         * during first read operation.
         */
        bp = geteblk(512);

-       bp->b_dev = dev;
+       bp->b_dev = dev & 0xff00;

        bp->b_blkno = bp->b_bcount = 0;
        bp->b_flags = B_READ;
        wdstrategy(bp);
        bp->b_blkno = bp->b_bcount = 0;
        bp->b_flags = B_READ;
        wdstrategy(bp);


@@ -634,7 +633,6 @@ wdcontrol(bp)
        int s, cnt;
        extern int bootdev, cyloffset;
 
        int s, cnt;
        extern int bootdev, cyloffset;
 

-       cyloffset=0;

        du = &wddrives[WDUNIT(bp->b_dev)];
        unit = du->dk_unit;
        switch (DISKSTATE(du->dk_state)) {
        du = &wddrives[WDUNIT(bp->b_dev)];
        unit = du->dk_unit;
        switch (DISKSTATE(du->dk_state)) {