diff options
author | gpalmer <gpalmer@FreeBSD.org> | 1995-05-03 23:38:20 +0000 |
---|---|---|
committer | gpalmer <gpalmer@FreeBSD.org> | 1995-05-03 23:38:20 +0000 |
commit | 494c18afd27167331d7a9f082aa867d7f10ddcb3 (patch) | |
tree | 139d10c3e61166c4cf4761fb63670c1528535bd1 /sys/scsi | |
parent | c5a430dd89d93819e2ada8328a932a84b1371a11 (diff) | |
download | FreeBSD-src-494c18afd27167331d7a9f082aa867d7f10ddcb3.zip FreeBSD-src-494c18afd27167331d7a9f082aa867d7f10ddcb3.tar.gz |
Try to make this work again. Peter's last changes left it like :
loading kernel
worm.o: Undefined symbol `_STUNIT' referenced from text segment
I copied the STUNIT definition from the old scsiconf.c into this file to
work around this problem.
Diffstat (limited to 'sys/scsi')
-rw-r--r-- | sys/scsi/worm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c index 317452d..151e0c7 100644 --- a/sys/scsi/worm.c +++ b/sys/scsi/worm.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: worm.c,v 1.3 1995/04/23 07:39:21 bde Exp $ + * $Id: worm.c,v 1.4 1995/04/23 22:07:56 gibbs Exp $ */ /* XXX This is PRELIMINARY. @@ -59,6 +59,8 @@ #include <scsi/scsiconf.h> #include <scsi/scsi_disk.h> +#define STUNIT(DEV) ((minor(DEV)&0xF0) >> 4) /* 4 bit unit. */ + struct scsi_data { struct buf *buf_queue; /* the queue of pending IO operations */ @@ -240,7 +242,7 @@ wormstart(unit, flags) flags | SCSI_NOSLEEP) == SUCCESSFULLY_QUEUED) { } else { badnews: - printf("worm%d: oops not queued\n", unit); + printf("worm%ld: oops not queued\n", unit); bp->b_flags |= B_ERROR; bp->b_error = EIO; biodone(bp); @@ -305,8 +307,6 @@ int worm_open(dev_t dev, int flags, int fmt, struct proc *p, struct scsi_link *sc_link) { - struct scsi_data *worm = sc_link->sd; - if (sc_link->flags & SDEV_OPEN) return EBUSY; |